diff options
author | KAPIL SINGAL <ks220y@att.com> | 2020-02-20 14:54:09 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-02-20 14:54:09 +0000 |
commit | dcf0322610861aec8078d783e5ee8107eb5bdb3e (patch) | |
tree | 28575661bf066b7e6524d3f28341a300573c94f5 /cds-ui | |
parent | 843bf742f4cf25a424161be152a1bd5265adefd7 (diff) | |
parent | 1094dd5be7b0b2d0a227084afdb15ea43a574934 (diff) |
Merge "Update certifcate"
Diffstat (limited to 'cds-ui')
-rw-r--r-- | cds-ui/server/.enc | 1 | ||||
-rw-r--r-- | cds-ui/server/aaf.p12 | bin | 0 -> 4279 bytes | |||
-rw-r--r-- | cds-ui/server/index.js | 18 | ||||
-rw-r--r-- | cds-ui/server/server.cert | 23 | ||||
-rw-r--r-- | cds-ui/server/server.key | 28 |
5 files changed, 17 insertions, 53 deletions
diff --git a/cds-ui/server/.enc b/cds-ui/server/.enc new file mode 100644 index 000000000..bae9625a2 --- /dev/null +++ b/cds-ui/server/.enc @@ -0,0 +1 @@ +cadi_keystore_password_p12=&jN+zBy,tcHfsh3$EFv5w7n{ diff --git a/cds-ui/server/aaf.p12 b/cds-ui/server/aaf.p12 Binary files differnew file mode 100644 index 000000000..c0f21b54c --- /dev/null +++ b/cds-ui/server/aaf.p12 diff --git a/cds-ui/server/index.js b/cds-ui/server/index.js index 161a18be7..be6a3b77f 100644 --- a/cds-ui/server/index.js +++ b/cds-ui/server/index.js @@ -25,12 +25,26 @@ const fs = require('fs') module.exports = application; if (require.main === module) { + + try { + var p12File = process.env.KEYSTORE || "aaf.p12" + var passwdFile = process.env.PASSPHRASE || ".enc" + + var data = fs.readFileSync(passwdFile, 'utf8') + var elements = data.match(/cadi_keystore_password_p12=(.*)\n/) + var passphrase = elements[1] + var p12 = fs.readFileSync(p12File) + } catch(e){ + console.error('Reading keystore error :', e) + process.exit(11) + } + // Run the application const config = { rest: { protocol: 'https', - key: fs.readFileSync('server.key'), - cert: fs.readFileSync('server.cert'), + pfx: p12, + passphrase: passphrase, port: +process.env.PORT || 3000, host: process.env.HOST || 'localhost', openApiSpec: { diff --git a/cds-ui/server/server.cert b/cds-ui/server/server.cert deleted file mode 100644 index a5b2eca4f..000000000 --- a/cds-ui/server/server.cert +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID6zCCAtOgAwIBAgIUKOL8h9cYkcHjt/7+3zsOUZGBEggwDQYJKoZIhvcNAQEL -BQAwgYQxCzAJBgNVBAYTAklFMQswCQYDVQQIDAJXSDEQMA4GA1UEBwwHQXRobG9u -ZTERMA8GA1UECgwIRXJpY3Nzb24xDDAKBgNVBAsMA0VTWTESMBAGA1UEAwwJSGVu -cnkgWGllMSEwHwYJKoZIhvcNAQkBFhJoZW5yeS54aWVAZXN0LnRlY2gwHhcNMTkw -NzAzMTU1MzAxWhcNMTkwODAyMTU1MzAxWjCBhDELMAkGA1UEBhMCSUUxCzAJBgNV -BAgMAldIMRAwDgYDVQQHDAdBdGhsb25lMREwDwYDVQQKDAhFcmljc3NvbjEMMAoG -A1UECwwDRVNZMRIwEAYDVQQDDAlIZW5yeSBYaWUxITAfBgkqhkiG9w0BCQEWEmhl -bnJ5LnhpZUBlc3QudGVjaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -ALuanknRJk8yXoafxrcbV1JBU57REt4Qpesv4jWt5YybQ+EvdodOCl65Rjsfe38q -hVzUV/4RWctERXutE0pofDGK5Q29Uu3W627eMuSYitbVvuHcVCCVRgjYVjZDh53j -y29IrzSiV2W6Sp4hkUZpTciLXNFFoSC8ZIKz7k1uF7Sokrk4ehm38vIcRFsbkxtu -a41P0/aT1XK/+dr5u2KzyfC/1gj3t4o03vSuBWopcRxabnKg2uygWYHAjzvyUqfj -y3Su55wjl3pw2/0qKvaYCvDV4DQLxs0yIrV1oYyckoHeW0GUEROrGFQIzk8KyEOS -WdlqpJco6RonGn1eErEf3gUCAwEAAaNTMFEwHQYDVR0OBBYEFO7nN1ukrhBLZAD7 -yYD1G1g8VGNRMB8GA1UdIwQYMBaAFO7nN1ukrhBLZAD7yYD1G1g8VGNRMA8GA1Ud -EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADzyzDmN3J2sALTtmjfiAelH -NfVmNc0ZjiExURCyEreAE78XGz/a/5avQWlLqo0TkaUVnrUh1UAOAFl2sa6uASOe -xwRk3eIwuQQHiYV+W2BlW0tEiQ6vtmRJ7/CvCDKM9LN/FPWWN0abZ78NXruQSZox -RJ9z6osrQv5sEkZ9cQ9m7/TW1fG0aysAtHqDccDIOpNEmOCxlLBdnI1IeQjqcCHO -K1+5mYhf9TiRFmnVulwzPDB1VyXsM17Q2AcwfvP+9A/c9aDBkuzkGuC5hEEgyH1z -3G/y2KKaZ/L3/cCaB0X0YcY0bvLVHdaKehTpbYn8BzA78zJTQJ27Q1MLl1PX8BY= ------END CERTIFICATE----- diff --git a/cds-ui/server/server.key b/cds-ui/server/server.key deleted file mode 100644 index c73a1b9d8..000000000 --- a/cds-ui/server/server.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC7mp5J0SZPMl6G -n8a3G1dSQVOe0RLeEKXrL+I1reWMm0PhL3aHTgpeuUY7H3t/KoVc1Ff+EVnLREV7 -rRNKaHwxiuUNvVLt1utu3jLkmIrW1b7h3FQglUYI2FY2Q4ed48tvSK80oldlukqe -IZFGaU3Ii1zRRaEgvGSCs+5Nbhe0qJK5OHoZt/LyHERbG5MbbmuNT9P2k9Vyv/na -+btis8nwv9YI97eKNN70rgVqKXEcWm5yoNrsoFmBwI878lKn48t0ruecI5d6cNv9 -Kir2mArw1eA0C8bNMiK1daGMnJKB3ltBlBETqxhUCM5PCshDklnZaqSXKOkaJxp9 -XhKxH94FAgMBAAECggEAdSXMChRMc8/kLvS+xcCQ+pBIgzfTLFABC6fO/e4lFXQv -IwLcZQlaeGQBcxHpsDMBLEJ83+49wCxVpzEghqpQQy+UcMv0aQh347dk2FJZAGZg -1/EZp28PWJ6e1yu8F+ATPN6KabemE6QMzEnxyaIgLEa6IwPz5dk+ek+ZU0iYDPrT -1b7co+ompuOF34huHLks8U65CGlflatsgmPf+iXIOh0qLMJCAxavncbCPIH2BzpK -T9YLPWHc3g0NVx/uPJi2/AIjaJ7+iC6qJnsEmD6akKpjUCvTkbUDUKjl9V+U5R0Q -tSA3omnoIAs5CJ2GQuzTG+PNG6gAc3PuXuMfaSCiUQKBgQDzM8b1VokWOu9jNV1a -2W86r9ShHFc/y7X5sgfHz1waPAyoYkNpjviYMqCtLDKK+A8Q/4qRKFykApN3TdqI -ZHIZLHFQ32JUC8BbMKjSutnGlm/ovu01xI+fOKIvM4SsnQ5sJtpU1Z63g8IXPsjz -kItGh2ETFaGxEk65v5j6qrXCOwKBgQDFed3MghVZRLxzbpFR7FN0W+T6G6d0Gp8x -cSGUGqAcM62FhDI/fDguTwLcQz4ruHKXAwlOuX+FwV9RAQ046EuqZU8iBHpbO8Mh -QfnoChRgCDHyL9bBSqOiGqNpwFMPk3p/XhQ1yGKjXCDTNtmfDKMZkkz4rM8uc1zC -AliIuPicvwKBgQDYPR5W/8VOFcLJ5CYIZDJI7RPS2F8fYyJ/THMsjsvmq6PZh91G -mw+gS8ufjh+2fo7u3ze2jzunvH6f4oI/KYhlp6VtceF8tyImMqK5E9gUgagpOrGx -T/8fY/yYmWcLD25GbVlNes7vfuBxSKrmHYwofrCqhl5JEe0brSb5IhYQBwKBgEAM -bqvN5S625Ihr7CYuCENNKs8T+RPnLorSrpliqVt8R2NupP2CRJaAeeUGyjtT75ab -HYGzGHFBbrDPLoKulRwHD8twuF6u23MF+xAPdNxQzCJI8dZvZvNEwIukHUyIAMse -sF9hRtzFHMBkoeC8MIoysVRWeDwQnp0uNZjipX/xAoGAFuCuYcN7MghscnoBcgK8 -0S57weKw4l2gNTMBCCQo/FiYHQN2H298oVu19dYSUZ/J5oJSHDp5ezC0Taxc4NB+ -3dQiZbVwiimoNuEj/PG95gA84TVld1igiG4ynQOAjw5s6H7sQX/ePVzorPrmcoGL -4YZxlJnmWQc201pMXp2mPEY= ------END PRIVATE KEY----- |