Skip to content

Commit b2fa8f8

Browse files
hamishforbeshamishforbes
committed
Fix test certs
1 parent 48d57e6 commit b2fa8f8

File tree

12 files changed

+138
-118
lines changed

12 files changed

+138
-118
lines changed

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Test
22

33
on: [push, pull_request]
44

5+
concurrency:
6+
group: ${{ github.ref }}
7+
cancel-in-progress: true
8+
59
jobs:
610
luacheck:
711
runs-on: ubuntu-latest

‎t/04-ssl.t‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ $ENV{TEST_NGINX_SOCKET_DIR} ||= $ENV{TEST_NGINX_HTML_DIR};
1010

1111
our $HttpConfig = qq{
1212
lua_package_path "$pwd/lib/?.lua;;";
13-
lua_ssl_trusted_certificate "../html/rootca.pem";
14-
ssl_certificate "../html/example.com.crt";
15-
ssl_certificate_key "../html/example.com.key";
13+
lua_ssl_trusted_certificate "../html/test-ca.pem";
14+
ssl_certificate "../html/test.pem";
15+
ssl_certificate_key "../html/test-key.pem";
1616
1717
init_by_lua_block {
1818
require("resty.consul")._debug(true)
@@ -33,9 +33,9 @@ sub read_file {
3333
$cert;
3434
}
3535

36-
our $RootCACert = read_file("t/cert/rootCA.pem");
37-
our $ExampleCert = read_file("t/cert/example.com.crt");
38-
our $ExampleKey = read_file("t/cert/example.com.key");
36+
our $RootCACert = read_file("t/cert/test-ca.pem");
37+
our $TestCert = read_file("t/cert/test.pem");
38+
our $TestKey = read_file("t/cert/test-key.pem");
3939

4040
no_long_string();
4141
no_root_location();
@@ -71,12 +71,12 @@ __DATA__
7171
}
7272
}
7373
--- user_files eval
74-
">>> rootca.pem
74+
">>> test-ca.pem
7575
$::RootCACert
76-
>>> example.com.key
77-
$::ExampleKey
78-
>>> example.com.crt
79-
$::ExampleCert"
76+
>>> test-key.pem
77+
$::TestKey
78+
>>> test.pem
79+
$::TestCert"
8080
--- request
8181
GET /a
8282
--- no_error_log
@@ -113,12 +113,12 @@ HTTPS OK
113113
}
114114
}
115115
--- user_files eval
116-
">>> rootca.pem
116+
">>> test-ca.pem
117117
$::RootCACert
118-
>>> example.com.key
119-
$::ExampleKey
120-
>>> example.com.crt
121-
$::ExampleCert"
118+
>>> test-key.pem
119+
$::TestKey
120+
>>> test.pem
121+
$::TestCert"
122122
--- request
123123
GET /a
124124
--- no_error_log

‎t/cert/ca.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"CN": "ca.test",
3+
"hosts": [
4+
"ca.local.test"
5+
],
6+
"key": {
7+
"algo": "rsa",
8+
"size": 2048
9+
},
10+
"names": [
11+
{
12+
"C": "UK",
13+
"L": "London"
14+
}
15+
]
16+
}

‎t/cert/cfssl.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"signing": {
3+
"default": {
4+
"expiry": "87600h",
5+
"usages": ["signing", "key encipherment", "server auth", "client auth"]
6+
}
7+
}
8+
}

