Skip to content
Permalink
Browse files

Merge pull request #79 from docker/4.0.0_20200311

merge 4.0.0_20200311
  • Loading branch information
pcaskey committed Mar 12, 2020
2 parents 31cede6 + 09804ce commit 518fa8f2c38af87ba9cdb2ca59da89a999983bd1
Showing with 389 additions and 5,219 deletions.
  1. +9 −9 Dockerfile
  2. +1 −1 container_files/idp/idp.installer.properties
  3. +0 −2 container_files/idp/idp.merge.properties
  4. +4 −4 test-compose/idp/Dockerfile
  5. +1 −1 test-compose/idp/container_files/config/shib-idp/conf/access-control.xml
  6. +0 −53 test-compose/idp/container_files/config/shib-idp/conf/admin/general-admin.xml
  7. +0 −129 test-compose/idp/container_files/config/shib-idp/conf/admin/metrics.xml
  8. +85 −30 test-compose/idp/container_files/config/shib-idp/conf/attribute-filter.xml
  9. +0 −96 test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-default.xml
  10. +0 −320 test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-full.xml
  11. +0 −94 test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-ldap.xml
  12. +62 −108 test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver.xml
  13. +0 −32 test-compose/idp/container_files/config/shib-idp/conf/audit.xml
  14. +0 −77 test-compose/idp/container_files/config/shib-idp/conf/authn/authn-comparison.xml
  15. +0 −18 test-compose/idp/container_files/config/shib-idp/conf/authn/authn-events-flow.xml
  16. +0 −25 test-compose/idp/container_files/config/shib-idp/conf/authn/duo-authn-config.xml
  17. +0 −9 test-compose/idp/container_files/config/shib-idp/conf/authn/duo.properties
  18. +0 −70 test-compose/idp/container_files/config/shib-idp/conf/authn/external-authn-config.xml
  19. +0 −156 test-compose/idp/container_files/config/shib-idp/conf/authn/general-authn.xml
  20. +0 −37 test-compose/idp/container_files/config/shib-idp/conf/authn/ipaddress-authn-config.xml
  21. +0 −27 test-compose/idp/container_files/config/shib-idp/conf/authn/jaas-authn-config.xml
  22. +0 −11 test-compose/idp/container_files/config/shib-idp/conf/authn/jaas.config
  23. +0 −31 test-compose/idp/container_files/config/shib-idp/conf/authn/krb5-authn-config.xml
  24. +0 −135 test-compose/idp/container_files/config/shib-idp/conf/authn/ldap-authn-config.xml
  25. +0 −94 test-compose/idp/container_files/config/shib-idp/conf/authn/mfa-authn-config.xml
  26. +0 −121 test-compose/idp/container_files/config/shib-idp/conf/authn/password-authn-config.xml
  27. +0 −75 test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-authn-config.xml
  28. +0 −63 test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml
  29. +0 −74 test-compose/idp/container_files/config/shib-idp/conf/authn/spnego-authn-config.xml
  30. +0 −44 test-compose/idp/container_files/config/shib-idp/conf/authn/x509-authn-config.xml
  31. +0 −21 test-compose/idp/container_files/config/shib-idp/conf/authn/x509-internal-authn-config.xml
  32. +0 −44 test-compose/idp/container_files/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml
  33. +0 −27 test-compose/idp/container_files/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml
  34. +0 −18 test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml
  35. +0 −109 test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n.xml
  36. +0 −37 test-compose/idp/container_files/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml
  37. +0 −84 test-compose/idp/container_files/config/shib-idp/conf/cas-protocol.xml
  38. +0 −65 test-compose/idp/container_files/config/shib-idp/conf/credentials.xml
  39. +0 −120 test-compose/idp/container_files/config/shib-idp/conf/errors.xml
  40. +0 −53 test-compose/idp/container_files/config/shib-idp/conf/global.xml
  41. +70 −39 test-compose/idp/container_files/config/shib-idp/conf/idp.properties
  42. +0 −195 test-compose/idp/container_files/config/shib-idp/conf/idp.properties.dist
  43. +0 −136 test-compose/idp/container_files/config/shib-idp/conf/intercept/consent-intercept-config.xml
  44. +0 −42 test-compose/idp/container_files/config/shib-idp/conf/intercept/context-check-intercept-config.xml
  45. +0 −37 ...compose/idp/container_files/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml
  46. +0 −18 test-compose/idp/container_files/config/shib-idp/conf/intercept/intercept-events-flow.xml
  47. +0 −54 test-compose/idp/container_files/config/shib-idp/conf/intercept/profile-intercept.xml
  48. +16 −19 test-compose/idp/container_files/config/shib-idp/conf/ldap.properties
  49. +0 −63 test-compose/idp/container_files/config/shib-idp/conf/ldap.properties.dist
  50. +43 −54 test-compose/idp/container_files/config/shib-idp/conf/logback.xml
  51. +39 −20 test-compose/idp/container_files/config/shib-idp/conf/metadata-providers.xml
  52. +0 −23 test-compose/idp/container_files/config/shib-idp/conf/mvc-beans.xml
  53. +11 −7 test-compose/idp/container_files/config/shib-idp/conf/relying-party.xml
  54. +0 −35 test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.properties
  55. +0 −62 test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.xml
  56. +0 −65 test-compose/idp/container_files/config/shib-idp/conf/services.properties
  57. +0 −144 test-compose/idp/container_files/config/shib-idp/conf/services.xml
  58. +0 −45 test-compose/idp/container_files/config/shib-idp/conf/session-manager.xml
  59. +0 −150 test-compose/idp/container_files/config/shib-idp/edit-webapp/css/consent.css
  60. +0 −12 test-compose/idp/container_files/config/shib-idp/edit-webapp/css/logout.css
  61. +0 −163 test-compose/idp/container_files/config/shib-idp/edit-webapp/css/main.css
  62. BIN test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo-mobile.png
  63. BIN test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo.png
  64. BIN test-compose/idp/container_files/config/shib-idp/edit-webapp/images/failure-32x32.png
  65. BIN test-compose/idp/container_files/config/shib-idp/edit-webapp/images/success-32x32.png
  66. +0 −240 test-compose/idp/container_files/config/shib-idp/messages/messages.properties
  67. +0 −53 test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-read.vm
  68. +0 −53 test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-write.vm
  69. +0 −83 test-compose/idp/container_files/config/shib-idp/views/duo.vm
  70. +0 −72 test-compose/idp/container_files/config/shib-idp/views/error.vm
  71. +0 −158 test-compose/idp/container_files/config/shib-idp/views/intercept/attribute-release.vm
  72. +0 −54 test-compose/idp/container_files/config/shib-idp/views/intercept/expiring-password.vm
  73. +0 −67 test-compose/idp/container_files/config/shib-idp/views/intercept/terms-of-use.vm
  74. +0 −24 test-compose/idp/container_files/config/shib-idp/views/login-error.vm
  75. +0 −140 test-compose/idp/container_files/config/shib-idp/views/login.vm
  76. +0 −59 test-compose/idp/container_files/config/shib-idp/views/logout-complete.vm
  77. +0 −58 test-compose/idp/container_files/config/shib-idp/views/logout-propagate.vm
  78. +0 −91 test-compose/idp/container_files/config/shib-idp/views/logout.vm
  79. +0 −49 test-compose/idp/container_files/config/shib-idp/views/spnego-unavailable.vm
  80. +0 −45 test-compose/idp/container_files/config/shib-idp/views/user-prefs.js
  81. +0 −60 test-compose/idp/container_files/config/shib-idp/views/user-prefs.vm
  82. +28 −0 test-compose/idp/container_files/credentials/shib-idp/inc-md-cert-mdq.pem
  83. +13 −0 test-compose/idp/container_files/credentials/shib-idp/secrets.properties
  84. +2 −2 tests/fulltest.sh
  85. +3 −3 tests/main.bats
  86. +2 −1 tests/sptest.login
