Skip to content

Commit 423d9b4

Browse files
cognifloydcognifloyd
authored
Merge branch 'master' into pants-export-venv
2 parents 73bea79 + 666355d commit 423d9b4

File tree

18 files changed

+280
-58
lines changed

18 files changed

+280
-58
lines changed

‎st2tests/st2tests/fixtures/ssl_certs/BUILD‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ resources(
1414
python_sources(
1515
dependencies=[":assets"],
1616
)
17+
18+
shell_sources(
19+
name="util",
20+
)

‎st2tests/st2tests/fixtures/ssl_certs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ Those certificates are issues and signed by a custom CA which is contained in th
77

88
Certificate passphrase is ``MySecretPassword``.
99

10-
NOTE: Those cerificates will expire on ``notAfter=Feb 11 15:58:38 2024 GMT``.
10+
NOTE: Those cerificates will expire on ``notAfter=Feb 12 04:43:45 2039 GMT``.

‎st2tests/st2tests/fixtures/ssl_certs/ca/ca_certificate_bundle.cer‎

42 Bytes
Binary file not shown.

‎st2tests/st2tests/fixtures/ssl_certs/ca/ca_certificate_bundle.pem‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICxjCCAa6gAwIBAgIJALjUApUWLemKMA0GCSqGSIb3DQEBCwUAMBMxETAPBgNV
3-
BAMMCE15VGVzdENBMB4XDTE5MDIxMjE1NTcwM1oXDTI0MDIxMTE1NTcwM1owEzER
4-
MA8GA1UEAwwITXlUZXN0Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
5-
AQDxVR7nSFKXUMET0WTtVNjsgD1HDdvIZcDyPGFEMNhtftPv4RmkxeFnKNumHbIu
6-
s2eox6MCT7wK9CKG+38szyMMDkCObYkGCKzZG2yejkjs6Kv74hvML8p+NIz3Cxch
7-
WEuD6ubnSoKl35cVt4/LUTM/IFG36H6f7Q47NYYsWIBMaXUvY5Wbg5SqxD4LMKkx
8-
uDFzITyrA38xvwb96mTkXT/OJEyswAAeWjjoKHWdirknhiFvKXi1T9jdmJTwBnGz
9-
lFUS1Aavkj/Og7el9JjoL6S83mclDPbcD68/kWUliHHr8l1wfAP/oObOm7wpXViU
10-
64nFnHP0/WtTM50urnWjFYjVAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0P
11-
BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQDwqchOuO85hfRb25LMeB9T0iEpwQdY
12-
cKCD1ASg42Sp/mzlscPmODxILnvm3BItEKbq6mrG2s9i42FRmXu+6D2Bm7k1jDnh
13-
FW/hI5KG5ULQWfkFqgUAWyeSKTF7oK9FRAfROY3K9E/MXxsO10e+ibgZPZjY8RTC
14-
eUihRw3LvIFj3mY3OQ+sBQ4OTh/nPd66trzAJee15ATC0nK0YJTVhLv576DmxOyb
15-
yuESg2l8qvjXI0C/W+MyLCO4sH1hhg+5pjEwiXH3Z1Sk59l7qag21kp53xhvjL7W
16-
+zisXvuZC08wfCPc3RJ6ThRb8MZZKeFpOffVVHBtgv9Aes7IOyVG15XA
2+
MIIC8DCCAdigAwIBAgIUGtedwXj7Nm3q6uev7luAMFB53tQwDQYJKoZIhvcNAQEL
3+
BQAwEzERMA8GA1UEAwwITXlUZXN0Q0EwHhcNMjQwMjE2MDQ0MzQ1WhcNMzkwMjEy
4+
MDQ0MzQ1WjATMREwDwYDVQQDDAhNeVRlc3RDQTCCASIwDQYJKoZIhvcNAQEBBQAD
5+
ggEPADCCAQoCggEBAPFVHudIUpdQwRPRZO1U2OyAPUcN28hlwPI8YUQw2G1+0+/h
6+
GaTF4Wco26Ydsi6zZ6jHowJPvAr0Iob7fyzPIwwOQI5tiQYIrNkbbJ6OSOzoq/vi
7+
G8wvyn40jPcLFyFYS4Pq5udKgqXflxW3j8tRMz8gUbfofp/tDjs1hixYgExpdS9j
8+
lZuDlKrEPgswqTG4MXMhPKsDfzG/Bv3qZORdP84kTKzAAB5aOOgodZ2KuSeGIW8p
9+
eLVP2N2YlPAGcbOUVRLUBq+SP86Dt6X0mOgvpLzeZyUM9twPrz+RZSWIcevyXXB8
10+
A/+g5s6bvCldWJTricWcc/T9a1MznS6udaMViNUCAwEAAaM8MDowDAYDVR0TBAUw
11+
AwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFGCZU1Sfg6rWWPvaYPavK4SPT0PE
12+
MA0GCSqGSIb3DQEBCwUAA4IBAQCpIVnSPl7gmfdBorOhue0F5Mzm5plPovu8QjUs
13+
lIpFook6Vn6uVcbfknvxXyDjqrhhVk/YBFnVfMlVM06ZlH7/afL0HbDBc3meXCfL
14+
+iT0kP6YBLuYsd+TxwMwBm4Dl6CZ8shNTp3/DNePlyteVxgJFC5oQ8zOkkEJz1aH
15+
j16S5CVRVUy9JfX2/BaVWhFnBKMfZBOIPnEi/mk13hthBKAWxW93Sf+oEus1pliD
16+
jblKeTDVGhrJ0hHLZ6Jz2ZRfWHIJi4kgbr+Q+E3uAptQW4FnK2uEIxt2Fzagavyc
17+
q1UNlpjqjVy4oQHA6/PAdHFC2ObLU4OmVwkwnz4RCqtmkX7k
1718
-----END CERTIFICATE-----

‎st2tests/st2tests/fixtures/ssl_certs/ca/certs/03.pem‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
Certificate:
2+
Data:
3+
Version: 3 (0x2)
4+
Serial Number: 3 (0x3)
5+
Signature Algorithm: sha256WithRSAEncryption
6+
Issuer: CN=MyTestCA
7+
Validity
8+
Not Before: Feb 16 04:43:45 2024 GMT
9+
Not After : Feb 12 04:43:45 2039 GMT
10+
Subject: CN=localhost, O=server
11+
Subject Public Key Info:
12+
Public Key Algorithm: rsaEncryption
13+
Public-Key: (2048 bit)
14+
Modulus:
15+
00:b8:b2:d4:75:b1:ea:3a:c5:22:46:79:2f:d9:2d:
16+
1f:89:a7:6b:ab:07:dd:81:a6:60:54:89:af:33:2a:
17+
2b:55:8c:e8:27:95:bb:6a:72:52:c9:63:e7:57:f9:
18+
72:fe:b8:cb:ee:da:22:3e:10:5c:56:00:ee:08:69:
19+
1f:ec:28:cf:37:81:39:b5:dc:48:f7:29:58:93:f5:
20+
07:12:d3:06:d6:59:7a:90:38:85:f2:15:9f:1c:37:
21+
64:b5:da:a7:42:fb:8b:91:43:00:03:9c:60:20:57:
22+
d7:f9:43:01:b9:36:64:ed:5a:30:ae:39:ce:ba:58:
23+
cd:e5:e5:4d:f3:dc:b6:7d:85:d7:b6:a0:b5:f7:51:
24+
e2:94:6f:55:c0:b7:b0:60:a4:1d:fc:8b:21:6f:8a:
25+
76:59:fc:62:04:85:4e:f9:c4:29:9d:80:7a:aa:eb:
26+
eb:11:80:b5:5c:f7:11:6c:9b:97:76:b7:3b:29:c6:
27+
27:75:67:68:8f:a3:3b:69:3d:73:3a:71:c9:ad:d2:
28+
ed:bf:b1:7b:76:46:20:57:db:ea:c0:de:f0:de:e7:
29+
7b:b8:d6:84:6e:c1:ef:5b:3d:22:fb:aa:a3:5f:fb:
30+
84:ef:9e:4d:66:82:7c:3b:c0:f1:e6:e8:3f:d6:5c:
31+
69:96:75:e5:7e:66:9d:22:26:d8:3c:12:5a:b5:1b:
32+
12:8b
33+
Exponent: 65537 (0x10001)
34+
X509v3 extensions:
35+
X509v3 Basic Constraints:
36+
CA:FALSE
37+
X509v3 Subject Key Identifier:
38+
64:EA:DA:BF:2B:78:10:EA:D5:29:CF:EC:6E:10:53:90:2D:F1:DB:D0
39+
X509v3 Authority Key Identifier:
40+
60:99:53:54:9F:83:AA:D6:58:FB:DA:60:F6:AF:2B:84:8F:4F:43:C4
41+
Signature Algorithm: sha256WithRSAEncryption
42+
Signature Value:
43+
de:33:7e:f8:29:8f:e6:32:4d:d8:7a:23:d2:d6:42:c6:b7:38:
44+
f2:39:3b:b1:85:cd:71:ea:aa:b7:74:81:5a:23:ef:e8:53:18:
45+
ea:06:5b:f7:3a:01:33:49:79:9f:a5:4f:ca:6c:e0:56:c8:dd:
46+
aa:62:06:37:8f:62:e0:74:5a:f8:84:6a:72:29:de:59:cc:96:
47+
f2:b0:bd:ba:5f:df:98:35:87:04:be:51:fe:91:91:86:3b:fd:
48+
86:e6:66:89:9a:7e:c1:c3:1a:1b:15:97:a4:38:9e:69:d4:81:
49+
b4:63:6e:7c:21:98:b3:ff:fd:65:42:3a:f3:e2:7c:e3:9e:a7:
50+
33:4c:c5:63:f2:91:f9:7b:d5:49:b2:5d:51:db:44:ea:13:37:
51+
58:08:c8:c9:8b:08:c0:ee:64:0b:37:c2:bc:91:b8:38:54:49:
52+
74:c9:dd:ec:e3:13:ae:c7:95:e5:e0:12:d2:77:cb:67:62:b4:
53+
31:91:b9:28:89:b8:e3:83:07:76:81:4f:a8:6e:a8:11:ca:94:
54+
4d:39:99:45:f9:9b:fa:8a:28:d2:a9:57:0e:68:1e:04:a8:04:
55+
ce:9e:ec:3e:c5:22:14:3d:c0:f6:ed:52:53:6f:c1:0d:cc:1e:
56+
8b:10:a4:c0:ca:54:c1:35:b5:c1:f3:72:81:98:c9:30:4b:95:
57+
81:4a:13:9f
58+
-----BEGIN CERTIFICATE-----
59+
MIIDADCCAeigAwIBAgIBAzANBgkqhkiG9w0BAQsFADATMREwDwYDVQQDDAhNeVRl
60+
c3RDQTAeFw0yNDAyMTYwNDQzNDVaFw0zOTAyMTIwNDQzNDVaMCUxEjAQBgNVBAMM
61+
CWxvY2FsaG9zdDEPMA0GA1UECgwGc2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
62+
AQ8AMIIBCgKCAQEAuLLUdbHqOsUiRnkv2S0fiadrqwfdgaZgVImvMyorVYzoJ5W7
63+
anJSyWPnV/ly/rjL7toiPhBcVgDuCGkf7CjPN4E5tdxI9ylYk/UHEtMG1ll6kDiF
64+
8hWfHDdktdqnQvuLkUMAA5xgIFfX+UMBuTZk7VowrjnOuljN5eVN89y2fYXXtqC1
65+
91HilG9VwLewYKQd/Ishb4p2WfxiBIVO+cQpnYB6quvrEYC1XPcRbJuXdrc7KcYn
66+
dWdoj6M7aT1zOnHJrdLtv7F7dkYgV9vqwN7w3ud7uNaEbsHvWz0i+6qjX/uE755N
67+
ZoJ8O8Dx5ug/1lxplnXlfmadIibYPBJatRsSiwIDAQABo00wSzAJBgNVHRMEAjAA
68+
MB0GA1UdDgQWBBRk6tq/K3gQ6tUpz+xuEFOQLfHb0DAfBgNVHSMEGDAWgBRgmVNU
69+
n4Oq1lj72mD2ryuEj09DxDANBgkqhkiG9w0BAQsFAAOCAQEA3jN++CmP5jJN2Hoj
70+
0tZCxrc48jk7sYXNceqqt3SBWiPv6FMY6gZb9zoBM0l5n6VPymzgVsjdqmIGN49i
71+
4HRa+IRqcineWcyW8rC9ul/fmDWHBL5R/pGRhjv9huZmiZp+wcMaGxWXpDieadSB
72+
tGNufCGYs//9ZUI68+J8456nM0zFY/KR+XvVSbJdUdtE6hM3WAjIyYsIwO5kCzfC
73+
vJG4OFRJdMnd7OMTrseV5eAS0nfLZ2K0MZG5KIm444MHdoFPqG6oEcqUTTmZRfmb
74+
+ooo0qlXDmgeBKgEzp7sPsUiFD3A9u1SU2/BDcweixCkwMpUwTW1wfNygZjJMEuV
75+
gUoTnw==
76+
-----END CERTIFICATE-----

‎st2tests/st2tests/fixtures/ssl_certs/ca/certs/04.pem‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
Certificate:
2+
Data:
3+
Version: 3 (0x2)
4+
Serial Number: 4 (0x4)
5+
Signature Algorithm: sha256WithRSAEncryption
6+
Issuer: CN=MyTestCA
7+
Validity
8+
Not Before: Feb 16 04:43:45 2024 GMT
9+
Not After : Feb 12 04:43:45 2039 GMT
10+
Subject: CN=localhost, O=client
11+
Subject Public Key Info:
12+
Public Key Algorithm: rsaEncryption
13+
Public-Key: (2048 bit)
14+
Modulus:
15+
00:e0:7c:64:67:0e:74:30:68:96:62:69:6b:c0:90:
16+
47:02:3c:2c:0f:b9:5f:7e:df:60:1e:b4:40:78:ff:
17+
22:10:8d:28:2c:82:66:fc:c9:94:50:8c:80:d8:34:
18+
83:18:90:88:b0:ff:a0:ae:49:99:6b:02:e6:bb:b0:
19+
f4:bc:92:15:21:4a:3e:38:13:54:43:fd:e6:00:25:
20+
87:f7:3d:79:01:6e:6c:fc:88:3f:15:91:2b:84:18:
21+
37:44:56:52:fa:15:d5:4f:ad:fd:53:de:2e:2a:77:
22+
be:9a:38:7f:1b:81:23:ec:e6:07:84:1c:b0:9f:e1:
23+
0a:6a:42:09:b9:44:ec:d7:4b:05:d2:45:bf:e2:1d:
24+
46:c7:df:8f:87:7b:5f:61:26:a0:35:d3:03:5d:77:
25+
ed:d0:a9:e7:fd:7f:2f:33:02:c5:e4:48:3c:64:72:
26+
a7:b7:2d:f4:c0:94:6b:e2:bd:9b:a9:37:92:08:f4:
27+
b9:93:76:df:a5:cc:4e:02:76:92:a5:30:ee:22:8c:
28+
48:a7:bc:3d:a6:3c:0b:54:05:56:bd:b8:ea:0e:55:
29+
39:0e:b3:f1:a6:c9:f6:f6:2f:12:4c:da:49:ec:cc:
30+
bb:fb:5d:bf:0b:f4:09:0e:b9:42:24:26:af:d6:66:
31+
b4:e0:6d:90:65:bc:80:ae:2d:da:c7:f3:02:7a:89:
32+
c5:b1
33+
Exponent: 65537 (0x10001)
34+
X509v3 extensions:
35+
X509v3 Basic Constraints:
36+
CA:FALSE
37+
X509v3 Subject Key Identifier:
38+
77:1C:53:73:49:A4:C4:BE:A9:4E:93:2F:73:AC:7A:97:EB:DF:35:9E
39+
X509v3 Authority Key Identifier:
40+
60:99:53:54:9F:83:AA:D6:58:FB:DA:60:F6:AF:2B:84:8F:4F:43:C4
41+
Signature Algorithm: sha256WithRSAEncryption
42+
Signature Value:
43+
71:c3:bf:b2:68:7c:fa:fc:47:57:54:53:2b:0f:31:9a:0b:5b:
44+
6c:73:ae:1b:a0:c5:2c:3d:4e:e5:99:fa:33:7f:d3:f2:39:27:
45+
99:dc:58:3a:ec:0a:bf:63:14:07:9e:de:3f:64:aa:d3:9f:d6:
46+
a3:d4:c5:45:be:4f:07:42:93:52:df:9c:70:a6:3d:b5:63:14:
47+
06:58:45:b7:d7:cb:16:96:cf:03:4c:71:09:bb:b8:8a:20:51:
48+
c9:ed:f3:b0:25:ed:de:72:45:9c:e1:23:b4:92:a2:34:e2:e3:
49+
8d:39:d5:15:2a:f3:38:b2:22:f2:1a:7d:e0:91:a6:05:8a:19:
50+
18:fb:c2:a7:cb:9b:a9:2b:d3:ce:0f:6d:42:57:07:72:de:f8:
51+
57:50:4f:23:16:8f:d3:7b:78:76:24:0b:5b:4b:f1:63:15:eb:
52+
28:9a:b6:b8:59:7d:fc:58:c2:77:78:ed:7e:e5:50:9e:b0:2d:
53+
db:78:6c:d9:81:8b:ec:1f:6f:d2:13:96:9d:4d:e3:bc:75:0b:
54+
4b:80:2a:e1:69:ae:9b:7b:44:54:ea:cf:85:2e:1f:89:5d:a7:
55+
9a:59:5b:f6:10:87:d8:61:23:4d:26:1b:de:85:ec:75:96:7c:
56+
fe:6c:09:90:7d:ab:58:90:39:bf:32:56:0b:5d:6c:be:23:5e:
57+
02:79:a2:8e
58+
-----BEGIN CERTIFICATE-----
59+
MIIDADCCAeigAwIBAgIBBDANBgkqhkiG9w0BAQsFADATMREwDwYDVQQDDAhNeVRl
60+
c3RDQTAeFw0yNDAyMTYwNDQzNDVaFw0zOTAyMTIwNDQzNDVaMCUxEjAQBgNVBAMM
61+
CWxvY2FsaG9zdDEPMA0GA1UECgwGY2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOC
62+
AQ8AMIIBCgKCAQEA4HxkZw50MGiWYmlrwJBHAjwsD7lfft9gHrRAeP8iEI0oLIJm
63+
/MmUUIyA2DSDGJCIsP+grkmZawLmu7D0vJIVIUo+OBNUQ/3mACWH9z15AW5s/Ig/
64+
FZErhBg3RFZS+hXVT639U94uKne+mjh/G4Ej7OYHhBywn+EKakIJuUTs10sF0kW/
65+
4h1Gx9+Ph3tfYSagNdMDXXft0Knn/X8vMwLF5Eg8ZHKnty30wJRr4r2bqTeSCPS5
66+
k3bfpcxOAnaSpTDuIoxIp7w9pjwLVAVWvbjqDlU5DrPxpsn29i8STNpJ7My7+12/
67+
C/QJDrlCJCav1ma04G2QZbyAri3ax/MCeonFsQIDAQABo00wSzAJBgNVHRMEAjAA
68+
MB0GA1UdDgQWBBR3HFNzSaTEvqlOky9zrHqX6981njAfBgNVHSMEGDAWgBRgmVNU
69+
n4Oq1lj72mD2ryuEj09DxDANBgkqhkiG9w0BAQsFAAOCAQEAccO/smh8+vxHV1RT
70+
Kw8xmgtbbHOuG6DFLD1O5Zn6M3/T8jknmdxYOuwKv2MUB57eP2Sq05/Wo9TFRb5P
71+
B0KTUt+ccKY9tWMUBlhFt9fLFpbPA0xxCbu4iiBRye3zsCXt3nJFnOEjtJKiNOLj
72+
jTnVFSrzOLIi8hp94JGmBYoZGPvCp8ubqSvTzg9tQlcHct74V1BPIxaP03t4diQL
73+
W0vxYxXrKJq2uFl9/FjCd3jtfuVQnrAt23hs2YGL7B9v0hOWnU3jvHULS4Aq4Wmu
74+
m3tEVOrPhS4fiV2nmllb9hCH2GEjTSYb3oXsdZZ8/mwJkH2rWJA5vzJWC11sviNe
75+
Anmijg==
76+
-----END CERTIFICATE-----

‎st2tests/st2tests/fixtures/ssl_certs/ca/index.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
V 240211155807Z 01 unknown /CN=localhost/O=server
2-
V 240211155838Z 02 unknown /CN=localhost/O=client
1+
E 240211155807Z 01 unknown /CN=localhost/O=server
2+
E 240211155838Z 02 unknown /CN=localhost/O=client
3+
V 390212044345Z 03 unknown /CN=localhost/O=server
4+
V 390212044345Z 04 unknown /CN=localhost/O=client

‎st2tests/st2tests/fixtures/ssl_certs/ca/index.txt.old‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
V 240211155807Z 01 unknown /CN=localhost/O=server
1+
E 240211155807Z 01 unknown /CN=localhost/O=server
2+
E 240211155838Z 02 unknown /CN=localhost/O=client
3+
V 390212044345Z 03 unknown /CN=localhost/O=server

‎st2tests/st2tests/fixtures/ssl_certs/ca/openssl.cnf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ private_key = $dir/private/ca_private_key.pem
1010
serial = $dir/serial
1111

1212
default_crl_days = 7
13-
default_days = 1825
13+
default_days = 5475
1414
default_md = sha256
1515

1616
policy = testca_policy
@@ -33,10 +33,10 @@ default_bits = 2048
3333
default_keyfile = ./private/ca_private_key.pem
3434
default_md = sha256
3535
prompt = yes
36-
distinguished_name = root_ca_distinguished_name
36+
distinguished_name = distinguished_name
3737
x509_extensions = root_ca_extensions
3838

39-
[ root_ca_distinguished_name ]
39+
[ distinguished_name ]
4040
commonName = hostname
4141

4242
[ root_ca_extensions ]

‎st2tests/st2tests/fixtures/ssl_certs/ca/serial‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
03
1+
05

0 commit comments

Comments
 (0)