From 1094dd5be7b0b2d0a227084afdb15ea43a574934 Mon Sep 17 00:00:00 2001 From: eeginux Date: Tue, 18 Feb 2020 10:54:48 +0000 Subject: [PATCH] Update certifcate Change to use p12 file and password Issue-ID: CCSDK-706 Change-Id: Idbc4ba392c4c6244a501f22e3e591f1256806eba Signed-off-by: eeginux --- cds-ui/server/.enc | 1 + cds-ui/server/aaf.p12 | Bin 0 -> 4279 bytes cds-ui/server/index.js | 18 ++++++++++++++++-- cds-ui/server/server.cert | 23 ----------------------- cds-ui/server/server.key | 28 ---------------------------- 5 files changed, 17 insertions(+), 53 deletions(-) create mode 100644 cds-ui/server/.enc create mode 100644 cds-ui/server/aaf.p12 delete mode 100644 cds-ui/server/server.cert delete mode 100644 cds-ui/server/server.key 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 new file mode 100644 index 0000000000000000000000000000000000000000..c0f21b54c389c1c3a7e2d18b916f31696d5feb53 GIT binary patch literal 4279 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 A^Z)<= literal 0 HcmV?d00001 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----- -- 2.16.6