diff --git a/Dockerfile b/Dockerfile index 08d8c8ef..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/lib/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/actions-services.yml b/actions-services.yml index 1f06cfdf..2c0a2c5c 100644 --- a/actions-services.yml +++ b/actions-services.yml @@ -92,7 +92,7 @@ services: - ./development/idp-local/metadata/saml20-sp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-sp-remote.php # Customized SSP code -- TODO: make a better solution that doesn't require hacking SSP code - - ./development/UserPass.php:/data/vendor/simplesamlphp/simplesamlphp/modules/exampleauth/lib/Auth/Source/UserPass.php + - ./development/UserPass.php:/data/vendor/simplesamlphp/simplesamlphp/modules/exampleauth/src/Auth/Source/UserPass.php # Enable checking our test metadata - ./dockerbuild/run-metadata-tests.sh:/data/run-metadata-tests.sh @@ -100,7 +100,7 @@ services: # Include the features folder (for the FakeIdBrokerClient class) - ./features:/data/features command: > - bash -c "whenavail db 3306 60 /data/vendor/simplesamlphp/simplesamlphp/modules/silauth/lib/Auth/Source/yii migrate --interactive=0 && + bash -c "whenavail db 3306 60 /data/vendor/simplesamlphp/simplesamlphp/modules/silauth/src/Auth/Source/yii migrate --interactive=0 && /data/run.sh" environment: ADMIN_PASS: "a" @@ -138,7 +138,7 @@ services: - ./development/idp2-local/metadata/saml20-sp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-sp-remote.php # Customized SSP code -- TODO: make a better solution that doesn't require hacking SSP code - - ./development/UserPass.php:/data/vendor/simplesamlphp/simplesamlphp/modules/exampleauth/lib/Auth/Source/UserPass.php + - ./development/UserPass.php:/data/vendor/simplesamlphp/simplesamlphp/modules/exampleauth/src/Auth/Source/UserPass.php environment: ADMIN_PASS: "b" diff --git a/docker-compose.yml b/docker-compose.yml index 6f121120..c41bf2d2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -146,7 +146,7 @@ services: - ./development/idp-local/metadata/saml20-sp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-sp-remote.php # Customized SSP code -- TODO: make a better solution that doesn't require hacking SSP code - - ./development/UserPass.php:/data/vendor/simplesamlphp/simplesamlphp/modules/exampleauth/lib/Auth/Source/UserPass.php + - ./development/UserPass.php:/data/vendor/simplesamlphp/simplesamlphp/modules/exampleauth/src/Auth/Source/UserPass.php # Enable checking our test metadata - ./dockerbuild/run-metadata-tests.sh:/data/run-metadata-tests.sh @@ -162,7 +162,7 @@ services: - ./modules/sildisco:/data/vendor/simplesamlphp/simplesamlphp/modules/sildisco - ./modules/material:/data/vendor/simplesamlphp/simplesamlphp/modules/material command: > - bash -c "whenavail db 3306 60 /data/vendor/simplesamlphp/simplesamlphp/modules/silauth/lib/Auth/Source/yii migrate --interactive=0 && + bash -c "whenavail db 3306 60 /data/vendor/simplesamlphp/simplesamlphp/modules/silauth/src/Auth/Source/yii migrate --interactive=0 && /data/run.sh" ports: - "8085:80" @@ -203,7 +203,7 @@ services: - ./development/idp2-local/metadata/saml20-sp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-sp-remote.php # Customized SSP code -- TODO: make a better solution that doesn't require hacking SSP code - - ./development/UserPass.php:/data/vendor/simplesamlphp/simplesamlphp/modules/exampleauth/lib/Auth/Source/UserPass.php + - ./development/UserPass.php:/data/vendor/simplesamlphp/simplesamlphp/modules/exampleauth/src/Auth/Source/UserPass.php # Local modules - ./modules/mfa:/data/vendor/simplesamlphp/simplesamlphp/modules/mfa diff --git a/dockerbuild/run-idp.sh b/dockerbuild/run-idp.sh index 2f65d0f0..ab6d1ed2 100755 --- a/dockerbuild/run-idp.sh +++ b/dockerbuild/run-idp.sh @@ -8,9 +8,9 @@ set -e # Try to run database migrations cd /data/vendor/simplesamlphp/simplesamlphp -chmod a+x ./modules/silauth/lib/Auth/Source/yii +chmod a+x ./modules/silauth/src/Auth/Source/yii -./modules/silauth/lib/Auth/Source/yii migrate --interactive=0 +./modules/silauth/src/Auth/Source/yii migrate --interactive=0 cd /data ./run.sh 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 266826f7..e366f45d 100644 --- a/docs/the_hub.md +++ b/docs/the_hub.md @@ -1,9 +1,9 @@ The hub will need its certs, `config.php` and `authsources.php` files as a normal simplesamlphp installation. Examples of these can be found in the `./development/hub` folder. (Note the `discoURL` entry in the `authsources.php` file.) Other files it will need are as follows ... -* The files in the `./lib` folder will need to go into `/data/vendor/simplesamlphp/simplesamlphp/modules/sildisco/lib` -* 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 `./src` folder will need to go into `/data/vendor/simplesamlphp/simplesamlphp/modules/sildisco/src` +* 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. @@ -35,6 +35,6 @@ In order to limit access to an IdP to only certain SP's, add an `'SPList'` array If you want to require SP's to list a certain IdP in their IDPList entry in order to be able to access it, add `excludeByDefault => true` to that IdP's metadata. ### Forced IdP discovery -The `.../lib/IdP/SAML2.php` file ensures that if an SP is allowed to access more than one IdP, then the user will be forced back to the IdP discovery page, even if they are already authenticated through one of those IdP's. +The `.../src/IdP/SAML2.php` file ensures that if an SP is allowed to access more than one IdP, then the user will be forced back to the IdP discovery page, even if they are already authenticated through one of those IdP's. The reason for this is to ensure that the user has a chance to decide which of their identities is used for that SP. 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/expirychecker/lib/Auth/Process/ExpiryDate.php b/modules/expirychecker/src/Auth/Process/ExpiryDate.php similarity index 100% rename from modules/expirychecker/lib/Auth/Process/ExpiryDate.php rename to modules/expirychecker/src/Auth/Process/ExpiryDate.php diff --git a/modules/expirychecker/lib/Utilities.php b/modules/expirychecker/src/Utilities.php similarity index 100% rename from modules/expirychecker/lib/Utilities.php rename to modules/expirychecker/src/Utilities.php diff --git a/modules/expirychecker/lib/Validator.php b/modules/expirychecker/src/Validator.php similarity index 100% rename from modules/expirychecker/lib/Validator.php rename to modules/expirychecker/src/Validator.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/mfa/lib/Assert.php b/modules/mfa/src/Assert.php similarity index 100% rename from modules/mfa/lib/Assert.php rename to modules/mfa/src/Assert.php diff --git a/modules/mfa/lib/Auth/Process/Mfa.php b/modules/mfa/src/Auth/Process/Mfa.php similarity index 100% rename from modules/mfa/lib/Auth/Process/Mfa.php rename to modules/mfa/src/Auth/Process/Mfa.php diff --git a/modules/mfa/lib/LoggerFactory.php b/modules/mfa/src/LoggerFactory.php similarity index 100% rename from modules/mfa/lib/LoggerFactory.php rename to modules/mfa/src/LoggerFactory.php diff --git a/modules/mfa/lib/LoginBrowser.php b/modules/mfa/src/LoginBrowser.php similarity index 100% rename from modules/mfa/lib/LoginBrowser.php rename to modules/mfa/src/LoginBrowser.php 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/profilereview/lib/Assert.php b/modules/profilereview/src/Assert.php similarity index 100% rename from modules/profilereview/lib/Assert.php rename to modules/profilereview/src/Assert.php diff --git a/modules/profilereview/lib/Auth/Process/ProfileReview.php b/modules/profilereview/src/Auth/Process/ProfileReview.php similarity index 100% rename from modules/profilereview/lib/Auth/Process/ProfileReview.php rename to modules/profilereview/src/Auth/Process/ProfileReview.php diff --git a/modules/profilereview/lib/LoggerFactory.php b/modules/profilereview/src/LoggerFactory.php similarity index 100% rename from modules/profilereview/lib/LoggerFactory.php rename to modules/profilereview/src/LoggerFactory.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/silauth/lib/Auth/Source/SilAuth.php b/modules/silauth/src/Auth/Source/SilAuth.php similarity index 100% rename from modules/silauth/lib/Auth/Source/SilAuth.php rename to modules/silauth/src/Auth/Source/SilAuth.php diff --git a/modules/silauth/lib/Auth/Source/auth/AuthError.php b/modules/silauth/src/Auth/Source/auth/AuthError.php similarity index 100% rename from modules/silauth/lib/Auth/Source/auth/AuthError.php rename to modules/silauth/src/Auth/Source/auth/AuthError.php diff --git a/modules/silauth/lib/Auth/Source/auth/Authenticator.php b/modules/silauth/src/Auth/Source/auth/Authenticator.php similarity index 100% rename from modules/silauth/lib/Auth/Source/auth/Authenticator.php rename to modules/silauth/src/Auth/Source/auth/Authenticator.php diff --git a/modules/silauth/lib/Auth/Source/auth/IdBroker.php b/modules/silauth/src/Auth/Source/auth/IdBroker.php similarity index 100% rename from modules/silauth/lib/Auth/Source/auth/IdBroker.php rename to modules/silauth/src/Auth/Source/auth/IdBroker.php diff --git a/modules/silauth/lib/Auth/Source/behaviors/CreatedAtUtcBehavior.php b/modules/silauth/src/Auth/Source/behaviors/CreatedAtUtcBehavior.php similarity index 100% rename from modules/silauth/lib/Auth/Source/behaviors/CreatedAtUtcBehavior.php rename to modules/silauth/src/Auth/Source/behaviors/CreatedAtUtcBehavior.php diff --git a/modules/silauth/lib/Auth/Source/captcha/Captcha.php b/modules/silauth/src/Auth/Source/captcha/Captcha.php similarity index 100% rename from modules/silauth/lib/Auth/Source/captcha/Captcha.php rename to modules/silauth/src/Auth/Source/captcha/Captcha.php diff --git a/modules/silauth/lib/Auth/Source/config/ConfigManager.php b/modules/silauth/src/Auth/Source/config/ConfigManager.php similarity index 100% rename from modules/silauth/lib/Auth/Source/config/ConfigManager.php rename to modules/silauth/src/Auth/Source/config/ConfigManager.php diff --git a/modules/silauth/lib/Auth/Source/config/ssp-config.php b/modules/silauth/src/Auth/Source/config/ssp-config.php similarity index 100% rename from modules/silauth/lib/Auth/Source/config/ssp-config.php rename to modules/silauth/src/Auth/Source/config/ssp-config.php diff --git a/modules/silauth/lib/Auth/Source/config/yii2-config.php b/modules/silauth/src/Auth/Source/config/yii2-config.php similarity index 100% rename from modules/silauth/lib/Auth/Source/config/yii2-config.php rename to modules/silauth/src/Auth/Source/config/yii2-config.php diff --git a/modules/silauth/lib/Auth/Source/csrf/CsrfProtector.php b/modules/silauth/src/Auth/Source/csrf/CsrfProtector.php similarity index 100% rename from modules/silauth/lib/Auth/Source/csrf/CsrfProtector.php rename to modules/silauth/src/Auth/Source/csrf/CsrfProtector.php diff --git a/modules/silauth/lib/Auth/Source/http/Request.php b/modules/silauth/src/Auth/Source/http/Request.php similarity index 100% rename from modules/silauth/lib/Auth/Source/http/Request.php rename to modules/silauth/src/Auth/Source/http/Request.php diff --git a/modules/silauth/lib/Auth/Source/models/FailedLoginIpAddress.php b/modules/silauth/src/Auth/Source/models/FailedLoginIpAddress.php similarity index 100% rename from modules/silauth/lib/Auth/Source/models/FailedLoginIpAddress.php rename to modules/silauth/src/Auth/Source/models/FailedLoginIpAddress.php diff --git a/modules/silauth/lib/Auth/Source/models/FailedLoginIpAddressBase.php b/modules/silauth/src/Auth/Source/models/FailedLoginIpAddressBase.php similarity index 100% rename from modules/silauth/lib/Auth/Source/models/FailedLoginIpAddressBase.php rename to modules/silauth/src/Auth/Source/models/FailedLoginIpAddressBase.php diff --git a/modules/silauth/lib/Auth/Source/models/FailedLoginUsername.php b/modules/silauth/src/Auth/Source/models/FailedLoginUsername.php similarity index 100% rename from modules/silauth/lib/Auth/Source/models/FailedLoginUsername.php rename to modules/silauth/src/Auth/Source/models/FailedLoginUsername.php diff --git a/modules/silauth/lib/Auth/Source/models/FailedLoginUsernameBase.php b/modules/silauth/src/Auth/Source/models/FailedLoginUsernameBase.php similarity index 100% rename from modules/silauth/lib/Auth/Source/models/FailedLoginUsernameBase.php rename to modules/silauth/src/Auth/Source/models/FailedLoginUsernameBase.php diff --git a/modules/silauth/lib/Auth/Source/rebuildbasemodels.sh b/modules/silauth/src/Auth/Source/rebuildbasemodels.sh similarity index 100% rename from modules/silauth/lib/Auth/Source/rebuildbasemodels.sh rename to modules/silauth/src/Auth/Source/rebuildbasemodels.sh diff --git a/modules/silauth/lib/Auth/Source/saml/User.php b/modules/silauth/src/Auth/Source/saml/User.php similarity index 100% rename from modules/silauth/lib/Auth/Source/saml/User.php rename to modules/silauth/src/Auth/Source/saml/User.php diff --git a/modules/silauth/lib/Auth/Source/system/System.php b/modules/silauth/src/Auth/Source/system/System.php similarity index 100% rename from modules/silauth/lib/Auth/Source/system/System.php rename to modules/silauth/src/Auth/Source/system/System.php diff --git a/modules/silauth/lib/Auth/Source/tests/bootstrap.php b/modules/silauth/src/Auth/Source/tests/bootstrap.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/bootstrap.php rename to modules/silauth/src/Auth/Source/tests/bootstrap.php diff --git a/modules/silauth/lib/Auth/Source/tests/fakes/FakeFailedIdBroker.php b/modules/silauth/src/Auth/Source/tests/fakes/FakeFailedIdBroker.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/fakes/FakeFailedIdBroker.php rename to modules/silauth/src/Auth/Source/tests/fakes/FakeFailedIdBroker.php diff --git a/modules/silauth/lib/Auth/Source/tests/fakes/FakeIdBroker.php b/modules/silauth/src/Auth/Source/tests/fakes/FakeIdBroker.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/fakes/FakeIdBroker.php rename to modules/silauth/src/Auth/Source/tests/fakes/FakeIdBroker.php diff --git a/modules/silauth/lib/Auth/Source/tests/fakes/FakeInvalidIdBroker.php b/modules/silauth/src/Auth/Source/tests/fakes/FakeInvalidIdBroker.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/fakes/FakeInvalidIdBroker.php rename to modules/silauth/src/Auth/Source/tests/fakes/FakeInvalidIdBroker.php diff --git a/modules/silauth/lib/Auth/Source/tests/fakes/FakeSuccessfulIdBroker.php b/modules/silauth/src/Auth/Source/tests/fakes/FakeSuccessfulIdBroker.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/fakes/FakeSuccessfulIdBroker.php rename to modules/silauth/src/Auth/Source/tests/fakes/FakeSuccessfulIdBroker.php diff --git a/modules/silauth/lib/Auth/Source/tests/phpunit.xml b/modules/silauth/src/Auth/Source/tests/phpunit.xml similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/phpunit.xml rename to modules/silauth/src/Auth/Source/tests/phpunit.xml diff --git a/modules/silauth/lib/Auth/Source/tests/unit/auth/AuthenticatorTest.php b/modules/silauth/src/Auth/Source/tests/unit/auth/AuthenticatorTest.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/auth/AuthenticatorTest.php rename to modules/silauth/src/Auth/Source/tests/unit/auth/AuthenticatorTest.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/captcha/DummyFailedCaptcha.php b/modules/silauth/src/Auth/Source/tests/unit/captcha/DummyFailedCaptcha.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/captcha/DummyFailedCaptcha.php rename to modules/silauth/src/Auth/Source/tests/unit/captcha/DummyFailedCaptcha.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/captcha/DummySuccessfulCaptcha.php b/modules/silauth/src/Auth/Source/tests/unit/captcha/DummySuccessfulCaptcha.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/captcha/DummySuccessfulCaptcha.php rename to modules/silauth/src/Auth/Source/tests/unit/captcha/DummySuccessfulCaptcha.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/config/ConfigManagerTest.php b/modules/silauth/src/Auth/Source/tests/unit/config/ConfigManagerTest.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/config/ConfigManagerTest.php rename to modules/silauth/src/Auth/Source/tests/unit/config/ConfigManagerTest.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/csrf/CsrfProtectorTest.php b/modules/silauth/src/Auth/Source/tests/unit/csrf/CsrfProtectorTest.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/csrf/CsrfProtectorTest.php rename to modules/silauth/src/Auth/Source/tests/unit/csrf/CsrfProtectorTest.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/csrf/FakeSession.php b/modules/silauth/src/Auth/Source/tests/unit/csrf/FakeSession.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/csrf/FakeSession.php rename to modules/silauth/src/Auth/Source/tests/unit/csrf/FakeSession.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/http/DummyRequest.php b/modules/silauth/src/Auth/Source/tests/unit/http/DummyRequest.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/http/DummyRequest.php rename to modules/silauth/src/Auth/Source/tests/unit/http/DummyRequest.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/http/RequestTest.php b/modules/silauth/src/Auth/Source/tests/unit/http/RequestTest.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/http/RequestTest.php rename to modules/silauth/src/Auth/Source/tests/unit/http/RequestTest.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/models/FailedLoginIpAddressTest.php b/modules/silauth/src/Auth/Source/tests/unit/models/FailedLoginIpAddressTest.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/models/FailedLoginIpAddressTest.php rename to modules/silauth/src/Auth/Source/tests/unit/models/FailedLoginIpAddressTest.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/models/FailedLoginUsernameTest.php b/modules/silauth/src/Auth/Source/tests/unit/models/FailedLoginUsernameTest.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/models/FailedLoginUsernameTest.php rename to modules/silauth/src/Auth/Source/tests/unit/models/FailedLoginUsernameTest.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/text/TextTest.php b/modules/silauth/src/Auth/Source/tests/unit/text/TextTest.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/text/TextTest.php rename to modules/silauth/src/Auth/Source/tests/unit/text/TextTest.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/time/UtcTimeTest.php b/modules/silauth/src/Auth/Source/tests/unit/time/UtcTimeTest.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/time/UtcTimeTest.php rename to modules/silauth/src/Auth/Source/tests/unit/time/UtcTimeTest.php diff --git a/modules/silauth/lib/Auth/Source/tests/unit/time/WaitTimeTest.php b/modules/silauth/src/Auth/Source/tests/unit/time/WaitTimeTest.php similarity index 100% rename from modules/silauth/lib/Auth/Source/tests/unit/time/WaitTimeTest.php rename to modules/silauth/src/Auth/Source/tests/unit/time/WaitTimeTest.php diff --git a/modules/silauth/lib/Auth/Source/text/Text.php b/modules/silauth/src/Auth/Source/text/Text.php similarity index 100% rename from modules/silauth/lib/Auth/Source/text/Text.php rename to modules/silauth/src/Auth/Source/text/Text.php diff --git a/modules/silauth/lib/Auth/Source/time/UtcTime.php b/modules/silauth/src/Auth/Source/time/UtcTime.php similarity index 100% rename from modules/silauth/lib/Auth/Source/time/UtcTime.php rename to modules/silauth/src/Auth/Source/time/UtcTime.php diff --git a/modules/silauth/lib/Auth/Source/time/WaitTime.php b/modules/silauth/src/Auth/Source/time/WaitTime.php similarity index 100% rename from modules/silauth/lib/Auth/Source/time/WaitTime.php rename to modules/silauth/src/Auth/Source/time/WaitTime.php diff --git a/modules/silauth/lib/Auth/Source/traits/LoggerAwareTrait.php b/modules/silauth/src/Auth/Source/traits/LoggerAwareTrait.php similarity index 100% rename from modules/silauth/lib/Auth/Source/traits/LoggerAwareTrait.php rename to modules/silauth/src/Auth/Source/traits/LoggerAwareTrait.php diff --git a/modules/silauth/lib/Auth/Source/yii b/modules/silauth/src/Auth/Source/yii similarity index 100% rename from modules/silauth/lib/Auth/Source/yii rename to modules/silauth/src/Auth/Source/yii 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 @@