-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
SSP-2060-Use_processing_chain #43
Merged
pradtke
merged 10 commits into
simplesamlphp:master
from
ioigoume:SSP-2060-Use_processing_chain
Nov 18, 2024
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
750813d
Initial commit.Added Processing Chain factory.Moved TicketFactory to …
ioigoume b1152c6
Get state from authsource and pass it to extract user attributes
ioigoume 9d49f92
Add processing chain query parameter handling.
ioigoume a0c558d
Fix ProcessingChaing redirect request handling.
ioigoume 4e03081
Fixed unit tests and phpcs
ioigoume 6a52c3b
Add testing steps with docker image to README
pradtke a911fa7
Review changes.
ioigoume 7ded799
Fix markdown errors
ioigoume c59c5ce
Merge branch 'master' into SSP-2060-Use_processing_chain
tvdijen f2c07c0
Fix scrutinizer reported issues
ioigoume File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| RewriteEngine On | ||
| RewriteRule ^/.well-known/openid-configuration(.*) /${SSP_APACHE_ALIAS}module.php/oidc/.well-known/openid-configuration$1 [PT] | ||
| RewriteRule ^/.well-known/openid-federation(.*) /${SSP_APACHE_ALIAS}module.php/oidc/.well-known/openid-federation$1 [PT] | ||
|
|
||
| # Some CAS clients expect you to run under /cas/ so you use some rewrite rules | ||
|
|
||
| RewriteRule ^/cas/login(.*) /${SSP_APACHE_ALIAS}module.php/casserver/login.php$1 [PT] | ||
| RewriteRule ^/cas/serviceValidate(.*) /${SSP_APACHE_ALIAS}module.php/casserver/serviceValidate.php$1 [PT] | ||
| RewriteRule ^/cas/p3/serviceValidate(.*) /${SSP_APACHE_ALIAS}module.php/casserver/serviceValidate.php$1 [PT] | ||
| RewriteRule ^/cas/proxyValidate(.*) /${SSP_APACHE_ALIAS}module.php/casserver/serviceValidate.php$1 [PT] | ||
| RewriteRule ^/cas/p3/proxyValidate(.*) /${SSP_APACHE_ALIAS}module.php/casserver/serviceValidate.php$1 [PT] | ||
| RewriteRule ^/cas/validate(.*) /${SSP_APACHE_ALIAS}module.php/casserver/validate.php$1 [PT] | ||
| RewriteRule ^/cas/logout(.*) /${SSP_APACHE_ALIAS}module.php/casserver/logout.php$1 [PT] | ||
| RewriteRule ^/cas/samlValidate(.*) /${SSP_APACHE_ALIAS}module.php/casserver/samlValidate.php$1 [PT] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| $config = array( | ||
|
|
||
| // This is an authentication source which handles admin authentication. | ||
| 'admin' => array( | ||
| 'core:AdminPassword', | ||
| ), | ||
|
|
||
| 'example-userpass' => [ | ||
| 'exampleauth:UserPass', | ||
| 'users' => [ | ||
| 'student:studentpass' => [ | ||
| 'uid' => ['student'], | ||
| 'eduPersonAffiliation' => ['member', 'student'], | ||
| 'eduPersonNickname' => 'Sir_Nickname', | ||
| 'displayName' => 'Some User', | ||
| 'givenName' => 'Firsty', | ||
| 'middle_name' => 'Mid', | ||
| 'sn' => 'Lasty', | ||
| 'labeledURI' => 'https://example.com/student', | ||
| 'jpegURL' => 'https://example.com/student.jpg', | ||
| 'mail' => '[email protected]', | ||
| 'email_verified' => 'yes', | ||
| 'zoneinfo' => 'Europe/Paris', | ||
| 'updated_at' => '1621374126', | ||
| 'preferredLanguage' => 'fr-CA', | ||
| 'website' => 'https://example.com/student-blog', | ||
| 'gender' => 'female', | ||
| 'birthdate' => '1945-03-21', | ||
| 'eduPersonUniqueId' => '13579', | ||
| 'phone_number_verified' => 'yes', | ||
| 'mobile' => '+1 (604) 555-1234;ext=5678', | ||
| 'postalAddress' => ["Place Charles de Gaulle, Paris"], | ||
| 'street_address' => ['Place Charles de Gaulle'], | ||
| 'locality' => ['Paris'], | ||
| 'region' => ['Île-de-France'], | ||
| 'postal_code' => ['75008'], | ||
| 'country' => ['France'], | ||
| // Confirm that an attribute containing xml stuff is handled | ||
| 'attributeContainingXml' => ['<confirmNothingBreaks test="true"/>', 'test < "'] | ||
| ], | ||
| 'employee:employeepass' => [ | ||
| 'uid' => ['employee'], | ||
| 'eduPersonAffiliation' => ['member', 'employee'], | ||
| 'eduPersonEntitlement' => ['urn:example:oidc:manage:client'] | ||
| ], | ||
| 'member:memberpass' => [ | ||
| 'uid' => ['member'], | ||
| 'eduPersonAffiliation' => ['member'], | ||
| 'eduPersonEntitlement' => ['urn:example:oidc:manage:client'] | ||
| ], | ||
| 'minimal:minimalpass' => [ | ||
| 'uid' => ['minimal'], | ||
| ], | ||
| ], | ||
| ], | ||
|
|
||
|
|
||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| $config['module.enable']['exampleauth'] = true; | ||
| $config['module.enable']['casserver'] = true; | ||
| // Have preprod warning enabled (though it may not be installed) to ease authproc redirect testing | ||
| $config['module.enable']['preprodwarning'] = true; | ||
| $config = [ | ||
| 'secretsalt' => 'testsalt', | ||
| 'logging.level' => 7, | ||
| ] + $config; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * Configuration for the module casserver. | ||
| * | ||
| */ | ||
|
|
||
| $config = [ | ||
| 'authsource' => 'example-userpass', | ||
|
|
||
| /* Scopes are named sets of entityIDs to be used for scoping. If a named scope is provided during login, then the | ||
| IdPs listed by the disco service will be restricted to entityIDs in the specified set. */ | ||
| 'scopes' => [ | ||
| 'mobile' => [ | ||
| 'https://idp1.domain:1234/saml2/idp/metadata.php', | ||
| 'https://idp2.domain:5678/saml2/idp/metadata.php' | ||
| ], | ||
| 'desktop' => [ | ||
| 'https://idp3.domain:1234/saml2/idp/metadata.php', | ||
| 'https://idp4.domain:5678/saml2/idp/metadata.php' | ||
| ] | ||
| ], | ||
| 'legal_service_urls' => [ | ||
| //Any service url string matching any of the following prefixes is accepted | ||
| 'http://host1.domain:1234/path1', | ||
| 'http://host1.domain:1234/noattributes' => [ | ||
| 'attributes' => false, | ||
| ], | ||
| 'https://host2.domain:5678/path2/path3', | ||
| // So is regex | ||
| '|^https://.*\.domain.com/|', | ||
| // Some configuration options can be overridden | ||
| 'https://override.example.com' => [ | ||
| 'attrname' => 'uid', | ||
| 'attributes_to_transfer' => ['cn'], | ||
| ], | ||
| ], | ||
|
|
||
| 'legal_target_service_urls' => [ | ||
| //Any target service url string matching any of the following prefixes is accepted | ||
| 'http://host3.domain:4321/path4', | ||
| 'https://host4.domain:8765/path5/path6', | ||
| ], | ||
|
|
||
| 'ticketstore' => [ | ||
| //defaults to filesystem ticket store using the directory 'ticketcache' | ||
| 'class' => 'casserver:FileSystemTicketStore', //Not intended for production | ||
| 'directory' => 'ticketcache', | ||
|
|
||
| //'class' => 'casserver:MemCacheTicketStore', | ||
| //'prefix' => 'some_prefix', | ||
|
|
||
| //'class' => 'casserver:SQLTicketStore', | ||
| //'dsn' => 'pgsql:host=localhost;port=5432;dbname=casserver', | ||
| //'username' => 'username', | ||
| //'password' => 'password', | ||
| //'prefix' => 'some_prefix', | ||
| //'options' => [ | ||
| // \PDO::ATTR_TIMEOUT => 4, | ||
| // ] | ||
|
|
||
| //'class' => 'casserver:RedisTicketStore', | ||
| //'prefix' => 'some_prefix', | ||
|
|
||
| // Store tickets in multiple ticket stores for redundancy or to allow | ||
| // transitions between data stores without downtime. | ||
| /* | ||
| 'class' => 'casserver:DelegatingTicketStore', | ||
| 'delegateTo' => 'all', | ||
| 'ticketStores' => [ | ||
| 'oldStore' => [ | ||
| 'class' => 'casserver:RedisTicketStore', | ||
| 'prefix' => 'cas', | ||
| ], | ||
| 'newStore' => [ | ||
| 'class' => 'casserver:FileSystemTicketStore', | ||
| 'prefix' => 'cas' | ||
| ] | ||
| ]*/ | ||
| ], | ||
|
|
||
| 'attrname' => 'uid', // 'eduPersonPrincipalName', | ||
| 'attributes' => true, // enable transfer of attributes, defaults to true | ||
| 'attributes_to_transfer' => ['cn', 'eduPersonAffiliation', 'attributeContainingXml'], // set of attributes to transfer, defaults to all | ||
|
|
||
| /** | ||
| * Optional authproc filter. Only authproc filters that solely rely on attributes | ||
| * (such as core:AttributeMap and AttributeAlter) | ||
| * may be used. If your authsource supports authproc filters you are better off doing it there. | ||
| */ | ||
| 'authproc' => [ | ||
| [ | ||
| 'class' => 'core:AttributeMap', | ||
| 'oid2name', | ||
| 'urn:example' => 'example', | ||
| ], | ||
| [ | ||
| 'class' => 'preprodwarning:Warning', | ||
| ], | ||
| // Additional authproc filter | ||
| ], | ||
|
|
||
| 'base64attributes' => false, // base64 encode transferred attributes, defaults to false | ||
|
|
||
| /** | ||
| * add an attribute with the value of the base64attributes | ||
| * configuration parameter to the set of transferred attributes. | ||
| * Defaults to not adding an indicator attribute. | ||
| */ | ||
| 'base64_attributes_indicator_attribute' => 'base64Attributes', | ||
|
|
||
| 'enable_logout' => true, // enable CAS logout, defaults to false | ||
| 'skip_logout_page' => true, /*perform a redirect instead of showing a logout page with a link to the location | ||
| given in the url parameter, defaults to false. Skipping the logout page makes the | ||
| url query parameter to CAS logout mandatory for obvious reasons.*/ | ||
|
|
||
| // how many seconds service tickets are valid for, defaults to 5 | ||
| 'service_ticket_expire_time' => 5, | ||
| // how many seconds proxy granting tickets are valid for at most, defaults to 3600 | ||
| 'proxy_granting_ticket_expire_time' => 600, | ||
| //how many seconds proxy tickets are valid for, defaults to 5 | ||
| 'proxy_ticket_expire_time' => 5, | ||
|
|
||
| // If query param debugMode=true is sent to the login endpoint then print cas ticket xml. Default false | ||
| 'debugMode' => true, | ||
| ]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be solved in SSP 2.3.3