make sure htadmin/nginx auth files get created with correct ownership (…

…#169)
idaholab · Apr 13, 2023 · e32b802 · e32b802
1 parent 1390d78
commit e32b802
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 28 deletions.
diff --git a/Dockerfiles/nginx.Dockerfile b/Dockerfiles/nginx.Dockerfile
@@ -186,8 +186,7 @@ RUN set -x ; \
   make -j$(getconf _NPROCESSORS_ONLN) ; \
   make install ; \
   rm -rf /etc/nginx/html/ ; \
-  mkdir -p /etc/nginx/conf.d/ ; \
-  mkdir -p /usr/share/nginx/html/ ; \
+  mkdir -p /etc/nginx/conf.d/ /etc/nginx/auth/ /usr/share/nginx/html/ ; \
   install -m644 html/index.html /usr/share/nginx/html/ ; \
   install -m644 html/50x.html /usr/share/nginx/html/ ; \
   install -m755 objs/nginx-debug /usr/sbin/nginx-debug ; \

diff --git a/htadmin/htadmin.sh b/htadmin/htadmin.sh
@@ -1,32 +1,22 @@
 #!/usr/bin/env bash
 
-HTADMIN_ENABLED=${NGINX_BASIC_AUTH:-"true"}
+if [[ "${NGINX_BASIC_AUTH:-true}" == "true" ]]; then
 
-if [[ ! -f /var/www/htadmin/config/config.ini ]] && [[ -f /var/www/htadmin/default/config.ini ]]; then
-  mkdir -p /var/www/htadmin/config/
-  cp /var/www/htadmin/default/config.ini /var/www/htadmin/config/config.ini
-fi
+  if [[ ! -f /var/www/htadmin/config/config.ini ]] && [[ -f /var/www/htadmin/default/config.ini ]]; then
+    cp /var/www/htadmin/default/config.ini /var/www/htadmin/config/config.ini
+    [[ -n ${PUID} ]] && chown -f ${PUID} /var/www/htadmin/config/config.ini
+    [[ -n ${PGID} ]] && chown -f :${PGID} /var/www/htadmin/config/config.ini
+  fi
 
-if [[ ! -f /var/www/htadmin/config/metadata ]] && [[ -f /var/www/htadmin/default/metadata ]]; then
-  mkdir -p /var/www/htadmin/config/
-  cp /var/www/htadmin/default/metadata /var/www/htadmin/config/metadata
-fi
+  if [[ ! -f /var/www/htadmin/config/metadata ]] && [[ -f /var/www/htadmin/default/metadata ]]; then
+    cp /var/www/htadmin/default/metadata /var/www/htadmin/config/metadata
+    [[ -n ${PUID} ]] && chown -f ${PUID} /var/www/htadmin/config/metadata
+    [[ -n ${PGID} ]] && chown -f :${PGID} /var/www/htadmin/config/metadata
+  fi
 
-if [[ "$HTADMIN_ENABLED" == "true" ]]; then
   sleep 10
   nginx -g "daemon off;"
+
 else
-  mkdir -p /tmp/htadmin_disabled
-    pushd /tmp/htadmin_disabled >/dev/null 2>&1 && \
-    cat << EOF > index.html
-      <html>
-      <header><title>Basic Authentication Disabled</title></header>
-      <body>
-      <h1>Basic HTTP authentication has been disabled.</h1>
-      <p>Refer to the <a href="/readme#AuthLDAP" onclick="javascript:event.target.port=443">Malcolm documentation</a> for details on LDAP authentication.</p>
-      </body>
-      </html>
-EOF
-  python3 -m http.server 80
-  popd >/dev/null 2>&1
+  /usr/local/bin/service_check_passthrough.sh -d -s htadmin -p 80 -f http
 fi
diff --git a/nginx/scripts/docker_entrypoint.sh b/nginx/scripts/docker_entrypoint.sh
@@ -238,8 +238,9 @@ EOF
 fi # basic vs. ldap
 
 if [[ ! -f /etc/nginx/auth/htpasswd ]] && [[ -f /tmp/auth/default/htpasswd ]]; then
-  mkdir -p /etc/nginx/auth/
-  cp /tmp/auth/default/htpasswd /etc/nginx/auth/
+  cp /tmp/auth/default/htpasswd /etc/nginx/auth/htpasswd
+  [[ -n ${PUID} ]] && chown -f ${PUID} /etc/nginx/auth/htpasswd
+  [[ -n ${PGID} ]] && chown -f :${PGID} /etc/nginx/auth/htpasswd
   rm -rf /tmp/auth/* || true
 fi
 

diff --git a/shared/bin/service_check_passthrough.sh b/shared/bin/service_check_passthrough.sh
@@ -51,7 +51,7 @@ while getopts 'vds:p:f:' OPTION; do
       ;;
 
     ?)
-      echo "script usage: $(basename $0) [-v] [-i input]" >&2
+      echo "script usage: $(basename $0) [-v (verbose)] [-d (disabled)] [-s <service>] [-p <port>] [-f <format>]" >&2
       exit 1
       ;;
   esac
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ while getopts 'vds:p:f:' OPTION; do @@
           ;;
         ?)
-          echo "script usage: $(basename $0) [-v] [-i input]" >&2
+          echo "script usage: $(basename $0) [-v (verbose)] [-d (disabled)] [-s <service>] [-p <port>] [-f <format>]" >&2
           exit 1
           ;;
       esac
@@ Expand Down @@