rename www -> public [skip ci]

silinternational · Jun 14, 2024 · 6186942 · 6186942
1 parent 213247d
commit 6186942
Show file tree

Hide file tree

Showing 49 changed files with 21 additions and 21 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -50,18 +50,18 @@ COPY modules/material/themes/material/mfa/* $SSP_PATH/modules/mfa/templates/
 COPY modules/material/themes/material/profilereview/* $SSP_PATH/modules/profilereview/templates/
 
 # Copy in SSP override files
-RUN mv $SSP_PATH/www/index.php $SSP_PATH/www/ssp-index.php
-COPY dockerbuild/ssp-overrides/index.php $SSP_PATH/www/index.php
-RUN mv $SSP_PATH/www/saml2/idp/SingleLogoutService.php $SSP_PATH/www/saml2/idp/ssp-SingleLogoutService.php
-COPY dockerbuild/ssp-overrides/SingleLogoutService.php $SSP_PATH/www/saml2/idp/SingleLogoutService.php
+RUN mv $SSP_PATH/public/index.php $SSP_PATH/public/ssp-index.php
+COPY dockerbuild/ssp-overrides/index.php $SSP_PATH/public/index.php
+RUN mv $SSP_PATH/public/saml2/idp/SingleLogoutService.php $SSP_PATH/public/saml2/idp/ssp-SingleLogoutService.php
+COPY dockerbuild/ssp-overrides/SingleLogoutService.php $SSP_PATH/public/saml2/idp/SingleLogoutService.php
 COPY dockerbuild/ssp-overrides/saml20-idp-remote.php $SSP_PATH/metadata/saml20-idp-remote.php
 COPY dockerbuild/ssp-overrides/saml20-sp-remote.php $SSP_PATH/metadata/saml20-sp-remote.php
 COPY dockerbuild/config/* $SSP_PATH/config/
-COPY dockerbuild/ssp-overrides/id.php $SSP_PATH/www/id.php
+COPY dockerbuild/ssp-overrides/id.php $SSP_PATH/public/id.php
 COPY dockerbuild/ssp-overrides/announcement.php $SSP_PATH/announcement/announcement.php
 COPY tests /data/tests
 
-RUN cp $SSP_PATH/modules/sildisco/src/SSOService.php $SSP_PATH/www/saml2/idp/
+RUN cp $SSP_PATH/modules/sildisco/src/SSOService.php $SSP_PATH/public/saml2/idp/
 RUN chmod a+x /data/run.sh /data/run-tests.sh
 
 ADD https://github.com/silinternational/config-shim/releases/latest/download/config-shim.gz config-shim.gz

diff --git a/Makefile b/Makefile
@@ -18,8 +18,8 @@ test-integration:
 	docker compose run --rm test ./run-integration-tests.sh
 
 copyJsLib:
-	cp ./node_modules/@simplewebauthn/browser/dist/bundle/index.umd.min.js ./modules/mfa/www/simplewebauthn/browser.js
-	cp ./node_modules/@simplewebauthn/browser/LICENSE.md ./modules/mfa/www/simplewebauthn/LICENSE.md
+	cp ./node_modules/@simplewebauthn/browser/dist/bundle/index.umd.min.js ./modules/mfa/public/simplewebauthn/browser.js
+	cp ./node_modules/@simplewebauthn/browser/LICENSE.md ./modules/mfa/public/simplewebauthn/LICENSE.md
 
 deps:
 	docker compose run --rm node npm install --ignore-scripts

diff --git a/README.md b/README.md
@@ -229,7 +229,7 @@ Update `/simplesamlphp/config/config.php`:
 'theme.color-scheme' => ['indigo-purple'|'blue_grey-teal'|'red-teal'|'orange-light_blue'|'brown-orange'|'teal-blue']
 ```
 
-The login page looks for `/simplesamlphp/www/logo.png` which is **NOT** provided by default.
+The login page looks for `/simplesamlphp/public/logo.png` which is **NOT** provided by default.
 
 ##### Analytics
 

diff --git a/dockerbuild/run.sh b/dockerbuild/run.sh
@@ -7,7 +7,7 @@ set -x
 set -e
 
 # This is a temporary fix (bug workaround) until ssp 2.0 is in use
-sed -i 's_\(\\SimpleSAML\\Error\\Assertion::installHandler()\)_// \1 _' /data/vendor/simplesamlphp/simplesamlphp/www/_include.php
+sed -i 's_\(\\SimpleSAML\\Error\\Assertion::installHandler()\)_// \1 _' /data/vendor/simplesamlphp/simplesamlphp/public/_include.php
 
 # establish a signal handler to catch the SIGTERM from a 'docker stop'
 # reference: https://medium.com/@gchudnov/trapping-signals-in-docker-containers-7a57fdda7d86

diff --git a/dockerbuild/vhost.conf b/dockerbuild/vhost.conf
@@ -1,9 +1,9 @@
 <VirtualHost _default_:80>
-  DocumentRoot /data/vendor/simplesamlphp/simplesamlphp/www/
+  DocumentRoot /data/vendor/simplesamlphp/simplesamlphp/public/
   RewriteEngine On
   DirectoryIndex index.php
 
-  <Directory /data/vendor/simplesamlphp/simplesamlphp/www/>
+  <Directory /data/vendor/simplesamlphp/simplesamlphp/public/>
     Options FollowSymLinks
     AllowOverride All
     Require all granted

diff --git a/docs/the_hub.md b/docs/the_hub.md
@@ -2,8 +2,8 @@ The hub will need its certs, `config.php` and `authsources.php` files as a norma
 
 Other files it will need are as follows ...
 * The files in the `./src` folder will need to go into `/data/vendor/simplesamlphp/simplesamlphp/modules/sildisco/src`
-* The files in the `./www` folder will need to go into `/data/vendor/simplesamlphp/simplesamlphp/modules/sildisco/www`
-* The `./sspoverrides/www_saml2_idp/SSOService.php` file will need overwrite the same out-of-the-box file in `/data/vendor/simplesamlphp/simplesamlphp/www/saml2/idp/`
+* The files in the `./public` folder will need to go into `/data/vendor/simplesamlphp/simplesamlphp/modules/sildisco/public`
+* The `./sspoverrides/www_saml2_idp/SSOService.php` file will need overwrite the same out-of-the-box file in `/data/vendor/simplesamlphp/simplesamlphp/public/saml2/idp/`
 
 ### Metadata files
 The hub should use the `saml20-*-remote.php`  files from [ssp-base](https://github.com/silinternational/ssp-base) in `/data/vendor/simplesamlphp/simplesamlphp/metadata/`.  These pull in metadata from all the files named `idp-*.php` and `sp-*.php` respectively, including those in sub-folders.

diff --git a/modules/expirychecker/www/about2expire.php → ...les/expirychecker/public/about2expire.php b/modules/expirychecker/www/about2expire.php → ...les/expirychecker/public/about2expire.php
diff --git a/modules/expirychecker/www/expired.php → modules/expirychecker/public/expired.php b/modules/expirychecker/www/expired.php → modules/expirychecker/public/expired.php
diff --git a/modules/material/www/bowser.1.9.4.min.js → modules/material/public/bowser.1.9.4.min.js b/modules/material/www/bowser.1.9.4.min.js → modules/material/public/bowser.1.9.4.min.js
diff --git a/modules/material/www/default-favicon.ico → modules/material/public/default-favicon.ico b/modules/material/www/default-favicon.ico → modules/material/public/default-favicon.ico
diff --git a/modules/material/www/default-favicon.png → modules/material/public/default-favicon.png b/modules/material/www/default-favicon.png → modules/material/public/default-favicon.png
diff --git a/modules/material/www/default-logo.png → modules/material/public/default-logo.png b/modules/material/www/default-logo.png → modules/material/public/default-logo.png
diff --git a/modules/material/www/email.svg → modules/material/public/email.svg b/modules/material/www/email.svg → modules/material/public/email.svg
diff --git a/modules/material/www/material-icons.woff → modules/material/public/material-icons.woff b/modules/material/www/material-icons.woff → modules/material/public/material-icons.woff
diff --git a/modules/material/www/material-icons.woff2 → modules/material/public/material-icons.woff2 b/modules/material/www/material-icons.woff2 → modules/material/public/material-icons.woff2
diff --git a/modules/material/www/material.1.2.1.min.js → ...les/material/public/material.1.2.1.min.js b/modules/material/www/material.1.2.1.min.js → ...les/material/public/material.1.2.1.min.js
diff --git a/...www/material.blue_grey-teal.1.2.1.min.css → ...lic/material.blue_grey-teal.1.2.1.min.css b/...www/material.blue_grey-teal.1.2.1.min.css → ...lic/material.blue_grey-teal.1.2.1.min.css
diff --git a/...l/www/material.brown-orange.1.2.1.min.css → ...ublic/material.brown-orange.1.2.1.min.css b/...l/www/material.brown-orange.1.2.1.min.css → ...ublic/material.brown-orange.1.2.1.min.css
diff --git a/.../www/material.indigo-purple.1.2.1.min.css → ...blic/material.indigo-purple.1.2.1.min.css b/.../www/material.indigo-purple.1.2.1.min.css → ...blic/material.indigo-purple.1.2.1.min.css
diff --git a/.../material.orange-light_blue.1.2.1.min.css → .../material.orange-light_blue.1.2.1.min.css b/.../material.orange-light_blue.1.2.1.min.css → .../material.orange-light_blue.1.2.1.min.css
diff --git a/...erial/www/material.red-teal.1.2.1.min.css → ...al/public/material.red-teal.1.2.1.min.css b/...erial/www/material.red-teal.1.2.1.min.css → ...al/public/material.red-teal.1.2.1.min.css
diff --git a/...rial/www/material.teal-blue.1.2.1.min.css → ...l/public/material.teal-blue.1.2.1.min.css b/...rial/www/material.teal-blue.1.2.1.min.css → ...l/public/material.teal-blue.1.2.1.min.css
diff --git a/modules/material/www/mfa-backupcode.svg → modules/material/public/mfa-backupcode.svg b/modules/material/www/mfa-backupcode.svg → modules/material/public/mfa-backupcode.svg
diff --git a/modules/material/www/mfa-manager.svg → modules/material/public/mfa-manager.svg b/modules/material/www/mfa-manager.svg → modules/material/public/mfa-manager.svg
diff --git a/modules/material/www/mfa-totp.svg → modules/material/public/mfa-totp.svg b/modules/material/www/mfa-totp.svg → modules/material/public/mfa-totp.svg
diff --git a/modules/material/www/mfa-u2f-api.js → modules/material/public/mfa-u2f-api.js b/modules/material/www/mfa-u2f-api.js → modules/material/public/mfa-u2f-api.js
diff --git a/modules/material/www/mfa-u2f.svg → modules/material/public/mfa-u2f.svg b/modules/material/www/mfa-u2f.svg → modules/material/public/mfa-u2f.svg
diff --git a/modules/material/www/mfa-webauthn.svg → modules/material/public/mfa-webauthn.svg b/modules/material/www/mfa-webauthn.svg → modules/material/public/mfa-webauthn.svg
diff --git a/modules/material/www/shield.svg → modules/material/public/shield.svg b/modules/material/www/shield.svg → modules/material/public/shield.svg
diff --git a/modules/material/www/styles.2.3.6.css → modules/material/public/styles.2.3.6.css b/modules/material/www/styles.2.3.6.css → modules/material/public/styles.2.3.6.css
diff --git a/modules/mfa/www/low-on-backup-codes.php → modules/mfa/public/low-on-backup-codes.php b/modules/mfa/www/low-on-backup-codes.php → modules/mfa/public/low-on-backup-codes.php
diff --git a/modules/mfa/www/must-set-up-mfa.php → modules/mfa/public/must-set-up-mfa.php b/modules/mfa/www/must-set-up-mfa.php → modules/mfa/public/must-set-up-mfa.php
diff --git a/modules/mfa/www/new-backup-codes.php → modules/mfa/public/new-backup-codes.php b/modules/mfa/www/new-backup-codes.php → modules/mfa/public/new-backup-codes.php
diff --git a/modules/mfa/www/out-of-backup-codes.php → modules/mfa/public/out-of-backup-codes.php b/modules/mfa/www/out-of-backup-codes.php → modules/mfa/public/out-of-backup-codes.php
diff --git a/modules/mfa/www/prompt-for-mfa.php → modules/mfa/public/prompt-for-mfa.php b/modules/mfa/www/prompt-for-mfa.php → modules/mfa/public/prompt-for-mfa.php
diff --git a/modules/mfa/www/send-manager-mfa.php → modules/mfa/public/send-manager-mfa.php b/modules/mfa/www/send-manager-mfa.php → modules/mfa/public/send-manager-mfa.php
diff --git a/modules/mfa/www/simplewebauthn/LICENSE.md → modules/mfa/public/simplewebauthn/LICENSE.md b/modules/mfa/www/simplewebauthn/LICENSE.md → modules/mfa/public/simplewebauthn/LICENSE.md
diff --git a/modules/mfa/www/simplewebauthn/browser.js → modules/mfa/public/simplewebauthn/browser.js b/modules/mfa/www/simplewebauthn/browser.js → modules/mfa/public/simplewebauthn/browser.js
diff --git a/modules/profilereview/www/nag.php → modules/profilereview/public/nag.php b/modules/profilereview/www/nag.php → modules/profilereview/public/nag.php
diff --git a/modules/profilereview/www/review.php → modules/profilereview/public/review.php b/modules/profilereview/www/review.php → modules/profilereview/public/review.php
diff --git a/modules/silauth/www/loginuserpass.php → modules/silauth/public/loginuserpass.php b/modules/silauth/www/loginuserpass.php → modules/silauth/public/loginuserpass.php
diff --git a/modules/silauth/www/status.php → modules/silauth/public/status.php b/modules/silauth/www/status.php → modules/silauth/public/status.php
diff --git a/modules/sildisco/www/betatest.php → modules/sildisco/public/betatest.php b/modules/sildisco/www/betatest.php → modules/sildisco/public/betatest.php
diff --git a/modules/sildisco/www/disco.php → modules/sildisco/public/disco.php b/modules/sildisco/www/disco.php → modules/sildisco/public/disco.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Custom IdP discovery service. Built-in service is in modules/saml/www/disco.php
+ * Custom IdP discovery service. Built-in service is in modules/saml/public/disco.php
  */
 
 $discoHandler = new \SimpleSAML\Module\sildisco\IdPDisco(['saml20-idp-remote'], 'saml');

