cleanup

Author: JoshMcCullough

.bin/git/hooks-wrapper

@@ -20,7 +20,7 @@ NATIVE_HOOKS_DIR=$(git rev-parse --show-toplevel)/.git/hooks
 # We don't want to bail at the first failure, as the user might
 # then bypass the hooks without knowing about additional issues.
 
-for hook in $CUSTOM_HOOKS_DIR/$(basename $0)-*; do
+for hook in ${CUSTOM_HOOKS_DIR}/$(basename $0)-*; do
     test -x "$hook" || continue
 
     echo "Running custom hook '$hookname' ..."
@@ -30,9 +30,9 @@ for hook in $CUSTOM_HOOKS_DIR/$(basename $0)-*; do
 done
 
 # check if there was a local hook that was moved previously
-if [ -f "$NATIVE_HOOKS_DIR/$hookname.local" ]; then
+if [ -f "${NATIVE_HOOKS_DIR}/$hookname.local" ]; then
     echo "Running native hook '$hookname' ..."
-    out=`$NATIVE_HOOKS_DIR/$hookname.local "$@"`
+    out=`${NATIVE_HOOKS_DIR}/$hookname.local "$@"`
     exitcodes+=($?)
     echo "$out"
 fi

.bin/git/init-hooks

@@ -7,13 +7,13 @@ HOOK_NAMES="applypatch-msg pre-applypatch post-applypatch pre-commit prepare-com
 REPO_ROOT_DIR=$(git rev-parse --show-toplevel)
 HOOKS_DIR=$(git rev-parse --show-toplevel)/.git/hooks
 
-for hook in $HOOK_NAMES; do
+for hook in ${HOOK_NAMES}; do
     # If the hook already exists, is a file, and is not a symlink
-    if [ ! -h $HOOKS_DIR/$hook ] && [ -f $HOOKS_DIR/$hook ]; then
-        mv $HOOKS_DIR/$hook $HOOKS_DIR/$hook.local
+    if [ ! -h ${HOOKS_DIR}/${hook} ] && [ -f ${HOOKS_DIR}/${hook} ]; then
+        mv ${HOOKS_DIR}/${hook} ${HOOKS_DIR}/${hook}.local
     fi
     # create the symlink, overwriting the file if it exists
     # probably the only way this would happen is if you're using an old version of git
     # -- back when the sample hooks were not executable, instead of being named ____.sample
-    ln -s -f $REPO_ROOT_DIR/bin/git/hooks-wrapper $HOOKS_DIR/$hook
+    ln -s -f ${REPO_ROOT_DIR}/bin/git/hooks-wrapper ${HOOKS_DIR}/${hook}
 done

Dockerfile

@@ -1,40 +1,41 @@
-ARG NGINX_VERSION=1.22.0
+ARG NGINX_VERSION
 
 
 FROM debian:bullseye-slim as BASE_IMAGE
 LABEL stage=builder
-RUN apt-get update \
+RUN  apt-get update \
 	&& apt-get install -y curl build-essential
 
 
 FROM BASE_IMAGE as BUILD_IMAGE
 LABEL stage=builder
 ENV LD_LIBRARY_PATH=/usr/local/lib
 ARG NGINX_VERSION
-ADD . /root/dl/ngx-http-auth-jwt-module
-RUN set -x \
+RUN  set -x \
 	&& apt-get install -y libjwt-dev libjwt0 libjansson-dev libjansson4 libpcre2-dev zlib1g-dev libpcre3-dev \
