Merge pull request #1226 from jembi/CU-86byrg3my_Fix-tests-due-to-cer…

…tificate-issues

Regenerate test certificates that have expired

test/integration/authenticationAPITests.js

@@ -993,7 +993,7 @@ describe('API Integration Tests', () => {
  roles: ['OpenMRS_PoC', 'PoC'],
  passwordHash: '',
  certFingerprint:
- '6D:BF:A5:BE:D7:F5:01:C2:EC:D0:BC:74:A4:12:5A:6F:36:C4:77:5C'
+ '96:ED:AF:89:4F:90:FD:FD:A0:45:37:B8:EA:B2:BD:7F:8E:0D:4A:47'
  }
 
  const testClientDoc2 = {
@@ -1018,13 +1018,13 @@ describe('API Integration Tests', () => {
  cert: {
  data: fs.readFileSync('test/resources/server-tls/cert.pem'),
  fingerprint:
- '23:37:6A:5E:A9:13:A4:8C:66:C5:BB:9F:0E:0D:68:9B:99:80:10:FC'
+ '9F:93:D1:96:A2:32:8F:EA:DC:A8:64:AB:CC:E1:13:C2:DA:E0:F4:49'
  },
  ca: [
  {
  data: fs.readFileSync('test/resources/client-tls/cert.pem'),
  fingerprint:
- '6D:BF:A5:BE:D7:F5:01:C2:EC:D0:BC:74:A4:12:5A:6F:36:C4:77:5C'
+ '96:ED:AF:89:4F:90:FD:FD:A0:45:37:B8:EA:B2:BD:7F:8E:0D:4A:47'
  },
  {
  data: fs.readFileSync(

test/integration/clientsAPITests.js

@@ -24,7 +24,7 @@ describe('API Integration Tests', () => {
  passwordHash:
  '$2a$10$w8GyqInkl72LMIQNpMM/fenF6VsVukyya.c6fh/GRtrKq05C2.Zgy',
  certFingerprint:
- '23:37:6A:5E:A9:13:A4:8C:66:C5:BB:9F:0E:0D:68:9B:99:80:10:FC'
+ '9F:93:D1:96:A2:32:8F:EA:DC:A8:64:AB:CC:E1:13:C2:DA:E0:F4:49'
  }
 
  let rootCookie = '',
@@ -76,7 +76,7 @@ describe('API Integration Tests', () => {
  '$2a$10$w8GyqInkl72LMIQNpMM/fenF6VsVukyya.c6fh/GRtrKq05C2.Zgy'
  )
  client.certFingerprint.should.equal(
- '23:37:6A:5E:A9:13:A4:8C:66:C5:BB:9F:0E:0D:68:9B:99:80:10:FC'
+ '9F:93:D1:96:A2:32:8F:EA:DC:A8:64:AB:CC:E1:13:C2:DA:E0:F4:49'
  )
  })
 

test/integration/keystoreAPITests.js

@@ -141,7 +141,7 @@ describe('API Integration Tests', () => {
 
  keystore = await KeystoreModelAPI.findOne({})
  keystore.cert.fingerprint.should.be.exactly(
- '35:B1:95:80:45:F6:39:A8:1E:75:E1:B1:16:16:32:EB:12:EA:1A:24'
+ '9F:93:D1:96:A2:32:8F:EA:DC:A8:64:AB:CC:E1:13:C2:DA:E0:F4:49'
  )
  })
 

test/integration/metadataAPITests.js

@@ -44,7 +44,7 @@ const sampleMetadata = {
  passwordHash:
  '$2a$10$w8GyqInkl72LMIQNpMM/fenF6VsVukyya.c6fh/GRtrKq05C2.Zgy',
  certFingerprint:
- '23:37:6A:5E:A9:13:A4:8C:66:C5:BB:9F:0E:0D:68:9B:99:80:10:FC'
+ '9F:93:D1:96:A2:32:8F:EA:DC:A8:64:AB:CC:E1:13:C2:DA:E0:F4:49'
  }
  ],
  Mediators: [
@@ -778,7 +778,7 @@ describe('API Integration Tests', () => {
  passwordHash:
  '$2a$10$w8GyqInkl72LMIQNpMM/fenF6VsVukyya.c6fh/GRtrKq05C2.Zgy',
  certFingerprint:
- '23:37:6A:5E:A9:13:A4:8C:66:C5:BB:9F:0E:0D:68:9B:99:80:10:FC'
+ '9F:93:D1:96:A2:32:8F:EA:DC:A8:64:AB:CC:E1:13:C2:DA:E0:F4:49'
  }
  ],
  Mediators: [

test/resources/client-tls/cert.pem

@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIJALAiF9OxCN0tMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
+MIIEFzCCAv+gAwIBAgIJALAiF9OxCN0tMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
 VQQGEwJaQTEMMAoGA1UECAwDS1pOMQ8wDQYDVQQHDAZEdXJiYW4xITAfBgNVBAoM
 GEplbWJpIEhlYWx0aCBTeXN0ZW1zIE5QQzEQMA4GA1UECwwHZUhlYWx0aDEeMBwG
 A1UEAwwVdGVzdC1jbGllbnQuamVtYmkub3JnMR0wGwYJKoZIhvcNAQkBFg5yeWFu
-QGplbWJpLm9yZzAeFw0xNDAzMTkxMzQ2NDhaFw0yNDAzMTYxMzQ2NDhaMIGgMQsw
-CQYDVQQGEwJaQTEMMAoGA1UECAwDS1pOMQ8wDQYDVQQHDAZEdXJiYW4xITAfBgNV
-BAoMGEplbWJpIEhlYWx0aCBTeXN0ZW1zIE5QQzEQMA4GA1UECwwHZUhlYWx0aDEe
-MBwGA1UEAwwVdGVzdC1jbGllbnQuamVtYmkub3JnMR0wGwYJKoZIhvcNAQkBFg5y
-eWFuQGplbWJpLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKPB
-9eSU9vASw7a+Dk79T92PpkdWcOy7Tt4AQXoepKJRy/ip3QKxPHLekSqRRQ12maZo
-7axsctB5EoI3bGpD/a/GukaS5BE5rt5g74G6iAC24RygeOv7H86U03l06XrTyRgk
-2DGw5LZVajjaFX9630eoBnoTPxLHmNHCV94I4c1cEMZrcS6kNXH/4jtuLJGjWy9p
-p9A0D7Lf/egoMmQqBQ1RVc4f43OiCyhrCVMMb2WuDPctiXZrlXopB0OPLpQOv3WO
-EzeKhA88BLSH7+Iyj6BUPazCfVaKyfrqa6iSUiXYj8lJFBhN49Pd5oPHLb6YR2Ci
-bYZcgDhGmYryruofXBcCAwEAAaNQME4wHQYDVR0OBBYEFPmmVNZYuv2Ha3m1bRtk
-xfdkuCaMMB8GA1UdIwQYMBaAFPmmVNZYuv2Ha3m1bRtkxfdkuCaMMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGqyp9cvxRtrzga0Z6+hY72Vk7nsQ5FP
-F7WZ7mT8FFbM4BhZb8lIdVx/BzA4tEpFuTrRqM1k5Rp9Nn90/4mz7XLacb6usq12
-MOv5TKCzt+rmvoQv/lgdIYU1167meHIUZMgRLSrd3/sT1+NgSisIrFROiRFNt2Th
-6+KOPVkU8zpbEX5pGoiIaunBcKnEyae/iqFJTKzHK9KSZAH7roJPnuc/m1ZuPyM1
-3s5k50m/dG1mBG8igRmtEWVIA14Qh1vWT2HMb1QtR4uiFHt6CSm7K4jfpDukLa+s
-VgFoA+CfqiFgWdK5xSJq89GA4xSBFUppMqcpNDNUgSfGt/U8TY/mfGE=
+QGplbWJpLm9yZzAgFw0yNDA1MTQxMjQ2MjhaGA8yMTI0MDQyMDEyNDYyOFowgaAx
+CzAJBgNVBAYTAlpBMQwwCgYDVQQIDANLWk4xDzANBgNVBAcMBkR1cmJhbjEhMB8G
+A1UECgwYSmVtYmkgSGVhbHRoIFN5c3RlbXMgTlBDMRAwDgYDVQQLDAdlSGVhbHRo
+MR4wHAYDVQQDDBV0ZXN0LWNsaWVudC5qZW1iaS5vcmcxHTAbBgkqhkiG9w0BCQEW
+DnJ5YW5AamVtYmkub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+o8H15JT28BLDtr4OTv1P3Y+mR1Zw7LtO3gBBeh6kolHL+KndArE8ct6RKpFFDXaZ
+pmjtrGxy0HkSgjdsakP9r8a6RpLkETmu3mDvgbqIALbhHKB46/sfzpTTeXTpetPJ
+GCTYMbDktlVqONoVf3rfR6gGehM/EseY0cJX3gjhzVwQxmtxLqQ1cf/iO24skaNb
+L2mn0DQPst/96CgyZCoFDVFVzh/jc6ILKGsJUwxvZa4M9y2JdmuVeikHQ48ulA6/
+dY4TN4qEDzwEtIfv4jKPoFQ9rMJ9VorJ+uprqJJSJdiPyUkUGE3j093mg8ctvphH
+YKJthlyAOEaZivKu6h9cFwIDAQABo1AwTjAdBgNVHQ4EFgQU+aZU1li6/YdrebVt
+G2TF92S4JowwHwYDVR0jBBgwFoAU+aZU1li6/YdrebVtG2TF92S4JowwDAYDVR0T
+BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAGFEJABaY2g7mgNylkQ9JETrcZEth
+pHuAwXaO15CWYgqz0JM5sZEz+RMlnjjZHGXea7GQXc9D7RlvGhIxlY+khtp5ua1P
+Bge4rfxLFZRdoNudzwzMbrCtBjth3ko9tai9YCqLupTLHKZcuVoU0RHnZ24eHY3p
+42ftYqrNlKI1gLz2BLlY83I16gA9VuzDZ/VNmOA0SdR9ZlWIsES6Jth0ZN7oxJ9N
+zgV16J+FKwuauySlujHIqDp9yA6BQ59n8RYgPitzlQLL1VMTtGPigEwYxXt/h7GS
+HSLh91RLYJiZMGPHenh/ldvzj9VxWmmPAWPIeatgCf01TORJZiF+noWgbQ==
 -----END CERTIFICATE-----

test/resources/client-tls/invalid-cert.pem

@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-Lm9yZzEcMBoGCSqGSIb3DQEJARYNbm9wZUBmYWtlLm9yZzAeFw0xNDAzMjQwNjUx
-MDJaFw0yNDAzMjEwNjUxMDJaMIGIMQswCQYDVQQGEwJaQTEMMAoGA1UECAwDS1pO
-MQ8wDQYDVQQHDAZEdXJiYW4xDzANBgNVBAoMBk1hbGljZTEQMA4GA1UECwwHSGFj
-a2VyczEZMBcGA1UEAwwQaGFja2Vycy5mYWtlLm9yZzEcMBoGCSqGSIb3DQEJARYN
-bm9wZUBmYWtlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANTj
-mEsIQr73aW/kI/JosRo6jWqSgjaEIsiHpItxjqutZBVcYBYbHtyDvk1npk+jNOum
-7nUriTTQGf0jni3/7jGaD1kxxRekuy+oxGKcvZ0yR3rxoQZjPgmEqu68s5ZHBRlL
-a1l0AM0QEXpZoWXme41qaoCw92eEfZXNyFaahWPGiBDElV3Na3tqOR+T7OBx1Oya
-jPFylLKXye+79Ms2MkrZT3vgcjiJXf6OwBL9RIAHYjrvq+4+v7J8HwdyyuwD7oKj
-YFyE9YCuXGCG85NAFzM0z9hN85eMHkjzNljU4jGpuS6fpYCgQ3kfykQ/pVmCAxT8
-GVvMumIolvOVldgK+RkCAwEAAaNQME4wHQYDVR0OBBYEFKjXBp/uion+/ZsAAAt5
-QzFPadUGMB8GA1UdIwQYMBaAFKjXBp/uion+/ZsAAAt5QzFPadUGMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALdQSrZsGrzvDngZphQd3QVF3Mfs8A9j
-SU/7yWTrWJVmyAOoR47kyH+MtmQGYquqwmsOVRkgLvSQ+TFFqA+DQthGeogf9b6z
-ShDtAfKWY8urBMVviW3xuc9azSSvt6F1LWmQVMRNUpQImBVcgu7CnJqiRcW9TCg2
-mTI2mdHSS3wiWTjy+ALpwEBbYD9vnYNPDaeiypYzIBuxM4JtN75btb1povRDF1X3
-aCNjlHGHarPYwbAz+QYk5ag/7sR7yJOHP2WHgtkx9+RzcrJZSa83XTSBmlGqBwc9
-m3ZMExR5ZrgMQgGCfzUPakp7bHk4R49alV0BevmBsk6RWudv+9iVx1A=
+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
 -----END CERTIFICATE-----

test/resources/server-tls/cert.pem

@@ -2,8 +2,8 @@
 MIIDqDCCApACCQCLPx1aZMwI3DANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMC
 WkExDDAKBgNVBAgMA0taTjEPMA0GA1UEBwwGRHVyYmFuMSEwHwYDVQQKDBhKZW1i
 aSBIZWFsdGggU3lzdGVtcyBOUEMxEDAOBgNVBAsMB2VIZWFsdGgxEjAQBgNVBAMM
-CWxvY2FsaG9zdDEdMBsGCSqGSIb3DQEJARYOcnlhbkBqZW1iaS5vcmcwIBcNMTYw
-MTE5MTIwMjM4WhgPMjA2NjAxMDYxMjAyMzhaMIGUMQswCQYDVQQGEwJaQTEMMAoG
+CWxvY2FsaG9zdDEdMBsGCSqGSIb3DQEJARYOcnlhbkBqZW1iaS5vcmcwIBcNMjQw
+NTE0MTE0NTA2WhgPMjEyNDA0MjAxMTQ1MDZaMIGUMQswCQYDVQQGEwJaQTEMMAoG
 A1UECAwDS1pOMQ8wDQYDVQQHDAZEdXJiYW4xITAfBgNVBAoMGEplbWJpIEhlYWx0
 aCBTeXN0ZW1zIE5QQzEQMA4GA1UECwwHZUhlYWx0aDESMBAGA1UEAwwJbG9jYWxo
 b3N0MR0wGwYJKoZIhvcNAQkBFg5yeWFuQGplbWJpLm9yZzCCASIwDQYJKoZIhvcN
@@ -13,10 +13,10 @@ hxGZ1WQMWyarcW6dZpmoHrlCKXFmauDx/TttA6N8FItagn2XX4DtTQyG2Ze1zh9E
 VhE3ZO+MsSBx7RClqo2xh3XIVWpLQ908ugofZwwmYqN/HX9qbnad13E7UbGp5Kvh
 cQsyx0b7P7G9QXk945C8qblnjOQdcZELlaJac77b1vz5Bkp66qHmXwuqUYN81Rta
 8TbP0mVJYPgTT7umpMY3MRqvOBeOtD/hRm45pzc2IczR4VsCAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAb5qbfMrsUyS/3Ye8O2UvxAQ6nYaIGmHARZAIY3vT0daI4PH/
-M/XeFffLJfVIboLoBkcO+MskGznUO1XGw1OapifRhuEijGZRxhW7OXlkjMY3BKrR
-GjZAuMA2fnUEpibtacZHatzlCrYC7M6McGujx0svLt/bGAArFPPivkcp5LOiLTHj
-s0Z/j1LZNwCUa4E1Vg/fya6opbjZmb2GMQQ6s1UhvWmpxTK2SO6xBVGuNS+u2WNC
-UoSYA/d1aR1zVYJlI1+jFcglPW2kivsTqAau5WBLvbVoq1NgVGKnGGdnQ/+u3Qkt
-FmrdRkLwU3RDZQWGLrzVFZLHsnsES60yz/aiRg==
------END CERTIFICATE-----
+9w0BAQsFAAOCAQEASV/up52Ed+FZyWsu55/aoyJbEaa2feN+LYnpxPzmVzQNtYLm
+XzIN5OurSSxhEiYHSEoUSghZk8uaRVXcdMsTNaz0Mtp1Hthl7zPTXze82/+XOyu8
+M1V9GrFPkaeCeMB9MHiYCh/1wVRlR8K/gyBFiWqcSqsENJZvpDaWSbG8/0SrcW9P
+vrN2bgtSjGou5bGKh4Vo+nTuiyWkSseiii6QiBlouqlzAThn7Hrp8CNNDJ7fY1VI
+x2WCyBshQBDEV910L26UV7xPWM+bRtd6s8oZ0zOVM1unVqHw+0wWJ1yuwdcB047C
+fgKf0/pfie1cMmnqZbukSZyX5dOmW4wa4LbGkA==
+-----END CERTIFICATE-----