From add59edf551c2fd8844e28c3aaf63dd9fc0a2181 Mon Sep 17 00:00:00 2001 From: Hans Zandbelt Date: Thu, 4 Jul 2019 09:32:45 +0200 Subject: [PATCH] depend on liboauth2 1.1.1 with log encapsulation changes - improve sample bearer token retrieval - bump to 3.0.2 Signed-off-by: Hans Zandbelt --- .cproject | 457 ++++++++++++++++++++++++++++++++++----------------- ChangeLog | 3 + README.md | 2 +- configure.ac | 6 +- 4 files changed, 312 insertions(+), 156 deletions(-) diff --git a/.cproject b/.cproject index 998af85..f3d34ee 100644 --- a/.cproject +++ b/.cproject @@ -1,155 +1,308 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - make - - all - true - true - false - - - make - - check - true - true - false - - - make - - clang-format - true - true - false - - - make - - clean - true - true - false - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + make + + + + all + + true + + true + + false + + + + + + make + + + + check + + true + + true + + false + + + + + + make + + + + clang-format + + true + + true + + false + + + + + + make + + + + clean + + true + + true + + false + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ChangeLog b/ChangeLog index e69de29..850cb0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,3 @@ +07/04/2019 +- depend on liboauth2 1.1.1 with log encapsulation changes +- bump to 3.0.2 diff --git a/README.md b/README.md index bff2c08..8917591 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ OAuth2TokenVerify [ introspect | jwk_uri | metadata | jwk | plain | base64 | bas # map $http_authorization $source_token { default ""; - "~bearer (?.*)$" $token; + "~*^Bearer\s+(?[\S]+)$" $token; } server { diff --git a/configure.ac b/configure.ac index 059ca00..c049ac8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([ngx_oauth2_module],[3.0.0],[hans.zandbelt@zmartzone.eu]) +AC_INIT([ngx_oauth2_module],[3.0.2],[hans.zandbelt@zmartzone.eu]) AM_INIT_AUTOMAKE([foreign no-define subdir-objects]) AC_CONFIG_MACRO_DIRS([m4]) @@ -25,11 +25,11 @@ AM_CONDITIONAL(HAVE_NGINX, [test x"$have_nginx" = "xyes"]) AC_SUBST(NGINX_CFLAGS) AC_SUBST(NGINX_LIBS) -PKG_CHECK_MODULES(OAUTH2, [liboauth2 >= 1.0.0]) +PKG_CHECK_MODULES(OAUTH2, [liboauth2 >= 1.1.1]) AC_SUBST(OAUTH2_CFLAGS) AC_SUBST(OAUTH2_LIBS) -PKG_CHECK_MODULES(OAUTH2_NGINX, [liboauth2_nginx >= 1.0.0]) +PKG_CHECK_MODULES(OAUTH2_NGINX, [liboauth2_nginx >= 1.1.1]) AC_SUBST(OAUTH2_NGINX_CFLAGS) AC_SUBST(OAUTH2_NGINX_LIBS)