refining

Author: fitzyjoe

Dockerfile

@@ -3,8 +3,6 @@ FROM centos:7
 LABEL maintainer="TeslaGov" email="[email protected]"
 
 ARG NGINX_VERSION=1.12.0
-ARG JANSSON_VERSION=2.10
-ARG LIBJWT_VERSION=1.8.0
 
 COPY resources/nginx.repo /etc/yum.repos.d/nginx.repo
 
@@ -15,6 +13,10 @@ RUN yum -y update && \
 	yum -y install pcre-devel pcre zlib-devel openssl-devel wget cmake check-devel check && \
 	yum -y install nginx-$NGINX_VERSION
 
+ARG JANSSON_VERSION=2.10
+ARG LIBJWT_VERSION=1.8.0
+ARG TESLA_REPO_NAME=ngx-http-auth-jwt-module
+
 # for compiling for rh-nginx110
 # yum -y install libxml2 libxslt libxml2-devel libxslt-devel gd gd-devel perl-ExtUtils-Embed
 
@@ -23,10 +25,10 @@ WORKDIR /root/dl
 
 # get our JWT module
 # change this to get a specific version?
-RUN wget https://github.com/TeslaGov/ngx-http-auth-jwt-module/archive/master.zip && \
-	unzip master.zip && \
-	rm master.zip && \
-	ln -sf ngx-http-auth-jwt-module-master ngx-http-auth-jwt-module
+RUN wget https://github.com/TeslaGov/$TESLA_REPO_NAME/archive/joefitz/match-rh-nginx110-version.zip && \
+	unzip match-rh-nginx110-version.zip && \
+	rm match-rh-nginx110-version.zip && \
+	ln -sf $TESLA_REPO_NAME-joefitz-match-rh-nginx110-version $TESLA_REPO_NAME
 
 # build jansson
 RUN wget https://github.com/akheron/jansson/archive/v$JANSSON_VERSION.zip && \

src/ngx_http_auth_jwt_module.c

@@ -22,6 +22,7 @@ static void * ngx_http_auth_jwt_create_loc_conf(ngx_conf_t *cf);
 static char * ngx_http_auth_jwt_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child);
 static int hex_char_to_binary( char ch, char* ret );
 static int hex_to_binary( const char* str, u_char* buf, int len );
+static char * ngx_str_t_to_char_ptr(ngx_pool_t *pool, ngx_str_t str);
 
 static ngx_command_t ngx_http_auth_jwt_commands[] = {