chore: trying to fix dockerfile + updated dockerfile

Author: unixfox

openresty-ssl-ja3/Dockerfile

@@ -2,19 +2,19 @@
 # https://github.com/openresty/docker-openresty
 
 ARG RESTY_IMAGE_BASE="alpine"
-ARG RESTY_IMAGE_TAG="3.20"
+ARG RESTY_IMAGE_TAG="3.21.3"
 
 FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}
 
 LABEL maintainer="Evan Wies <evan@neomantra.net>"
 
 # Docker Build Arguments
 ARG RESTY_IMAGE_BASE="alpine"
-ARG RESTY_IMAGE_TAG="3.20"
+ARG RESTY_IMAGE_TAG="3.21.3"
 ARG RESTY_VERSION="1.27.1.1"
 
 # https://github.com/openresty/openresty-packaging/blob/master/alpine/openresty-openssl3/APKBUILD
-ARG RESTY_OPENSSL_VERSION="3.0.15"
+ARG RESTY_OPENSSL_VERSION="3.0.16"
 ARG RESTY_OPENSSL_PATCH_VERSION="3.0.15"
 ARG RESTY_OPENSSL_URL_BASE="https://github.com/openssl/openssl/releases/download/openssl-${RESTY_OPENSSL_VERSION}"
 # LEGACY:  "https://www.openssl.org/source/old/1.1.1"
@@ -140,14 +140,13 @@ RUN apk add --no-cache --virtual .build-deps \
     && cd /tmp \
     && if [ -n "${RESTY_EVAL_PRE_CONFIGURE}" ]; then eval $(echo ${RESTY_EVAL_PRE_CONFIGURE}); fi \
     && cd /tmp \
-    && echo curl -fSL "${RESTY_OPENSSL_URL_BASE}/openssl-${RESTY_OPENSSL_VERSION}.tar.gz" -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
     && curl -fSL "${RESTY_OPENSSL_URL_BASE}/openssl-${RESTY_OPENSSL_VERSION}.tar.gz" -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
     && tar xzf openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
     && cd openssl-${RESTY_OPENSSL_VERSION} \
-    && if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-5) = "3.0.15" ] ; then \
+    && if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-4) = "3.0." ] ; then \
         echo 'patching OpenSSL 3.0.15 for OpenResty' \
         && curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-${RESTY_OPENSSL_PATCH_VERSION}-sess_set_get_cb_yield.patch | patch -p1 \
-	    && curl -s https://raw.githubusercontent.com/fooinha/nginx-ssl-ja3/master/patches/openssl-3.extensions.patch | patch -p1 ; \
+        && curl -s https://raw.githubusercontent.com/fooinha/nginx-ssl-ja3/master/patches/openssl-3.extensions.patch | patch -p1 ; \
     fi \
     && if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-5) = "1.1.1" ] ; then \
         echo 'patching OpenSSL 1.1.1 for OpenResty' \

openresty-ssl-ja3/http2/config

@@ -1,6 +1,5 @@
-
 #
-# JA3 module conf
+# HTTP/2 fingerprint module conf
 #
 
 ngx_addon_name=ngx_ssl_fingerprint_module
@@ -14,4 +13,4 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
   $ngx_addon_dir/src/nginx_ssl_fingerprint.c \
   $ngx_addon_dir/src/ngx_http_ssl_fingerprint_module.c"
 
-have=NGX_JA3_FINGERPRING_MODULE  . auto/have
+have=NGX_HTTP2_FINGERPRING_MODULE  . auto/have

openresty-ssl-ja3/http2/src/nginx_ssl_fingerprint.c

@@ -214,7 +214,7 @@ int ngx_http2_fingerprint(ngx_connection_t *c, ngx_http_v2_connection_t *h2c)
     }
     pstr = h2c->fp_str.data;
 
-    ngx_log_debug(NGX_LOG_DEBUG_EVENT, c->log, 0, "ngx_http2_fingerprint: alloc bytes: [%d]\n", n);
+    ngx_log_debug(NGX_LOG_DEBUG_EVENT, c->log, 0, "ngx_http2_fingerprint: alloc bytes: [%d]\\n", n);
 
     /* setting */
     for (i = 0; i < h2c->fp_settings.len; i+=5) {
@@ -255,7 +255,7 @@ int ngx_http2_fingerprint(ngx_connection_t *c, ngx_http_v2_connection_t *h2c)
 
     h2c->fp_fingerprinted = 1;
 
-    ngx_log_debug(NGX_LOG_DEBUG_EVENT, c->log, 0, "ngx_http2_fingerprint: http2 fingerprint: [%V], len=[%d]\n", &h2c->fp_str, h2c->fp_str.len);
+    ngx_log_debug(NGX_LOG_DEBUG_EVENT, c->log, 0, "ngx_http2_fingerprint: http2 fingerprint: [%V], len=[%d]\\n", &h2c->fp_str, h2c->fp_str.len);
 
     return NGX_OK;
-}
+}

openresty-ssl-ja3/http2/src/nginx_ssl_fingerprint.h

@@ -1,16 +1,14 @@
-
 /*
  * Obj: nginx_ssl_fingerprint.c
  */
 
 #ifndef NGINX_SSL_FINGERPRINT_H_
 #define NGINX_SSL_FINGERPRINT_H_ 1
 
-
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
 
 int ngx_http2_fingerprint(ngx_connection_t *c, ngx_http_v2_connection_t *h2c);
 
-#endif /** NGINX_SSL_FINGERPRINT_H_ */
+#endif /** NGINX_SSL_FINGERPRINT_H_ */

openresty-ssl-ja3/http2/src/ngx_http_ssl_fingerprint_module.c

@@ -1,4 +1,3 @@
-
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
@@ -71,12 +70,10 @@ ngx_http_ssl_fingerprint_init(ngx_conf_t *cf)
     ngx_http_variable_t  *var, *v;
 
     for (v = ngx_http_ssl_fingerprint_variables_list; v->name.len; v++) {
-
         var = ngx_http_add_variable(cf, &v->name, v->flags);
         if (var == NULL) {
             return NGX_ERROR;
         }
-        /** NOTE: update it, if set_handler will be needed */
         var->get_handler = v->get_handler;
         var->data = v->data;
     }