remove ADMIN_PROTECT_INDEX_PAGE option

silinternational · Mar 28, 2024 · 4eb6baf · 4eb6baf
1 parent fd3a2e9
commit 4eb6baf
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 25 deletions.
diff --git a/actions-services.yml b/actions-services.yml
@@ -43,7 +43,6 @@ services:
       SECRET_SALT: "not-secret-h57fjemb&dn^nsJFGNjweJ"
       IDP_NAME: "Hub"
       SECURE_COOKIE: "false"
-      ADMIN_PROTECT_INDEX_PAGE: "false"
       SHOW_SAML_ERRORS: "true"
       THEME_USE: "material:material"
       THEME_COLOR_SCHEME: "orange-light_blue"
@@ -100,4 +99,3 @@ services:
       SECURE_COOKIE: "false"
       SHOW_SAML_ERRORS: "true"
       SAML20_IDP_ENABLE: "false"
-      ADMIN_PROTECT_INDEX_PAGE: "false"
diff --git a/development/idp-local/config/config.php b/development/idp-local/config/config.php
@@ -45,7 +45,6 @@
 // Defaults provided if not defined in environment
 $BASE_URL_PATH = Env::get('BASE_URL_PATH', '/');
 $ADMIN_NAME = Env::get('ADMIN_NAME', 'SAML Admin');
-$ADMIN_PROTECT_INDEX_PAGE = Env::get('ADMIN_PROTECT_INDEX_PAGE', true);
 $SHOW_SAML_ERRORS = Env::get('SHOW_SAML_ERRORS', false);
 $TIMEZONE = Env::get('TIMEZONE', 'GMT');
 $ENABLE_DEBUG = Env::get('ENABLE_DEBUG', false);
@@ -242,7 +241,7 @@
      * Set this options to true if you want to require administrator password to access the web interface
      * or the metadata pages, respectively.
      */
-    'admin.protectindexpage' => $ADMIN_PROTECT_INDEX_PAGE,
+    'admin.protectindexpage' => true,
     'admin.protectmetadata' => true,
 
     /*

diff --git a/development/idp2-local/config/config.php b/development/idp2-local/config/config.php
@@ -43,7 +43,6 @@
 // Defaults provided if not defined in environment
 $BASE_URL_PATH = Env::get('BASE_URL_PATH', '/');
 $ADMIN_NAME = Env::get('ADMIN_NAME', 'SAML Admin');
-$ADMIN_PROTECT_INDEX_PAGE = Env::get('ADMIN_PROTECT_INDEX_PAGE', true);
 $SHOW_SAML_ERRORS = Env::get('SHOW_SAML_ERRORS', false);
 $TIMEZONE = Env::get('TIMEZONE', 'GMT');
 $ENABLE_DEBUG = Env::get('ENABLE_DEBUG', false);
@@ -171,7 +170,7 @@
      * You can also put a hash here; run "bin/pwgen.php" to generate one.
      */
     'auth.adminpassword' => $ADMIN_PASS,
-    'admin.protectindexpage' => $ADMIN_PROTECT_INDEX_PAGE,
+    'admin.protectindexpage' => true,
     'admin.protectmetadata' => true,
 
     /*

diff --git a/development/sp-local/config/config.php b/development/sp-local/config/config.php
@@ -25,7 +25,6 @@
 // Defaults provided if not defined in environment
 $BASE_URL_PATH = Env::get('BASE_URL_PATH', '/');
 $ADMIN_NAME = Env::get('ADMIN_NAME', 'SAML Admin');
-$ADMIN_PROTECT_INDEX_PAGE = Env::get('ADMIN_PROTECT_INDEX_PAGE', true);
 $SHOW_SAML_ERRORS = Env::get('SHOW_SAML_ERRORS', false);
 $TIMEZONE = Env::get('TIMEZONE', 'GMT');
 $ENABLE_DEBUG = Env::get('ENABLE_DEBUG', false);
@@ -141,7 +140,7 @@
      * You can also put a hash here; run "bin/pwgen.php" to generate one.
      */
     'auth.adminpassword' => $ADMIN_PASS,
-    'admin.protectindexpage' => $ADMIN_PROTECT_INDEX_PAGE,
+    'admin.protectindexpage' => true,
     'admin.protectmetadata' => true,
 
     /*

diff --git a/development/sp2-local/config/config.php b/development/sp2-local/config/config.php
@@ -25,7 +25,6 @@
 // Defaults provided if not defined in environment
 $BASE_URL_PATH = Env::get('BASE_URL_PATH', '/');
 $ADMIN_NAME = Env::get('ADMIN_NAME', 'SAML Admin');
-$ADMIN_PROTECT_INDEX_PAGE = Env::get('ADMIN_PROTECT_INDEX_PAGE', true);
 $SHOW_SAML_ERRORS = Env::get('SHOW_SAML_ERRORS', false);
 $TIMEZONE = Env::get('TIMEZONE', 'GMT');
 $ENABLE_DEBUG = Env::get('ENABLE_DEBUG', false);
@@ -141,7 +140,7 @@
      * You can also put a hash here; run "bin/pwgen.php" to generate one.
      */
     'auth.adminpassword' => $ADMIN_PASS,
