Skip to content

Commit

Permalink
ui: change default auth to basic
Browse files Browse the repository at this point in the history
  • Loading branch information
silv3rr committed Aug 21, 2024
1 parent 0ada5a7 commit 3147a58
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

ARG WEBUI_PORT
ARG WEBUI_CERT
ARG WEBUI_AUTH_MODE
ARG WEBUI_AUTH_USER
ARG WEBUI_AUTH_PASS
FROM alpine:3.18
HEALTHCHECK CMD wget -qO /dev/null http://127.0.0.1/health
LABEL org.opencontainers.image.source=https://github.com/silv3rr/glftpd-webui
Expand All @@ -19,6 +16,9 @@ COPY --chown=0:0 bin/entrypoint.sh /
COPY --chown=0:0 bin/auth.sh /
COPY --chown=0:0 etc/sudoers.d/glftpd-web /etc/sudoers.d
COPY --chown=0:0 etc/nginx /etc/nginx
COPY --chown=0:0 etc/nginx/http.d/auth-server.conf.template /etc/nginx/http.d/auth-server.conf
COPY --chown=0:0 etc/nginx/auth.d/auth_pages.conf.template /etc/nginx/auth.d/auth_pages.conf
COPY --chown=0:0 etc/nginx/auth.d/auth_basic.conf.template /etc/nginx/auth.d/auth_basic.conf
COPY --chown=0:0 bin/gltool.sh bin/gotty bin/passchk bin/pywho bin/spy etc/spy.conf /usr/local/bin/
#COPY --chown=0:0 etc/webspy/ /usr/local/bin/webspy/
COPY --chown=100:101 assets/ /app/assets/
Expand Down
8 changes: 1 addition & 7 deletions docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@
# >> DOCKER-BUILD-GLFTPD-V3 :: WEBUI
################################## ################################ #### # ##
#
# BUILD-TIME VARIABLES:
#
# WEBUI_AUTH_MODE=<basic|glftpd|both>
# WEBUI_AUTH_USER=MyUser set basic auth username (default: shit)
# WEBUI_AUTH_PASS=MyPw123 set basic auth password
#
# ARGS+= " --any-flags " add any other docker build options
# ARGS+= " --any-flags " adds any docker build options
#
################################################################## #### ## ##

Expand Down
1 change: 1 addition & 0 deletions etc/nginx/.htpasswd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shit:$apr1$8kedvKJ7$PuY2hy.QQh6iLP3Ckwm740
1 change: 0 additions & 1 deletion src/auth/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
/*--------------------------------------------------------------------------*
* SHIT:FRAMEWORK auth index
*--------------------------------------------------------------------------*/
// TODO: add nginx htp auth digest / PHP_AUTH_DIGEST

// XXX: index.php(302) -> /auth/login.php -> /auth/index.php(POST) -> /auth/login.php

Expand Down
2 changes: 1 addition & 1 deletion src/ui/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*-----------------------------------------------------------------------*/

return $cfg = array(
'auth' => "both",
'auth' => "basic",
'mode' => "docker",
'show_more_opts' => false,
'show_alerts' => true,
Expand Down
2 changes: 1 addition & 1 deletion src/ui/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*--------------------------------------------------------------------------*/

// TODO:
// auth: fix 'both', it's wonky w/ the basic auth + retest 'basic'
// auth: add nginx http auth digest, PHP_AUTH_DIGEST
// fix del flags notifications
// add self service for users (addip, invite), use gl auth
// cleanup debug
Expand Down

0 comments on commit 3147a58

Please sign in to comment.