diff --git a/Workbench/configs-and-secrets/grouper/shibboleth/idp-metadata.xml b/Workbench/configs-and-secrets/grouper/shibboleth/idp-metadata.xml index 4fa67a7..8bf0814 100644 --- a/Workbench/configs-and-secrets/grouper/shibboleth/idp-metadata.xml +++ b/Workbench/configs-and-secrets/grouper/shibboleth/idp-metadata.xml @@ -1,10 +1,4 @@ - @@ -104,10 +98,10 @@ p+tGUbGS2l873J5PrsbpeKEVR/IIoKo= urn:mace:shibboleth:1.0:nameIdentifier urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - - - + + + + @@ -198,8 +192,8 @@ p+tGUbGS2l873J5PrsbpeKEVR/IIoKo= - - + + diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml index b7e03df..781cae7 100644 --- a/Workbench/docker-compose.yml +++ b/Workbench/docker-compose.yml @@ -41,7 +41,10 @@ services: target: /opt/grouper/conf/grouper.client.properties grouper_ui: - build: ./grouper_ui/ + build: + context: ./grouper_ui/ + args: + - CSPHOSTNAME command: bash -c "while ! curl -s grouper_data:3306 > /dev/null; do echo waiting for mysql on grouper_data to start; sleep 3; done; while ! curl -s ldap://directory:389 > /dev/null; do echo waiting for ldap on directory to start; sleep 3; done; exec ui" depends_on: - grouper_data @@ -82,9 +85,6 @@ services: - type: bind source: ./configs-and-secrets/grouper/shibboleth/shibboleth2.xml target: /etc/shibboleth/shibboleth2.xml - - type: bind - source: ./configs-and-secrets/grouper/shibboleth/idp-metadata.xml - target: /etc/shibboleth/idp-metadata.xml - type: bind source: ./configs-and-secrets/grouper/httpd/shib.conf target: /etc/httpd/conf.d/shib.conf @@ -235,7 +235,10 @@ services: target: /etc/pki/tls/certs/cachain.pem idp: - build: ./idp/ + build: + context: ./idp/ + args: + - CSPHOSTNAME depends_on: - directory environment: @@ -260,7 +263,10 @@ services: - mq:/var/lib/rabbitmq webproxy: - build: ./webproxy/ + build: + context: ./webproxy/ + args: + - CSPHOSTNAME networks: - net ports: diff --git a/Workbench/grouper_ui/Dockerfile b/Workbench/grouper_ui/Dockerfile index 89fa4b8..3e54b51 100644 --- a/Workbench/grouper_ui/Dockerfile +++ b/Workbench/grouper_ui/Dockerfile @@ -2,8 +2,17 @@ FROM tier/grouper:2.4.0-a96-u57-w11-p12-20200324-rc1 LABEL author="tier-packaging@internet2.edu " -#COPY in custom css, images, etc +ARG CSPHOSTNAME=localhost +ENV CSPHOSTNAME=$CSPHOSTNAME RUN yum -y update +COPY container_files/shibboleth/idp-metadata.xml /etc/shibboleth/ + +COPY container_files/system/setservername.sh /usr/local/bin/ +RUN chmod 755 /usr/local/bin/setservername.sh + +#set hostname +RUN /usr/local/bin/setservername.sh + CMD ["ui"] diff --git a/Workbench/grouper_ui/container_files/shibboleth/idp-metadata.xml b/Workbench/grouper_ui/container_files/shibboleth/idp-metadata.xml new file mode 100644 index 0000000..8bf0814 --- /dev/null +++ b/Workbench/grouper_ui/container_files/shibboleth/idp-metadata.xml @@ -0,0 +1,201 @@ + + + + + + + example.org + + + + + + + +MIIDEzCCAfugAwIBAgIUS9SuTXwsFVVG+LjOEAbLqqT/el0wDQYJKoZIhvcNAQEL +BQAwFTETMBEGA1UEAwwKaWRwdGVzdGJlZDAeFw0xNTEyMTEwMjIwMjZaFw0zNTEy +MTEwMjIwMjZaMBUxEzARBgNVBAMMCmlkcHRlc3RiZWQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQCMAoDHx8xCIfv/6QKqt9mcHYmEJ8y2dKprUbpdcOjH +YvNPIl/lHPsUyrb+Nc+q2CDeiWjVk1mWYq0UpIwpBMuw1H6+oOqr4VQRi65pin0M +SfE0MWIaFo5FPvpvoptkHD4gvREbm4swyXGMczcMRfqgalFXhUD2wz8W3XAM5Cq2 +03XeJbj6TwjvKatG5XPdeUe2FBGuOO2q54L1hcIGnLMCQrg7D31lR13PJbjnJ0No +5C3k8TPuny6vJsBC03GNLNKfmrKVTdzr3VKp1uay1G3DL9314fgmbl8HA5iRQmy+ +XInUU6/8NXZSF59p3ITAOvZQeZsbJjg5gGDip5OZo9YlAgMBAAGjWzBZMB0GA1Ud +DgQWBBRPlM4VkKZ0U4ec9GrIhFQl0hNbLDA4BgNVHREEMTAvggppZHB0ZXN0YmVk +hiFodHRwczovL2lkcHRlc3RiZWQvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL +BQADggEBAIZ0a1ov3my3ljJG588I/PHx+TxAWONWmpKbO9c/qI3Drxk4oRIffiac +ANxdvtabgIzrlk5gMMisD7oyqHJiWgKv5Bgctd8w3IS3lLl7wHX65mTKQRXniG98 +NIjkvfrhe2eeJxecOqnDI8GOhIGCIqZUn8ShdM/yHjhQ2Mh0Hj3U0LlKvnmfGSQl +j0viGwbFCaNaIP3zc5UmCrdE5h8sWL3Fu7ILKM9RyFa2ILHrJScV9t623IcHffHP +IeaY/WtuapsrqRFxuQL9QFWN0FsRIdLmjTq+00+B/XnnKRKFBuWfjhHLF/uu8f+E +t6Lf23Kb8yD6ZR7dihMZAGHnYQ/hlhM= + + + + + + + + + +MIIDFDCCAfygAwIBAgIVAN3vv+b7KN5Se9m1RZsCllp/B/hdMA0GCSqGSIb3DQEB +CwUAMBUxEzARBgNVBAMMCmlkcHRlc3RiZWQwHhcNMTUxMjExMDIyMDE0WhcNMzUx +MjExMDIyMDE0WjAVMRMwEQYDVQQDDAppZHB0ZXN0YmVkMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAh91caeY0Q85uhaUyqFwP2bMjwMFxMzRlAoqBHd7g +u6eo4duaeLz1BaoR2XTBpNNvFR5oHH+TkKahVDGeH5+kcnIpxI8JPdsZml1srvf2 +Z6dzJsulJZUdpqnngycTkGtZgEoC1vmYVky2BSAIIifmdh6s0epbHnMGLsHzMKfJ +Cb/Q6dYzRWTCPtzE2VMuQqqWgeyMr7u14x/Vqr9RPEFsgY8GIu5jzB6AyUIwrLg+ +MNkv6aIdcHwxYTGL7ijfy6rSWrgBflQoYRYNEnseK0ZHgJahz4ovCag6wZAoPpBs +uYlY7lEr89Ucb6NHx3uqGMsXlDFdE4QwfDLLhCYHPvJ0uwIDAQABo1swWTAdBgNV +HQ4EFgQUAkOgED3iYdmvQEOMm6u/JmD/UTQwOAYDVR0RBDEwL4IKaWRwdGVzdGJl +ZIYhaHR0cHM6Ly9pZHB0ZXN0YmVkL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB +CwUAA4IBAQBIdd4YWlnvJjql8+zKKgmWgIY7U8DA8e6QcbAf8f8cdE33RSnjI63X +sv/y9GfmbAVAD6RIAXPFFeRYJ08GOxGI9axfNaKdlsklJ9bk4ducHqgCSWYVer3s +RQBjxyOfSTvk9YCJvdJVQRJLcCvxwKakFCsOSnV3t9OvN86Ak+fKPVB5j2fM/0fZ +Kqjn3iqgdNPTLXPsuJLJO5lITRiBa4onmVelAiCstI9PQiaEck+oAHnMTnC9JE/B +DHv3e4rwq3LznlqPw0GSd7xqNTdMDwNOWjkuOr3sGpWS8ms/ZHHXV1Vd22uPe70i +s00xrv14zLifcc8oj5DYzOhYRifRXgHX + + + + + + + + + +MIIDEzCCAfugAwIBAgIUG6Nn1rlERS1vsi88tcdzSYX0oqAwDQYJKoZIhvcNAQEL +BQAwFTETMBEGA1UEAwwKaWRwdGVzdGJlZDAeFw0xNTEyMTEwMjIwMTRaFw0zNTEy +MTEwMjIwMTRaMBUxEzARBgNVBAMMCmlkcHRlc3RiZWQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQCBXv0o3fmT8iluyLjJ4lBAVCW+ZRVyEXPYQuRi7vfD +cO4a6d1kxiJLsaK0W88VNxjFQRr8PgDkWr28vwoH1rgk4pLsszLD48DBzD942peJ +l/S6FnsIJjmaHcBh4pbNhU4yowu63iKkvttrcZAEbpEro6Z8CziWEx8sywoaYEQG +ifPkr9ORV6Cn3txq+9gMBePG41GrtZrUGIu+xrndL0Shh4Pq0eq/9MAsVlIIXEa8 +9WfH8J2kFcTOfoWtIc70b7TLZQsx4YnNcnrGLSUEcstFyPLX+Xtv5SNZF89OOIxX +VNjNvgE5DbJb9hMM4UAFqI+1bo9QqtxwThjc/sOvIxzNAgMBAAGjWzBZMB0GA1Ud +DgQWBBStTyogRPuAVG6q7yPyav1uvE+7pTA4BgNVHREEMTAvggppZHB0ZXN0YmVk +hiFodHRwczovL2lkcHRlc3RiZWQvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL +BQADggEBAFMfoOv+oISGjvamq7+Y4G7ep5vxlAPeK3RATYPYvAmyH946qZXh98ni +QXyuqZW5P5eEt86toY45IwDU5r09SKwHughEe99iiEkxh0mb2qo84qX9/qcg+kyN +jeLd/OSyolpUCEFNwOFcog7pj7Eer+6AHbwTn1Mjb5TBsKwtDMJsaxPvdj0u7M5r +xL/wHkFhn1rCo2QiojzjSlV3yLTh49iTyhE3cG+RxaNKDCxhp0jSSLX1BW/ZoPA8 ++PMJEA+Q0QbyRD8aJOHN5O8jGxCa/ZzcOnYVL6AsEXoDiY3vAUYh1FUonOWw0m9H +p+tGUbGS2l873J5PrsbpeKEVR/IIoKo= + + + + + + + urn:mace:shibboleth:1.0:nameIdentifier + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + + + + + + + + + + + + localhost + + + + + + +MIIDEzCCAfugAwIBAgIUS9SuTXwsFVVG+LjOEAbLqqT/el0wDQYJKoZIhvcNAQEL +BQAwFTETMBEGA1UEAwwKaWRwdGVzdGJlZDAeFw0xNTEyMTEwMjIwMjZaFw0zNTEy +MTEwMjIwMjZaMBUxEzARBgNVBAMMCmlkcHRlc3RiZWQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQCMAoDHx8xCIfv/6QKqt9mcHYmEJ8y2dKprUbpdcOjH +YvNPIl/lHPsUyrb+Nc+q2CDeiWjVk1mWYq0UpIwpBMuw1H6+oOqr4VQRi65pin0M +SfE0MWIaFo5FPvpvoptkHD4gvREbm4swyXGMczcMRfqgalFXhUD2wz8W3XAM5Cq2 +03XeJbj6TwjvKatG5XPdeUe2FBGuOO2q54L1hcIGnLMCQrg7D31lR13PJbjnJ0No +5C3k8TPuny6vJsBC03GNLNKfmrKVTdzr3VKp1uay1G3DL9314fgmbl8HA5iRQmy+ +XInUU6/8NXZSF59p3ITAOvZQeZsbJjg5gGDip5OZo9YlAgMBAAGjWzBZMB0GA1Ud +DgQWBBRPlM4VkKZ0U4ec9GrIhFQl0hNbLDA4BgNVHREEMTAvggppZHB0ZXN0YmVk +hiFodHRwczovL2lkcHRlc3RiZWQvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL +BQADggEBAIZ0a1ov3my3ljJG588I/PHx+TxAWONWmpKbO9c/qI3Drxk4oRIffiac +ANxdvtabgIzrlk5gMMisD7oyqHJiWgKv5Bgctd8w3IS3lLl7wHX65mTKQRXniG98 +NIjkvfrhe2eeJxecOqnDI8GOhIGCIqZUn8ShdM/yHjhQ2Mh0Hj3U0LlKvnmfGSQl +j0viGwbFCaNaIP3zc5UmCrdE5h8sWL3Fu7ILKM9RyFa2ILHrJScV9t623IcHffHP +IeaY/WtuapsrqRFxuQL9QFWN0FsRIdLmjTq+00+B/XnnKRKFBuWfjhHLF/uu8f+E +t6Lf23Kb8yD6ZR7dihMZAGHnYQ/hlhM= + + + + + + + + + +MIIDFDCCAfygAwIBAgIVAN3vv+b7KN5Se9m1RZsCllp/B/hdMA0GCSqGSIb3DQEB +CwUAMBUxEzARBgNVBAMMCmlkcHRlc3RiZWQwHhcNMTUxMjExMDIyMDE0WhcNMzUx +MjExMDIyMDE0WjAVMRMwEQYDVQQDDAppZHB0ZXN0YmVkMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAh91caeY0Q85uhaUyqFwP2bMjwMFxMzRlAoqBHd7g +u6eo4duaeLz1BaoR2XTBpNNvFR5oHH+TkKahVDGeH5+kcnIpxI8JPdsZml1srvf2 +Z6dzJsulJZUdpqnngycTkGtZgEoC1vmYVky2BSAIIifmdh6s0epbHnMGLsHzMKfJ +Cb/Q6dYzRWTCPtzE2VMuQqqWgeyMr7u14x/Vqr9RPEFsgY8GIu5jzB6AyUIwrLg+ +MNkv6aIdcHwxYTGL7ijfy6rSWrgBflQoYRYNEnseK0ZHgJahz4ovCag6wZAoPpBs +uYlY7lEr89Ucb6NHx3uqGMsXlDFdE4QwfDLLhCYHPvJ0uwIDAQABo1swWTAdBgNV +HQ4EFgQUAkOgED3iYdmvQEOMm6u/JmD/UTQwOAYDVR0RBDEwL4IKaWRwdGVzdGJl +ZIYhaHR0cHM6Ly9pZHB0ZXN0YmVkL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB +CwUAA4IBAQBIdd4YWlnvJjql8+zKKgmWgIY7U8DA8e6QcbAf8f8cdE33RSnjI63X +sv/y9GfmbAVAD6RIAXPFFeRYJ08GOxGI9axfNaKdlsklJ9bk4ducHqgCSWYVer3s +RQBjxyOfSTvk9YCJvdJVQRJLcCvxwKakFCsOSnV3t9OvN86Ak+fKPVB5j2fM/0fZ +Kqjn3iqgdNPTLXPsuJLJO5lITRiBa4onmVelAiCstI9PQiaEck+oAHnMTnC9JE/B +DHv3e4rwq3LznlqPw0GSd7xqNTdMDwNOWjkuOr3sGpWS8ms/ZHHXV1Vd22uPe70i +s00xrv14zLifcc8oj5DYzOhYRifRXgHX + + + + + + + + + +MIIDEzCCAfugAwIBAgIUG6Nn1rlERS1vsi88tcdzSYX0oqAwDQYJKoZIhvcNAQEL +BQAwFTETMBEGA1UEAwwKaWRwdGVzdGJlZDAeFw0xNTEyMTEwMjIwMTRaFw0zNTEy +MTEwMjIwMTRaMBUxEzARBgNVBAMMCmlkcHRlc3RiZWQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQCBXv0o3fmT8iluyLjJ4lBAVCW+ZRVyEXPYQuRi7vfD +cO4a6d1kxiJLsaK0W88VNxjFQRr8PgDkWr28vwoH1rgk4pLsszLD48DBzD942peJ +l/S6FnsIJjmaHcBh4pbNhU4yowu63iKkvttrcZAEbpEro6Z8CziWEx8sywoaYEQG +ifPkr9ORV6Cn3txq+9gMBePG41GrtZrUGIu+xrndL0Shh4Pq0eq/9MAsVlIIXEa8 +9WfH8J2kFcTOfoWtIc70b7TLZQsx4YnNcnrGLSUEcstFyPLX+Xtv5SNZF89OOIxX +VNjNvgE5DbJb9hMM4UAFqI+1bo9QqtxwThjc/sOvIxzNAgMBAAGjWzBZMB0GA1Ud +DgQWBBStTyogRPuAVG6q7yPyav1uvE+7pTA4BgNVHREEMTAvggppZHB0ZXN0YmVk +hiFodHRwczovL2lkcHRlc3RiZWQvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL +BQADggEBAFMfoOv+oISGjvamq7+Y4G7ep5vxlAPeK3RATYPYvAmyH946qZXh98ni +QXyuqZW5P5eEt86toY45IwDU5r09SKwHughEe99iiEkxh0mb2qo84qX9/qcg+kyN +jeLd/OSyolpUCEFNwOFcog7pj7Eer+6AHbwTn1Mjb5TBsKwtDMJsaxPvdj0u7M5r +xL/wHkFhn1rCo2QiojzjSlV3yLTh49iTyhE3cG+RxaNKDCxhp0jSSLX1BW/ZoPA8 ++PMJEA+Q0QbyRD8aJOHN5O8jGxCa/ZzcOnYVL6AsEXoDiY3vAUYh1FUonOWw0m9H +p+tGUbGS2l873J5PrsbpeKEVR/IIoKo= + + + + + + + + + + + + + + diff --git a/Workbench/grouper_ui/container_files/system/setservername.sh b/Workbench/grouper_ui/container_files/system/setservername.sh new file mode 100644 index 0000000..6b16d28 --- /dev/null +++ b/Workbench/grouper_ui/container_files/system/setservername.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +files="/etc/shibboleth/idp-metadata.xml" + +for file in $files + do + sed -i "s|__CSPHOSTNAME__|$CSPHOSTNAME|g" $file + done \ No newline at end of file diff --git a/Workbench/idp/Dockerfile b/Workbench/idp/Dockerfile index b4e2b8f..095418f 100644 --- a/Workbench/idp/Dockerfile +++ b/Workbench/idp/Dockerfile @@ -2,4 +2,13 @@ FROM tier/shib-idp:latest LABEL author="tier-packaging@internet2.edu " +ARG CSPHOSTNAME=localhost +ENV CSPHOSTNAME=$CSPHOSTNAME + COPY shibboleth-idp/ /opt/shibboleth-idp/ + +COPY container_files/system/setservername.sh /usr/local/bin/ +RUN chmod 755 /usr/local/bin/setservername.sh + +#set hostname +RUN /usr/local/bin/setservername.sh diff --git a/Workbench/idp/container_files/system/setservername.sh b/Workbench/idp/container_files/system/setservername.sh new file mode 100644 index 0000000..b980e21 --- /dev/null +++ b/Workbench/idp/container_files/system/setservername.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +files="/opt/shibboleth-idp/metadata/idp-metadata.xml /opt/shibboleth-idp/metadata/grouper-sp.xml /opt/shibboleth-idp/metadata/proxy-sp.xml" + +for file in $files + do + sed -i "s|__CSPHOSTNAME__|$CSPHOSTNAME|g" $file + done \ No newline at end of file diff --git a/Workbench/idp/shibboleth-idp/metadata/grouper-sp.xml b/Workbench/idp/shibboleth-idp/metadata/grouper-sp.xml index d24b331..9d33be8 100644 --- a/Workbench/idp/shibboleth-idp/metadata/grouper-sp.xml +++ b/Workbench/idp/shibboleth-idp/metadata/grouper-sp.xml @@ -21,8 +21,8 @@ - - + + @@ -59,15 +59,15 @@ Z75p+JrWYZJYrx/vpWxL8g== - - - - - - - - - + + + + + + + + + diff --git a/Workbench/idp/shibboleth-idp/metadata/idp-metadata.xml b/Workbench/idp/shibboleth-idp/metadata/idp-metadata.xml index 65db47e..930008f 100644 --- a/Workbench/idp/shibboleth-idp/metadata/idp-metadata.xml +++ b/Workbench/idp/shibboleth-idp/metadata/idp-metadata.xml @@ -1,10 +1,4 @@ - @@ -104,10 +98,10 @@ p+tGUbGS2l873J5PrsbpeKEVR/IIoKo= urn:mace:shibboleth:1.0:nameIdentifier urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - - - + + + + @@ -198,8 +192,8 @@ p+tGUbGS2l873J5PrsbpeKEVR/IIoKo= - - + + diff --git a/Workbench/idp/shibboleth-idp/metadata/proxy-sp.xml b/Workbench/idp/shibboleth-idp/metadata/proxy-sp.xml index dc3961f..ccdcfd5 100644 --- a/Workbench/idp/shibboleth-idp/metadata/proxy-sp.xml +++ b/Workbench/idp/shibboleth-idp/metadata/proxy-sp.xml @@ -21,7 +21,7 @@ - + @@ -92,15 +92,15 @@ IvRCNeI0FpjTvdt4stm66ZqRfH8Ww+hzCHtDz6MBBRIl5uRaYPqakjsW6/UK7hs= - - - - - - - - - + + + + + + + + + diff --git a/Workbench/webproxy/Dockerfile b/Workbench/webproxy/Dockerfile index 29afb04..da544b8 100644 --- a/Workbench/webproxy/Dockerfile +++ b/Workbench/webproxy/Dockerfile @@ -1,15 +1,23 @@ FROM tier/shibboleth_sp:latest +ARG CSPHOSTNAME=localhost +ENV CSPHOSTNAME=$CSPHOSTNAME + COPY container_files/httpd/proxy.conf /etc/httpd/conf.d/ COPY container_files/httpd/shib.conf /etc/httpd/conf.d/ COPY container_files/httpd/index.html /var/www/html/ COPY container_files/httpd/csp_logo.jpg /var/www/html/ +COPY container_files/httpd/localhost.crt /etc/pki/tls/certs/localhost.crt +COPY container_files/httpd/localhost.key /etc/pki/tls/private/localhost.key +RUN chmod 600 /etc/pki/tls/certs/localhost.crt && chmod 600 /etc/pki/tls/private/localhost.key COPY container_files/shibboleth/ /etc/shibboleth/ - +COPY container_files/system/setservername.sh /usr/local/bin/ +RUN chmod 755 /usr/local/bin/setservername.sh # fix httpd logging for ssl logs RUN sed -i 's/TransferLog logs\/ssl_access_log/TransferLog \/tmp\/logpipe/g' /etc/httpd/conf.d/ssl.conf \ && sed -i 's/ErrorLog logs\/ssl_error_log/ErrorLog \/tmp\/logpipe/g' /etc/httpd/conf.d/ssl.conf - +#set hostname +RUN /usr/local/bin/setservername.sh diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html index d2aa80a..738e986 100644 --- a/Workbench/webproxy/container_files/httpd/index.html +++ b/Workbench/webproxy/container_files/httpd/index.html @@ -4,22 +4,20 @@

