Skip to content

bump IdP UI #144

Merged
merged 1 commit into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,26 @@
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
MIIDgzCCAmugAwIBAgIEcPqhyTANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJV
UzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjESMBAGA1UE
ChMJSW50ZXJuZXQyMQwwCgYDVQQLEwNkZXYxGjAYBgNVBAMTEWlkcHVpLmV4YW1w
bGUub3JnMB4XDTIwMTIxNTIyMjE1MloXDTMwMTIxMzIyMjE1MlowcjELMAkGA1UE
BhMCVVMxETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxEjAQ
BgNVBAoTCUludGVybmV0MjEMMAoGA1UECxMDZGV2MRowGAYDVQQDExFpZHB1aS5l
eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIYkcjUA
B9RePxkLMOKc+he23yY1m9YocYwkcJOJnPt9+L/2laIYJzxgAtDmxZ+YcpJxI0Px
QJ6kQJVhEbMYEOnbfqxgphrUxYHkVyXHVVtNInydAawWWrT9DrA1HRzq8RXTqLit
+8OeKjsiRHAiR2/g2CmuLvo3KhQbpe4FUJbIC2Eo3BHtlMElHGtubBfnY7S4zULY
vZXCiTBJSFX4S/8Sk8DirHCKK47CDGMLbuvXYYpk+rnegVQudYprNy70Yx0xH2gl
I3WyL4/sPgPPJg5FbA0nF5WDlVkMKQq6kYbT2PuIu67lCAeMlNgihp95e3L0xYUg
qiukTAIIk+CDHskCAwEAAaMhMB8wHQYDVR0OBBYEFK1cSS3HdqLZyGW2+9H9gDkP
dl7wMA0GCSqGSIb3DQEBCwUAA4IBAQBiOi+h2/Xg6Yr53mvQqcFJxd/jDTfBob9L
h21cCr3tv0ZldgZN5WYobw6pX8VRCZMc91bCEqI1XrlueRDM785iLHcYYFt1RM7m
Ly+F0lsvn5VdTN+L/sOypU1Eco+3SxiSItk2VBXG1U+gkJWvmpOTE+W93y6W6Lyl
hoixs3MTdn7IZrKeBUgBtiho/+QRjm74Y4DSveGIOt521GLYmiP9CW5wIvnh1z2c
gr6gaui1XfGQA/1DqGz9FIcnr+39hIbXA3qgVub7H5x30e6nSA5Dc+UkVZ7I+75u
sCw582pAQy6p2Vy3unUExYINbXima4SuEYsTBLsjuH4LiaNSWwB/
<ds:X509Certificate>
MIIDizCCAnOgAwIBAgIJAPuaizz7UkDoMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV
BAYTAlVTMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg
Q29tcGFueSBMdGQxGDAWBgNVBAMMD2lkcHVpLndvcmtiZW5jaDAeFw0yMzA0MTQx
NjU5MDNaFw00MzA0MDkxNjU5MDNaMFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQHDAxE
ZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxGDAWBgNV
BAMMD2lkcHVpLndvcmtiZW5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
ggEBAMPZGkwzIzyc1PWKg8Y+fbGYXQ6zUoiVmldjzCw+NNEDgaUwQ8G4r1UjWu6m
JNDAufp8vgKuOIFrSGfhOqlxHqIfOm7b02li55MabKvc85h1m4tS2xYv03ZQxSVB
2gRSwhUHDTRGNNrzxwGHAvDYWxQMfn0rkwmT3odb8vO7qDDFGxGVCtWPwmg475AW
wjYvy8LpoyWFWYpJBWM1VjV3dye2fLIftny2taVo2Yq1G8BNSP9pcQHVzjmazFuu
NH4jzqHdWDlvliqOQ3NIOrFYOfQ1wmhoR/Utm9xg/ER7BWT9ODuMr9qK/aRUABwz
SKRwDDGcJByni/ZAfFp6P/HM3wECAwEAAaNQME4wHQYDVR0OBBYEFAQQknwMvZlR
DOTb6vmYj/AHosI+MB8GA1UdIwQYMBaAFAQQknwMvZlRDOTb6vmYj/AHosI+MAwG
A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKemzuEX/wjAY0QCad28fz8i
inaPSXdHDozcSMTmmcJSyuxuOX1+LkmtJsKFIq1OXiCURFUFFM7yTi5xFakfYwJI
8mOtS81JJYTobRF63t642QXzkZFfzKrqYXoN2zU2bEFkA8keSVqrOOPj8bCMZ6RI
C4r8FSj0C6SCXCTSQSNolb2dVBhRD+EiCC2OJDkVHdYyVhp6S8Q0biUgFznYHrgf
eWnIS4UUDQUU23P0d45534jRd4vk6E68kiShkVfk7i7DIfpzuBXkaWEbi3HsSjlP
GGh6plos9J351YT9PtC8rVPgNDHdYynZLMOifs9w2ohP0lBQfwM/4y1mZ+M6CM4=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
Expand All @@ -46,25 +46,25 @@ sCw582pAQy6p2Vy3unUExYINbXima4SuEYsTBLsjuH4LiaNSWwB/
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
MIIDgzCCAmugAwIBAgIEcPqhyTANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJV
UzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjESMBAGA1UE
ChMJSW50ZXJuZXQyMQwwCgYDVQQLEwNkZXYxGjAYBgNVBAMTEWlkcHVpLmV4YW1w
bGUub3JnMB4XDTIwMTIxNTIyMjE1MloXDTMwMTIxMzIyMjE1MlowcjELMAkGA1UE
BhMCVVMxETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxEjAQ
BgNVBAoTCUludGVybmV0MjEMMAoGA1UECxMDZGV2MRowGAYDVQQDExFpZHB1aS5l
eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIYkcjUA
B9RePxkLMOKc+he23yY1m9YocYwkcJOJnPt9+L/2laIYJzxgAtDmxZ+YcpJxI0Px
QJ6kQJVhEbMYEOnbfqxgphrUxYHkVyXHVVtNInydAawWWrT9DrA1HRzq8RXTqLit
+8OeKjsiRHAiR2/g2CmuLvo3KhQbpe4FUJbIC2Eo3BHtlMElHGtubBfnY7S4zULY
vZXCiTBJSFX4S/8Sk8DirHCKK47CDGMLbuvXYYpk+rnegVQudYprNy70Yx0xH2gl
I3WyL4/sPgPPJg5FbA0nF5WDlVkMKQq6kYbT2PuIu67lCAeMlNgihp95e3L0xYUg
qiukTAIIk+CDHskCAwEAAaMhMB8wHQYDVR0OBBYEFK1cSS3HdqLZyGW2+9H9gDkP
dl7wMA0GCSqGSIb3DQEBCwUAA4IBAQBiOi+h2/Xg6Yr53mvQqcFJxd/jDTfBob9L
h21cCr3tv0ZldgZN5WYobw6pX8VRCZMc91bCEqI1XrlueRDM785iLHcYYFt1RM7m
Ly+F0lsvn5VdTN+L/sOypU1Eco+3SxiSItk2VBXG1U+gkJWvmpOTE+W93y6W6Lyl
hoixs3MTdn7IZrKeBUgBtiho/+QRjm74Y4DSveGIOt521GLYmiP9CW5wIvnh1z2c
gr6gaui1XfGQA/1DqGz9FIcnr+39hIbXA3qgVub7H5x30e6nSA5Dc+UkVZ7I+75u
sCw582pAQy6p2Vy3unUExYINbXima4SuEYsTBLsjuH4LiaNSWwB/
MIIDizCCAnOgAwIBAgIJAPuaizz7UkDoMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV
BAYTAlVTMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg
Q29tcGFueSBMdGQxGDAWBgNVBAMMD2lkcHVpLndvcmtiZW5jaDAeFw0yMzA0MTQx
NjU5MDNaFw00MzA0MDkxNjU5MDNaMFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQHDAxE
ZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxGDAWBgNV
BAMMD2lkcHVpLndvcmtiZW5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
ggEBAMPZGkwzIzyc1PWKg8Y+fbGYXQ6zUoiVmldjzCw+NNEDgaUwQ8G4r1UjWu6m
JNDAufp8vgKuOIFrSGfhOqlxHqIfOm7b02li55MabKvc85h1m4tS2xYv03ZQxSVB
2gRSwhUHDTRGNNrzxwGHAvDYWxQMfn0rkwmT3odb8vO7qDDFGxGVCtWPwmg475AW
wjYvy8LpoyWFWYpJBWM1VjV3dye2fLIftny2taVo2Yq1G8BNSP9pcQHVzjmazFuu
NH4jzqHdWDlvliqOQ3NIOrFYOfQ1wmhoR/Utm9xg/ER7BWT9ODuMr9qK/aRUABwz
SKRwDDGcJByni/ZAfFp6P/HM3wECAwEAAaNQME4wHQYDVR0OBBYEFAQQknwMvZlR
DOTb6vmYj/AHosI+MB8GA1UdIwQYMBaAFAQQknwMvZlRDOTb6vmYj/AHosI+MAwG
A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKemzuEX/wjAY0QCad28fz8i
inaPSXdHDozcSMTmmcJSyuxuOX1+LkmtJsKFIq1OXiCURFUFFM7yTi5xFakfYwJI
8mOtS81JJYTobRF63t642QXzkZFfzKrqYXoN2zU2bEFkA8keSVqrOOPj8bCMZ6RI
C4r8FSj0C6SCXCTSQSNolb2dVBhRD+EiCC2OJDkVHdYyVhp6S8Q0biUgFznYHrgf
eWnIS4UUDQUU23P0d45534jRd4vk6E68kiShkVfk7i7DIfpzuBXkaWEbi3HsSjlP
GGh6plos9J351YT9PtC8rVPgNDHdYynZLMOifs9w2ohP0lBQfwM/4y1mZ+M6CM4=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
Expand Down
4 changes: 2 additions & 2 deletions Workbench/idp_ui/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM i2incommon/shib-idp-ui:1.17.3
FROM i2incommon/shib-idp-ui:1.17.4

