From 15b50f637a9f939f250a57b3d3ff7452469714e2 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 8 Oct 2018 22:40:04 +0200 Subject: [PATCH] deploy validator 3.0.0 --- global/overlay/etc/puppet/cosmos-rules.yaml | 2 +- .../metadata-validator/cert/sc-prod-md.crt | 35 ++++++++++++++++ .../sc-qa-md.crt} | 0 .../cert/se-metadata-cert.crt | 15 +++++++ .../cfg/application.properties | 41 ++++++++++++++----- 5 files changed, 82 insertions(+), 11 deletions(-) create mode 100644 validator-1.qa.komreg.net/overlay/etc/metadata-validator/cert/sc-prod-md.crt rename validator-1.qa.komreg.net/overlay/etc/metadata-validator/{qa-metadata-cert.crt => cert/sc-qa-md.crt} (100%) create mode 100644 validator-1.qa.komreg.net/overlay/etc/metadata-validator/cert/se-metadata-cert.crt diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index d5aaad4e..2b931c0e 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -712,7 +712,7 @@ md-eu1.qa.komreg.net: sunet_iaas_cloud: autoupdate: validator: - version: 2.1.3 + version: 3.0.0 sunet::frontend::register_sites: sites: 'swedenconnect.se': diff --git a/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cert/sc-prod-md.crt b/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cert/sc-prod-md.crt new file mode 100644 index 00000000..522e3b87 --- /dev/null +++ b/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cert/sc-prod-md.crt @@ -0,0 +1,35 @@ +-----BEGIN CERTIFICATE----- +MIIGFTCCA/2gAwIBAgIJAMRMtpYesnyPMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD +VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x +IjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsMDlN3 +ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0YSBz +aWduZXIgdjIuMDAeFw0xODA1MzAwOTIzMzVaFw0zODA1MzAwOTIzMzVaMIGgMQsw +CQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hv +bG0xIjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsM +DlN3ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0 +YSBzaWduZXIgdjIuMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPer +La2IxQHWRFvX5mC8OgYSsZTjNcEGz0vLwBsdckQiBWWgrLdnU6+raS/SlriY4qcZ +g8CJkhj8CdLBn6UxwdwOy+tGYjyAFCkV2yQ68euyNqwWgT6iiq/dn1kjWzamC18H +U0LN/c7eieldhdI8edSF9Z6Drjt7s8glP4Lrd1FM5NXWros06fpEs61BoMZrIyei +ptB4M7XBGJW6mQx3trnN4FnDZIyzNf9H+Z4XvXnn/URLMd0S3hS2uxVS7OGluKY6 +hhXfpcOGwUKcQmE7coI0mhZ9TAsG7h++J/A7aBp3eWr9eXzeFmwg7sHRBtd3LaD+ +yBLXuUFaPHJyOSFCeiys1O1Oh2CGpJIfPHlqmCQmTQrNEtioJyPRVAZamwio+mYt +EsI8ssPW3/FNEe93cHd88BDhCDtz5oiQiGyflsCWSh4SwjFVVw7jgRGzmkn2TfHv +yjiiexS8LeleqwMQ95e9dcVbktxBvDnPd0xCAXVL0y2P31DXLYe/2806C/21KWRU +Z/EtLTQKpxJWhqsZwSZSpxjb6h3l8D9HAm5w4I/4w3JB40R7GJFWtuwh+clRnzC2 +xtN9cGfe+LXG0SG6ObUu9XBVBwNIL2xNgz+eSCv1n/8hlahoZySLtj0AKFQPyWvw +Bitvvwk8uq3NPpBiz2nilHG3nnzlp+TK6+pjOHOrAgMBAAGjUDBOMB0GA1UdDgQW +BBTqVEEVOf9SV47Nz0su8/MYAWOy4jAfBgNVHSMEGDAWgBTqVEEVOf9SV47Nz0su +8/MYAWOy4jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAXjshVZ5td +ZqClqmZUEEWFh8oDk8lrRkZfXUmThQiKYq7NrLecbquDh1Mglq3zVxndZMAZVzrQ +3U/EJ7B+LXfd5fnl91+qb5d1bJBs/Om/AyFA/bBnOyYPzkZWf+M8nItzQyOJX7ZO +kzIOakaet6HR6T7ADk7vfSjqnRLywNL/cq3/if9c5WGh5NUSteltuDHOsm3DwvN4 +aFP+rngiYF1j509wbZOO7koIwZZUG9g0Etv0T8u7xXyZkYxjEfrr4uMf6121PoaP +7mMU1Msuqw7idRMOj7mL5tIpu1ihw/a2pWqaXkxNsQXpOv+HtpBZ28pzqAtcHt8q +r5V5Gm+W37RMlnIDsJwgEfA6FKEDqahSRmYnh8v+F9aDRDpGYpwRtK3k0tiy9Kvp +8o16aCCqLtFU+Lme2NzkcFQubPmkan21M6/VTGP7UrgtvhXAaqYcTQBq/YJ4TiXz +SBZgjywUi1nMZAzG4KS4jFR27Kdiul3G10I/M7nPtNq51uNspiO117zRo/8qD4wE +BOoxiQw0f7/UPW8uznHU3DR3JUkTTlUfKHrfB7RZvkqw15bLkH8DpgINkjW+PFzI +OkY6KYbZj/wwCYBw3rxMb4oY3Lv0S6cLmLvxmkG8eizY9ymwNlr/YAwPeyzuLPRf +j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/validator-1.qa.komreg.net/overlay/etc/metadata-validator/qa-metadata-cert.crt b/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cert/sc-qa-md.crt similarity index 100% rename from validator-1.qa.komreg.net/overlay/etc/metadata-validator/qa-metadata-cert.crt rename to validator-1.qa.komreg.net/overlay/etc/metadata-validator/cert/sc-qa-md.crt diff --git a/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cert/se-metadata-cert.crt b/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cert/se-metadata-cert.crt new file mode 100644 index 00000000..3686046a --- /dev/null +++ b/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cert/se-metadata-cert.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICyzCCAbMCBgFEwQFDRDANBgkqhkiG9w0BAQUFADApMScwJQYDVQQDDB5Td2VkaXNoIEUtaWRl +bnRpZmljYXRpb24gYm9hcmQwHhcNMTQwMzE0MTIzMTI5WhcNMTkwMzE0MTQzMTI5WjApMScwJQYD +VQQDDB5Td2VkaXNoIEUtaWRlbnRpZmljYXRpb24gYm9hcmQwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQCGxrPbCuZYeMZniwOAIO1MiQjGD3LIfaLBddNucsAVrxpYW7bYMwzvgL2Gp4yV +6IyAx5kUgHPjEkEEIjH+NhxYdChD8iWBkLuaOkxyYNXFjFQ3APk5kqP+BB+fP8peWlKGX6S2mfcB +7eObDQqb28osfXE+bak4X2rNf5i+Yx9VdXBpRhDxk7umDdWTSJlc+ZCxWUt3ldc58/sXIgAzVWk4 +9A3GIvOHlBVgm/5g3yzU9HnxD1fyOKT+NkF5J9mjM0x8Qg9K/Zep3n1xmb8kZ/vcRxv+AounGDd7 +w/QWW84sPegySHqm5GkLSgwB63nJZr5wS+qoT9sTooCM0AhBhY1FAgMBAAEwDQYJKoZIhvcNAQEF +BQADggEBAESqy6GrAEbL/blJQxDb/LCCW4y3KAAs/pqvR4SQMP0rvVe5FJiUJsE/6DEhk+cl0N+o +5e8/NusIUD7f6vKSYTHgCodSeDYGdrkRrOucDBWgIlYVsR3yTb/za3AlgiTW6eGGqiY6SeEzXNTM +5o0GpoZbknQZEK/xCJLtMAU6oX7pDBLahtYeJAJJNFVjtPKsERr2Ob2ni9XW8+fxyjv0v2gmlQvW +i6VnpD6VJ3nwAFDsGHBgzli32YBd62rukqyiqvC595LNg0Dg4fyv1ZuOiqajWSd3x8JI6bS01QvY +3fNKY84wMQXpRq9C3zRtpPKmh22W6mcQvh1uN3qNaIEEklE= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties b/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties index 23a03d8b..0b99ec55 100644 --- a/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties +++ b/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties @@ -8,22 +8,43 @@ md-validator.html.title=Metadata Validator - Swedenconnect QA Metadata md-validator.title=Metadata Validator for Sweden Connect Metadata md-validator.logo.location=${md-validator.path.prefix}/digg-logo.svg md-validator.logo.height=60 +md-validator.home.text=Home +md-validator.home.url=https://swedenconnect.se # Metadata location for national metadata specified as either URL (http or https), "file://" or "classpath:" # Multipple sources may be set ordered by index. Valid parameters are "location", "certFile" (optional), # "cacheFile" (optional), "index" and "ignoreSignatureValidation" default false. -md-validator.nationalMetadata.qa.location=https://qa.md.swedenconnect.se/entities -md-validator.nationalMetadata.qa.certFile=${md-validator.path.prefix}/qa-metadata-cert.crt -md-validator.nationalMetadata.qa.cacheFile=${md-validator.path.prefix}/mdcache/qa-metadata-cache.xml -md-validator.nationalMetadata.qa.index=0 -md-validator.nationalMetadata.qa.ignoreSignatureValidation=false -#md-validator.nationalMetadata.dev.location=http://eid.svelegtest.se/metadata/mdx/role/idp.xml -#md-validator.nationalMetadata.dev.certFile=${md-validator.path.prefix}/se-metadata-cert.crt -#md-validator.nationalMetadata.dev.cacheFile=${md-validator.path.prefix}/ps-mdcache/dev-metadata-cache.xml -#md-validator.nationalMetadata.dev.index=1 -#md-validator.nationalMetadata.dev.ignoreSignatureValidation=false +md-validator.metadataSource.prod[0].location=https://md.swedenconnect.se/entities +md-validator.metadataSource.prod[0].certFile=${md-validator.path.prefix}/cert/sc-prod-md.crt +md-validator.metadataSource.prod[0].cacheFile=${md-validator.path.prefix}/mdcache/prod-metadata-cache.xml +md-validator.metadataSource.prod[0].index=0 +md-validator.metadataSource.prod[0].ignoreSignatureValidation=false +md-validator.metadataSource.qa[0].location=https://qa.md.swedenconnect.se/entities +md-validator.metadataSource.qa[0].certFile=${md-validator.path.prefix}/cert/sc-qa-md.crt +md-validator.metadataSource.qa[0].cacheFile=${md-validator.path.prefix}/mdcache/qa-metadata-cache.xml +md-validator.metadataSource.qa[0].index=0 +md-validator.metadataSource.qa[0].ignoreSignatureValidation=false + +md-validator.metadataSource.dev[0].location=http://eid.svelegtest.se/metadata/feed +md-validator.metadataSource.dev[0].certFile=${md-validator.path.prefix}/cert/se-metadata-cert.crt +md-validator.metadataSource.dev[0].cacheFile=${md-validator.path.prefix}/mdcache/dev-metadata-cache.xml +md-validator.metadataSource.dev[0].index=0 +md-validator.metadataSource.dev[0].ignoreSignatureValidation=false + +# Optional definiton of title names and descriptions for each federation +md-validator.federationName.prod=Production +md-validator.federationDescription.prod=Metadata Validator for Sweden Connect services in Production +md-validator.federationName.qa=QA +md-validator.federationDescription.qa=Metadata Validator for Sweden Connect QA federation +md-validator.federationName.dev=Sandbox +md-validator.federationDescription.dev=Metadata Validator for Sweden Connect Dev federation + +# Optional definiton of ordering in the menu (Default ordered alphabetically) +md-validator.federationOrder[0]=prod +md-validator.federationOrder[1]=qa +md-validator.federationOrder[2]=dev # Service TLS settings #server.ssl.key-store=${md-validator.path.prefix}/keystore/sslSnakeOil.p12