Skip to content

Commit

Permalink
Start testing with SSP v2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Marko Ivančić committed Dec 5, 2024
1 parent 143c7dc commit 20c6cbf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ PHP version requirement changes in minor releases for SimpleSAMLphp.

| OIDC module | Tested SimpleSAMLphp | PHP | Note |
|:------------|:---------------------|:------:|-----------------------------|
| v6.\* | v2.2.\* | \>=8.2 | Recommended |
| v6.\* | v2.3.\* | \>=8.2 | Recommended |
| v5.\* | v2.1.\* | \>=8.1 | |
| v4.\* | v2.0.\* | \>=8.0 | |
| v3.\* | v2.0.\* | \>=7.4 | Abandoned from August 2023. |
Expand Down Expand Up @@ -329,7 +329,7 @@ docker run --name ssp-oidc-dev \
--mount type=bind,source="$(pwd)/docker/ssp/oidc_module.crt",target=/var/simplesamlphp/cert/oidc_module.crt,readonly \
--mount type=bind,source="$(pwd)/docker/ssp/oidc_module.key",target=/var/simplesamlphp/cert/oidc_module.key,readonly \
--mount type=bind,source="$(pwd)/docker/apache-override.cf",target=/etc/apache2/sites-enabled/ssp-override.cf,readonly \
-p 443:443 cirrusid/simplesamlphp:v2.2.2
-p 443:443 cirrusid/simplesamlphp:v2.3.5
```

Visit https://localhost/simplesaml/ and confirm you get the default page.
Expand Down
2 changes: 1 addition & 1 deletion UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ has been refactored:

- upgraded to v5 of lcobucci/jwt https://github.com/lcobucci/jwt
- upgraded to v3 of laminas/laminas-diactoros https://github.com/laminas/laminas-diactoros
- SimpleSAMLphp version used during development was bumped to v2.2
- SimpleSAMLphp version used during development was bumped to v2.3
- In Authorization Code Flow, a new validation was added which checks for 'openid' value in 'scope' parameter. Up to
now, 'openid' value was dynamically added if not present. In Implicit Code Flow this validation was already present.

Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"friendsofphp/php-cs-fixer": "^3",
"phpunit/phpunit": "^10",
"rector/rector": "^0.18.3",
"simplesamlphp/simplesamlphp": "2.2.*",
"simplesamlphp/simplesamlphp": "2.3.*",
"simplesamlphp/simplesamlphp-test-framework": "^1.5",
"squizlabs/php_codesniffer": "^3",
"vimeo/psalm": "^5",
Expand All @@ -56,9 +56,10 @@
},
"sort-packages": true,
"allow-plugins": {
"simplesamlphp/composer-module-installer": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"phpstan/extension-installer": true
"phpstan/extension-installer": true,
"simplesamlphp/composer-module-installer": true,
"simplesamlphp/composer-xmlprovider-installer": true
},
"cache-dir": "build/composer"
},
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#FROM cirrusid/simplesamlphp:v2.2.2
FROM cicnavi/simplesamlphp:dev
FROM cirrusid/simplesamlphp:v2.3.5
#FROM cicnavi/simplesamlphp:dev

RUN apt-get update && apt-get install -y sqlite3
# Prepopulate the DB with items needed for testing
Expand Down

0 comments on commit 20c6cbf

Please sign in to comment.