From 56a620d02f2b39ce64d07007902b53544d235a59 Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Thu, 26 Apr 2018 17:31:07 -0700 Subject: Adding cert files to support https Adding cert files generated by AAF CA Incorporating them into the docker build as well Issue-ID: AAF-265 Change-Id: I1ee1e031bf058a0325fe2c6fe8eed5e3948d70e7 Signed-off-by: Kiran Kamineni --- sms-service/bin/build_quorum_image.sh | 10 +++- sms-service/bin/build_sms_image.sh | 12 ++++- sms-service/bin/quorumdockerfile | 2 + sms-service/bin/smsdockerfile | 3 ++ sms-service/src/quorumclient/config.json | 2 +- sms-service/src/quorumclient/quorumclient.go | 24 +++++---- .../sms/auth/aaf-sms.api.simpledemo.onap.org.pem | 59 ++++++++++++++++++++++ .../sms/auth/aaf-sms.api.simpledemo.onap.org.pr | 32 ++++++++++++ sms-service/src/sms/auth/aaf_root_ca.cer | 31 ++++++++++++ sms-service/src/sms/smsconfig.json.template | 6 +-- sms-service/src/sms/test/loop_test.sh | 28 +++++----- 11 files changed, 176 insertions(+), 33 deletions(-) create mode 100644 sms-service/src/sms/auth/aaf-sms.api.simpledemo.onap.org.pem create mode 100644 sms-service/src/sms/auth/aaf-sms.api.simpledemo.onap.org.pr create mode 100644 sms-service/src/sms/auth/aaf_root_ca.cer diff --git a/sms-service/bin/build_quorum_image.sh b/sms-service/bin/build_quorum_image.sh index 4691067..b26accf 100755 --- a/sms-service/bin/build_quorum_image.sh +++ b/sms-service/bin/build_quorum_image.sh @@ -27,8 +27,13 @@ function generate_binary { cp ../target/quorumclient . } -function remove_binary { +function copy_certificates { + cp ../src/sms/auth/aaf_root_ca.cer . +} + +function cleanup { rm quorumclient + rm aaf_root_ca.cer } function build_image { @@ -51,6 +56,7 @@ function push_image { } generate_binary +copy_certificates build_image push_image -remove_binary \ No newline at end of file +cleanup \ No newline at end of file diff --git a/sms-service/bin/build_sms_image.sh b/sms-service/bin/build_sms_image.sh index a89e64e..cd3663f 100755 --- a/sms-service/bin/build_sms_image.sh +++ b/sms-service/bin/build_sms_image.sh @@ -27,8 +27,15 @@ function generate_binary { cp ../target/sms . } -function remove_binary { +function copy_certificates { + cp ../src/sms/auth/aaf-sms.api.simpledemo.onap.org.pem . + cp ../src/sms/auth/aaf-sms.api.simpledemo.onap.org.pr . +} + +function cleanup { rm sms + rm aaf-sms.api.simpledemo.onap.org.pem + rm af-sms.api.simpledemo.onap.org.pr } function build_image { @@ -51,6 +58,7 @@ function push_image { } generate_binary +copy_certificates build_image push_image -remove_binary \ No newline at end of file +cleanup \ No newline at end of file diff --git a/sms-service/bin/quorumdockerfile b/sms-service/bin/quorumdockerfile index fa4a159..3b787d7 100644 --- a/sms-service/bin/quorumdockerfile +++ b/sms-service/bin/quorumdockerfile @@ -5,7 +5,9 @@ LABEL version=2.0.0 LABEL maintainer="Girish Havaldar " RUN mkdir -p /quorumclient/auth +ADD aaf_root_ca.cer /quorumclient/cert/aaf_root_ca.cer ADD quorumclient /quorumclient/bin/quorumclient RUN chmod +x /quorumclient/bin/quorumclient +WORKDIR /quorumclient ENTRYPOINT ["/quorumclient/bin/quorumclient"] diff --git a/sms-service/bin/smsdockerfile b/sms-service/bin/smsdockerfile index 629fcd5..50704b2 100644 --- a/sms-service/bin/smsdockerfile +++ b/sms-service/bin/smsdockerfile @@ -7,7 +7,10 @@ LABEL maintainer="vamshi krishna " EXPOSE 10443 RUN mkdir -p /sms/auth +ADD aaf-sms.api.simpledemo.onap.org.pem /sms/cert/aaf-sms.api.simpledemo.onap.org.pem +ADD aaf-sms.api.simpledemo.onap.org.pr /sms/cert/aaf-sms.api.simpledemo.onap.org.pr ADD sms /sms/bin/sms RUN chmod +x /sms/bin/sms +WORKDIR /sms ENTRYPOINT ["/sms/bin/sms"] diff --git a/sms-service/src/quorumclient/config.json b/sms-service/src/quorumclient/config.json index a096968..53cbf41 100644 --- a/sms-service/src/quorumclient/config.json +++ b/sms-service/src/quorumclient/config.json @@ -1,6 +1,6 @@ { "url":"https://aaf-sms:10443", - "cafile": "auth/selfsignedca.pem", + "cafile": "cert/aaf_root_ca.cer", "clientcert":"client.cert", "clientkey":"client.key", "timeout":"10s" diff --git a/sms-service/src/quorumclient/quorumclient.go b/sms-service/src/quorumclient/quorumclient.go index 51dfc9c..9db6da8 100644 --- a/sms-service/src/quorumclient/quorumclient.go +++ b/sms-service/src/quorumclient/quorumclient.go @@ -64,14 +64,14 @@ func loadPGPKeys(prKeyPath string, pbKeyPath string) (string, string, error) { //calls necessary initialization endpoints on the //SMS webservice func main() { - folderName := os.Getenv("HOSTNAME") + folderName := filepath.Join("auth", os.Getenv("HOSTNAME")) //Make sure to create the folder. It is not guaranteed to exist os.MkdirAll(folderName, 0700) - idFilePath := filepath.Join("auth", folderName, "id") - pbKeyPath := filepath.Join("auth", folderName, "pbkey") - prKeyPath := filepath.Join("auth", folderName, "prkey") - shardPath := filepath.Join("auth", folderName, "shard") + idFilePath := filepath.Join(folderName, "id") + pbKeyPath := filepath.Join(folderName, "pbkey") + prKeyPath := filepath.Join(folderName, "prkey") + shardPath := filepath.Join(folderName, "shard") smslogger.Init("quorum.log") smslogger.WriteInfo("Starting Log for Quorum Client") @@ -138,11 +138,14 @@ func main() { caCertPool := x509.NewCertPool() caCertPool.AppendCertsFromPEM(caCert) - // Load the client certificate files - //cert, err := tls.LoadX509KeyPair(cfg.ClientCert, cfg.ClientKey) - //if err != nil { - // log.Fatalf("Error while loading key pair %v ", err) - //} + /* + Support Client certificates once we have auto generated certs + Load the client certificate files + cert, err := tls.LoadX509KeyPair(cfg.ClientCert, cfg.ClientKey) + if err != nil { + log.Fatalf("Error while loading key pair %v ", err) + } + */ transport.TLSClientConfig = &tls.Config{ MinVersion: tls.VersionTLS12, @@ -171,7 +174,6 @@ func main() { Seal bool `json:"sealstatus"` } err = json.NewDecoder(response.Body).Decode(&data) - sealed := data.Seal // Unseal the vault if sealed diff --git a/sms-service/src/sms/auth/aaf-sms.api.simpledemo.onap.org.pem b/sms-service/src/sms/auth/aaf-sms.api.simpledemo.onap.org.pem new file mode 100644 index 0000000..a8ae076 --- /dev/null +++ b/sms-service/src/sms/auth/aaf-sms.api.simpledemo.onap.org.pem @@ -0,0 +1,59 @@ +Bag Attributes + localKeyID: F5 51 07 8F 6A B5 88 A5 C1 63 25 5E B8 0B 85 EB 6C BD 36 08 + friendlyName: aaf-sms@aaf-sms.onap.org +subject=/C=US/O=ONAP/OU=aaf-sms@aaf-sms.onap.org/OU=OSAAF/CN=aaf-sms.api.simpledemo.onap.org +issuer=/C=US/O=ONAP/OU=OSAAF/CN=intermediateCA_1 +-----BEGIN CERTIFICATE----- +MIIENjCCAx6gAwIBAgIBHDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJVUzEN +MAsGA1UECgwET05BUDEOMAwGA1UECwwFT1NBQUYxGTAXBgNVBAMMEGludGVybWVk +aWF0ZUNBXzEwHhcNMTgwNDI1MTEwOTI1WhcNMTkwNDIwMTEwOTI1WjB5MQswCQYD +VQQGEwJVUzENMAsGA1UECgwET05BUDEhMB8GA1UECwwYYWFmLXNtc0BhYWYtc21z +Lm9uYXAub3JnMQ4wDAYDVQQLDAVPU0FBRjEoMCYGA1UEAwwfYWFmLXNtcy5hcGku +c2ltcGxlZGVtby5vbmFwLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBALA5rFblvq/bhtiP7n9SWzG+hmvoVD3zLyMpn2LrWhGvUBBZNU1RL7tPAU++ +HQpuf7klmrBAIAVZniKCGKHctOwXvy+GmbfOCZhSLCR31vmh8lS6Jme0TigKb6sL +tq1yahHNaWdWXv8RfiJ2WausCv8HUuGSOWpj/Wltno4bvctZ+kZoySrr8QjRURiy +DJxe3+JtaUi0GfCiVc+1yFWZU9aetEVBgouwaLOe4w/gL1XPinvmGseEYTbA7G6U +0Q9b3ZrdpmEWvQHRL4k5s66mvu8amW31aUSU4IlF3fKDr6xr/AS0j3qsJlEAgid/ +VueWU6ZyVw6c3BRowtcH4CKj0/8CAwEAAaOB+jCB9zAJBgNVHRMEAjAAMBEGCWCG +SAGG+EIBAQQEAwIGwDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5lcmF0ZWQg +U2VydmVyIENlcnRpZmljYXRlMB0GA1UdDgQWBBTaf9ELsETQX2tK/ilkzkFwlNx+ +OzBUBgNVHSMETTBLgBQd5lldG54KOKRipsGF8/PP1vGX6qEwpC4wLDEOMAwGA1UE +CwwFT1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVTggEBMA4GA1UdDwEB +/wQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDQYJKoZIhvcN +AQELBQADggEBACJFD0XRb6YmL5n0+coxb6y/reG/aCgspiilIgS+DcDNSmUzU7gb +Yn43ZWQtgIepUk3vbv+lO15u7wbaHGWhJ7SAlFXzHgthjvi1wcLZilKdKTRktZa+ +q+v/3VrU8gZkf9sydbOseCA0vGdnO5UHQqMfIo3kpJsNxb2lT6FmdU5GKGellHvi +fkczO1UZnSYGgkpyBV+gU6peDLNDludiq1iD1gLHdSpn3U1pcaFaBg3lFQamEOVH +0vyxl6naD8C8K7wFFbFOJ9LV2dvTB04DmofUNaO9kuqRrLndHcR2b4htCLRHK4O2 +wap2ThiXgiy86zvTZKWt2YTghZUNjaPOpMQ= +-----END CERTIFICATE----- +Bag Attributes: +subject=/C=US/O=ONAP/OU=OSAAF/CN=intermediateCA_1 +issuer=/OU=OSAAF/O=ONAP/C=US +-----BEGIN CERTIFICATE----- +MIIEVDCCAjygAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB +RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwNDA1MTQxNTQwWhcN +MTgwNjA0MTQxNTQwWjBHMQswCQYDVQQGEwJVUzENMAsGA1UECgwET05BUDEOMAwG +A1UECwwFT1NBQUYxGTAXBgNVBAMMEGludGVybWVkaWF0ZUNBXzEwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCY3YPA/YQdz4kaZQzdRzWNjmn33WYAWZ8+ +EIz3PhkEzk7M1q9N7Icx2LvozMj4VH0yGz/HYlliHhw26ZRsjYMSR8zATsXl4oW9 +w9BrjuyvM3w8Ptxe8WbUFF9LJDGyXPeVvcXVo0iyh3QYPWC/AWmomN19MvBFN5vH +AvEG/7qtonViNfISW9Gr9LpXB0foCmUDBu/lV+SwRGajoCPqdZhZ6/L6/yqDvha2 +wsML/UZXlGhXAedt/xOKmT/dSXx/I0vWBVp6Tq4zu87yCvd+I6Tpa5HjttA2I5EV +zdHX+JYBPBBcVCyO9YQOYjJuoVDE4D5etY6dEipKG/KZF/rqAoqZAgMBAAGjZjBk +MB0GA1UdDgQWBBQd5lldG54KOKRipsGF8/PP1vGX6jAfBgNVHSMEGDAWgBRTVTPy +S+vQUbHBeJrBKDF77+rtSTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQE +AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAmgeiitBDi/YEqFh2Cqp0VIEqw8hiuV87 +rADQWMK4hv5WXl3KJTjFAnWsYFUKrm6s1jNH16FyGExUQgwggob0Vt+MHiUs36jU +kyret/uE5qrjz+/J+i2XG6s1oKcDRVD/jU4qBygZWFBMuwl7sz8IEvaYXGM43s96 +Du3UF9E+V3aMppqkGWz6MnrTmANnWAlDAMeifcoexjrpxiKbp8f49HX1UzwFoeEg +RnVwNqgDWT66yGV6mbNl6FpE/U81RpCRY1ZJDeVTxbqIaG/UPV4hpQ+BEVBDF+cb +rGsvsNYYpWx5srIQ7WtGKIlaDFbfWPwnHDHegzr8ypAS3KNWULE+QXCbHWtB+b0Y +WhP/2F6Jjb+ByvJqQoE+nHEYBeUOZUUZC4IuQFNJ5Wy5P0CNXdheiWhdrBmG02Gy +KMi0FJx6BEoWM2xcdl6bn5j9mhF4TX7zgepNWlgTra4Z8Oz8iqbQk33/s2OKM4ic +6ZezUYhNp+MuUt4Se+ufNcGV65jnUKeROtWzNLwP+xwglEFlG8aNiAORthd7QJuT +Ey2cX7H7f38ENQ5YCriUk1nVLO9F66l/rNRzYZgQzRI3IvDW8vyM2TLW2mcZNsaf +qjFMcCDweV2FRb8eTbmWzzB2/xTVpGzVJqzwgE+U7UtJx5CZS3wPkvXuEgvcg1tY +m1r4NGYFvLM= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/sms-service/src/sms/auth/aaf-sms.api.simpledemo.onap.org.pr b/sms-service/src/sms/auth/aaf-sms.api.simpledemo.onap.org.pr new file mode 100644 index 0000000..e2204ae --- /dev/null +++ b/sms-service/src/sms/auth/aaf-sms.api.simpledemo.onap.org.pr @@ -0,0 +1,32 @@ +Bag Attributes + localKeyID: F5 51 07 8F 6A B5 88 A5 C1 63 25 5E B8 0B 85 EB 6C BD 36 08 + friendlyName: aaf-sms@aaf-sms.onap.org +Key Attributes: +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCwOaxW5b6v24bY +j+5/UlsxvoZr6FQ98y8jKZ9i61oRr1AQWTVNUS+7TwFPvh0Kbn+5JZqwQCAFWZ4i +ghih3LTsF78vhpm3zgmYUiwkd9b5ofJUuiZntE4oCm+rC7atcmoRzWlnVl7/EX4i +dlmrrAr/B1LhkjlqY/1pbZ6OG73LWfpGaMkq6/EI0VEYsgycXt/ibWlItBnwolXP +tchVmVPWnrRFQYKLsGiznuMP4C9Vz4p75hrHhGE2wOxulNEPW92a3aZhFr0B0S+J +ObOupr7vGplt9WlElOCJRd3yg6+sa/wEtI96rCZRAIInf1bnllOmclcOnNwUaMLX +B+Aio9P/AgMBAAECggEAVHvhxmswRujMtegS49FczPVVRkhEksqST541vluse4v7 +q0rJRf7lDjxrGYrAK28cJmwDw/mKIGZ9bHfITVkdF46u5p719Ot/KBpE9VrKojTk +k4AGx3LmgUW3kV31PyP5+/zpSlRbCJefS/BHPwkk4GznbCMJCZtUMwYNnH1qOSFn +MbHH5TRzfsFsF1OALYnXcq+zaUYXVM25hCiQ0pPtsnPcnVO+mV0mWRBQNbPMmV8A +Yy2XqB4fTxIjJ+k28ppmf2Eq9AuISJvwG/T2p+FHkXjNAYrJqUQw5S780499RqXI +6BhIjrjx9Pyb8zUle+3ZN+FbBcs4RHgrgL05ueWe4QKBgQDXLypqRuIRKAXrtAwo +fSCc/pKY9+rHvKQbqqY0eVSb8tZMMLDA0ElQuF3LoWIRJGYnb9PcQN/C+qtyY82Z +bG+iWmdHtrm361H8ry2Mjdo7T65qypHS++RhaUhEHgPQaqXNLcmyruI+EWG6cC7n +hNO3VY1G2xhaSaDF5sja4cjtMQKBgQDRpsDhJuXQb6L7yjDf3lYq3ZqjyY0P66Wo +DaBwnH0I3GFE+jyOfSFNAalLErbXZwD/XSS1dKE3iVrzy9tYCLp4n7TSLVI4n1bz +O8gH9qqbYEG8VhEYfuQF1wKxeqQ4q9fuzDe3dlAQyw80tFCiFvtPls67B5cRR6Di +5f15iBLILwKBgGKWX251r1mA5sWIphFe0rRbBjtDSrPcP6vVUXS1KgiRB5G8tR6B +zzVGYuLKu61y6cKjv4Mnzdz9D9PG2gmy3qqZlLwMgaY8EEIe2FWPIC8QYK7YxFrP +wWDH5a4fukugsPoCQmi1Kz6YpBfREgxMlNtoPOP7uXqURS6mf9uYmn/hAoGBAKuA +6lBFbcKxUHcB1DGOxJaUaiiKfKcFcqKjYxg8K9zPy5KN0nQN0OwZ68/KI2DalmpQ +W/NE0Y2JA6pkna7KlSCQJW+6O4SudIbN5Lj/BFnOyHe1QI71XruYRE/DsAvcJ+zl +ir6+Pok+U9Ydm8i9XCCjkcJWVzJ/khGLa2u78QFpAoGAKwlTP1rQGLMz0uUW8bx9 +EAHUf0IkXgs+qVCvg6gWE96q7l+UncLf4842Rl77uZfJr76yBhwo3ezCA+DQDqmg +JhktLPnaeHJcuTiYI/bXXlNCf56SsY88TxP1UGkbSmYryLAO/fM9nAHH7qj7DWqW +Ng8ecGGlcYcjmKxtWYolR+U= +-----END PRIVATE KEY----- \ No newline at end of file diff --git a/sms-service/src/sms/auth/aaf_root_ca.cer b/sms-service/src/sms/auth/aaf_root_ca.cer new file mode 100644 index 0000000..e9a50d7 --- /dev/null +++ b/sms-service/src/sms/auth/aaf_root_ca.cer @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV +BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx +NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK +DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC +ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7 +XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn +H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM +pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7 +NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg +2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY +wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd +ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM +P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6 +aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY +PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G +A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ +UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN +BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz +L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9 +7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx +c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf +jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2 +RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h +PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF +CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+ +Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A +cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR +ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX +dYY= +-----END CERTIFICATE----- diff --git a/sms-service/src/sms/smsconfig.json.template b/sms-service/src/sms/smsconfig.json.template index 7eb4916..b74bdff 100644 --- a/sms-service/src/sms/smsconfig.json.template +++ b/sms-service/src/sms/smsconfig.json.template @@ -1,7 +1,7 @@ { - "cafile": "auth/selfsignedca.pem", - "servercert": "auth/server.cert", - "serverkey": "auth/server.key", + "cafile": "auth/aaf_root_ca.cer", + "servercert": "auth/aaf-sms.api.simpledemo.onap.org.pem", + "serverkey": "auth/aaf-sms.api.simpledemo.onap.org.pr", "smsdbaddress": "http://localhost:8200", "vaulttoken": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", diff --git a/sms-service/src/sms/test/loop_test.sh b/sms-service/src/sms/test/loop_test.sh index 0af328e..a48c9b1 100644 --- a/sms-service/src/sms/test/loop_test.sh +++ b/sms-service/src/sms/test/loop_test.sh @@ -3,57 +3,57 @@ RED='\033[0;31m' NC='\033[0m' URL=$1 PORT=$2 -for i in `seq 1 2`; +for i in `seq 1 2`; do echo -e "${RED}----------------BEGIN GET STATUS----------------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X GET \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X GET \ https://${URL}:${PORT}/v1/sms/quorum/status echo -e "${RED}----------------BEGIN CREATE SECRET DOMAIN------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X POST \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X POST \ -d @test/test_create_domain.json https://${URL}:${PORT}/v1/sms/domain echo -e "${RED}----------------BEGIN CREATE SECRET 1-----------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X POST \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X POST \ -d @test/test_create_secret1.json https://${URL}:${PORT}/v1/sms/domain/curltestdomain/secret echo -e "${RED}----------------BEGIN CREATE SECRET 2-----------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X POST \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X POST \ -d @test/test_create_secret2.json https://${URL}:${PORT}/v1/sms/domain/curltestdomain/secret echo -e "${RED}----------------BEGIN CREATE SECRET 3-----------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X POST \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X POST \ -d @test/test_create_secret3.json https://${URL}:${PORT}/v1/sms/domain/curltestdomain/secret echo -e "${RED}----------------BEGIN LIST SECRET---------------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X GET \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X GET \ https://${URL}:${PORT}/v1/sms/domain/curltestdomain/secret echo -e "${RED}----------------BEGIN GET SECRET 1--------------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X GET \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X GET \ https://${URL}:${PORT}/v1/sms/domain/curltestdomain/secret/curltestsecret1 echo -e "${RED}----------------BEGIN GET SECRET 2--------------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X GET \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X GET \ https://${URL}:${PORT}/v1/sms/domain/curltestdomain/secret/curltestsecret2 echo -e "${RED}----------------BEGIN GET SECRET 3--------------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X GET \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X GET \ https://${URL}:${PORT}/v1/sms/domain/curltestdomain/secret/curltestsecret3 echo -e "${RED}----------------BEGIN DELETE SECRET 1-----------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X DELETE \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X DELETE \ https://${URL}:${PORT}/v1/sms/domain/curltestdomain/secret/curltestsecret1 echo -e "${RED}----------------BEGIN DELETE SECRET 2-----------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X DELETE \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X DELETE \ https://${URL}:${PORT}/v1/sms/domain/curltestdomain/secret/curltestsecret2 echo -e "${RED}----------------BEGIN DELETE SECRET 3-----------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X DELETE \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X DELETE \ https://${URL}:${PORT}/v1/sms/domain/curltestdomain/secret/curltestsecret3 echo -e "${RED}----------------BEGIN DELETE SECRET DOMAIN------${NC}" - curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem -X DELETE \ + curl -i -w "\n" -H "Accept: application/json" --cacert auth/aaf_root_ca.cer -X DELETE \ https://${URL}:${PORT}/v1/sms/domain/curltestdomain done -- cgit 1.2.3-korg