From 618694212f81ce1013e8cfd4b7d471d5f279f903 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Fri, 14 Jun 2024 14:08:18 +0800 Subject: [PATCH] rename www -> public [skip ci] --- Dockerfile | 12 ++++++------ Makefile | 4 ++-- README.md | 2 +- dockerbuild/run.sh | 2 +- dockerbuild/vhost.conf | 4 ++-- docs/the_hub.md | 4 ++-- .../expirychecker/{www => public}/about2expire.php | 0 modules/expirychecker/{www => public}/expired.php | 0 .../material/{www => public}/bowser.1.9.4.min.js | 0 .../material/{www => public}/default-favicon.ico | Bin .../material/{www => public}/default-favicon.png | Bin modules/material/{www => public}/default-logo.png | Bin modules/material/{www => public}/email.svg | 0 .../material/{www => public}/material-icons.woff | Bin .../material/{www => public}/material-icons.woff2 | Bin .../material/{www => public}/material.1.2.1.min.js | 0 .../material.blue_grey-teal.1.2.1.min.css | 0 .../material.brown-orange.1.2.1.min.css | 0 .../material.indigo-purple.1.2.1.min.css | 0 .../material.orange-light_blue.1.2.1.min.css | 0 .../{www => public}/material.red-teal.1.2.1.min.css | 0 .../material.teal-blue.1.2.1.min.css | 0 modules/material/{www => public}/mfa-backupcode.svg | 0 modules/material/{www => public}/mfa-manager.svg | 0 modules/material/{www => public}/mfa-totp.svg | 0 modules/material/{www => public}/mfa-u2f-api.js | 0 modules/material/{www => public}/mfa-u2f.svg | 0 modules/material/{www => public}/mfa-webauthn.svg | 0 modules/material/{www => public}/shield.svg | 0 modules/material/{www => public}/styles.2.3.6.css | 0 modules/mfa/{www => public}/low-on-backup-codes.php | 0 modules/mfa/{www => public}/must-set-up-mfa.php | 0 modules/mfa/{www => public}/new-backup-codes.php | 0 modules/mfa/{www => public}/out-of-backup-codes.php | 0 modules/mfa/{www => public}/prompt-for-mfa.php | 0 modules/mfa/{www => public}/send-manager-mfa.php | 0 .../mfa/{www => public}/simplewebauthn/LICENSE.md | 0 .../mfa/{www => public}/simplewebauthn/browser.js | 0 modules/profilereview/{www => public}/nag.php | 0 modules/profilereview/{www => public}/review.php | 0 modules/silauth/{www => public}/loginuserpass.php | 0 modules/silauth/{www => public}/status.php | 0 modules/sildisco/{www => public}/betatest.php | 0 modules/sildisco/{www => public}/disco.php | 2 +- modules/sildisco/{www => public}/metadata.php | 4 ++-- modules/sildisco/{www => public}/sp/discoresp.php | 2 +- modules/sildisco/{www => public}/sp/saml2-acs.php | 2 +- .../sildisco/{www => public}/sp/saml2-logout.php | 2 +- modules/sildisco/src/SSOService.php | 2 +- 49 files changed, 21 insertions(+), 21 deletions(-) rename modules/expirychecker/{www => public}/about2expire.php (100%) rename modules/expirychecker/{www => public}/expired.php (100%) rename modules/material/{www => public}/bowser.1.9.4.min.js (100%) rename modules/material/{www => public}/default-favicon.ico (100%) rename modules/material/{www => public}/default-favicon.png (100%) rename modules/material/{www => public}/default-logo.png (100%) rename modules/material/{www => public}/email.svg (100%) rename modules/material/{www => public}/material-icons.woff (100%) rename modules/material/{www => public}/material-icons.woff2 (100%) rename modules/material/{www => public}/material.1.2.1.min.js (100%) rename modules/material/{www => public}/material.blue_grey-teal.1.2.1.min.css (100%) rename modules/material/{www => public}/material.brown-orange.1.2.1.min.css (100%) rename modules/material/{www => public}/material.indigo-purple.1.2.1.min.css (100%) rename modules/material/{www => public}/material.orange-light_blue.1.2.1.min.css (100%) rename modules/material/{www => public}/material.red-teal.1.2.1.min.css (100%) rename modules/material/{www => public}/material.teal-blue.1.2.1.min.css (100%) rename modules/material/{www => public}/mfa-backupcode.svg (100%) rename modules/material/{www => public}/mfa-manager.svg (100%) rename modules/material/{www => public}/mfa-totp.svg (100%) rename modules/material/{www => public}/mfa-u2f-api.js (100%) rename modules/material/{www => public}/mfa-u2f.svg (100%) rename modules/material/{www => public}/mfa-webauthn.svg (100%) rename modules/material/{www => public}/shield.svg (100%) rename modules/material/{www => public}/styles.2.3.6.css (100%) rename modules/mfa/{www => public}/low-on-backup-codes.php (100%) rename modules/mfa/{www => public}/must-set-up-mfa.php (100%) rename modules/mfa/{www => public}/new-backup-codes.php (100%) rename modules/mfa/{www => public}/out-of-backup-codes.php (100%) rename modules/mfa/{www => public}/prompt-for-mfa.php (100%) rename modules/mfa/{www => public}/send-manager-mfa.php (100%) rename modules/mfa/{www => public}/simplewebauthn/LICENSE.md (100%) rename modules/mfa/{www => public}/simplewebauthn/browser.js (100%) rename modules/profilereview/{www => public}/nag.php (100%) rename modules/profilereview/{www => public}/review.php (100%) rename modules/silauth/{www => public}/loginuserpass.php (100%) rename modules/silauth/{www => public}/status.php (100%) rename modules/sildisco/{www => public}/betatest.php (100%) rename modules/sildisco/{www => public}/disco.php (90%) rename modules/sildisco/{www => public}/metadata.php (98%) rename modules/sildisco/{www => public}/sp/discoresp.php (94%) rename modules/sildisco/{www => public}/sp/saml2-acs.php (99%) rename modules/sildisco/{www => public}/sp/saml2-logout.php (99%) diff --git a/Dockerfile b/Dockerfile index 6252fee4..55a5688c 100644 --- 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 index 76024d52..50292e2b 100644 --- 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 index a32fc312..e9b314ff 100644 --- 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 index 4d7ff730..f55cd465 100755 --- 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 index f2638b82..c2ea9893 100644 --- a/dockerbuild/vhost.conf +++ b/dockerbuild/vhost.conf @@ -1,9 +1,9 @@ - DocumentRoot /data/vendor/simplesamlphp/simplesamlphp/www/ + DocumentRoot /data/vendor/simplesamlphp/simplesamlphp/public/ RewriteEngine On DirectoryIndex index.php - + Options FollowSymLinks AllowOverride All Require all granted diff --git a/docs/the_hub.md b/docs/the_hub.md index a27f6192..e366f45d 100644 --- 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 b/modules/expirychecker/public/about2expire.php similarity index 100% rename from modules/expirychecker/www/about2expire.php rename to modules/expirychecker/public/about2expire.php diff --git a/modules/expirychecker/www/expired.php b/modules/expirychecker/public/expired.php similarity index 100% rename from modules/expirychecker/www/expired.php rename to modules/expirychecker/public/expired.php diff --git a/modules/material/www/bowser.1.9.4.min.js b/modules/material/public/bowser.1.9.4.min.js similarity index 100% rename from modules/material/www/bowser.1.9.4.min.js rename to modules/material/public/bowser.1.9.4.min.js diff --git a/modules/material/www/default-favicon.ico b/modules/material/public/default-favicon.ico similarity index 100% rename from modules/material/www/default-favicon.ico rename to modules/material/public/default-favicon.ico diff --git a/modules/material/www/default-favicon.png b/modules/material/public/default-favicon.png similarity index 100% rename from modules/material/www/default-favicon.png rename to modules/material/public/default-favicon.png diff --git a/modules/material/www/default-logo.png b/modules/material/public/default-logo.png similarity index 100% rename from modules/material/www/default-logo.png rename to modules/material/public/default-logo.png diff --git a/modules/material/www/email.svg b/modules/material/public/email.svg similarity index 100% rename from modules/material/www/email.svg rename to modules/material/public/email.svg diff --git a/modules/material/www/material-icons.woff b/modules/material/public/material-icons.woff similarity index 100% rename from modules/material/www/material-icons.woff rename to modules/material/public/material-icons.woff diff --git a/modules/material/www/material-icons.woff2 b/modules/material/public/material-icons.woff2 similarity index 100% rename from modules/material/www/material-icons.woff2 rename to modules/material/public/material-icons.woff2 diff --git a/modules/material/www/material.1.2.1.min.js b/modules/material/public/material.1.2.1.min.js similarity index 100% rename from modules/material/www/material.1.2.1.min.js rename to modules/material/public/material.1.2.1.min.js diff --git a/modules/material/www/material.blue_grey-teal.1.2.1.min.css b/modules/material/public/material.blue_grey-teal.1.2.1.min.css similarity index 100% rename from modules/material/www/material.blue_grey-teal.1.2.1.min.css rename to modules/material/public/material.blue_grey-teal.1.2.1.min.css diff --git a/modules/material/www/material.brown-orange.1.2.1.min.css b/modules/material/public/material.brown-orange.1.2.1.min.css similarity index 100% rename from modules/material/www/material.brown-orange.1.2.1.min.css rename to modules/material/public/material.brown-orange.1.2.1.min.css diff --git a/modules/material/www/material.indigo-purple.1.2.1.min.css b/modules/material/public/material.indigo-purple.1.2.1.min.css similarity index 100% rename from modules/material/www/material.indigo-purple.1.2.1.min.css rename to modules/material/public/material.indigo-purple.1.2.1.min.css diff --git a/modules/material/www/material.orange-light_blue.1.2.1.min.css b/modules/material/public/material.orange-light_blue.1.2.1.min.css similarity index 100% rename from modules/material/www/material.orange-light_blue.1.2.1.min.css rename to modules/material/public/material.orange-light_blue.1.2.1.min.css diff --git a/modules/material/www/material.red-teal.1.2.1.min.css b/modules/material/public/material.red-teal.1.2.1.min.css similarity index 100% rename from modules/material/www/material.red-teal.1.2.1.min.css rename to modules/material/public/material.red-teal.1.2.1.min.css diff --git a/modules/material/www/material.teal-blue.1.2.1.min.css b/modules/material/public/material.teal-blue.1.2.1.min.css similarity index 100% rename from modules/material/www/material.teal-blue.1.2.1.min.css rename to modules/material/public/material.teal-blue.1.2.1.min.css diff --git a/modules/material/www/mfa-backupcode.svg b/modules/material/public/mfa-backupcode.svg similarity index 100% rename from modules/material/www/mfa-backupcode.svg rename to modules/material/public/mfa-backupcode.svg diff --git a/modules/material/www/mfa-manager.svg b/modules/material/public/mfa-manager.svg similarity index 100% rename from modules/material/www/mfa-manager.svg rename to modules/material/public/mfa-manager.svg diff --git a/modules/material/www/mfa-totp.svg b/modules/material/public/mfa-totp.svg similarity index 100% rename from modules/material/www/mfa-totp.svg rename to modules/material/public/mfa-totp.svg diff --git a/modules/material/www/mfa-u2f-api.js b/modules/material/public/mfa-u2f-api.js similarity index 100% rename from modules/material/www/mfa-u2f-api.js rename to modules/material/public/mfa-u2f-api.js diff --git a/modules/material/www/mfa-u2f.svg b/modules/material/public/mfa-u2f.svg similarity index 100% rename from modules/material/www/mfa-u2f.svg rename to modules/material/public/mfa-u2f.svg diff --git a/modules/material/www/mfa-webauthn.svg b/modules/material/public/mfa-webauthn.svg similarity index 100% rename from modules/material/www/mfa-webauthn.svg rename to modules/material/public/mfa-webauthn.svg diff --git a/modules/material/www/shield.svg b/modules/material/public/shield.svg similarity index 100% rename from modules/material/www/shield.svg rename to modules/material/public/shield.svg diff --git a/modules/material/www/styles.2.3.6.css b/modules/material/public/styles.2.3.6.css similarity index 100% rename from modules/material/www/styles.2.3.6.css rename to modules/material/public/styles.2.3.6.css diff --git a/modules/mfa/www/low-on-backup-codes.php b/modules/mfa/public/low-on-backup-codes.php similarity index 100% rename from modules/mfa/www/low-on-backup-codes.php rename to modules/mfa/public/low-on-backup-codes.php diff --git a/modules/mfa/www/must-set-up-mfa.php b/modules/mfa/public/must-set-up-mfa.php similarity index 100% rename from modules/mfa/www/must-set-up-mfa.php rename to modules/mfa/public/must-set-up-mfa.php diff --git a/modules/mfa/www/new-backup-codes.php b/modules/mfa/public/new-backup-codes.php similarity index 100% rename from modules/mfa/www/new-backup-codes.php rename to modules/mfa/public/new-backup-codes.php diff --git a/modules/mfa/www/out-of-backup-codes.php b/modules/mfa/public/out-of-backup-codes.php similarity index 100% rename from modules/mfa/www/out-of-backup-codes.php rename to modules/mfa/public/out-of-backup-codes.php diff --git a/modules/mfa/www/prompt-for-mfa.php b/modules/mfa/public/prompt-for-mfa.php similarity index 100% rename from modules/mfa/www/prompt-for-mfa.php rename to modules/mfa/public/prompt-for-mfa.php diff --git a/modules/mfa/www/send-manager-mfa.php b/modules/mfa/public/send-manager-mfa.php similarity index 100% rename from modules/mfa/www/send-manager-mfa.php rename to modules/mfa/public/send-manager-mfa.php diff --git a/modules/mfa/www/simplewebauthn/LICENSE.md b/modules/mfa/public/simplewebauthn/LICENSE.md similarity index 100% rename from modules/mfa/www/simplewebauthn/LICENSE.md rename to modules/mfa/public/simplewebauthn/LICENSE.md diff --git a/modules/mfa/www/simplewebauthn/browser.js b/modules/mfa/public/simplewebauthn/browser.js similarity index 100% rename from modules/mfa/www/simplewebauthn/browser.js rename to modules/mfa/public/simplewebauthn/browser.js diff --git a/modules/profilereview/www/nag.php b/modules/profilereview/public/nag.php similarity index 100% rename from modules/profilereview/www/nag.php rename to modules/profilereview/public/nag.php diff --git a/modules/profilereview/www/review.php b/modules/profilereview/public/review.php similarity index 100% rename from modules/profilereview/www/review.php rename to modules/profilereview/public/review.php diff --git a/modules/silauth/www/loginuserpass.php b/modules/silauth/public/loginuserpass.php similarity index 100% rename from modules/silauth/www/loginuserpass.php rename to modules/silauth/public/loginuserpass.php diff --git a/modules/silauth/www/status.php b/modules/silauth/public/status.php similarity index 100% rename from modules/silauth/www/status.php rename to modules/silauth/public/status.php diff --git a/modules/sildisco/www/betatest.php b/modules/sildisco/public/betatest.php similarity index 100% rename from modules/sildisco/www/betatest.php rename to modules/sildisco/public/betatest.php diff --git a/modules/sildisco/www/disco.php b/modules/sildisco/public/disco.php similarity index 90% rename from modules/sildisco/www/disco.php rename to modules/sildisco/public/disco.php index e6b87f69..bc2b8321 100644 --- a/modules/sildisco/www/disco.php +++ b/modules/sildisco/public/disco.php @@ -1,7 +1,7 @@