Skip to content

Commit

Permalink
remove hard requirement on ADMIN_PASS
Browse files Browse the repository at this point in the history
and use the SSP default of 123 which triggers a runtime error message only if the admin page is actually used
  • Loading branch information
briskt committed Jul 19, 2024
1 parent c7ea413 commit 2516c3f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ services:
MYSQL_USER: silauth
MYSQL_PASSWORD: silauth
PROFILE_URL_FOR_TESTS: http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub
ADMIN_PASS: b
SECRET_SALT: abc123
IDP_NAME: x
volumes:
Expand Down Expand Up @@ -282,7 +281,6 @@ services:
- "8081:80"
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "sp1"
IDP_NAME: "NA"
SECRET_SALT: "not-secret-h57fjemb&dn^nsJFGNjweJz1"
SECURE_COOKIE: "false"
Expand All @@ -305,7 +303,6 @@ services:
- "8082:80"
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "sp2"
IDP_NAME: "NA"
SECRET_SALT: "h57fjemb&dn^nsJFGNjweJz2"
SECURE_COOKIE: "false"
Expand All @@ -330,7 +327,6 @@ services:
- local.env
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: sp3
IDP_NAME: "NA"
SECRET_SALT: h57fjemb&dn^nsJFGNjweJz3
SECURE_COOKIE: "false"
Expand All @@ -351,7 +347,6 @@ services:
- ./development/sp-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: sp1
IDP_NAME: THIS VARIABLE IS REQUIRED BUT PROBABLY NOT USED
SECRET_SALT: NOT-a-secret-k49fjfkw73hjf9t87wjiw
SECURE_COOKIE: "false"
Expand Down
2 changes: 1 addition & 1 deletion dockerbuild/config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

try {
// Required to be defined in environment variables
$ADMIN_PASS = Env::requireEnv('ADMIN_PASS');
$SECRET_SALT = Env::requireEnv('SECRET_SALT');
$IDP_NAME = Env::requireEnv('IDP_NAME');
} catch (EnvVarNotFoundException $e) {
Expand All @@ -47,6 +46,7 @@
// Defaults provided if not defined in environment
$IDP_DISPLAY_NAME = Env::get('IDP_DISPLAY_NAME', $IDP_NAME);
$BASE_URL_PATH = Env::get('BASE_URL_PATH', '/');
$ADMIN_PASS = Env::get('ADMIN_PASS', '123');
$ADMIN_EMAIL = Env::get('ADMIN_EMAIL', '[email protected]');
$ADMIN_NAME = Env::get('ADMIN_NAME', 'SAML Admin');
$SHOW_SAML_ERRORS = Env::get('SHOW_SAML_ERRORS', false);
Expand Down

0 comments on commit 2516c3f

Please sign in to comment.