Welcome to the InCommon TAP Workbench!


This is your own personal instance of the InCommon Trusted Access Platform Workbench.

-It is running on your local machine. -

For more information, see this page.

The system contains the following TAP components (click the links to access each component in its own tab): In addition, the following applications are available: diff --git a/Workbench/webproxy/container_files/httpd/localhost.crt b/Workbench/webproxy/container_files/httpd/localhost.crt new file mode 100644 index 0000000..881c325 --- /dev/null +++ b/Workbench/webproxy/container_files/httpd/localhost.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID6jCCAtKgAwIBAgICaaIwDQYJKoZIhvcNAQELBQAwgakxCzAJBgNVBAYTAi0t +MRIwEAYDVQQIDAlTb21lU3RhdGUxETAPBgNVBAcMCFNvbWVDaXR5MRkwFwYDVQQK +DBBTb21lT3JnYW5pemF0aW9uMR8wHQYDVQQLDBZTb21lT3JnYW5pemF0aW9uYWxV +bml0MRUwEwYDVQQDDAxiYWFhMWFiNTE0NGExIDAeBgkqhkiG9w0BCQEWEXJvb3RA +YmFhYTFhYjUxNDRhMB4XDTIwMDQyMTE4NTkwN1oXDTIxMDQyMTE4NTkwN1owgakx +CzAJBgNVBAYTAi0tMRIwEAYDVQQIDAlTb21lU3RhdGUxETAPBgNVBAcMCFNvbWVD +aXR5MRkwFwYDVQQKDBBTb21lT3JnYW5pemF0aW9uMR8wHQYDVQQLDBZTb21lT3Jn +YW5pemF0aW9uYWxVbml0MRUwEwYDVQQDDAxiYWFhMWFiNTE0NGExIDAeBgkqhkiG +9w0BCQEWEXJvb3RAYmFhYTFhYjUxNDRhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEArzuaMkF/83JBHj8mQMm5jhKLSSC+viuisAxNHGHM6j33lJl9ls4R +iUBnbW4sTW4l1uYMfKZJKr5y9msTQXu8+CCON7oscUvFuc/D8gRb/J9QmJK188Cr +L6DS+ofZXZqqV4Ou5FKjOax7gOvAMAGV7x4F9qEfdy8SyjSjhK5+57BaboH/PgLY +qu0i7SJ+NzkGq7M0lt/DdqGZazOQbBhaoryB/hvo7JgSbxAfhVqQdtkcidSsNbBA +/+PLlk1+hhOhiA15h/laA854T6FNYyeurEyr530zUo7P4/PZZyu/7y4D+s8KlNt3 +zpfVy9hNXgxFRCpLBC4XWLVwYmT18DfHIQIDAQABoxowGDAJBgNVHRMEAjAAMAsG +A1UdDwQEAwIF4DANBgkqhkiG9w0BAQsFAAOCAQEAJcmopkftBDCpVW8GmtlD23o6 +oBOAnD566BK5zA23R9QDyoTX2Roz6moXxMrY3tlgL4LO/2prrR70vBIG6zn5q/xG +goAwnWcQmFSg3HhiVJlcjRNrBEIbYw2edeZC38r6sWVj50RFCtlCMIaDdRAZCiVy +Avf+S2Dw1QD9urkdjTMQaogMNmjZiXxKB2Zteqnks3JEVpOdlnLZYObIvSa1leIP +gw4HgTllV1IqOJtgciczBX3xr8l6WR730BOv39ciGk25R4DQZxR/dR61NpnaYYuz +8Rb+n48KaBe3vcxDtgAP8skFf1FN72bMOxrSYy6TEcN4URUMK4ybcXvLVKWEjg== +-----END CERTIFICATE----- diff --git a/Workbench/webproxy/container_files/httpd/localhost.key b/Workbench/webproxy/container_files/httpd/localhost.key new file mode 100644 index 0000000..a307941 --- /dev/null +++ b/Workbench/webproxy/container_files/httpd/localhost.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEArzuaMkF/83JBHj8mQMm5jhKLSSC+viuisAxNHGHM6j33lJl9 +ls4RiUBnbW4sTW4l1uYMfKZJKr5y9msTQXu8+CCON7oscUvFuc/D8gRb/J9QmJK1 +88CrL6DS+ofZXZqqV4Ou5FKjOax7gOvAMAGV7x4F9qEfdy8SyjSjhK5+57BaboH/ +PgLYqu0i7SJ+NzkGq7M0lt/DdqGZazOQbBhaoryB/hvo7JgSbxAfhVqQdtkcidSs +NbBA/+PLlk1+hhOhiA15h/laA854T6FNYyeurEyr530zUo7P4/PZZyu/7y4D+s8K +lNt3zpfVy9hNXgxFRCpLBC4XWLVwYmT18DfHIQIDAQABAoIBAHCCxWOlOKE35+Wi +yE3q98/nyjS+6Jmz7LY6f7xMc0SnWvK3hrKwRwQoLQBPL/TbV0Je3P+fyPS/6ZKc +d3WhHFj4ljfjuqtX6nF+nCIleGaAaEA+WsNSHtfq2+vuE7uNFfgw3bdN8+2Q+I9z +TyfDrOAmF9Ad7dUZjWf1WlRTsbnSKoDB50lGg+cQUcmTPyKt9TGGbKHjie5KmO7O +T+MV3nO2XKlqDThE5reornMor99PJ7b5CveKEV88988rotdjTQJ7o2zqEjPc3Ycy +qvAvM80h7ehG2QmC3/wc2lwzEqwDXAG3QTOycWCkOt4Ue4pGA7s+AeROFNphbSlk +VD5vQwECgYEA2Jw/ppueg5u6a9gFwYqa3JFMF721PNfu5kD+oll+7qazXes8Ggxk +wn0RKATdb5esUdsMWvOF8BVGtellRTiCv+Fr6qQNS4zZ653FFTkfzqzCvYBi76Ru +I1HyZqb3E/0ElwKb7XdlZs6n+eQGUFRUmmLoOcuaIHvaeul/8brBCTECgYEAzxkg +dx6Aprf3oViAkudFaKRAcXEKej8bMyjMxvtax6CUQ0qBlzHnsmbrAVWUNctBpyWC +XDfJP+qeHM+VAOf0GxCjI/hox5hOZId3l7R6lDXYKZvmNaL4ce3AEaQVdNzcvUNT +rLktlvbi+4ukfwHu0roqSn3wgpFzeGDcUZ7YIPECgYBzdz762iOydjX2vO28kN0i +TJWqZicRau3fcbAK7Pgb0WL14qpkHE0t26tkkMtVbB2geMrqRLwWEdFisSqZrpkM +Heb/6jloF4om7jAbsxrAehlJGQIkSpunWkyD6eb1kb97nBlwiV/VYL3sGGBBO+Lp +dWXjQSREwqDhOk1Il0vFUQKBgF8+MwwVXx1NZfkx9o+ZBPbG80w4rJTkCOJSVTr9 +xhYg54666TZboS8O3e1TKkJDJAJ24aj/jvJyOB0P6nrsMftwf1a/m5CPnx3knz+J +pQYcbTlVlV39gT0EFl0GlUeVe38fQ5Af6bOP/3uoERLIFMmdDG4N1Vp3Ah/OjASN +hOBBAoGBAKYvCKIjVvionwEjPLuBAcnjU4XGdAx1+wYfXbsQqmcDAEBdQbLL8Orj +VApGB+3JesTT2T5WlcUL08UyttpFKMREHK6DspTnc1Gyvo+RPnsF1ig+NG76BNNO +1WCH+DBpR4Ih6hJaokjWQn6kkRLS2tAKnPeupcqDxkja49yRccKr +-----END RSA PRIVATE KEY----- diff --git a/Workbench/webproxy/container_files/shibboleth/idp-metadata.xml b/Workbench/webproxy/container_files/shibboleth/idp-metadata.xml index 4fa67a7..8bf0814 100644 --- a/Workbench/webproxy/container_files/shibboleth/idp-metadata.xml +++ b/Workbench/webproxy/container_files/shibboleth/idp-metadata.xml @@ -1,10 +1,4 @@ - @@ -104,10 +98,10 @@ p+tGUbGS2l873J5PrsbpeKEVR/IIoKo= urn:mace:shibboleth:1.0:nameIdentifier urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - - - + + + + @@ -198,8 +192,8 @@ p+tGUbGS2l873J5PrsbpeKEVR/IIoKo= - - + + diff --git a/Workbench/webproxy/container_files/system/setservername.sh b/Workbench/webproxy/container_files/system/setservername.sh new file mode 100644 index 0000000..00294cd --- /dev/null +++ b/Workbench/webproxy/container_files/system/setservername.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +files="/etc/shibboleth/idp-metadata.xml /var/www/html/index.html" + +for file in $files + do + sed -i "s|__CSPHOSTNAME__|$CSPHOSTNAME|g" $file + done \ No newline at end of file