Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit d9abd44

Browse files
author
Tianyi Chen
committed
fix ssl_test
1 parent c28873c commit d9abd44

File tree

9 files changed

+121
-187
lines changed

9 files changed

+121
-187
lines changed

‎script/installation/create_certificates_test.sh

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

‎test/network/ssl/root.crt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDDzCCAfegAwIBAgIJALnYXsYu6xTqMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV
3+
BAMME3Jvb3QueW91cmRvbWFpbi5jb20wHhcNMTgwMzI3MjAwNTM5WhcNMjgwMzI0
4+
MjAwNTM5WjAeMRwwGgYDVQQDDBNyb290LnlvdXJkb21haW4uY29tMIIBIjANBgkq
5+
hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+bP/zPanodNjwRT07JHxeXGhUQGdWbgM
6+
lXa30aYqM3JYsMyumXukNhAI0ErEwX+CkXBsK3/+nuATm18s8FipIWuUeh19Sokh
7+
qeLaZiSrZEHHjsiLreVsoKI9bAuohPay2XI3hkLEeQ1Mo4yxRjU1BpktY4lhzvvf
8+
cTE1G/zRtGMAGKeng/S0aadjJbmFxEQB14x68FQg6UsfpukIizmZmgJ5uRnmhDgL
9+
xiMfYrGjSl+sH9+Pmi5D6jcYIC1P1qcVDB7q1xd+cktrfNCXVo8zaYlDOuAqhPoD
10+
TpTf0eK9aPXoiFtP30Ys8S3CjQA3ChuxX96oyNOxG87VNGVFRiyvfQIDAQABo1Aw
11+
TjAdBgNVHQ4EFgQUcHPnzTFlIDQL7qO4hWpr4c3g0fEwHwYDVR0jBBgwFoAUcHPn
12+
zTFlIDQL7qO4hWpr4c3g0fEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
13+
AQEA4ghpPKmNeSlFEwkfaqeum9DuvORlhrdBA/l64QlB3VwmeyA2O/bpTGuad3E6
14+
BsrR2DXH0k4lpoK/uzBGgUas5R0Tg2eiUD/uhHff/thU/yvoCD3o2K0cQXKCTYgq
15+
ct25OLMNxf2sHN8VD64AJnvF6yIv0ptBkF2Iqcn5486f5pJgs48MhJcSjFZYpjvo
16+
T54vh+U6DLT0dPIa5JJOhBQIe6LYuJDwZH84Fh3lGKip5OWT1RfuTHKViz5fL+lX
17+
eQqzL9kA9zm593Z6ltvVdSTxndBW1JYgL9opMB7wrvuEdGUECXzZJWioO9EP/yV2
18+
ekprwI05kJhh2fqrduTuIq30HQ==
19+
-----END CERTIFICATE-----

