aperx/factorio-clusterio
1
0 Fork 0
mirror of https://github.com/clusterio/clusterio.git synced 2026-11-12 15:04:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use pre-generated certificate for HttpCloser test (#477)

Browse Source 
Remove ugly hack to generate and use an insecure certificate on the fly
in the HttpCloser's https tests and replace it with the already existing
properly generated test certificate. Removes the dependency on node-forge.
This commit is contained in:
Hornwitser authored and GitHub committed 2022-11-09 20:18:24 +01:00
1 parent 4e9f3ee173
commit 87598b24ee
2 files changed
+4 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

package.json
-1
View File
@@ -34,7 +34,6 @@
"jsonwebtoken": "^8.2.1",
"jszip": "^3.2.2",
"mocha": "^9.2.2",
"node-forge": "^1.3.1",
"nyc": "^15.1.0",
"phin": "^3.5.1"
}
test/master/HttpCloser.js
+4 -35
View File
@@ -1,11 +1,10 @@
"use strict";
const assert = require("assert").strict;
const fs = require("fs-extra");
const http = require("http");
const https = require("https");
const util = require("util");
const tls = require("tls");
const forge = require("node-forge");
const phin = require("phin");
const { wait } = require("@clusterio/lib/helpers");
@@ -14,21 +13,6 @@ const HttpCloser = require("@clusterio/master/src/HttpCloser");
// Time to wait during async operations to ensure they happened in order.
const tick = 20;
const origCreateSecureContext = tls.createSecureContext;
tls.createSecureContext = function(options) {
if (!options.cert || !options.key) {
return origCreateSecureContext(options);
}
let lessOptions = { ...options };
delete lessOptions.key;
delete lessOptions.cert;
let ctx = origCreateSecureContext(lessOptions);
ctx.context.setCert(options.cert);
ctx.context.setKey(options.key, undefined);
return ctx;
};
function serverSuite(proto) {
let api = proto === "http" ? http : https;
let server;
@@ -49,24 +33,9 @@ function serverSuite(proto) {
before(async function() {
if (proto === "https") {
// Generate TLS certificate
let keypair = forge.pki.rsa.generateKeyPair(512);
let cert = forge.pki.createCertificate();
cert.publicKey = keypair.publicKey;
cert.serialNumber = "01";
cert.validity.notBefore = new Date();
cert.validity.notAfter = new Date(cert.validity.notBefore);
cert.validity.notAfter.setFullYear(cert.validity.notAfter.getFullYear() + 1);
let attrs = [{ name: "commonName", value: "localhost" }];
cert.setSubject(attrs);
cert.setIssuer(attrs);
cert.sign(keypair.privateKey);
serverOptions.key = forge.pki.privateKeyToPem(keypair.privateKey);
let pem = forge.pki.certificateToPem(cert);
serverOptions.cert = pem;
serverOptions.ciphers = "DEFAULT@SECLEVEL=0";
clientOptions.ca = pem;
clientOptions.ciphers = "DEFAULT@SECLEVEL=0";
serverOptions.key = await fs.readFile("test/file/tls/key.pem");
serverOptions.cert = await fs.readFile("test/file/tls/cert.pem");
clientOptions.ca = serverOptions.cert;
}
});
beforeEach(async function() {