From adda8d4628750e4efd8ce2f85239beb5edd0842b Mon Sep 17 00:00:00 2001 From: root Date: Mon, 24 Apr 2023 17:55:44 +0000 Subject: [PATCH] bump IdP UI --- .../idp/shibboleth-idp/metadata/idpui-sp.xml | 78 +++++++++--------- Workbench/idp_ui/Dockerfile | 4 +- .../container_files/idp_ui/application.yml | 3 +- .../container_files/idp_ui/samlcert.p12 | Bin 0 -> 2509 bytes Workbench/idp_ui_api/Dockerfile | 2 +- .../webproxy/container_files/httpd/index.html | 2 +- 6 files changed, 45 insertions(+), 44 deletions(-) create mode 100644 Workbench/idp_ui/container_files/idp_ui/samlcert.p12 diff --git a/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml b/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml index b72cf1d..e949a16 100644 --- a/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml +++ b/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml @@ -18,26 +18,26 @@ - -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= @@ -46,25 +46,25 @@ sCw582pAQy6p2Vy3unUExYINbXima4SuEYsTBLsjuH4LiaNSWwB/ -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= diff --git a/Workbench/idp_ui/Dockerfile b/Workbench/idp_ui/Dockerfile index dca3380..2fef2b7 100644 --- a/Workbench/idp_ui/Dockerfile +++ b/Workbench/idp_ui/Dockerfile @@ -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 @@ -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/ diff --git a/Workbench/idp_ui/container_files/idp_ui/application.yml b/Workbench/idp_ui/container_files/idp_ui/application.yml index ffc5f0d..f1e986f 100644 --- a/Workbench/idp_ui/container_files/idp_ui/application.yml +++ b/Workbench/idp_ui/container_files/idp_ui/application.yml @@ -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" diff --git a/Workbench/idp_ui/container_files/idp_ui/samlcert.p12 b/Workbench/idp_ui/container_files/idp_ui/samlcert.p12 new file mode 100644 index 0000000000000000000000000000000000000000..8c09cfea52e5ca05d66d976c0aeba691e30c24e9 GIT binary patch literal 2509 zcmY+^cQhM}8U}D75wR(n*lJa+*n9hE6*X&=s#U9~QblSdwLjDrR8?xlXf^XCtagmjYv$lypwB01z%39bHND_DW zNil3eT{wPc+HzenIJH&%JoVcUIj)g2tIoLGmdmAO*21f?u)yJiO%XPE`5WtMRBF`9 zy|p-AylbI;!0svoZc+ z|IUNgyDef?6nmf}F7oT5=#%)136W$0jRNY)I=3A(ii`{Y~8 z69zLgB@b0B;#)*wYseug_=SJ$$$;b*i}PP%ZYe7s3`h=VEQRNr|p`113u&S{5@=q0XVaByNihplCOhjgA> zbQu1)$n{vZtVK*)jKJ{3!egN%UhkH$MpZ7rOP@j;xmnKvZ+YFHX~p{>@xf6fre#N& zQ!a5>`l5$V-TF+|F4L^cr+XrEYM$aZ_UQ+fn}*8h5~U@QZN1ps*=J}PX``T7v~{1N zUhy6s5$I9!acl}xSKOX<=3ARm^CnzNxZ!p(873|vj(+q; zJNrmWB}*Vt!W(lf1H_+`J78s`wY9r!ZeTvkt@eCG72||Zk&AKcn7dG=2$S-OP#-U6 znz-b~f@CWd4C=gY+ub#Nmz+ZT7O1fNHn+?#Z?g2~?@jgf00NGwBg?a2knmt?J-tfF zEUCD0aK_Yxu;<3MYvhjigA{Qt0%;C)JB34P9{%Q)rJ;&MQHdWYp+H}3lUP>i3NUOCZv1_A$ylb>rFRdQSZ=9gGWk;a^S_l<*S zf6hIZsODQbwpoB9K^p%9Lmm<&2}FX#uHsu)CqPd1A0{XPq*tEoTtTw=e|nJp(L>-^ zDbOz6b@-1SKqRnhFgd0eMb{6<4u(pnn(DX*I|A%y)Ufu8*-h1n%IMg6l7@ntkoC*E z_j*?*4Znb7hgFUO|UFi6t5IxF#13Nw5ff5@kfWJUS{NTmrH> z6o*qrVPH!Gc?#|2LyD;HY6z2zM>bY!t)pYIP2-l7sxpYetrT7IkPr>~*Y%DXg0Bz} z^wu=pRSKWT(1Eh^p2r-CuE3#w+nguzdmbOAyt+XAH4jtIVtCH(N|L4Tq*-d5uW>2u z#8$x70=V3xby%GfJpZco1lI)BW+9|A zPBy1TxX&01-`%NBw%z~K`ZcOg+Yxgd(dW9zlwIZYG&Eu`7SdzSkGL$yerS#&F7%bg z+jLih!4-PZZ^#qdWTSvh=p|S|)-#ch-rGUWwEaUzL*3(!rM9C!mI!45j04##!1uQj znqGp-@;cljPXvWq8(cC}pw2Um&^d#3Xb72a8?V@5MPDw;PrMT|J$HSNzv;1#Vfd?U z+2+952Wc;w+Os~^R;(V_eBBzmHg{jc@Xc~%+O7?PSx07-xSNc&(e)|Ux)CjE>hj2b zjn^4@TpR#3OEQS|-X-u{=QDFUUGbguS!kpG6dbqy+Ti;dgyNti|NK$y#%1gVXB*}= z_x5ZLdl$jj+dhnAb7GS1be?dXvq}qAzo<*!v4IOpUUs+uuIGNYoJrpwIf|q5%onfqyS(^7+d0Wy(mb$cl9$(~cTqp` zW#y)je$;ny^@t{Z6~g+8$ErcuY*#irH?0mALZT?;;pT7h;-pbO6P{_6TRsNLj3Mz2 z%uE!`KaROC3y@Ii;r<*;;{NhJujfc&SrXvY$;BLT&F3Y!EC){kUd&#%U!O4(I6=pz z5}SH+fd1_Qwb}$H(E(W9-1f8lWw^k(MvFFaLWpAT^@ZqemjpkY_rE$qm?c<%OgF~D ze;Ws-BjS3B+QVv`nd){@F5wbz9yo*?Buq<2$_gR@GWl!R;avJ!2U_M@*|nA4c#S-k Sv;Welcome to the InCommon TAP Workbench!
  • midPoint (4.6)
  • COmanage Registry (4.1.0)
    • -
  • Shibboleth IdP UI (1.17.3)
    • +
  • Shibboleth IdP UI (1.17.4)