‎test/network/ssl/root.key

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD5s//M9qeh02PB
3+
FPTskfF5caFRAZ1ZuAyVdrfRpiozcliwzK6Ze6Q2EAjQSsTBf4KRcGwrf/6e4BOb
4+
XyzwWKkha5R6HX1KiSGp4tpmJKtkQceOyIut5Wygoj1sC6iE9rLZcjeGQsR5DUyj
5+
jLFGNTUGmS1jiWHO+99xMTUb/NG0YwAYp6eD9LRpp2MluYXERAHXjHrwVCDpSx+m
6+
6QiLOZmaAnm5GeaEOAvGIx9isaNKX6wf34+aLkPqNxggLU/WpxUMHurXF35yS2t8
7+
0JdWjzNpiUM64CqE+gNOlN/R4r1o9eiIW0/fRizxLcKNADcKG7Ff3qjI07EbztU0
8+
ZUVGLK99AgMBAAECggEBAKukQEyqq9YAEczyU92eAGfjZOji/D9k1TmUTozM9KtC
9+
iZaWS9py9BC5euV6z77WoHDK34ATTnn1O2UMyj44I6I2aex7AtnOY5Z8unWF9U5I
10+
LR2H2wPg9YeBnkj7xo4Hai8wZNxkXtt6+dheaKkC//0WI+4MzG/UEOak1YX0hk3A
11+
eAOldQdPAKs4tMiTaj47bXRkXTNvKertmk7mrQewI2GHs8T3jJuHInIXv4tbyMCo
12+
Y9PGqufFw+PmcYy10h0RRgwqQOdcuopSArtIP9OoG7jiM/yFSFG83z7bQ3a8aDoo
13+
lrJsk3IcW+XVDOoTwDpgNdJtQ3671VYc30N5r+pJHMECgYEA/em3T7zJoJI4maFK
14+
vuFq5e2sBJdKz+iMBx5ZSOOP9J0O3iWykbE0r7H4GPBFM8P2wnqlZeQM7iFmFTAR
15+
PJT+u8rucfR1Y3HrVgFtWEG17YyRs9yn+sEW+Rwnc0RociuFL0xJlJNvkbhWVKSg
16+
1SopWdJ/x7nTIWfLcjgSyJtihq0CgYEA+8FswZAUej+LHBdOgvUF8oQhCvaDabX1
17+
i89SlgzAVFXc11NaI3bBhSKPreMcE3CmYqhYHNIReI2YWjZEJRtB5QMzYxU77OW+
18+
OSaP5oRfQenpo132VKbHbAgrALe8KYy7avYHRrS/bTJehRqQaTL2dflKUc8gc8dY
19+
N0RCgryGdhECgYBoAL9RLeb4mmwMoYBYR0TeAUggaUf/eSVCFTBFJtDkRSC95XsL
20+
KiaGgMM6k9AEsBP2/P2aipqxP4Ts0M9+nRjqGukoTBV5MkRO6i67o869CoLzxUIY
21+
99ZNGzcdg7u0aBcZlInfDbT5XyQdb4FhTu+5Fvu392l/mWA/3K/085Cb0QKBgQDS
22+
RKYiMMV5qTL1vl2bsSxLdqHmdyghFZHFON7AZlwI1EIEMiDZ9+j/2nLoiAQ+FFtT
23+
kUkuoSFob9LsneBioZZywS6dNfH8FZLARv3vSWYKNmUmRmdkInvzNgs8qTjl9x3d
24+
4ykGnBY6DNS3FQ3CX4dL12+ETpvLN5btafynFvCzEQKBgQCxTA32yitkjHs6qlZL
25+
Nhhs5bisM5upzbgHs3CuI83OnbdW9X9Wx1jVTEf4wFAvOUmwdVPvdrghZ0Dsd2mI
26+
/WKkWDYHnLqDw0CSmSz6w1N+9BwOI2LzPiWcqMo795DZCwkuKnDyuv79UmuH3ta5
27+
X/DANwRv0KqMTYddWJD56/59KA==
28+
-----END PRIVATE KEY-----

‎test/network/ssl/root_test.crt

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