‎t/cert/example.com.crt‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎t/cert/example.com.key‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎t/cert/rootCA.key‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎t/cert/rootCA.pem‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎t/cert/test-ca-key.pem‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEogIBAAKCAQEArk/zgLBBS31UJ4Cxcbzg313nVs3FdQuScY1ecf/PNLM5Mgm4
3+
lNJ9oMAlLVmAfVfC+6NeZqgco1N8ugrVPZWSL6IblkO7RtZYgugbkx1wPBF3p6Ds
4+
h07XvC7d2leNaym5cNHy980e770X4Sd+EH8vOgGcPRhONpuy5DSOtyO6lGIcl6wU
5+
xWT+tEskW28+ag+/3ZS/OWMOMcpPtij7eqxIFTgp3Ioly+yJsWBtftV/122oqkKN
6+
TIdQsOxLnvd8lQ4FI1Mcoaq4zS7sE8fVmvwkjgpVoSyYxkpo9XSwn3R5mEd1hVz8
7+
AzNrwLB2nw/fEha8o+JSM0piOHZvnm4AZHSR0wIDAQABAoIBAGQOqrTc964Qc+T0
8+
/2ZNSDuPWILAPS7xhI8/2c3QTC1xD0zEvbpXlRtYED8W2CWa4ea2ITMGHuI1wyu7
9+
minumGpVQEah/HcuBMKn32Q0Cr/AOxHy0rLctANmV5zEkv3HhpXXPgO2L6LnxTRO
10+
ChQIHaDLWdbMA+FewHI0JRPFI42WTJjnca5WJlmIftKBxL2yyWebOWSX5VAG0wR8
11+
fZn07WpwlDLf1/pWOacVwSdVdvYqjzN6zIJlEqv/3tzwP7AmAUc4rWGRxjkdTpZs
12+
ud44LrjgJp/Od/9CPYMqGxTV1lB2/ly2XAP5qDIaarU2WZqetA78C5Ys4X2zoiIG
13+
qUWJH7ECgYEA5Fhjp+tvBfPUSZiisOzFCDijEAKDvQ+cCSaWaowwGudJ67gYm3FA
14+
chHh+/uvFkYJJjEKlTYisqCU1y1Ln9KYIIZB3NQ+GGXU1H9hjQZprdOg71ht6a8J
15+
pSXlI+5LQXnDkc4r//7sS4lkQiRY+F0W4OSU0r3apHhPOkj/yM8WwukCgYEAw2xT
16+
TXKPFMU8VdZjBlZncpqrwyeJ3cSFiWln/jYQY28Kpkp4T//dLWWrH7b5KBlOiJkK
17+
BXVHbFhxyNy8Gg6XSFjeBDxoPRyWebzk9vlsRixwOLz0ViMEcIHUOYVWP1LfDujN
18+
XemFw+8ecTJcz2Lha+a3jRE/wQ3MVaPD3tuLYVsCgYBnsLuQRRjlWxPLV8SJEvtm
19+
AFILsxifgbcZcKxdNcuia+TlZXPHImZhZj14b5HSS3tcHGjx2ONougLcs3Tj3n22
20+
R0EhRj/sVFGRLUbfA0p55N/vz/gZZaK7m7mx10PVN7XXQAg690fWBU3Buz+riJob
21+
BbGPASeICBnyHbQJPADaAQKBgA6ewRCvPGMaamwlkNz9g9nAFo+QGrFbrX3dQ+lx
22+
1AIMYaiVM7EQfFSUIZxKzRMh6Y0wnd5QqtpBN6oGUZBFfS3tcBazCj1gMSXEawDL
23+
Ij2Rv4ePI1x6XC+qlt0Cy7QLGCL+abbX7Kj+77EaSnU9eY3gAeVs3+8qgBn8GYBH
24+
voK3AoGAUyODizmYlboKa29MJpiOWM4j+dKf/jK7SYF76RZx5R+TZ6NLLDYd0pkg
25+
jU0c0D5OI3WXtND2hyqw70pHcUCb785EqNjB8KVyc9fbVcGTd2zYXpks+1SAUCSE
26+
fVIMefEd6hCcTnoax8JNOc6rZRwpK4qv4MwlVgP7xzt8ZGFNNlw=
27+
-----END RSA PRIVATE KEY-----

‎t/cert/test-ca.pem‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDMDCCAhigAwIBAgIUCK+3YYt8VmGVtaPcuPTHCzuA9BYwDQYJKoZIhvcNAQEL
3+
BQAwMDELMAkGA1UEBhMCVUsxDzANBgNVBAcTBkxvbmRvbjEQMA4GA1UEAxMHY2Eu
4+
dGVzdDAeFw0yMTA4MTgyMjE3MDBaFw0yNjA4MTcyMjE3MDBaMDAxCzAJBgNVBAYT
5+
AlVLMQ8wDQYDVQQHEwZMb25kb24xEDAOBgNVBAMTB2NhLnRlc3QwggEiMA0GCSqG
6+
SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuT/OAsEFLfVQngLFxvODfXedWzcV1C5Jx
7+
jV5x/880szkyCbiU0n2gwCUtWYB9V8L7o15mqByjU3y6CtU9lZIvohuWQ7tG1liC
8+
6BuTHXA8EXenoOyHTte8Lt3aV41rKblw0fL3zR7vvRfhJ34Qfy86AZw9GE42m7Lk
9+
NI63I7qUYhyXrBTFZP60SyRbbz5qD7/dlL85Yw4xyk+2KPt6rEgVOCnciiXL7Imx
10+
YG1+1X/XbaiqQo1Mh1Cw7Eue93yVDgUjUxyhqrjNLuwTx9Wa/CSOClWhLJjGSmj1
11+
dLCfdHmYR3WFXPwDM2vAsHafD98SFryj4lIzSmI4dm+ebgBkdJHTAgMBAAGjQjBA
12+
MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBThpQvv
13+
ZNgk02z5l29Lr/pb8/0X0zANBgkqhkiG9w0BAQsFAAOCAQEArWrTZoOcQOW4NHq4
14+
FO/wq8Y9vJFUUGd0QQFCQlirzTnva2hogY3ANWzjUkcnVvEsGvEADEr/QnMNY3uw
15+
x6TD7mDKjB470Qk7SnEH2HJbrdgCqpEgfWrfmGVGKUh7UbvTT4LqP3A5LEKBfzXF
16+
YpqB9IYSZH+kS0BD5cklvIlQN8K/VYn8JTE+aW38JmmJ05z/HXXbUWETLQHJgzpE
17+
VKUENAwBmJtBZnl1gh9Cc2uPTjfgxssFzZmNM4gujk+2qhsk8ZzmII8E/bhR2hXh
18+
S0nIiApR1raqsPsfygQSYAGvmLnYyvywr9l6Zeq9sRokaK2G+KaHGgIBXFSo8PHB
19+
wudhQA==
20+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)