@@ -8,12 +8,12 @@ FROM centos:centos7
ENV TOMCAT_MAJOR=9 \
TOMCAT_VERSION=9.0.31 \
##shib-idp \
VERSION=3.4.6 \
VERSION=4.0.0 \
##TIER \
TIERVERSION=20200303 \
################## \
### OTHER VARS ### \
################## \
TIERVERSION=20200311 \
#################### \
#### OTHER VARS #### \
#################### \
# \
#global \
IMAGENAME=shibboleth_idp \
@@ -70,16 +70,16 @@ RUN update-ca-trust extract
##### ENV TIER_BEACON_OPT_OUT True

# Install Corretto Java JDK
#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html
ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-x64-linux-jdk.rpm
ARG CORRETTO_RPM=amazon-corretto-8-x64-linux-jdk.rpm
#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html
ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-11-x64-linux-jdk.rpm
ARG CORRETTO_RPM=amazon-corretto-11-x64-linux-jdk.rpm
COPY container_files/java-corretto/corretto-signing-key.pub .
RUN curl -O -L $CORRETTO_URL_PERM \
&& rpm --import corretto-signing-key.pub \
&& rpm -K $CORRETTO_RPM \
&& rpm -i $CORRETTO_RPM \
&& rm -r corretto-signing-key.pub $CORRETTO_RPM
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto
ENV JAVA_HOME=/usr/lib/jvm/java-11-amazon-corretto