-	&& mkdir -p /root/dl
-WORKDIR /root/dl
-RUN set -x \
-	&& curl -O http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz \
-	&& tar -xzf nginx-$NGINX_VERSION.tar.gz \
-	&& rm nginx-$NGINX_VERSION.tar.gz \
-	&& ln -sf nginx-$NGINX_VERSION nginx \
-	&& cd /root/dl/nginx \
-	&& ./configure --with-compat --add-dynamic-module=../ngx-http-auth-jwt-module \
+	&& mkdir -p /root/build/ngx-http-auth-jwt-module
+WORKDIR /root/build/ngx-http-auth-jwt-module
+ADD config ./
+ADD src/*.h src/*.c ./src/
+WORKDIR /root/build
+RUN  set -x \
+  && mkdir nginx \
+	&& curl -O http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \
+	&& tar -xzf nginx-${NGINX_VERSION}.tar.gz --strip-components 1 -C nginx \
+	&& rm nginx-${NGINX_VERSION}.tar.gz
+WORKDIR /root/build/nginx
+RUN  ./configure --with-compat --add-dynamic-module=../ngx-http-auth-jwt-module \
 	&& make modules
 
 
 FROM nginx:${NGINX_VERSION}
 LABEL stage=builder
-RUN apt-get update \
+RUN  apt-get update \
 	&& apt-get -y install libjansson4 libjwt0 \
 	&& cd /etc/nginx \
-	&& cp nginx.conf nginx.conf.orig \
 	&& sed -ri '/pid\s+\/var\/run\/nginx\.pid;$/a load_module \/usr\/lib64\/nginx\/modules\/ngx_http_auth_jwt_module\.so;' nginx.conf
 
 
 LABEL stage=
 LABEL maintainer="TeslaGov" email="[email protected]"
-COPY --from=BUILD_IMAGE /root/dl/nginx/objs/ngx_http_auth_jwt_module.so /usr/lib64/nginx/modules/
+COPY --from=BUILD_IMAGE /root/build/nginx/objs/ngx_http_auth_jwt_module.so /usr/lib64/nginx/modules/

config

@@ -1,8 +1,7 @@
-ngx_addon_name=ngx_http_auth_jwt_module
-
 ngx_module_type=HTTP
-ngx_module_name=ngx_http_auth_jwt_module
-ngx_module_srcs="$ngx_addon_dir/src/ngx_http_auth_jwt_binary_converters.c $ngx_addon_dir/src/ngx_http_auth_jwt_header_processing.c $ngx_addon_dir/src/ngx_http_auth_jwt_string.c $ngx_addon_dir/src/ngx_http_auth_jwt_module.c"
+ngx_addon_name=ngx_http_auth_jwt_module
+ngx_module_name=$ngx_addon_name
+ngx_module_srcs="${ngx_addon_dir}/src/ngx_http_auth_jwt_binary_converters.c ${ngx_addon_dir}/src/ngx_http_auth_jwt_header_processing.c ${ngx_addon_dir}/src/ngx_http_auth_jwt_string.c ${ngx_addon_dir}/src/ngx_http_auth_jwt_module.c"
 ngx_module_libs="-ljansson -ljwt"
 
 . auto/module

scripts.sh

@@ -5,25 +5,34 @@ GREEN='\033[0;32m'
 RED='\033[0;31m'
 NC='\033[0m'
 
-DOCKER_ORG_NAME=${DOCKER_ORG_NAME:-teslagov}
-DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-jwt-nginx}
-DOCKER_FULL_IMAGE_NAME=${DOCKER_ORG_NAME}/${DOCKER_IMAGE_NAME}
-CONTAINER_NAME_PREFIX=${CONTAINER_NAME_PREFIX:-jwt-nginx-test}
-NGINX_VERSION=${NGINX_VERSION:-1.22.0}
+export ORG_NAME=${ORG_NAME:-teslagov}
+export IMAGE_NAME=${IMAGE_NAME:-jwt-nginx}
+export FULL_IMAGE_NAME=${ORG_NAME}/${IMAGE_NAME}
+export CONTAINER_NAME_PREFIX=${CONTAINER_NAME_PREFIX:-jwt-nginx-test}
+export NGINX_VERSION=${NGINX_VERSION:-1.22.0}
 
 all() {
 	build_nginx
 	start_nginx
 	test
 }
 
+fetch_headers() {
+	printf "${BLUE} Fetching NGINX headers...${NC}"
+	local files='src/core/ngx_core.h src/http/ngx_http.h'
+
+	for f in ${files}; do
+		curl "https://raw.githubusercontent.com/nginx/nginx/release-${NGINX_VERSION}/${f}" -o src/lib/$(basename ${f})
+	done
+}
+
 build_nginx() {
-	DOCKER_ARGS=${1:-}
+	local dockerArgs=${1:-}
 
 	printf "${BLUE}  Building...${NC}"
 	docker image pull debian:bullseye-slim
 	docker image pull nginx:${NGINX_VERSION}
-	docker image build -t ${DOCKER_FULL_IMAGE_NAME}:latest -t ${DOCKER_FULL_IMAGE_NAME}:${NGINX_VERSION} --build-arg NGINX_VERSION=${NGINX_VERSION} ${DOCKER_ARGS} .
+	docker image build -t ${FULL_IMAGE_NAME}:latest -t ${FULL_IMAGE_NAME}:${NGINX_VERSION} --build-arg NGINX_VERSION=${NGINX_VERSION} ${dockerArgs} .
 
 	if [ "$?" -ne 0 ]; then
 		printf "${RED}  Build failed ${NC}"
@@ -39,43 +48,35 @@ rebuild_nginx() {
 }
 
 start_nginx() {
-	docker run --rm --name "${DOCKER_IMAGE_NAME}" -d -p 8000:80 ${DOCKER_FULL_IMAGE_NAME}
+	docker run --rm --name "${IMAGE_NAME}" -d -p 8000:80 ${FULL_IMAGE_NAME}
 }
 
 stop_nginx() {
-	docker stop "${DOCKER_IMAGE_NAME}"
+	docker stop "${IMAGE_NAME}"
 }
 
 cp_bin() {
 	printf "${BLUE}  Copying binaries...${NC}"
 	rm -rf bin
 	mkdir bin
-	docker exec "${DOCKER_IMAGE_NAME}" sh -c "tar -chf - \
+	docker exec "${IMAGE_NAME}" sh -c "tar -chf - \
 		/usr/lib64/nginx/modules/ngx_http_auth_jwt_module.so \
 		/usr/lib/x86_64-linux-gnu/libjansson.so.* \
 		/usr/lib/x86_64-linux-gnu/libjwt.*" 2>/dev/null | tar -xf - -C bin &>/dev/null
 }
 
 build_test_runner() {
-	DOCKER_ARGS=${1:-}
-
-	export CONTAINER_NAME_PREFIX
-	export IMAGE_NAME=${IMAGE_NAME:-${DOCKER_FULL_IMAGE_NAME}}
-	export IMAGE_VERSION=${NGINX_VERSION}
+	local dockerArgs=${1:-}
 
 	printf "${BLUE}  Building test runner...${NC}"
-	docker compose -f ./test/docker-compose-test.yml build ${DOCKER_ARGS}
+	docker compose -f ./test/docker-compose-test.yml build ${dockerArgs}
 }
 
 rebuild_test_runner() {
 	build_test_runner --no-cache
 }
 
 test() {
-	export CONTAINER_NAME_PREFIX
-	export IMAGE_NAME=${IMAGE_NAME:-${DOCKER_FULL_IMAGE_NAME}}
-	export IMAGE_VERSION=${NGINX_VERSION}
-
 	printf "${BLUE}  Running tests...${NC}"
 	docker compose -f ./test/docker-compose-test.yml up --no-start
 	docker start ${CONTAINER_NAME_PREFIX}

test/Dockerfile-test-nginx

@@ -1,5 +1,5 @@
 ARG BASE_IMAGE
 
 FROM ${BASE_IMAGE} as NGINX
-COPY test-jwt-nginx.conf /etc/nginx/conf.d/test-jwt-nginx.conf
+COPY test.conf /etc/nginx/conf.d/test.conf
 COPY rsa_key_2048-pub.pem /etc/nginx/rsa-key.conf

test/docker-compose-test.yml

@@ -8,7 +8,7 @@ services:
       context: .
       dockerfile: Dockerfile-test-nginx
       args:
-        BASE_IMAGE: ${IMAGE_NAME}:${IMAGE_VERSION:-latest}
+        BASE_IMAGE: ${FULL_IMAGE_NAME}:${NGINX_VERSION:-latest}
     logging:
       driver: ${LOG_DRIVER:-journald}
 
@@ -18,7 +18,7 @@ services:
       context: .
       dockerfile: Dockerfile-test-runner
     environment:
-      BASE_IMAGE: ${IMAGE_NAME}:${IMAGE_VERSION:-latest}
+      BASE_IMAGE: ${FULL_IMAGE_NAME}:${NGINX_VERSION:-latest}
 
     depends_on:
       - nginx

test/test-jwt-nginx.conf renamed to test/test.conf

@@ -10,7 +10,7 @@ run_test () {
   local expect=$3
   local extra=$4
 
-  cmd="curl -X GET -o /dev/null --silent --head --write-out '%{http_code}' http://nginx:8000$path -H 'cache-control: no-cache' $extra"
+  cmd="curl -X GET -o /dev/null --silent --head --write-out '%{http_code}' http://nginx:8000${path} -H 'cache-control: no-cache' $extra"
   result=$(eval ${cmd})
 
   if [ "${result}" -eq "${expect}" ]; then