auth prefixes

Author: tiredofit

rootfs/container/defaults/_10-nginx/10-nginx.advanced

@@ -7,7 +7,6 @@ NGINX_AUTHENTICATION_LDAP_ATTRIBUTE=${NGINX_AUTHENTICATION_LDAP_ATTRIBUTE:-"uid"
 NGINX_AUTHENTICATION_LDAP_FILTER=${NGINX_AUTHENTICATION_LDAP_FILTER:-"(objectClass=person)"}
 NGINX_AUTHENTICATION_LDAP_GROUP_ATTRIBUTE=${NGINX_AUTHENTICATION_LDAP_GROUP_ATTRIBUTE:-"uniquemember"}
 NGINX_AUTHENTICATION_LDAP_SCOPE=${NGINX_AUTHENTICATION_LDAP_SCOPE:-"sub"}
-NGINX_AUTHENTICATION_LLNG_ATTRIBUTE1=${NGINX_AUTHENTICATION_LLNG_ATTRIBUTE1:-"HTTP_AUTH_USER,uid,upstream_http_uid"}
 NGINX_AUTHENTICATION_LLNG_FASTCGI_BUFFER_SIZE=${NGINX_AUTHENTICATION_LLNG_FASTCGI_BUFFER_SIZE:-"32k"}
 NGINX_AUTHENTICATION_LLNG_FASTCGI_BUFFERS=${NGINX_AUTHENTICATION_LLNG_FASTCGI_BUFFERS:-"32 32k"}
 NGINX_BLOCK_BOTS_WHITELIST_IP=${NGINX_BLOCK_BOTS_WHITELIST_IP:-"127.0.0.1,10.0.0.0/8,172.16.0.0/12,192.168.0.0/24"}

rootfs/container/functions/10-nginx

@@ -287,14 +287,30 @@ nginx_authentication_configure_llng() {
 
     __() {
         local in="$1"
-        local vn="NGINX_SITE_${_sitename^^}_AUTHENTICATION_LLNG_ATTRIBUTE${in}"
-        _ "${vn}"
+        local idx
+        if [[ "${in}" =~ ^[0-9]+$ ]]; then
+            idx=$((10#${in}))
+        else
+            idx="${in}"
+        fi
+        local vn_padded="NGINX_SITE_${_sitename^^}_AUTHENTICATION_LLNG_ATTRIBUTE$(printf '%02d' "${idx}")"
+        local vn_unpadded="NGINX_SITE_${_sitename^^}_AUTHENTICATION_LLNG_ATTRIBUTE${idx}"
+        _ "${vn_padded}"
+        _ "${vn_unpadded}"
     }
 
     ___() {
         local in="$1"
-        local vn="NGINX_AUTHENTICATION_LLNG_ATTRIBUTE${in}"
-        _ "${vn}"
+        local idx
+        if [[ "${in}" =~ ^[0-9]+$ ]]; then
+            idx=$((10#${in}))
+        else
+            idx="${in}"
+        fi
+        local vn_padded="NGINX_AUTHENTICATION_LLNG_ATTRIBUTE$(printf '%02d' "${idx}")"
+        local vn_unpadded="NGINX_AUTHENTICATION_LLNG_ATTRIBUTE${idx}"
+        _ "${vn_padded}"
+        _ "${vn_unpadded}"
     }
 
     local sc=$(printenv | grep -cE "^NGINX_SITE_${_sitename^^}_AUTHENTICATION_LLNG_ATTRIBUTE[0-9]+=")