@requestly/requestly-proxy 1.1.23 → 1.2.0

package/dist/components/proxy-middleware/helpers/harObectCreator.js

@@ -22,14 +22,14 @@ const createHarQueryStrings = (query_params) => {
             query_value.forEach(val => {
                 res.push({
                     "name": query,
-                    "value": val
+                    "value": val !== null && val !== void 0 ? val : ""
                 });
             });
         }
         else {
             res.push({
                 "name": query,
-                "value": query_value
+                "value": query_value !== null && query_value !== void 0 ? query_value : ""
             });
         }
     });

package/dist/components/proxy-middleware/helpers/http_helpers.js

@@ -49,13 +49,8 @@ const bodyParser = (contentTypeHeader, buffer) => {
 };
 exports.bodyParser = bodyParser;
 const getContentType = (contentTypeHeader) => {
-    if (!contentTypeHeader) {
-        return null;
-    }
-    let contentType = null;
-    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type
-    contentType = contentTypeHeader.split(";")[0];
-    return contentType;
+    var _a;
+    return (_a = contentTypeHeader === null || contentTypeHeader === void 0 ? void 0 : contentTypeHeader.split(";")[0]) !== null && _a !== void 0 ? _a : null;
 };
 exports.getContentType = getContentType;
 const parseJsonBody = (data) => {

package/dist/components/proxy-middleware/rule_action_processor/processors/modify_response_processor.js

@@ -117,6 +117,7 @@ const modify_response_using_code = (action, ctx) => __awaiter(void 0, void 0, vo
             responseType: (_c = (_b = ctx === null || ctx === void 0 ? void 0 : ctx.serverToProxyResponse) === null || _b === void 0 ? void 0 : _b.headers) === null || _c === void 0 ? void 0 : _c["content-type"],
             requestHeaders: ctx.clientToProxyRequest.headers,
             requestData: (0, http_helpers_1.parseJsonBody)((_e = (_d = ctx.rq) === null || _d === void 0 ? void 0 : _d.final_request) === null || _e === void 0 ? void 0 : _e.body) || null,
+            statusCode: ctx.serverToProxyResponse.statusCode,
         };
         try {
             args.responseJSON = JSON.parse(args.response);

package/dist/lib/proxy/lib/ca.d.ts

@@ -1,5 +1,6 @@
 export = CA;
 declare class CA {
+    onCARegenerated(callback: any): void;
     randomSerialNumber(): string;
     generateCA(callback: any): void;
     loadCA(callback: any): void;

package/dist/lib/proxy/lib/ca.js

@@ -127,7 +127,12 @@ var ServerExtensions = [
         name: "subjectKeyIdentifier",
     },
 ];
-var CA = function () { };
+var CA = function () {
+    this.onCARegenerationCallbacks = [];
+};
+CA.prototype.onCARegenerated = function (callback) {
+    this.onCARegenerationCallbacks.push(callback);
+};
 CA.create = function (caFolder, callback) {
     var ca = new CA();
     ca.baseCAFolder = caFolder;
@@ -140,7 +145,19 @@ CA.create = function (caFolder, callback) {
         function (callback) {
             FS.exists(path.join(ca.certsFolder, "ca.pem"), function (exists) {
                 if (exists) {
-                    ca.loadCA(callback);
+                    // ca.loadCA(callback);
+                    ca.loadCA(function (err) {
+                        if (err) {
+                            return callback(err);
+                        }
+                        if (ca.CAcert.validity.notAfter < new Date()) {
+                            // generate the certificate again since it is expired
+                            ca.generateCA(callback);
+                        }
+                        else {
+                            return callback();
+                        }
+                    });
                 }
                 else {
                     ca.generateCA(callback);
@@ -153,6 +170,7 @@ CA.create = function (caFolder, callback) {
         }
         return callback(null, ca);
     });
+    return ca;
 };
 CA.prototype.randomSerialNumber = function () {
     // generate random 16 bytes hex string
@@ -182,12 +200,25 @@ CA.prototype.generateCA = function (callback) {
         cert.sign(keys.privateKey, Forge.md.sha256.create());
         self.CAcert = cert;
         self.CAkeys = keys;
+        // delete all the keys and certs in the folders, first
+        // so that previously generated keys and certs are not used
+        async.parallel([
+            ...FS.readdirSync(self.certsFolder).map((file) => {
+                return () => FS.unlinkSync(path.join(self.certsFolder, file));
+            }),
+            ...FS.readdirSync(self.keysFolder).map((file) => {
+                return () => FS.unlinkSync(path.join(self.keysFolder, file));
+            }),
+        ], (err) => {
+            console.debug("Error while deleting existing certs during CA regeneration: ", err);
+        });
         async.parallel([
             FS.writeFile.bind(null, path.join(self.certsFolder, "ca.pem"), pki.certificateToPem(cert)),
             FS.writeFile.bind(null, path.join(self.keysFolder, "ca.private.key"), pki.privateKeyToPem(keys.privateKey)),
             FS.writeFile.bind(null, path.join(self.keysFolder, "ca.public.key"), pki.publicKeyToPem(keys.publicKey)),
         ], callback);
-    });
+        this.onCARegenerationCallbacks.forEach((callback) => callback(path.join(self.certsFolder, "ca.pem")));
+    }.bind(self));
 };
 CA.prototype.loadCA = function (callback) {
     var self = this;

package/dist/lib/proxy/lib/proxy.d.ts

@@ -16,7 +16,7 @@ declare var WebSocket: {
 };
 declare var url: any;
 declare var semaphore: any;
-declare var ca: any;
+declare var CA: any;
 declare var Sentry: any;
 declare const checkInvalidHeaderChar: any;
 declare const debug: any;

package/dist/lib/proxy/lib/proxy.js

@@ -12,7 +12,7 @@ var events = require("events");
 var WebSocket = require("ws");
 var url = require("url");
 var semaphore = require("semaphore");
-var ca = require("./ca.js");
+var CA = require("./ca.js");
 var Sentry = require("@sentry/browser");
 const checkInvalidHeaderChar = require("../custom/utils/checkInvalidHeaderChar");
 const debug = require("debug")("http-mitm-proxy");
@@ -38,6 +38,7 @@ var Proxy = function () {
     this.onResponseDataHandlers = [];
     this.onResponseEndHandlers = [];
     this.responseContentPotentiallyModified = false;
+    this.onCARegeneratedHandlers = [];
 };
 module.exports.Proxy = Proxy;
 const PROXY_HANDLER_TYPE = {
@@ -74,7 +75,7 @@ Proxy.prototype.listen = function (options, callback = (e) => { }) {
     this.httpsPort = this.forceSNI ? options.httpsPort : undefined;
     this.sslCaDir =
         options.sslCaDir || path.resolve(process.cwd(), ".http-mitm-proxy");
-    ca.create(this.sslCaDir, function (err, ca) {
+    this.ca = CA.create(this.sslCaDir, function (err, ca) {
         if (err) {
             return callback(err);
         }
@@ -115,7 +116,8 @@ Proxy.prototype.listen = function (options, callback = (e) => { }) {
                 callback();
             });
         }
-    });
+    }.bind(this));
+    this.ca.onCARegenerated(this._onCARegenerated.bind(this));
     return this;
 };
 Proxy.prototype._createHttpsServer = function (options, callback) {
@@ -561,6 +563,12 @@ Proxy.prototype.onCertificateMissing = function (ctx, files, callback) {
     });
     return this;
 };
+Proxy.prototype.onCARegenerated = function (fn) {
+    this.onCARegeneratedHandlers.push(fn);
+};
+Proxy.prototype._onCARegenerated = function (pathToNewCA) {
+    this.onCARegeneratedHandlers.forEach(fn => fn(pathToNewCA));
+};
 Proxy.prototype._onError = function (kind, ctx, err) {
     if (ctx) {
         ctx.currentHandler = PROXY_HANDLER_TYPE.ON_ERROR;

package/dist/rq-proxy.js

@@ -13,6 +13,9 @@ class RQProxy {
             console.log(proxyConfig);
             // @ts-ignore
             this.proxy = new proxy_1.default();
+            if (proxyConfig.onCARegenerated) {
+                this.proxy.onCARegenerated(proxyConfig.onCARegenerated);
+            }
             // console.log(this.proxy);
             this.proxy.listen({
                 port: proxyConfig.port,

package/dist/types/index.d.ts

@@ -1,7 +1,9 @@
 export interface ProxyConfig {
+    [x: string]: any;
     port: Number;
     certPath: String;
     rootCertPath: String;
+    onCARegenerated?: Function;
 }
 export interface Rule {
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@requestly/requestly-proxy",
-  "version": "1.1.23",
+  "version": "1.2.0",
   "description": "Proxy that gives superpowers to all the Requestly clients",
   "main": "dist/index.js",
   "scripts": {