Skip to content

Commit 6e03b32

Browse files
committed
Merge pull request #46 from pontusmelke/1.0-tls-tck
TLS TCK for javascript driver
2 parents 5bfaa5c + 7a11e38 commit 6e03b32

File tree

14 files changed

+387
-59
lines changed

14 files changed

+387
-59
lines changed

gulpfile.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,18 @@ gulp.task('build-browser-test', function(){
110110
));
111111
});
112112

113-
var compress = function(source, dest, filename) {
114-
115-
}
116-
117113
var buildNode = function(options) {
118114
return gulp.src(options.src)
119115
.pipe(babel({ignore: ['src/external/**/*.js']}))
120116
.pipe(gulp.dest(options.dest))
121-
}
117+
};
122118

123119
gulp.task('nodejs', function(){
124120
return buildNode({
125121
src: 'src/**/*.js',
126122
dest: 'lib'
127123
});
128-
})
124+
});
129125

130126
gulp.task('all', function(cb){
131127
runSequence('nodejs', 'browser', cb);
@@ -223,7 +219,7 @@ var runPowershell = function( cmd ) {
223219
console.log("Powershell Script finished");
224220
});
225221
child.stdin.end(); //end input
226-
}
222+
};
227223

228224
/** Set the project version, controls package.json and version.js */
229225
gulp.task('set', function() {

test/internal/tls.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ describe('trust-signed-certificates', function() {
5757
driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), {
5858
encrypted: true,
5959
trust: "TRUST_SIGNED_CERTIFICATES",
60-
trustedCertificates: ["build/neo4j-enterprise-3.0.0/certificates/snakeoil.cert"]
60+
trustedCertificates: ["build/neo4j-enterprise-3.0.0/certificates/neo4j.cert"]
6161
});
6262

6363
// When

test/neo4j-driver.test.js

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

test/resources/derived.cert

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDQzCCAisCAQEwDQYJKoZIhvcNAQEFBQAwdDELMAkGA1UEBhMCU0UxEzARBgNV
3+
BAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
4+
ZDELMAkGA1UEAxMCY2ExIDAeBgkqhkiG9w0BCQEWEWR1bW15QGV4YW1wbGUuY29t
5+
MCAXDTE2MDQwNjA3NDcwOVoYDzQ3NTQwMzAzMDc0NzA5WjBZMQswCQYDVQQGEwJT
6+
RTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
7+
cyBQdHkgTHRkMRIwEAYDVQQDEwlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUA
8+
A4IBDwAwggEKAoIBAQC/TV9r/CeZ7vQrNIZyjk3DSiGvUMLl22bvNsrqDm3MNhix
9+
WvypiDv8zt+VtyUsba860u7P3/fnQqv/wFaNIaPqIc3C/jr7w/ITqhEdvHv/NlLk
10+
9so4ehtogCJg8vZ4Xwg/Sa5XCfNwP89yORjhCjWF0s9n+GczSXUi/KuYe2tkL7w/
11+
gIG6jgjl9Kz1NIBysqcgVM3pclFVGVkUN7KoLK+jy+uW0X0ZEm5NXNO7UIcpp4Gi
12+
+IvEqIbpL1j7oTx9JLflPG3XED97uGdWR4zwaifiSPzc8H6JAUhnmprLpmN71Uv9
13+
P2cB3z5YXbB2GRa44trqvVdem549SzecGnf5IUYBAgMBAAEwDQYJKoZIhvcNAQEF
14+
BQADggEBADBGFnt6AKwy33BGcthMeTlMlkZ9XYx9GUHi9uD9bF+kNIiO7zSMQ4Pg
15+
tA8pgY7jfqpvRb+yCXCc42Pgwbw7BUp15Xpxwogxb5GsWq7e8MdSt56fTtZyxx7G
16+
VVTdBbM0kyqSqe1ap6MjQTkzu+GuBnXO+YRHtTA3LhxW63hstw3cyezMg5ABt4gU
17+
+K89B1/uNRus2CEcJXi0rzWWt3eW18Yjzc0nLnTRol0FT3ZBkxgeOfxIjZCPKjG1
18+
DWCnZlOH4BU/v0WRuMDAIi0J8NS0nPWvY+CKwCMMVzBQik1gcR1nh4HvrkKXSe+i
19+
klDr1OENbgIt6yJds+hMaeweGWTxYhY=
20+
-----END CERTIFICATE-----

test/resources/derived.key

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEoQIBAAKCAQEAv01fa/wnme70KzSGco5Nw0ohr1DC5dtm7zbK6g5tzDYYsVr8
3+
qYg7/M7flbclLG2vOtLuz9/350Kr/8BWjSGj6iHNwv46+8PyE6oRHbx7/zZS5PbK
4+
OHobaIAiYPL2eF8IP0muVwnzcD/PcjkY4Qo1hdLPZ/hnM0l1IvyrmHtrZC+8P4CB
5+
uo4I5fSs9TSAcrKnIFTN6XJRVRlZFDeyqCyvo8vrltF9GRJuTVzTu1CHKaeBoviL
6+
xKiG6S9Y+6E8fSS35Txt1xA/e7hnVkeM8Gon4kj83PB+iQFIZ5qay6Zje9VL/T9n
7+
Ad8+WF2wdhkWuOLa6r1XXpuePUs3nBp3+SFGAQIDAQABAoIBAApSUmOxJzHXArWS
8+
D+7+XpO63DZpVRqxy8v8WNZoEOSDxrFLB3beMt5hCw844niTMnEqEFiG7Qk9P6p8
9+
5i6XMhDf4gozTVtoJxeIhYPlN4t9kttntWF2tSPeRfyVH1c/SWKgxxdLIidcSgUP
10+
r5f0xQ6DYU1qyaaqv/czSs7fWdv932Szq6cuUHe3VJzNlYZWkMzDNNZ8+WYXd/0L
11+
d1BtDqMVTVJ4RJmIZNDy1aVTM4FiOPj1OKaoF4KsOrVAZUYrtVVBB8K9zgpv/hEh
12+
klQflCPDJnVSLehlbMB1UYj/1VU+Xzd3LmTd2uFgoZrRnZzR7wAun7e7+M1AhDdH
13+
jJwha0ECgYEA8AooT8qtRtvPT2QbhNmhrKypA/omMqiAMod8oaoyjdk1swaUVEuo
14+
+udlOar4RX9heSjBqnzLeHNrn/v7WdJl1esv0OXz/J7mSC64i6KXyVzEdzIPMA1a
15+
O66yNebzuQDswtfGH7mXEMxdNvLrNg+BSP3tihOAjTMS6e60I3SXVScCgYEAzAWh
16+
JZFUCpSV/kf2EColT+4rGACKrhcbBvJq0rzKtOTxs/JLtNW8+RfNbEvwha1VgCN3
17+
od5l4IET1wJRuH1/f3IPJVtHEHS1tIDHg8mhHpG7Yk2Vx1io/mVa7bPyf0C4uDeL
18+
Y16QA+auA7AfXeEEC2ac10ImnIj3VBAq+L1xFJcCf3NUbgnoV1i0Q+bhMleiOQu9
19+
6Xb/uVqdmvqsHjWOkLuWoTZi8uGNeKMUio4qlx7NFQghjOtdCmXVDuDPMPT3Ifam
20+
CVNVKOU3c207BXARrtwQtlSOuL1drPz/8p/zVyaMSzVSdt7HTM3FYwQDsv9Gc9ee
21+
KYMt25X79Bpxlhty6UMCgYALhYHdMkDRvCRgUMYHkam7wtJyL42lWS6wjL4Vmo3D
22+
+23e4J7/3lYmpv510DAMDIbYjqgx3vJX5FIvgTUGOygZFWLflDEGL+EXCXK68YcE
23+
x+wSGBmOQWaBv02MQO4/23LTDGf1u6BcaAmJsceDsLJexnOzAExX6LA28hbLJz+c
24+
jwKBgQCdwuOFISVM9S6aNa8OZFvlBLLmKnLWGZcdu1oNzYNQ4oPfh/FwGI3Ke+tW
25+
SdbdSYgxFwfrGyI7slVSoOgFqhDHEPyYTPBwQ0ismK9p7Ap4fTyrV2FHO6DyGNbW
26+
EIwUp6V85h9icDC1zMvFRLhPSTlHcjIZjg1xZJFKtwyzBzmtSA==
27+
-----END RSA PRIVATE KEY-----

test/resources/other.cert

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIBpjCCAQ+gAwIBAgIJAIDjBHb55oY0MA0GCSqGSIb3DQEBDQUAMBQxEjAQBgNV
3+
BAMMCWxvY2FsaG9zdDAgFw0xNTA0MDcwNzAwMjRaGA85OTk5MTIzMTIzNTk1OVow
4+
FDESMBAGA1UEAwwJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
5+
gQCl8RnRaMMy8K78YGfqK50Vp6DI5plxE8s6xwPwzEazhhg2LJWkBRJN702mRnvt
6+
QU+WUFoGop0Gz70jWeAriUQze9psN4ZuO72Um5HTNgFj/+u+pPfr2aeSJBqQIQdc
7+
CoVGt4qx8A9vmUnxKJpR74tIPJchsflHSXbXLbP6SPXKkQIDAQABMA0GCSqGSIb3
8+
DQEBDQUAA4GBACVEIX+Y7dhVVLueu+dsUsTFeOM410/yNmyrglvCcNnyIQPSOmWF
9+
js8ulTINzECESK1bFgnE0LA66haI/ozH5WPFrDOI7upx1KhBtRGWA3Bn7UCWytyH
10+
OSCfejPcW9uPfgBxPeUeww1+ZOipw8qJwaFSkthnXSyHGjfvZb+Zbb1y
11+
-----END CERTIFICATE-----

test/resources/other.key

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAKXxGdFowzLwrvxg
3+
Z+ornRWnoMjmmXETyzrHA/DMRrOGGDYslaQFEk3vTaZGe+1BT5ZQWgainQbPvSNZ
4+
4CuJRDN72mw3hm47vZSbkdM2AWP/676k9+vZp5IkGpAhB1wKhUa3irHwD2+ZSfEo
5+
mlHvi0g8lyGx+UdJdtcts/pI9cqRAgMBAAECgYAbuH8boGibZeGVf3VchRSkvW/6
6+
n6saXLgihYR/AWD+NHRu+Fu3HrHEGynZkQS6yaJF9f5UBW496Q4rjaQJIdEmk0xg
7+
LUjdaPc5+iWCzxfW+LQpRsANKRBrurhQDQRw74dVfVkTII3nzmvVrplzjS5ABShK
8+
9sHw6L45elSS5T5JwQJBAOZULFp0hCK5bloV4h4vU8+zaOWM+LpH4GOvFTT+yTtV
9+
VAZQrt5NFa9YuRVbvM/qLAXSQHYWrznfBA5/UOHFkj0CQQC4b9BVVEKJhYfHV4j6
10+
A946n1yx0w3Y0Bo/h8GCJH6Da1FU8WtSFfYbPhnOnIhvXvRKB5DpRjbpK9XqN9At
11+
Q4LlAkAjSfg1r65jB5gRs1Ken0+u/eTvbqbZG5QUkcmlAfhg39Ts1sXEB3lwER7i
12+
V9jY3h76kVkQ/q7AJhwgAH+q57NdAkAgGtaZA+HRLn1EJeiiHKpCahsomSR/6Tmo
13+
dWkpzlB3b+bocl3MHCaK93RmkrjtKgo8GLUQ5jgIvqit7KlAN9BBAkAE525Aw0VD
14+
1lGJclWjuTZAGD4+MSttIJ1ZtHU8QShNBHMe7CUsPtRypXn4WToLVc3Ya53cGGcT
15+
1BQEchduOUpF
16+
-----END PRIVATE KEY-----

test/resources/root.cert

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDZjCCAk4CCQCvDqKVXw2uvTANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJT
3+
RTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
4+
cyBQdHkgTHRkMQswCQYDVQQDEwJjYTEgMB4GCSqGSIb3DQEJARYRZHVtbXlAZXhh
5+
bXBsZS5jb20wIBcNMTYwNDA2MDc0NjQ2WhgPNDc1NDAzMDMwNzQ2NDZaMHQxCzAJ
6+
BgNVBAYTAlNFMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5l
7+
dCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMTAmNhMSAwHgYJKoZIhvcNAQkBFhFk
8+
dW1teUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
9+
ANmZyHSsDT6o2I+5tc4itWu2E9vbCiWx8AkVKQ162QP5ZSwoPzf76RnDDY0U3LCV
10+
BDblI/reB/7ABc1mo6eBNNjL0vqT6jyMykml9ErhQIQslmq+SI4GE2Hjl51hTM/f
11+
FxJIIh2AjxJs1nAZxm9P9oEF9Q45mc5Fyi0tkfR9O98a1vDn9kEb5SryUvEVWUlH
12+
ly57KpmhmjLv5hwOdvyFdkPWMeGfrERTWFiiyB+FM/52Tl9knsKzh515WiuViRyp
13+
68k9SfHkOaZnuxY5ziP+Y2y+Njtr15hP7s4IKd5M7wCLIL082xvPYadH0r0blx6/
14+
oIRRZAPjslRebmvX7TIMM18CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAUy2KghZH
15+
YrD7BVUtDS5XzpW0hSq5uFZy4P76uHTaA0V11r3hZ5bqhiojk0YxvcOlwlEpE/90
16+
XKczVF9jLSyWcJQ/ArU9u34k90jzTgF+A7BcInUxXviouNnPvB93ofwHAZCQcLDW
17+
IPNKrOvsaHr/mKtRwTqoS/lQ6uVpLAofdly6C4h0U6AQFxOfUswjoqKLmk665xCP
18+
SyEVBzqUX5MlXbSzEncILRzTKXVA9Qz1YEDWIded1bv4D/VJRgnxwKCl/QDVTx58
19+
9SDwG1brdJIAdzxybAJuTVv+ieEFot4IC9Jyz8athOPyFu7oQyfDJOVnLQGVmkeP
20+
UHPW/w32r+np9Q==
21+
-----END CERTIFICATE-----

test/resources/root.key

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEpQIBAAKCAQEA2ZnIdKwNPqjYj7m1ziK1a7YT29sKJbHwCRUpDXrZA/llLCg/
3+
N/vpGcMNjRTcsJUENuUj+t4H/sAFzWajp4E02MvS+pPqPIzKSaX0SuFAhCyWar5I
4+
jgYTYeOXnWFMz98XEkgiHYCPEmzWcBnGb0/2gQX1DjmZzkXKLS2R9H073xrW8Of2
5+
QRvlKvJS8RVZSUeXLnsqmaGaMu/mHA52/IV2Q9Yx4Z+sRFNYWKLIH4Uz/nZOX2Se
6+
wrOHnXlaK5WJHKnryT1J8eQ5pme7FjnOI/5jbL42O2vXmE/uzggp3kzvAIsgvTzb
7+
G89hp0fSvRuXHr+ghFFkA+OyVF5ua9ftMgwzXwIDAQABAoIBAEe9uug0fV1mP5gL
8+
K1Sd/uBXNG7s5YiOBMyJzHIkSX5U8DVBw64KgMy8kTAta6FQUAZlP5qLL2mfF4qj
9+
x1sHb0v2z0VMFRMHe/4SF9vELgglxyXEPJmOiT9h0O/TT4bNT4b4fz7ozsLNXVmy
10+
NcknPOdG9odNGFd4jPKeLpvD2kRwseeyELdXtqKrG2NmP0t4k76Jrlr9gjt31jkj
11+
uxXVoEuoyL4PSA/O+8Sl3igO7JqlzXeQrAfeUOMkwyNieaE2KT9vKsGwZM9Pchfj
12+
WIxqYM8e4FrvY0FUfqC/yo/4cgaRofhreqN/Y+v0y921n+It9rD+h5LeqHvoOGMB
13+
w5gQBtECgYEA/GbdyJpGIx2kW3qZIexPtTSu4aPk2Edl7J6isnGkI0dr0I+YC6Bd
14+
+1fqINkvBWytYBRI9rwcTOYGTxdCOyJ2g3DJeLVX0CRn4TaYNEnyhs5GYaL/Dyrs
15+
OGC1Ef0M08zF2KWDq/BCcxdULr9Wk8mLVZJG/c9JVqW8V7j9dMllPGcCgYEA3LPp
16+
Nlfi+APgaEwb9GzbpXdz9ZbfNXlY1SoJAwvBIa7bhh9I019hsdbFlPhvXOmAtDjQ
17+
JFQkytSTcbqUz+T+zw+L8xB10uxPALsoahJQO+gbciQCaMII39hFiRQgLQiHiQTn
18+
RbeX+yocC179Eh8YoRG1Ln3MF4aUGsKDwmzl9kkCgYEAnzpFr8ejd4O7q/oroLrz
19+
jd0udiputAJWym9JNEl8wsTLv0bXJH6Gy4kqqo5Ym5NzzKj/XqhNMjXqxPpnTebv
20+
3PvKHdxJCYXuAqXuXw5HccOvouiw/2CUpPxdPnvlG7iTF5lS96UaRoDxGoyakaET
21+
xWgCYRvjqEXmC3EodASZWQECgYEAuQlVw6wXrNyDLq5w2ZLS7H2kCQl/BnRAmCdv
22+
+s/GEplpj593DVBwtgtdCDLqGzniIDdpuquZVTy4iadm0I4rXCqqqRTp0/cvnWtM
23+
zPGhtzg4mo+6PV5A1nuagP0QpPD7wVMNG5R7paZ+cMIo5yKPIauY/euWSzsXvP/M
24+
PBvVCZECgYEAvUO9DYgAOgpeVbsVJKH77cbOjy/wcRZvnIfWT3k4WKEYkw39Rzio
25+
mn8jqS/YJKWXqRVlJ/2IEv3b4TxqIBZQ1dQs6C/PM6iUQIcXalZ62PAQtubO4YI+
26+
GMgXfHTMmBG+2XnQkP/fNgJ9AjK2m9b7mC50E18wfaN6tk1WmnCRYSw=
27+
-----END RSA PRIVATE KEY-----

test/v1/tck/steps/environment.js

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
*/
1919

2020
var neo4j = require("../../../../lib/v1");
21+
var fs = require("fs");
2122

2223
module.exports = function () {
2324

24-
var failedScenarios = []
25+
var failedScenarios = [];
2526

2627
this.Before("@reset_database", function( scenario, callback ) {
2728
this.driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
@@ -32,20 +33,33 @@ module.exports = function () {
3233
callback();
3334
});
3435

35-
this.Before("~@reset_database", function( scenario, callback ) {
36+
this.Before("@tls", function( scenario ) {
37+
this.knownHosts1 = "known_hosts1";
38+
this.knownHosts2 = "known_hosts2";
39+
_deleteFile(this.knownHosts1);
40+
_deleteFile(this.knownHosts2);
41+
});
42+
43+
this.Before("~@reset_database", "~@tls", function( scenario, callback ) {
3644
this.driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
3745
this.session = this.driver.session();
3846
callback();
3947
});
4048

4149
this.Before("@equality_test", function( scenario ) {
42-
this.savedValues = {}
50+
this.savedValues = {};
4351
});
4452

4553
this.After(function (scenario, callback) {
54+
if (this.driver) {
55+
this.driver.close();
56+
}
4657
if (!scenario.isSuccessful()) {
4758
failedScenarios.push(scenario)
4859
}
60+
61+
_deleteFile(this.knownHosts1);
62+
_deleteFile(this.knownHosts2);
4963
callback();
5064
});
5165

@@ -59,4 +73,16 @@ module.exports = function () {
5973
}
6074
callback();
6175
});
62-
}
76+
77+
function _deleteFile(fname) {
78+
if (!fname) return;
79+
80+
try {
81+
fs.lstatSync(fname);
82+
fs.unlinkSync(fname);
83+
}
84+
catch (e) {
85+
// ignore
86+
}
87+
}
88+
};

0 commit comments

Comments
 (0)