‎test/network/ssl/server.crt

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIICujCCAaICCQCGyfkOWMMn2jANBgkqhkiG9w0BAQsFADAeMRwwGgYDVQQDDBNy
3+
b290LnlvdXJkb21haW4uY29tMB4XDTE4MDMyNzIwMDU0OFoXDTE5MDMyNzIwMDU0
4+
OFowIDEeMBwGA1UEAwwVZGJob3N0LnlvdXJkb21haW4uY29tMIIBIjANBgkqhkiG
5+
9w0BAQEFAAOCAQ8AMIIBCgKCAQEA75NjtSRgvXgreFG5Ud0UjMMPkkBUcPcHDTuR
6+
SqMkTld+TNw22mCadSVvYtbECwmbbBRvQ4PGaIvyeVH2+s5kUqrB6GHdy3pslhoG
7+
I5QTgMZHlJDDlL/dDKzMRnjAcf33wUnxB0ZgHZiQ1w6DCe8q59BoFc1lqb0jq64x
8+
TtBdmU/KdQT2Bk/3K3hHWhfLDIZnHPxptBBVm2sq7B+lpcAHbw7OGjv7AUyonzWC
9+
U1rvQpzbIs3vqEzNRu1KR6muuf5vNFY5DXchKitZiIwvj6El3Irkk9Of6NrOlSeI
10+
diSh2DS3i3z/mHCvbJc2d7Pbp0Hy0Jb27Ym9TtGJ68675lYTMQIDAQABMA0GCSqG
11+
SIb3DQEBCwUAA4IBAQBc5SNlFnyQLhJSF8iEVw3qevIEjhcgjSUazfNVMNKD+edN
12+
Q5v2w1yEp8sdFJVR9KYfpqj+h9BABG7toY1+COGjdbNM/0dVrwBle14s9ALmj5nR
13+
tAR13jyRsdbGR7C8P7n1KessHi/RBokLZjMkfiPlimWQjMeRsLsQVjf2XGk+ywOO
14+
57O0GktuEnN17MYa/D393+AL6fMFcmmuE4e7Hf6mN77ztWcWo/BAyc1tQXsQm4CQ
15+
KDk43LAUEA+ml12PuRjDVDeTDPrIte6YDM9Dxbr0vXj+NPZ4rVvPM5b+wxnZr7kQ
16+
2G7oYEHfI5QRpIw5fvVwRoNo0NhLHK6SlAKnzn3i
17+
-----END CERTIFICATE-----
18+
-----BEGIN CERTIFICATE-----
19+
MIIDDzCCAfegAwIBAgIJALnYXsYu6xTqMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV
20+
BAMME3Jvb3QueW91cmRvbWFpbi5jb20wHhcNMTgwMzI3MjAwNTM5WhcNMjgwMzI0
21+
MjAwNTM5WjAeMRwwGgYDVQQDDBNyb290LnlvdXJkb21haW4uY29tMIIBIjANBgkq
22+
hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+bP/zPanodNjwRT07JHxeXGhUQGdWbgM
23+
lXa30aYqM3JYsMyumXukNhAI0ErEwX+CkXBsK3/+nuATm18s8FipIWuUeh19Sokh
24+
qeLaZiSrZEHHjsiLreVsoKI9bAuohPay2XI3hkLEeQ1Mo4yxRjU1BpktY4lhzvvf
25+
cTE1G/zRtGMAGKeng/S0aadjJbmFxEQB14x68FQg6UsfpukIizmZmgJ5uRnmhDgL
26+
xiMfYrGjSl+sH9+Pmi5D6jcYIC1P1qcVDB7q1xd+cktrfNCXVo8zaYlDOuAqhPoD
27+
TpTf0eK9aPXoiFtP30Ys8S3CjQA3ChuxX96oyNOxG87VNGVFRiyvfQIDAQABo1Aw
28+
TjAdBgNVHQ4EFgQUcHPnzTFlIDQL7qO4hWpr4c3g0fEwHwYDVR0jBBgwFoAUcHPn
29+
zTFlIDQL7qO4hWpr4c3g0fEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
30+
AQEA4ghpPKmNeSlFEwkfaqeum9DuvORlhrdBA/l64QlB3VwmeyA2O/bpTGuad3E6
31+
BsrR2DXH0k4lpoK/uzBGgUas5R0Tg2eiUD/uhHff/thU/yvoCD3o2K0cQXKCTYgq
32+
ct25OLMNxf2sHN8VD64AJnvF6yIv0ptBkF2Iqcn5486f5pJgs48MhJcSjFZYpjvo
33+
T54vh+U6DLT0dPIa5JJOhBQIe6LYuJDwZH84Fh3lGKip5OWT1RfuTHKViz5fL+lX
34+
eQqzL9kA9zm593Z6ltvVdSTxndBW1JYgL9opMB7wrvuEdGUECXzZJWioO9EP/yV2
35+
ekprwI05kJhh2fqrduTuIq30HQ==
36+
-----END CERTIFICATE-----