ARG CSPHOSTNAME=localhost
ENV CSPHOSTNAME=$CSPHOSTNAME
Expand All @@ -8,7 +8,7 @@ COPY container_files/idp_ui/shibui-test.p12 /opt/shibui/
COPY container_files/idp_ui/users.txt /opt/shibui/

RUN mkdir -p /opt/shibui/saml/
COPY container_files/idp_ui/samlkeystore.jks /opt/shibui/saml/
COPY container_files/idp_ui/samlcert.p12 /opt/shibui/saml/
COPY container_files/idp_ui/idp-metadata.xml /opt/shibui/saml/

COPY container_files/system/setservername.sh /usr/local/bin/
Expand Down
3 changes: 2 additions & 1 deletion Workbench/idp_ui/container_files/idp_ui/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ shibui:
beacon-enabled: true
pac4j-enabled: true
pac4j:
keystorePath: "/opt/shibui/saml/samlkeystore.jks"
keystorePath: "/opt/shibui/saml/samlcert.p12"
keystoreType: "PKCS12"
keystorePassword: "changeit"
privateKeyPassword: "changeit"
serviceProviderEntityId: "https://sp.example.org/shibui"
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion Workbench/idp_ui_api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM i2incommon/shib-idp-ui:1.17.3
FROM i2incommon/shib-idp-ui:1.17.4

ARG CSPHOSTNAME=localhost
ENV CSPHOSTNAME=$CSPHOSTNAME
Expand Down
2 changes: 1 addition & 1 deletion Workbench/webproxy/container_files/httpd/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
<li><a href="https://__CSPHOSTNAME__/midpoint" target="TAP-WB-MIDPOINT">midPoint (4.6)</a></li>
<ul><li><a href="https://__CSPHOSTNAME__/midPoint-doc.html" target="TAP-WB-MIDPOINT-CONFIG">Technical doc on midPoint's configuration</a></li></ul>
<li><a href="https://__CSPHOSTNAME__/registry" target="TAP-WB-COMANAGE">COmanage Registry (4.1.0)</a></li>
<li><a href="https://__CSPHOSTNAME__/idpui/" target="TAP-WB-IDPUI">Shibboleth IdP UI (1.17.3)</a></li>
<li><a href="https://__CSPHOSTNAME__/idpui/" target="TAP-WB-IDPUI">Shibboleth IdP UI (1.17.4)</a></li>
</ul>

<br />
Expand Down