From ec03ac8f7467df54925fef4f5d821c0bcdfcb546 Mon Sep 17 00:00:00 2001 From: Krzysztof Gajewski Date: Thu, 20 Aug 2020 13:44:38 +0200 Subject: [PATCH] Enable HTTPS in SO-Monitoring Signed-off-by: Krzysztof Gajewski Issue-ID: SO-2920 Change-Id: I8c0d5a4c68c23daa885bfb1e0d4a1f08438e6761 --- so-monitoring/so-monitoring-service/pom.xml | 18 +++++++++++++ .../src/main/resources/application.yaml | 12 ++++++++- .../src/main/resources/org.onap.so.p12 | Bin 0 -> 4071 bytes .../src/main/resources/org.onap.so.trust.jks | Bin 0 -> 1413 bytes so-monitoring/so-monitoring-ui/pom.xml | 2 +- .../src/main/frontend/angular.json | 4 ++- .../src/main/frontend/package.json | 2 +- .../src/main/frontend/src/app/ssl/localhost.crt | 23 +++++++++++++++++ .../src/main/frontend/src/app/ssl/localhost.key | 28 +++++++++++++++++++++ .../main/frontend/src/environments/environment.ts | 2 +- 10 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.p12 create mode 100644 so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.trust.jks create mode 100644 so-monitoring/so-monitoring-ui/src/main/frontend/src/app/ssl/localhost.crt create mode 100644 so-monitoring/so-monitoring-ui/src/main/frontend/src/app/ssl/localhost.key diff --git a/so-monitoring/so-monitoring-service/pom.xml b/so-monitoring/so-monitoring-service/pom.xml index 6671ac56d4..4a0f6cbe1d 100644 --- a/so-monitoring/so-monitoring-service/pom.xml +++ b/so-monitoring/so-monitoring-service/pom.xml @@ -104,6 +104,24 @@ + + + src/main/resources + true + + **/*.p12 + **/*.jks + + + + src/main/resources + false + + **/*.p12 + **/*.jks + + + diff --git a/so-monitoring/so-monitoring-service/src/main/resources/application.yaml b/so-monitoring/so-monitoring-service/src/main/resources/application.yaml index dbccb76979..ef0b6aa786 100644 --- a/so-monitoring/so-monitoring-service/src/main/resources/application.yaml +++ b/so-monitoring/so-monitoring-service/src/main/resources/application.yaml @@ -1,8 +1,12 @@ server: + ssl: + keyStore: classpath:org.onap.so.p12 + keyStorePassword: 6IxlmmPs:HqNhzVP#VFuSs,% + trustStore: classpath:org.onap.so.trust.jks + trustStorePassword: 72z0TFN&xfSR;;&NrIP^QB,^ port: 9091 tomcat: max-threads: 50 -ssl-enable: false camunda: rest: api: @@ -19,3 +23,9 @@ mso: spring: main: allow-bean-definition-overriding: true + security: + usercredentials: + - + username: gui + password: '$2a$10$ndkDhATUid4a3g0JJVRv2esX4rtB.vzCn7iBhKyR1qZ/wDdvNzjTS' + role: GUI-Client diff --git a/so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.p12 b/so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.p12 new file mode 100644 index 0000000000000000000000000000000000000000..8fa921a88492cc2a96c80495773419bc4244a348 GIT binary patch literal 4071 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 TB18MDjKRSN)~3pY>l*(C$8uws literal 0 HcmV?d00001 diff --git a/so-monitoring/so-monitoring-ui/pom.xml b/so-monitoring/so-monitoring-ui/pom.xml index 71480416d3..574d78287a 100644 --- a/so-monitoring/so-monitoring-ui/pom.xml +++ b/so-monitoring/so-monitoring-ui/pom.xml @@ -49,7 +49,7 @@ generate-resources - v10.15.3 + v10.19.0 v1.7.0 diff --git a/so-monitoring/so-monitoring-ui/src/main/frontend/angular.json b/so-monitoring/so-monitoring-ui/src/main/frontend/angular.json index b58ee265d0..45feb6007c 100644 --- a/so-monitoring/so-monitoring-ui/src/main/frontend/angular.json +++ b/so-monitoring/so-monitoring-ui/src/main/frontend/angular.json @@ -55,7 +55,9 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "ONAP-SO-Monitor:build" + "browserTarget": "ONAP-SO-Monitor:build", + "sslKey": "src/app/ssl/localhost.key", + "sslCert": "src/app/ssl/localhost.crt" }, "configurations": { "production": { diff --git a/so-monitoring/so-monitoring-ui/src/main/frontend/package.json b/so-monitoring/so-monitoring-ui/src/main/frontend/package.json index c793264e99..fcbeabed69 100644 --- a/so-monitoring/so-monitoring-ui/src/main/frontend/package.json +++ b/so-monitoring/so-monitoring-ui/src/main/frontend/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "ng serve", + "start": "ng serve --ssl", "build": "ng build", "test": "ng test", "lint": "ng lint", diff --git a/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/ssl/localhost.crt b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/ssl/localhost.crt new file mode 100644 index 0000000000..7995c0e2c3 --- /dev/null +++ b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/ssl/localhost.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID5jCCAs6gAwIBAgIUPVNQnCGr+uu048oN/oILqbk+DKwwDQYJKoZIhvcNAQEL +BQAwgZ8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxv +bmRvbjEYMBYGA1UECgwPTXkgT3JnYW5pc2F0aW9uMR8wHQYDVQQLDBZNeSBPcmdh +bmlzYXRpb25hbCBVbml0MR8wHQYJKoZIhvcNAQkBFhBlbWFpbEBkb21haW4uY29t +MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjAwODA3MTIyMjM2WhcNMzAwNTA3MTIy +MjM2WjCBnzELMAkGA1UEBhMCR0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwG +TG9uZG9uMRgwFgYDVQQKDA9NeSBPcmdhbmlzYXRpb24xHzAdBgNVBAsMFk15IE9y +Z2FuaXNhdGlvbmFsIFVuaXQxHzAdBgkqhkiG9w0BCQEWEGVtYWlsQGRvbWFpbi5j +b20xEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAKCtMRhrl1o1obijVfREsIatq/fEiFETCtSx3mJVKjZjYNHFn2/OjvXo +ncABnhKiFND8XiLYEgzDw9rtX3l2RVe9gQm2zNUvKPcmO+D4Dsn6QJu8HS7uDU8m +gaXRiEUHsjD+jvEF/sUKjD565XRGd9qCyDpdtjra2W7CGZdzTrdepMRJhxMmA0fB +t3JsV/52WMCqU6drSxT8hH7PvXh4nwr9DQ2fvUZarRptiW2Dg9zSqO+6M3XWCvUI +jdm4Q0jxXY2jCLsh1oTo3dIYdHedB4LORXAPIRsLdJ1/ofl9NdyL20kG4ONIdJXv +5mTuPGBATGOWEJvD8TTxrZtEMx9GNTsCAwEAAaMYMBYwFAYDVR0RBA0wC4IJbG9j +YWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQAIDUoitU/11f9ApfPXwtuDaPeX20sc +gSfq/MLQ9LttSi/SpAjebSlp12JNkZvxuV+2cPmc92NWv8WXqfyP+0BDhlGTm1qp +Hc/wRB9ASG/7Z1imAh+zpNXFe0fV0HpUqJx33ywiXLoMTTaSvwPSF4VEki8g9h2R +8zVXjsaE0ybi4eUIKG+ZJ2EBaVgLMEm+osVMnkTEWIeR3XN66Ko2SegvOrAjfOyz +CIqkDvPhowYkKVV4LSsFIgz+YKOVMxaEcHbrxciYKymmWQ/9I/ek8TUs8C4z6cKs +n+9nvYisfFpZ6tpMU+cgYkGezOCV5+nAri+SHoAfAOMXVPLACT39sOF9 +-----END CERTIFICATE----- diff --git a/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/ssl/localhost.key b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/ssl/localhost.key new file mode 100644 index 0000000000..85e6b7e09d --- /dev/null +++ b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/ssl/localhost.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCgrTEYa5daNaG4 +o1X0RLCGrav3xIhREwrUsd5iVSo2Y2DRxZ9vzo716J3AAZ4SohTQ/F4i2BIMw8Pa +7V95dkVXvYEJtszVLyj3Jjvg+A7J+kCbvB0u7g1PJoGl0YhFB7Iw/o7xBf7FCow+ +euV0Rnfagsg6XbY62tluwhmXc063XqTESYcTJgNHwbdybFf+dljAqlOna0sU/IR+ +z714eJ8K/Q0Nn71GWq0abYltg4Pc0qjvujN11gr1CI3ZuENI8V2Nowi7IdaE6N3S +GHR3nQeCzkVwDyEbC3Sdf6H5fTXci9tJBuDjSHSV7+Zk7jxgQExjlhCbw/E08a2b +RDMfRjU7AgMBAAECggEAByszAY/rVM8HxCEleJyH87pT7d4K5vMejJbTATgjhgGx +FCrpDif9IOOcBjEMSHCK1TgtSwiw5XjmiCIHHHg2Z8/ArhpF0U0lWsGN8l+e6UwN +DeW6t5lPZrSlHCzZE5tgS+dPoVlPIKNz1mXNTv7F4i3rmQ8NTlrtUI/AbI1seanh +Ofb2yhHkkiHYIUridCDTuhk9hMmypHB9THA7SFRB7C9/zO8T95I2D1QQ5ZO5xKGg +rDAMacSeQMnuKNcyuF4RYoh0T4PmM1NFGH1F1+QKTAt5CU0rkZtMHZ9YuYPYCC1S +f1YrPQSJ5mFstaF9kWDp1rnR2J8Od/KU5ZSOgmvMoQKBgQDUithsDxnGEOQCKXfX +e6/kgaL7mB5Q/Pgeyiy5lyBjTLZcbFeaDzkRBR3zL5v8xbNZ4IsJqkaxJavrIwr4 +R2+WvuznEaeLhFds0ze57kDyV/uunsQwBSJSXYohCRiq1gc7nqpamSSpFFI9Ls81 +JmXSPdyosRWESjCTCrQffZFKhQKBgQDBh4VZ9lSAGfASKjkqGLncAEHcnCbavQoy +2DlHEhA+gZDvR2CSsunIxlQerZC78KcTA+oex54Ovi+NG8Rx6qyyywxiGjm0e1yG +B2z060CTO9PlMhs81kXJkUDxR4tHyMNtLaFKICJ9J6wZXBnYZcMU+Do7OhlRVoaL +qrNwhonsvwKBgCCTq3pckim+mwQN0RWRGrOefxmrBjKJo4osmNBVbpxpvKXL4V12 +qduG+kE08ea7crL67LStiapLSN+AfoTxhhQH7Y25MgH7Zd8DPM5dy0yZ2bS5Fv75 +Onp/ZdWMbGB6757eweOjB3B28ef4zb+qw/6GhtTAV7jwGiPfhx4wg911AoGBAIAP +1H82UK4/+6uZgyBHIl3hUbPRJKjkJOaGTEiqPFOQWz7rJY2NlMQF8U4nnjmvQm+D +zJ23i/DHiyG9+R1EpCjf0f7sybiTVSNfsIrVTXLgSRRGNt3oEGAUnTvMEu9ae284 +nZ02bHwTD3/sgTHADPpIVAgzJuO69Odg+sKAVK5zAoGAVn6bUm+QVuELmn8CNT+y +XsSks5gu0MDwuSbUwjuNjSGMEab2lwyIgY8CduopyJWLPgkVtALiuXxp6OzPNCE4 +pC/5HNaqawCQ7Kgbk6MjRwY551HQRgMG7wf9iFBP8sfdWG30vYFmiYWN4oUEDi5j +ytwU+extcKSRxj/O1op3KDI= +-----END PRIVATE KEY----- diff --git a/so-monitoring/so-monitoring-ui/src/main/frontend/src/environments/environment.ts b/so-monitoring/so-monitoring-ui/src/main/frontend/src/environments/environment.ts index f0c63fe582..bf2f31d5c9 100644 --- a/so-monitoring/so-monitoring-ui/src/main/frontend/src/environments/environment.ts +++ b/so-monitoring/so-monitoring-ui/src/main/frontend/src/environments/environment.ts @@ -24,5 +24,5 @@ SPDX-License-Identifier: Apache-2.0 export const environment = { production: false, - soMonitoringBackendURL: 'http://so-monitoring:30224/so/monitoring/' + soMonitoringBackendURL: 'https://so-monitoring:30224/so/monitoring/' }; -- 2.16.6