‎test/network/ssl/server.key

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDvk2O1JGC9eCt4
3+
UblR3RSMww+SQFRw9wcNO5FKoyROV35M3DbaYJp1JW9i1sQLCZtsFG9Dg8Zoi/J5
4+
Ufb6zmRSqsHoYd3LemyWGgYjlBOAxkeUkMOUv90MrMxGeMBx/ffBSfEHRmAdmJDX
5+
DoMJ7yrn0GgVzWWpvSOrrjFO0F2ZT8p1BPYGT/creEdaF8sMhmcc/Gm0EFWbayrs
6+
H6WlwAdvDs4aO/sBTKifNYJTWu9CnNsize+oTM1G7UpHqa65/m80VjkNdyEqK1mI
7+
jC+PoSXciuST05/o2s6VJ4h2JKHYNLeLfP+YcK9slzZ3s9unQfLQlvbtib1O0Ynr
8+
zrvmVhMxAgMBAAECggEAD/iicAQB0v+83iOMmDGF2jByzEwvlOxS8wXilLg1hmd8
9+
ywDvQzWndmHNgChTH20/iEAAft69DmEuA/p73ZJ+y6gIj0Ze896weH05pYuMlUwi
10+
n3vbHgKAaQToBVatdav5pVAZmmONqstt9HhKMhJYqOWS2sk7mso6I4rUTK3FX5/6
11+
GK+Xr0E6doGLiGx1wLD+JazKRpiBbq8yrZbldaHvvufeBW+C9oJUpbbAgjc/0uNX
12+
zOp5DG9Rt7N7kaZgKy13mZ3P9BEKM52bj11nk88FNvoNR+zxOGyJh6YFI0IeRVZ9
13+
6gR7n0pNjJ0G/WKkOgzrXY9z78aT8t9sVOOsp9ZqAQKBgQD6XU4LS4Bfyhb3FfFi
14+
CSZl+fADlUlRR4qHfZp3dnYh8SLUC5YwMk5KfjkSX1frnVL+kFZBO5I2ZcqxhHTM
15+
YhSGYoxu4HdpzKNCi1P+iceHiwDSoF0HGQOxqze4NYDN63ODqFjDgsEPIM4SlssZ
16+
0o1zzEGZpu4OhreMaOA4M8EPkQKBgQD09+p1X6SKclBCnZDdyI+Xvp7ybombqp6F
17+
vJfehgtLkq/c6v2pLI1UV0eo6LeZwdB4xTHHrzZVE5LKJmkaRNVMEuvbwuJnOmLQ
18+
NVrxBmanhJ5FKgB2KTYY+iKgqEdkoHp21MM5HBPGGDBKO96knDYVSLlbNivmeo8b
19+
51zQ9DQ5oQKBgGMtHOJaiULowgok9ha4uy5AQPSaaY26AkVD2zGhipBNfldzM45q
20+
DxtxPthpTmG2U48lzBVRLM1Bq3aAmufvnmPRnAG8B3Gwr6eHm8FEAPdPeAb3oYJT
21+
RWRXB95/y0NHFt47jNX98M42V4uDknbrMj+B1SaxurGkagdD8DYzQjIRAoGAdpda
22+
gu4FaxzCLC25hxTkJxMaQcUvixPDYH0XjJuZ9kESMEH3ASJXXSBPyb63u5Dvirf0
23+
THZPOEqcgo6rzRLLq+NxGVe0YUMLuT5LQ2nU4n46XMNjq9Bxpw/ZGau9vEJQZxzD
24+
Ue98xybIofdv5oLVT+KAEV8dS5vDkj+kWGgQrGECgYAw6AoXsWTHo0chADBt+hEm
25+
CEguCXSwxx2tix5WF2gwbunjfnkXe2nmG3M+teG0xRK3mqoPqevyaA6gL0kDwBIu
26+
CD1pNTVrcqg8jAnLP0hfX5VNgL2lLIfhLFbUdal7VklfdW70Pbv3J6D3uCVXaW4A
27+
BGtLxLiDzo9PJi09hKhrng==
28+
-----END PRIVATE KEY-----

‎test/network/ssl/server_test.crt

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

‎test/network/ssl/server_test.key

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

‎test/network/ssl_test.cpp

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,19 @@ namespace test {
3232

3333
class SSLTests : public PelotonTest {};
3434

35+
// The following keys and certificates are generated using
36+
// https://www.postgresql.org/docs/9.5/static/libpq-ssl.html
37+
// and then concate root.crt right after server.crt
3538
std::string client_crt = std::string(StringUtil::Format(
36-
"%s%s", SOURCE_FOLDER, "/test/network/ssl/client_test.crt"));
39+
"%s%s", SOURCE_FOLDER, "/test/network/ssl/root.crt"));
3740
std::string client_key = std::string(StringUtil::Format(
38-
"%s%s", SOURCE_FOLDER, "/test/network/ssl/client_test.key"));
41+
"%s%s", SOURCE_FOLDER, "/test/network/ssl/root.key"));
3942
std::string server_crt = std::string(StringUtil::Format(
40-
"%s%s", SOURCE_FOLDER, "/test/network/ssl/server_test.crt"));
43+
"%s%s", SOURCE_FOLDER, "/test/network/ssl/server.crt"));
4144
std::string server_key = std::string(StringUtil::Format(
42-
"%s%s", SOURCE_FOLDER, "/test/network/ssl/server_test.key"));
45+
"%s%s", SOURCE_FOLDER, "/test/network/ssl/server.key"));
4346
std::string root_crt = std::string(StringUtil::Format(
44-
"%s%s", SOURCE_FOLDER, "/test/network/ssl/root_test.crt"));
47+
"%s%s", SOURCE_FOLDER, "/test/network/ssl/root.crt"));
4548

4649
/**
4750
* Basic SSL connection test: Tested with valid certificats and key files
@@ -51,8 +54,8 @@ void *BasicTest(int port) {
5154
// forcing the factory to generate psql protocol handler
5255
pqxx::connection C(StringUtil::Format(
5356
"host=127.0.0.1 port=%d user=default_database application_name=psql "
54-
"sslmode=require sslkey=%s ",
55-
port, client_key.c_str()));
57+
"sslmode=require sslkey=%s sslcert=%s sslrootcert=%s",
58+
port, client_key.c_str(), client_crt.c_str(), root_crt.c_str()));
5659

5760
pqxx::work txn1(C);
5861

0 commit comments

Comments
 (0)