# To use Zulu Java:
#RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
@@ -1,4 +1,4 @@
idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-3.4.6
idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-4.0.0
idp.target.dir=/opt/shibboleth-idp
idp.host.name=idp.example.org
idp.sealer.password=changeit
@@ -1,5 +1,3 @@
idp.entityID=https://idp.example.org/idp/shibboleth
idp.sealer.storePassword=changeit
idp.sealer.keyPassword=changeit
idp.scope=example.org

@@ -1,4 +1,4 @@
FROM tier/shib-idp:3.4.6_20200303
FROM tier/shib-idp:4.0.0_20200311

# The build args below can be used at build-time to tell the build process where to find your config files. This is for a completely burned-in config.
ARG TOMCFG=config/tomcat
@@ -17,9 +17,9 @@ ADD ${TOMCERT} /opt/certs
ADD ${TOMWWWROOT} /usr/local/tomcat/webapps/ROOT
ADD ${SHBCFG} /opt/shibboleth-idp/conf
ADD ${SHBCREDS} /opt/shibboleth-idp/credentials
ADD ${SHBVIEWS} /opt/shibboleth-idp/views
ADD ${SHBEDWAPP} /opt/shibboleth-idp/edit-webapp
ADD ${SHBMSGS} /opt/shibboleth-idp/messages
#ADD ${SHBVIEWS} /opt/shibboleth-idp/views
#ADD ${SHBEDWAPP} /opt/shibboleth-idp/edit-webapp
#ADD ${SHBMSGS} /opt/shibboleth-idp/messages
ADD ${SHBMD} /opt/shibboleth-idp/metadata


@@ -30,7 +30,7 @@

<entry key="AccessByIPAddress">
<bean id="AccessByIPAddress" parent="shibboleth.IPRangeAccessControl"
p:allowedRanges="#{ {'127.0.0.1/32', '::1/128', '172.17.0.0/24', '172.18.0.0/24', '10.255.0.0/16'} }" />
p:allowedRanges="#{ {'127.0.0.1/32', '::1/128'} }" />
</entry>

<!--

This file was deleted.

This file was deleted.

0 comments on commit 518fa8f

Please sign in to comment.
You can’t perform that action at this time.