diff --git a/modules/sildisco/www/metadata.php → modules/sildisco/public/metadata.php b/modules/sildisco/www/metadata.php → modules/sildisco/public/metadata.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Borrowed and modified from simplesamlphp/www/saml2/idp/metadata.php
+ * Borrowed and modified from simplesamlphp/public/saml2/idp/metadata.php
  */
 
-require_once('../www/_include.php');
+require_once('../public/_include.php');
 
 use SAML2\Constants;
 use SimpleSAML\Utils\Auth as Auth;

diff --git a/modules/sildisco/www/sp/discoresp.php → modules/sildisco/public/sp/discoresp.php b/modules/sildisco/www/sp/discoresp.php → modules/sildisco/public/sp/discoresp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Modified version of modules/saml/www/sp/discoresp.php
+ * Modified version of modules/saml/public/sp/discoresp.php
  * 2024-06-06 -- Merged with simplesamlphp 1.19.8, lines marked with GTIS are modified
  */
 

diff --git a/modules/sildisco/www/sp/saml2-acs.php → modules/sildisco/public/sp/saml2-acs.php b/modules/sildisco/www/sp/saml2-acs.php → modules/sildisco/public/sp/saml2-acs.php
@@ -3,7 +3,7 @@
 /**
  * Assertion consumer service handler for SAML 2.0 SP authentication client.
  *
- * Similar to modules/saml/www/sp/saml2-acs.php
+ * Similar to modules/saml/public/sp/saml2-acs.php
  * 2024-06-06 -- Merged with simplesamlphp 1.19.8, lines marked with GTIS are modified
  */
 

diff --git a/modules/sildisco/www/sp/saml2-logout.php → modules/sildisco/public/sp/saml2-logout.php b/modules/sildisco/www/sp/saml2-logout.php → modules/sildisco/public/sp/saml2-logout.php
@@ -5,7 +5,7 @@
  *
  * This endpoint handles both logout requests and logout responses.
  *
- * Similar to modules/saml/www/sp/saml2-logout.php
+ * Similar to modules/saml/public/sp/saml2-logout.php
  * 2024-06-06 -- Merged with simplesamlphp 1.19.8, lines marked with GTIS are modified
  */
 

diff --git a/modules/sildisco/src/SSOService.php b/modules/sildisco/src/SSOService.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * Note: This has been copied from the core code (www/saml2/idp/SSOService.php version 1.19.6)
+ * Note: This has been copied from the core code (public/saml2/idp/SSOService.php version 1.19.6)
  *   and modified to call a different authentication class/method
  *
  * Original comments ...