-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merged in feature/shibui-2393-testbed (pull request #626)
Feature/shibui 2393 testbed
- Loading branch information
Showing
22 changed files
with
943 additions
and
22 deletions.
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
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
71 changes: 71 additions & 0 deletions
71
testbed/integration/shibboleth-idp/config/shib-idp/conf/credentials.xml
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,71 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <beans xmlns="http://www.springframework.org/schema/beans" | ||
| xmlns:context="http://www.springframework.org/schema/context" | ||
| xmlns:util="http://www.springframework.org/schema/util" | ||
| xmlns:p="http://www.springframework.org/schema/p" | ||
| xmlns:c="http://www.springframework.org/schema/c" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd | ||
| http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd | ||
| http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd" | ||
|
|
||
| default-init-method="initialize" | ||
| default-destroy-method="destroy"> | ||
|
|
||
| <!-- | ||
| NOTE: if you're using a legacy relying-party.xml file from a V2 configuration, this file is ignored. | ||
| This defines the signing and encryption key and certificate pairs referenced by your relying-party.xml | ||
| configuration. You don't normally need to touch this, unless you have advanced requirements such as | ||
| supporting multiple sets of keys for different relying parties, in which case you may want to define | ||
| all your credentials here for convenience. | ||
| --> | ||
|
|
||
| <!-- | ||
| The list of ALL of your IdP's signing credentials. If you define additional signing credentials, | ||
| for example for specific relying parties or different key types, make sure to include them within this list. | ||
| --> | ||
| <util:list id="shibboleth.SigningCredentials"> | ||
| <ref bean="shibboleth.DefaultSigningCredential" /> | ||
| </util:list> | ||
|
|
||
| <!-- Your IdP's default signing key, set via property file. --> | ||
| <bean id="shibboleth.DefaultSigningCredential" | ||
| class="net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean" | ||
| p:privateKeyResource="%{idp.signing.key}" | ||
| p:certificateResource="%{idp.signing.cert}" | ||
| p:entityId-ref="entityID" /> | ||
|
|
||
| <!-- Your IdP's default client TLS credential, by default the same as the default signing credential. --> | ||
| <alias alias="shibboleth.DefaultClientTLSCredential" name="shibboleth.DefaultSigningCredential" /> | ||
|
|
||
| <!-- | ||
| The list of ALL of your IdP's encryption credentials. By default this is just an alias | ||
| for 'shibboleth.DefaultEncryptionCredentials'. It could be re-defined as | ||
| a list with additional credentials if needed. | ||
| --> | ||
| <alias alias="shibboleth.EncryptionCredentials" name="shibboleth.DefaultEncryptionCredentials" /> | ||
|
|
||
| <!-- Your IdP's default encryption (really decryption) keys, set via property file. --> | ||
| <util:list id="shibboleth.DefaultEncryptionCredentials"> | ||
| <bean class="net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean" | ||
| p:privateKeyResource="%{idp.encryption.key}" | ||
| p:certificateResource="%{idp.encryption.cert}" | ||
| p:entityId-ref="entityID" /> | ||
|
|
||
| <!-- | ||
| For key rollover, uncomment and point to your original keypair, and use the one above | ||
| to point to your new keypair. Once metadata has propagated, comment this one out again. | ||
| --> | ||
| <!-- | ||
| <bean class="net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean" | ||
| p:privateKeyResource="%{idp.encryption.key.2}" | ||
| p:certificateResource="%{idp.encryption.cert.2}" | ||
| p:entityId-ref="entityID" /> | ||
| --> | ||
| </util:list> | ||
|
|
||
| <!-- OIDC extension default credential definitions --> | ||
| <import resource="oidc-credentials.xml" /> | ||
|
|
||
| </beans> |
80 changes: 80 additions & 0 deletions
80
testbed/integration/shibboleth-idp/config/shib-idp/conf/global.xml
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,80 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <beans xmlns="http://www.springframework.org/schema/beans" | ||
| xmlns:context="http://www.springframework.org/schema/context" | ||
| xmlns:util="http://www.springframework.org/schema/util" | ||
| xmlns:p="http://www.springframework.org/schema/p" | ||
| xmlns:c="http://www.springframework.org/schema/c" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd | ||
| http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd | ||
| http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd" | ||
|
|
||
| default-init-method="initialize" | ||
| default-destroy-method="destroy"> | ||
|
|
||
| <!-- Use this file to define any custom beans needed globally. --> | ||
|
|
||
| <!-- Postgres configuration --> | ||
| <bean id="shibboleth.JPAStorageService" | ||
| class="org.opensaml.storage.impl.JPAStorageService" | ||
| p:cleanupInterval="%{idp.storage.cleanupInterval:PT10M}" | ||
| c:factory-ref="shibboleth.JPAStorageService.EntityManagerFactory" /> | ||
|
|
||
| <bean id="shibboleth.JPAStorageService.EntityManagerFactory" | ||
| class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> | ||
| <property name="persistenceUnitName" value="storageservice" /> | ||
| <property name="packagesToScan" value="org.opensaml.storage.impl" /> | ||
| <property name="dataSource" ref="shibboleth.JPAStorageService.DataSource" /> | ||
| <property name="jpaVendorAdapter" ref="shibboleth.JPAStorageService.JPAVendorAdapter" /> | ||
| <property name="jpaDialect"> | ||
| <bean class="org.springframework.orm.jpa.vendor.HibernateJpaDialect" /> | ||
| </property> | ||
| </bean> | ||
|
|
||
| <bean id="shibboleth.JPAStorageService.JPAVendorAdapter" | ||
| class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"> | ||
| <property name="database" value="POSTGRESQL" /> | ||
| </bean> | ||
| <bean id="shibboleth.JPAStorageService.DataSource" | ||
| class="com.zaxxer.hikari.HikariDataSource" destroy-method="close" lazy-init="true" | ||
| p:driverClassName="org.postgresql.Driver" | ||
| p:jdbcUrl="jdbc:postgresql://database:5432/oidc_dynreg" | ||
| p:username="shibui" | ||
| p:password="shibui" /> | ||
|
|
||
| <!-- | ||
| Algorithm include/exclude sets that override or merge with library defaults. Normally you can leave these | ||
| empty or commented and use the system defaults, but you can override those defaults using these beans. | ||
| Each <value> element is an algorithm URI; you can also use <util:constant> elements in place of literal values. | ||
| --> | ||
|
|
||
| <!-- | ||
| <util:set id="shibboleth.IncludedSignatureAlgorithms"> | ||
| </util:set> | ||
| <util:set id="shibboleth.ExcludedSignatureAlgorithms"> | ||
| </util:set> | ||
| <util:set id="shibboleth.IncludedEncryptionAlgorithms"> | ||
| </util:set> | ||
| <util:set id="shibboleth.ExcludedEncryptionAlgorithms"> | ||
| </util:set> | ||
| --> | ||
|
|
||
| <!-- | ||
| If you need to define and inject custom Java object(s) into the various views used throughout the | ||
| system (errors, login, logout, etc.), you can uncomment and define the bean below to be of any | ||
| type required. It will appear in the view scope as a variable named "custom". | ||
| The example below defines the bean as a map, which allows you to inject multiple objects under | ||
| named keys to expand the feature to support multiple injected objects. | ||
| --> | ||
|
|
||
| <!-- | ||
| <util:map id="shibboleth.CustomViewContext"> | ||
| <entry key="foo" value="bar"/> | ||
| </util:map> | ||
| --> | ||
|
|
||
| </beans> |
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.