-    'admin.protectindexpage' => $ADMIN_PROTECT_INDEX_PAGE,
+    'admin.protectindexpage' => true,
     'admin.protectmetadata' => true,
 
     /*

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,12 +3,12 @@ services:
   ssp:
     build: .
     volumes:
-      # Utilize custom certs 
+      # Utilize custom certs
       - ./development/ssp/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
 
       # Utilize custom configs
       - ./development/ssp/config/authsources.php:/data/vendor/simplesamlphp/simplesamlphp/config/authsources.php
-      
+
       # Configure the debugger
       - ./development/ssp/run-debug.sh:/data/run-debug.sh
     command: ["/data/run-debug.sh"]
@@ -98,7 +98,6 @@ services:
       SECRET_SALT: "h57fjemb&dn^nsJFGNjweJ"
       IDP_NAME: "Hub"
       SECURE_COOKIE: "false"
-      ADMIN_PROTECT_INDEX_PAGE: "false"
       SHOW_SAML_ERRORS: "true"
       THEME_USE: "material:material"
       THEME_COLOR_SCHEME: "orange-light_blue"
@@ -110,7 +109,7 @@ services:
       - db
     volumes:
       # Utilize custom certs
-      - ./development/idp-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert 
+      - ./development/idp-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
 
       # Utilize custom configs
       - ./development/idp-local/config/authsources.php:/data/vendor/simplesamlphp/simplesamlphp/config/authsources.php
@@ -146,7 +145,7 @@ services:
     build: .
     volumes:
       # Utilize custom certs
-      - ./development/idp2-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert  
+      - ./development/idp2-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
 
       # Utilize custom configs
       - ./development/idp2-local/config/authsources.php:/data/vendor/simplesamlphp/simplesamlphp/config/authsources.php
@@ -190,7 +189,6 @@ services:
       SECURE_COOKIE: "false"
       SHOW_SAML_ERRORS: "true"
       SAML20_IDP_ENABLE: "false"
-      ADMIN_PROTECT_INDEX_PAGE: "false"
 
   sp2:
     build: .
@@ -213,8 +211,7 @@ services:
       SECURE_COOKIE: "false"
       SHOW_SAML_ERRORS: "true"
       SAML20_IDP_ENABLE: "false"
-      ADMIN_PROTECT_INDEX_PAGE: "false"
-
+
 networks:
   default:
     driver: bridge

diff --git a/dockerbuild/ssp-overrides/config.php b/dockerbuild/ssp-overrides/config.php
@@ -45,7 +45,6 @@
 // Defaults provided if not defined in environment
 $BASE_URL_PATH = Env::get('BASE_URL_PATH', '/');
 $ADMIN_NAME = Env::get('ADMIN_NAME', 'SAML Admin');
-$ADMIN_PROTECT_INDEX_PAGE = Env::get('ADMIN_PROTECT_INDEX_PAGE', true);
 $SHOW_SAML_ERRORS = Env::get('SHOW_SAML_ERRORS', false);
 $TIMEZONE = Env::get('TIMEZONE', 'GMT');
 $ENABLE_DEBUG = Env::get('ENABLE_DEBUG', false);
@@ -242,7 +241,7 @@
      * Set this options to true if you want to require administrator password to access the web interface
      * or the metadata pages, respectively.
      */
-    'admin.protectindexpage' => $ADMIN_PROTECT_INDEX_PAGE,
+    'admin.protectindexpage' => true,
     'admin.protectmetadata' => true,
 
     /*

diff --git a/features/material.feature b/features/material.feature
@@ -1,20 +1,20 @@
 Feature: Material theme
-  
+
   Scenario: Hub (disco) page
     When I go to the Hub's discovery page
     Then I should see our material theme
-  
+
   Scenario: Error page
     When I go to the Hub but specify an invalid authentication source
     Then I should see an "Error" page
       And I should see our material theme
 
   Scenario: Logout page
     When I go to the Hub's home page
+      And I log in as a hub administrator
       And I click on "Authentication"
       And I click on "Test configured authentication sources"
       And I click on "admin"
-      And I log in as a hub administrator
       And I click on "Logout"
     Then I should see a "Logged out" page
       And I should see our material theme
@@ -26,5 +26,5 @@ Feature: Material theme
       And I should see our material theme
 
   Scenario: Forgot password link
-    
+
   Scenario: Help and profile links
diff --git a/local.env.dist b/local.env.dist
@@ -6,7 +6,6 @@ SECRET_SALT=
 
 # These are Optional
 ADMIN_NAME=
-ADMIN_PROTECT_INDEX_PAGE=
 ANALYTICS_ID=
 BASE_URL_PATH=
 COMPOSER_ALLOW_SUPERUSER=1