build.sh fix for MacOS Docker.

TimUnderhay · fitzyjoe · commit 7593b72696aa · 2018-05-25T11:54:10.000-04:00
Removed memcpy op for RSA validation and use pointer instead
diff --git a/build.sh b/build.sh
@@ -15,7 +15,9 @@ fi
 
 CONTAINER_ID=$(docker run --name "${DOCKER_IMAGE_NAME}-cont" -d -p 8000:8000 ${DOCKER_IMAGE_NAME})
 
-MACHINE_IP=`docker-machine ip`
+if ! MACHINE_IP=`docker-machine ip 2>/dev/null`; then
+  MACHINE_IP='0.0.0.0' # fix for MacOS
+fi
 
 docker cp ${CONTAINER_ID}:/usr/lib64/nginx/modules/ngx_http_auth_jwt_module.so .
 
diff --git a/ngx_http_auth_jwt_module.so b/ngx_http_auth_jwt_module.so
diff --git a/src/ngx_http_auth_jwt_module.c b/src/ngx_http_auth_jwt_module.c
@@ -171,8 +171,7 @@ static ngx_int_t ngx_http_auth_jwt_handler(ngx_http_request_t *r)
 	else if ( auth_jwt_algorithm.len == sizeof("RS256") - 1 && ngx_strncmp(auth_jwt_algorithm.data, "RS256", sizeof("RS256") - 1) == 0 )
 	{
 		// in this case, 'Binary' is a misnomer, as it is the public key string itself
-		keyBinary = ngx_palloc(r->pool, jwtcf->auth_jwt_key.len);
-		ngx_memcpy(keyBinary, jwtcf->auth_jwt_key.data, jwtcf->auth_jwt_key.len);
+		keyBinary = jwtcf->auth_jwt_key.data;
 		keylen = jwtcf->auth_jwt_key.len;
 	}
 	else

Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,7 @@ static ngx_int_t ngx_http_auth_jwt_handler(ngx_http_request_t *r)`
`171`	`171`	`else if ( auth_jwt_algorithm.len == sizeof("RS256") - 1 && ngx_strncmp(auth_jwt_algorithm.data, "RS256", sizeof("RS256") - 1) == 0 )`
`172`	`172`	`{`
`173`	`173`	`// in this case, 'Binary' is a misnomer, as it is the public key string itself`
`174`		`- keyBinary = ngx_palloc(r->pool, jwtcf->auth_jwt_key.len);`
`175`		`- ngx_memcpy(keyBinary, jwtcf->auth_jwt_key.data, jwtcf->auth_jwt_key.len);`
	`174`	`+ keyBinary = jwtcf->auth_jwt_key.data;`
`176`	`175`	`keylen = jwtcf->auth_jwt_key.len;`
`177`	`176`	`}`
`178`	`177`	`else`