Merge pull request #243 from silinternational/develop

Release 10.0.0-alpha.4 -- update to SimpleSAMLphp 2.2.2, now functional in IdP mode

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.php]
+charset = utf-8
+indent_size = 4
+
+[*.twig]
+charset = utf-8
+indent_size = 2

.github/workflows/test-and-publish.yml

@@ -10,14 +10,16 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: Create env files
+        run: cp local.env.dist local.env && cp local.broker.env.dist local.broker.env
       - name: test
-        run: docker compose -f actions-services.yml run test ./run-tests.sh
+        run: docker compose run test ./run-tests.sh
       - name: check hub metadata for tests
-        run: docker compose -f actions-services.yml run ssp-hub.local ./run-metadata-tests.sh
+        run: docker compose run ssp-hub.local ./run-metadata-tests.sh
       - name: check idp metadata for tests
-        run: docker compose -f actions-services.yml run ssp-idp1.local ./run-metadata-tests.sh
+        run: docker compose run ssp-idp1.local ./run-metadata-tests.sh
       - name: check sp metadata for tests
-        run: docker compose -f actions-services.yml run ssp-sp1.local ./run-metadata-tests.sh
+        run: docker compose run ssp-sp1.local ./run-metadata-tests.sh
 
   build-and-publish:
     name: Build and Publish

Dockerfile

@@ -45,28 +45,31 @@ ENV SSP_PATH /data/vendor/simplesamlphp/simplesamlphp
 COPY modules/ $SSP_PATH/modules
 
 # Copy material theme templates to other modules, just in case the "default" theme is selected
+COPY modules/material/themes/material/default/* $SSP_PATH/modules/default/templates/
 COPY modules/material/themes/material/expirychecker/* $SSP_PATH/modules/expirychecker/templates/
 COPY modules/material/themes/material/mfa/* $SSP_PATH/modules/mfa/templates/
 COPY modules/material/themes/material/profilereview/* $SSP_PATH/modules/profilereview/templates/
+COPY modules/material/themes/material/silauth/* $SSP_PATH/modules/silauth/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
 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 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
 RUN gzip -d config-shim.gz && chmod 755 config-shim && mv config-shim /usr/local/bin
 
+# Set permissions for cache directory. Corresponds to the `cachedir` setting in config.php.
+RUN mkdir /data/cache
+RUN chown -R www-data:www-data /data/cache
+
 EXPOSE 80
 ENTRYPOINT ["/usr/local/bin/s3-expand"]
 CMD ["/data/run.sh"]

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

README.md

@@ -229,14 +229,14 @@ 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
 
 Update `/simplesamlphp/config/config.php`:
 
 ```
-'analytics.trackingId' => 'G-some-unique-id-for-your-site'
+'analytics.trackingId' => 'UA-some-unique-id-for-your-site'
 ```
 
 This project provides a convenience by loading this config with whatever is in the environment variable `ANALYTICS_ID`._