npm - snyk-broker - Versions diffs - 4.207.0 → 4.208.1 - Mend

snyk-broker 4.207.0 → 4.208.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (129) hide show

package/dist/cli/init.js CHANGED Viewed

@@ -40,6 +40,6 @@ exports.default = async (templateName) => {
         const writer = (0, fs_1.createWriteStream)(path_1.default.resolve(process.cwd(), newfile));
         reader.pipe(writer).on('finish', resolve).on('error', reject);
     })));
-    logger_1.log.info({ templateName }, 'initialisation complete');
+    logger_1.log.info({ templateName }, 'Initialisation complete.');
 };
 //# sourceMappingURL=init.js.map

package/dist/cli/init.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../cli/init.ts"],"names":[],"mappings":";;;;;AAAA,2BAA0E;AAC1E,gDAAwB;AACxB,MAAM,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AAC7D,+CAAmD;AAEnD,kBAAe,KAAK,EAAE,YAAY,EAAE,EAAE;IACpC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IAED,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAErD,MAAM,SAAS,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,8BAA8B,CAAC,CAAC;KAChE;IAED,MAAM,aAAa,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAErD,qEAAqE;IACrE,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3C,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAErC,IAAI;YACF,MAAM,aAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEvB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;SAChC;IACH,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAEzE,IAAI,aAAa,CAAC,MAAM,EAAE;QACxB,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1E,MAAM,IAAI,KAAK,CACb,4EAA4E,iBAAiB,EAAE,CAChG,CAAC;KACH;IAED,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CACf,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC9C,YAAM,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,0BAA0B,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAA,qBAAgB,EAAC,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,IAAA,sBAAiB,EAC9B,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CACrC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC,CAAC,CACL,CACF,CAAC;IAEF,YAAM,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,EAAE,~~yBAAyB~~,CAAC,CAAC;~~AAC3D~~,CAAC,CAAC"}
1	+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../cli/init.ts"],"names":[],"mappings":";;;;;AAAA,2BAA0E;AAC1E,gDAAwB;AACxB,MAAM,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AAC7D,+CAAmD;AAEnD,kBAAe,KAAK,EAAE,YAAY,EAAE,EAAE;IACpC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IAED,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAErD,MAAM,SAAS,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,8BAA8B,CAAC,CAAC;KAChE;IAED,MAAM,aAAa,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAErD,qEAAqE;IACrE,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3C,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAErC,IAAI;YACF,MAAM,aAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEvB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;SAChC;IACH,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAEzE,IAAI,aAAa,CAAC,MAAM,EAAE;QACxB,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1E,MAAM,IAAI,KAAK,CACb,4EAA4E,iBAAiB,EAAE,CAChG,CAAC;KACH;IAED,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CACf,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC9C,YAAM,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,0BAA0B,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAA,qBAAgB,EAAC,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,IAAA,sBAAiB,EAC9B,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CACrC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC,CAAC,CACL,CACF,CAAC;IAEF,YAAM,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,EAAE,0BAA0B,CAAC,CAAC;AAC5D,CAAC,CAAC"}

package/dist/client-templates/bitbucket-server-bearer-auth/.env.sample CHANGED Viewed

@@ -15,6 +15,9 @@ BITBUCKET=bitbucket.yourdomain.com
 # changed to "bitbucket.yourdomain.com/rest/api/1.0"
 BITBUCKET_API=$BITBUCKET/rest/api/1.0
+# GIT Endpoint to override if necessary
+BITBUCKET_GIT=$BITBUCKET
 # the url of your broker client (including scheme and port)
 # BROKER_CLIENT_URL=

package/dist/lib/broker-workload/clientRequest.js CHANGED Viewed

@@ -5,6 +5,9 @@ const clientRequestHelpers_1 = require("../hybrid-sdk/clientRequestHelpers");
 const metrics_1 = require("../common/utils/metrics");
 const requestFiltering_1 = require("./requestFiltering");
 const logger_1 = require("../logs/logger");
+const interpolateRequestWithConfigData_1 = require("../hybrid-sdk/interpolateRequestWithConfigData");
+const token_1 = require("../common/utils/token");
+const node_crypto_1 = require("node:crypto");
 class BrokerClientRequestWorkload {
     constructor(req, res, options) {
         this.req = req;
@@ -13,8 +16,26 @@ class BrokerClientRequestWorkload {
     }
     async handler(makeRequestOverHttp = false) {
         const hybridClientRequestHandler = new clientRequestHelpers_1.HybridClientRequestHandler(this.req, this.res);
-        const filterResponse = (0, requestFiltering_1.filterClientRequest)(this.req, this.options, this.res.locals.websocket);
-        if (!filterResponse) {
+        const matchedFilterRule = (0, requestFiltering_1.filterClientRequest)(this.req, this.options, this.res.locals.websocket);
+        const logContext = {
+            url: this.req.url,
+            connectionName: '',
+            requestMethod: this.req.method,
+            requestHeaders: this.req.headers,
+            streamingID: '',
+            maskedToken: this.res.locals.websocket.connectionIdentifier
+                ? (0, token_1.maskToken)(this.res.locals.websocket.connectionIdentifier)
+                : '',
+            hashedToken: this.res.locals.websocket.connectionIdentifier
+                ? (0, token_1.hashToken)(this.res.locals.websocket.connectionIdentifier)
+                : '',
+            transport: this.res.locals.websocket?.socket?.transport?.name ?? 'unknown',
+            responseMedium: this.req.headers['x-broker-ws-response']
+                ? 'websocket'
+                : 'http',
+            requestId: (0, node_crypto_1.randomUUID)(),
+        };
+        if (!matchedFilterRule) {
             (0, metrics_1.incrementHttpRequestsTotal)(true, 'inbound-request');
             const reason = 'Request does not match any accept rule, blocking HTTP request';
             hybridClientRequestHandler.logContext.error = 'blocked';
@@ -25,7 +46,7 @@ class BrokerClientRequestWorkload {
                 .send({ message: 'blocked', reason, url: this.req.url });
         }
         else {
-            hybridClientRequestHandler.makeRequest(filterResponse, makeRequestOverHttp);
+            hybridClientRequestHandler.makeRequest((0, interpolateRequestWithConfigData_1.getInterpolatedRequest)(null, matchedFilterRule, this.req, logContext, this.options.config, 'upstream'), makeRequestOverHttp);
             (0, metrics_1.incrementHttpRequestsTotal)(false, 'inbound-request');
         }
     }

package/dist/lib/broker-workload/clientRequest.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"clientRequest.js","sourceRoot":"","sources":["../../../lib/broker-workload/clientRequest.ts"],"names":[],"mappings":";;;AACA,6EAAgF;AAChF,qDAAqE;AACrE,yDAAyD;AACzD,2CAA+C;~~AAE~~/C,MAAa,2BAA2B;IAItC,YAAY,GAAG,EAAE,GAAG,EAAE,OAAO;QAC3B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,mBAAmB,GAAG,KAAK;QACvC,MAAM,0BAA0B,GAAG,IAAI,iDAA0B,CAC/D,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,GAAG,CACT,CAAC;QACF,MAAM,~~cAAc~~,GAAG,IAAA,sCAAmB,~~EACxC~~,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAC1B,CAAC;QAEF,IAAI,CAAC,cAAc,EAAE;~~YACnB~~,IAAA,oCAA0B,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YACpD,MAAM,MAAM,GACV,+DAA+D,CAAC;YAClE,0BAA0B,CAAC,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;YACxD,YAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC3D,iEAAiE;YACjE,OAAO,IAAI,CAAC,GAAG;iBACZ,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;SAC5D;aAAM;YACL,0BAA0B,CAAC,WAAW,CACpC,~~cAAc~~,~~EACd~~,mBAAmB,CACpB,CAAC;YACF,IAAA,oCAA0B,EAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;SACtD;IACH,CAAC;CACF;~~AAvCD~~,~~kEAuCC~~"}
1	+ {"version":3,"file":"clientRequest.js","sourceRoot":"","sources":["../../../lib/broker-workload/clientRequest.ts"],"names":[],"mappings":";;;AACA,6EAAgF;AAChF,qDAAqE;AACrE,yDAAyD;AACzD,2CAA+C;AAC/C,qGAAwF;AAExF,iDAA6D;AAC7D,6CAAyC;AAEzC,MAAa,2BAA2B;IAItC,YAAY,GAAG,EAAE,GAAG,EAAE,OAAO;QAC3B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,mBAAmB,GAAG,KAAK;QACvC,MAAM,0BAA0B,GAAG,IAAI,iDAA0B,CAC/D,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,GAAG,CACT,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAA,sCAAmB,EAC3C,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAC1B,CAAC;QAEF,MAAM,UAAU,GAAuB;YACrC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG;YACjB,cAAc,EAAE,EAAE;YAClB,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM;YAC9B,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO;YAChC,WAAW,EAAE,EAAE;YACf,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB;gBACzD,CAAC,CAAC,IAAA,iBAAS,EAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC;gBAC3D,CAAC,CAAC,EAAE;YACN,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB;gBACzD,CAAC,CAAC,IAAA,iBAAS,EAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC;gBAC3D,CAAC,CAAC,EAAE;YACN,SAAS,EACP,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,IAAI,SAAS;YACjE,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,sBAAsB,CAAC;gBACtD,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,MAAM;YACV,SAAS,EAAE,IAAA,wBAAU,GAAE;SACxB,CAAC;QAEF,IAAI,CAAC,iBAAiB,EAAE;YACtB,IAAA,oCAA0B,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YACpD,MAAM,MAAM,GACV,+DAA+D,CAAC;YAClE,0BAA0B,CAAC,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;YACxD,YAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC3D,iEAAiE;YACjE,OAAO,IAAI,CAAC,GAAG;iBACZ,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;SAC5D;aAAM;YACL,0BAA0B,CAAC,WAAW,CACpC,IAAA,yDAAsB,EACpB,IAAI,EACJ,iBAAiB,EACjB,IAAI,CAAC,GAAG,EACR,UAAU,EACV,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,UAAU,CACX,EACD,mBAAmB,CACpB,CAAC;YACF,IAAA,oCAA0B,EAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;SACtD;IACH,CAAC;CACF;AAlED,kEAkEC"}

package/dist/lib/broker-workload/index.js CHANGED Viewed

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrokerWorkload = void 0;
 const pluginManager_1 = require("../client/brokerClientPlugins/pluginManager");
-const prepareRequest_1 = require("../common/relay/prepareRequest");
+const prepareRequest_1 = require("./prepareRequest");
 const content_length_1 = require("../common/utils/content-length");
 const headers_value_constants_1 = require("../common/utils/headers-value-constants");
 const metrics_1 = require("../common/utils/metrics");
@@ -13,6 +13,7 @@ const correlation_headers_1 = require("../common/utils/correlation-headers");
 const requestFiltering_1 = require("./requestFiltering");
 const request_1 = require("../hybrid-sdk/http/request");
 const log_1 = require("../logs/log");
+const interpolateRequestWithConfigData_1 = require("../hybrid-sdk/interpolateRequestWithConfigData");
 class BrokerWorkload {
     constructor(connectionIdentifier, options, websocketConnectionHandler) {
         this.options = options;
@@ -47,13 +48,12 @@ class BrokerWorkload {
             connectionIdentifier: this.connectionIdentifier,
             payloadStreamingId: payload.streamingID,
             ...correlationHeaders,
-            // overHttp: payload.headers['x-broker-ws-response'] ? false : true,
-        }, this.websocketConnectionHandler, websocketResponseHandler, logContext);
+        }, this.websocketConnectionHandler, websocketResponseHandler, this.options.config, logContext);
         const simplifiedContext = structuredClone(logContext);
         delete simplifiedContext.requestHeaders;
         logger_1.log.info(simplifiedContext, `[Websocket Flow] Received request from ${process.env.BROKER_TYPE == 'client' ? 'client' : 'server'}`);
-        const filterResponse = (0, requestFiltering_1.filterRequest)(payload, this.options, this.websocketConnectionHandler);
-        if (!filterResponse) {
+        const matchedFilterRule = (0, requestFiltering_1.filterRequest)(payload, this.options, this.websocketConnectionHandler);
+        if (!matchedFilterRule) {
             (0, metrics_1.incrementWebSocketRequestsTotal)(true, 'inbound-request');
             const reason = '[Websocket Flow][Blocked Request] Does not match any accept rule';
             logContext.error = 'Blocked by filter rules';
@@ -69,8 +69,9 @@ class BrokerWorkload {
             });
         }
         else {
+            const urlInterpolated = (0, interpolateRequestWithConfigData_1.getInterpolatedRequest)(this.connectionIdentifier, matchedFilterRule, payload, logContext, this.options.config, 'downstream');
             (0, metrics_1.incrementWebSocketRequestsTotal)(false, 'inbound-request');
-            const preparedRequest = await (0, prepareRequest_1.prepareRequestFromFilterResult)(filterResponse, payload, logContext, this.options, this.connectionIdentifier, this.websocketConnectionHandler?.socketType);
+            const preparedRequest = await (0, prepareRequest_1.prepareRequest)(urlInterpolated, payload, logContext, this.options, this.connectionIdentifier, this.websocketConnectionHandler?.socketType);
             if (this.options.config.universalBrokerEnabled) {
                 preparedRequest.req = await (0, pluginManager_1.runPreRequestPlugins)(this.options, this.connectionIdentifier, preparedRequest.req);
                 payload.headers[headers_value_constants_1.contentLengthHeader] = (0, content_length_1.computeContentLength)(payload);
@@ -103,7 +104,7 @@ class BrokerWorkload {
                             statusCode: response.statusCode,
                             responseHeaders: response.headers,
                             url: preparedRequest.req.url,
-                        }, `[Websocket Flow][Inbound] Unexpected status code for relayed request`);
+                        }, `[Websocket Flow][Inbound] Unexpected status code for relayed request.`);
                     }
                     responseHandler.sendDataResponse(response, logContext);
                 }

package/dist/lib/broker-workload/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/broker-workload/index.ts"],"names":[],"mappings":";;;AAAA,+EAAmF;AACnF,~~mEAAgF~~;~~AAEhF~~,mEAAsE;AACtE,qFAA8E;AAC9E,qDAGiC;AACjC,iDAA6D;AAC7D,2CAA+C;AAC/C,mEAAsE;AACtE,6EAAoF;AACpF,yDAAmD;AACnD,wDAGoC;AACpC,qCAAuC;~~AAEvC~~,MAAa,cAAc;IAIzB,YACE,oBAA4B,EAC5B,OAAO,EACP,0BAA0B;QAE1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,wBAAwB;QAC7C,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,sBAAsB,EAAE;YAC9C,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC;SAC1D;QACD,MAAM,kBAAkB,GAAG,IAAA,mDAA6B,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE1E,MAAM,UAAU,GAAuB;YACrC,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,cAAc,EAAE,IAAI,CAAC,0BAA0B,CAAC,YAAY,IAAI,EAAE;YAClE,aAAa,EAAE,OAAO,CAAC,MAAM;YAC7B,cAAc,EAAE,OAAO,CAAC,OAAO;YAC/B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,WAAW,EAAE,IAAA,iBAAS,EAAC,IAAI,CAAC,oBAAoB,CAAC;YACjD,WAAW,EAAE,IAAA,iBAAS,EAAC,IAAI,CAAC,oBAAoB,CAAC;YACjD,SAAS,EACP,IAAI,CAAC,0BAA0B,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,IAAI,SAAS;YACvE,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC;gBACrD,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,MAAM;YACV,GAAG,kBAAkB;SACtB,CAAC;QAEF,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE;YACjC,4DAA4D;YAC5D,sFAAsF;YACtF,YAAM,CAAC,KAAK,CACV,UAAU,EACV,+DAA+D,CAChE,CAAC;SACH;QAED,MAAM,eAAe,GAAG,IAAI,uCAAqB,CAC/C;YACE,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,kBAAkB,EAAE,OAAO,CAAC,WAAW;YACvC,GAAG,kBAAkB;~~YACrB~~,~~oEAAoE;SACrE,~~EACD,IAAI,CAAC,0BAA0B,EAC/B,wBAAwB,EACxB,UAAU,CACX,CAAC;QAEF,MAAM,iBAAiB,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;QACtD,OAAO,iBAAiB,CAAC,cAAc,CAAC;QACxC,YAAM,CAAC,IAAI,CACT,iBAAiB,EACjB,0CACE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QACnD,EAAE,CACH,CAAC;QAEF,MAAM,~~cAAc~~,GAAG,IAAA,gCAAa,~~EAClC~~,OAAO,EACP,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,0BAA0B,CAChC,CAAC;QACF,IAAI,CAAC,~~cAAc~~,EAAE;~~YACnB~~,IAAA,yCAA+B,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YACzD,MAAM,MAAM,GACV,kEAAkE,CAAC;YACrE,UAAU,CAAC,KAAK,GAAG,yBAAyB,CAAC;YAC7C,YAAM,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAChC,yCAAyC;YACzC,OAAO,eAAe,CAAC,YAAY,CAAC;gBAClC,MAAM,EAAE,GAAG;gBACX,IAAI,EAAE;oBACJ,OAAO,EAAE,SAAS;oBAClB,MAAM;oBACN,GAAG,EAAE,OAAO,CAAC,GAAG;iBACjB;aACF,CAAC,CAAC;SACJ;aAAM;YACL,IAAA,yCAA+B,EAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;YAC1D,MAAM,eAAe,GAAG,MAAM,IAAA,+~~CAA8B~~,~~EAC1D~~,~~cAAc~~,~~EACd~~,OAAO,EACP,UAAU,EACV,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,0BAA0B,EAAE,UAAU,CAC5C,CAAC;YACF,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,sBAAsB,EAAE;gBAC9C,eAAe,CAAC,GAAG,GAAG,MAAM,IAAA,oCAAoB,EAC9C,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,oBAAoB,EACzB,eAAe,CAAC,GAAG,CACpB,CAAC;gBACF,OAAO,CAAC,OAAO,CAAC,6CAAmB,CAAC,GAAG,IAAA,qCAAoB,EAAC,OAAO,CAAC,CAAC;aACtE;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,KAAK,QAAQ,EAAE;gBAC/C,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,GAAG,IAAA,iBAAS,EACzD,IAAI,CAAC,oBAAoB,CAC1B,EAAE,CAAC;aACL;YACD,IAAA,oCAA0B,EAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;YAEtD,IAAI,OAAO,CAAC,WAAW,EAAE;gBACvB,sCAAsC;gBACtC,IAAI;oBACF,MAAM,iCAAiC,GACrC,MAAM,IAAA,0CAAgC,EAAC,eAAe,CAAC,GAAG,CAAC,CAAC;oBAC9D,eAAe,CAAC,kBAAkB,CAAC,iCAAiC,CAAC,CAAC;iBACvE;gBAAC,OAAO,CAAC,EAAE;oBACV,YAAM,CAAC,KAAK,CACV;wBACE,GAAG,UAAU;wBACb,KAAK,EAAE,CAAC;wBACR,UAAU,EAAE,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,KAAK;qBACpD,EACD,mEAAmE,CACpE,CAAC;iBACH;aACF;iBAAM;gBACL,sEAAsE;gBACtE,IAAI;oBACF,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAuB,EAAC,eAAe,CAAC,GAAG,CAAC,CAAC;oBACpE,MAAM,MAAM,GAAG,CAAC,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC;oBACxD,IAAI,MAAM,GAAG,GAAG,EAAE;wBAChB,YAAM,CAAC,IAAI,CACT;4BACE,UAAU,EAAE,QAAQ,CAAC,UAAU;4BAC/B,eAAe,EAAE,QAAQ,CAAC,OAAO;4BACjC,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,GAAG;yBAC7B,EACD,~~sEAAsE~~,~~CACvE~~,CAAC;qBACH;oBACD,eAAe,CAAC,gBAAgB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;iBACxD;gBAAC,OAAO,KAAK,EAAE;oBACd,IAAA,cAAQ,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;oBAC5B,OAAO,eAAe,CAAC,YAAY,CAAC;wBAClC,MAAM,EAAE,GAAG;wBACX,IAAI,EAAE,KAAK;qBACZ,CAAC,CAAC;iBACJ;aACF;SACF;IACH,CAAC;CACF;~~AAzJD~~,~~wCAyJC~~"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/broker-workload/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/{common/relay → broker-workload}/prepareRequest.js RENAMED Viewed

@@ -3,18 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareRequestFromFilterResult = void 0;
+exports.prepareRequest = void 0;
 const url_1 = require("url");
-const version_1 = __importDefault(require("../utils/version"));
-const try_json_parse_1 = __importDefault(require("../utils/try-json-parse"));
-const replace_vars_1 = require("../utils/replace-vars");
-const undefsafe_1 = __importDefault(require("undefsafe"));
-const logger_1 = require("../../logs/logger");
-const scm_1 = require("../../client/scm");
-const universal_1 = require("../config/universal");
-const content_length_1 = require("../utils/content-length");
-const headers_value_constants_1 = require("../utils/headers-value-constants");
-const prepareRequestFromFilterResult = async (result, payload, logContext, options, brokerToken, socketType) => {
+const version_1 = __importDefault(require("../common/utils/version"));
+const logger_1 = require("../logs/logger");
+const scm_1 = require("../client/scm");
+const universal_1 = require("../common/config/universal");
+const content_length_1 = require("../common/utils/content-length");
+const headers_value_constants_1 = require("../common/utils/headers-value-constants");
+const prepareRequest = async (result, payload, logContext, options, brokerToken, socketType) => {
     let errorPreparing = null;
     if (result.url.startsWith('http') === false) {
         result.url = 'https://' + result.url;
@@ -49,43 +46,6 @@ const prepareRequestFromFilterResult = async (result, payload, logContext, optio
             logContext.authHeaderSetByRuleUrl = true;
         }
     }
-    // if the request is all good - and at this point it is, we'll check
-    // whether we want to do variable substitution on the body
-    //
-    // Variable substitution - for those who forgot - is substituting a part
-    // of a given string (e.g. "${SOME_ENV_VAR}/rest/of/string")
-    // with an env var of the same name (SOME_ENV_VAR).
-    // This is used (for example) to substitute the snyk url
-    // with the broker's url when defining the target for an incoming webhook.
-    if (!options.config.disableBodyVarsSubstitution && payload.body) {
-        const parsedBody = (0, try_json_parse_1.default)(payload.body);
-        if (parsedBody.BROKER_VAR_SUB) {
-            logContext.bodyVarsSubstitution = parsedBody.BROKER_VAR_SUB;
-            for (const path of parsedBody.BROKER_VAR_SUB) {
-                let source = (0, undefsafe_1.default)(parsedBody, path); // get the value
-                source = (0, replace_vars_1.replace)(source, options.config.universalBrokerEnabled
-                    ? (0, universal_1.getConfigForIdentifier)(brokerToken, options.config)
-                    : options.config); // replace the variables
-                (0, undefsafe_1.default)(parsedBody, path, source); // put it back in
-            }
-            //Remove the BROKER_VAR_SUB for the request body
-            delete parsedBody.BROKER_VAR_SUB;
-            payload.body = JSON.stringify(parsedBody);
-        }
-    }
-    if (!options.config.disableHeaderVarsSubstitution &&
-        payload.headers &&
-        payload.headers['x-broker-var-sub']) {
-        // check whether we want to do variable substitution on the headers
-        logContext.headerVarsSubstitution = payload.headers['x-broker-var-sub'];
-        for (const path of payload.headers['x-broker-var-sub'].split(',')) {
-            let source = (0, undefsafe_1.default)(payload.headers, path.trim()); // get the value
-            source = (0, replace_vars_1.replace)(source, options.config.universalBrokerEnabled
-                ? (0, universal_1.getConfigForIdentifier)(brokerToken, options.config)
-                : options.config); // replace the variables
-            (0, undefsafe_1.default)(payload.headers, path.trim(), source); // put it back in
-        }
-    }
     // remove headers that we don't want to relay
     // (because they corrupt the request)
     const headersToRemove = [
@@ -93,8 +53,6 @@ const prepareRequestFromFilterResult = async (result, payload, logContext, optio
         'x-forwarded-proto',
         'content-length',
         'host',
-        'accept-encoding',
-        'content-encoding',
         'x-forwarded-host',
         'x-forwarded-port',
         'snyk-acting-group-public-id',
@@ -128,6 +86,7 @@ const prepareRequestFromFilterResult = async (result, payload, logContext, optio
     // Unsure why - possibly Primus?
     if (payload.body?.type === 'Buffer')
         payload.body = Buffer.of(payload.body.data);
+    // TODO: Move github commit signing to a plugin
     if ((0, scm_1.gitHubTreeCheckNeeded)(options.config, {
         method: payload.method,
         url: payload.url,
@@ -158,6 +117,7 @@ const prepareRequestFromFilterResult = async (result, payload, logContext, optio
             logger_1.log.error({ error }, 'error while signing github commit');
         }
     }
+    // TODO: Move github commit signing to a plugin
     payload.headers['connection'] = 'Keep-Alive';
     payload.headers['Keep-Alive'] = 'timeout=60, max=1000';
     if (payload.headers &&
@@ -194,5 +154,5 @@ const prepareRequestFromFilterResult = async (result, payload, logContext, optio
     }
     return { req, error: errorPreparing };
 };
-exports.prepareRequestFromFilterResult = prepareRequestFromFilterResult;
+exports.prepareRequest = prepareRequest;
 //# sourceMappingURL=prepareRequest.js.map

package/dist/lib/broker-workload/prepareRequest.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"prepareRequest.js","sourceRoot":"","sources":["../../../lib/broker-workload/prepareRequest.ts"],"names":[],"mappings":"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"}

package/dist/lib/client/auth/brokerServerConnection.js ADDED Viewed

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renewBrokerServerConnection = void 0;
+const request_1 = require("../../hybrid-sdk/http/request");
+const utils_1 = require("../../hybrid-sdk/http/utils");
+const renewBrokerServerConnection = async (brokerServerConnectionParams, clientConfig) => {
+    const apiHostname = clientConfig.API_BASE_URL;
+    const body = {
+        data: {
+            type: 'broker_connection',
+            attributes: {
+                broker_client_id: brokerServerConnectionParams.brokerClientId,
+            },
+        },
+    };
+    let url = new URL(`${apiHostname}/hidden/brokers/connections/${brokerServerConnectionParams.connectionIdentifier}/auth/refresh`);
+    url = (0, utils_1.addServerIdAndRoleQS)(url, brokerServerConnectionParams.serverId, brokerServerConnectionParams.role);
+    const req = {
+        url: url.toString(),
+        headers: {
+            Authorization: brokerServerConnectionParams.authorization,
+            'Content-type': 'application/vnd.api+json',
+        },
+        method: 'POST',
+        body: JSON.stringify(body),
+    };
+    return await (0, request_1.makeRequestToDownstream)(req);
+};
+exports.renewBrokerServerConnection = renewBrokerServerConnection;
+//# sourceMappingURL=brokerServerConnection.js.map

package/dist/lib/client/auth/brokerServerConnection.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"brokerServerConnection.js","sourceRoot":"","sources":["../../../../lib/client/auth/brokerServerConnection.ts"],"names":[],"mappings":";;;AAEA,2DAGuC;AACvC,uDAAmE;AAU5D,MAAM,2BAA2B,GAAG,KAAK,EAC9C,4BAA0D,EAC1D,YAA2B,EACJ,EAAE;IACzB,MAAM,WAAW,GAAG,YAAY,CAAC,YAAY,CAAC;IAC9C,MAAM,IAAI,GAAG;QACX,IAAI,EAAE;YACJ,IAAI,EAAE,mBAAmB;YACzB,UAAU,EAAE;gBACV,gBAAgB,EAAE,4BAA4B,CAAC,cAAc;aAC9D;SACF;KACF,CAAC;IACF,IAAI,GAAG,GAAG,IAAI,GAAG,CACf,GAAG,WAAW,+BAA+B,4BAA4B,CAAC,oBAAoB,eAAe,CAC9G,CAAC;IACF,GAAG,GAAG,IAAA,4BAAoB,EACxB,GAAG,EACH,4BAA4B,CAAC,QAAQ,EACrC,4BAA4B,CAAC,IAAI,CAClC,CAAC;IAEF,MAAM,GAAG,GAA8B;QACrC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;QACnB,OAAO,EAAE;YACP,aAAa,EAAE,4BAA4B,CAAC,aAAa;YACzD,cAAc,EAAE,0BAA0B;SAC3C;QACD,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;KAC3B,CAAC;IACF,OAAO,MAAM,IAAA,iCAAuB,EAAC,GAAG,CAAC,CAAC;AAC5C,CAAC,CAAC;AAhCW,QAAA,2BAA2B,+BAgCtC"}

package/dist/lib/client/auth/oauth.js CHANGED Viewed

@@ -1,9 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchJwt = void 0;
+exports.setfetchAndUpdateJwt = exports.fetchAndUpdateJwt = exports.setAuthConfigKey = exports.getAuthConfig = void 0;
 const request_1 = require("../../hybrid-sdk/http/request");
 const logger_1 = require("../../logs/logger");
-async function fetchJwt(apiHostname, clientId, clientSecret) {
+const authConfig = {};
+const getAuthConfig = () => {
+    return authConfig;
+};
+exports.getAuthConfig = getAuthConfig;
+const setAuthConfigKey = (key, value) => {
+    authConfig[key] = value;
+};
+exports.setAuthConfigKey = setAuthConfigKey;
+async function fetchAndUpdateJwt(apiHostname, clientId, clientSecret) {
     try {
         const data = {
             grant_type: 'client_credentials',
@@ -22,15 +31,48 @@ async function fetchJwt(apiHostname, clientId, clientSecret) {
             const errorBody = JSON.parse(oauthResponse.body);
             throw new Error(`${oauthResponse.statusCode}-${errorBody.error}:${errorBody.error_description}`);
         }
-        const accessToken = JSON.parse(oauthResponse.body);
-        const jwt = accessToken.access_token;
-        const type = accessToken.token_type;
-        const expiresIn = accessToken.expires_in;
+        const accessTokenJSON = JSON.parse(oauthResponse.body);
+        const jwt = accessTokenJSON.access_token;
+        const type = accessTokenJSON.token_type;
+        const expiresIn = accessTokenJSON.expires_in;
+        (0, exports.setAuthConfigKey)('accessToken', {
+            expiresIn: expiresIn,
+            authHeader: `${type} ${jwt}`,
+        });
         return { expiresIn: expiresIn, authHeader: `${type} ${jwt}` };
     }
     catch (err) {
         logger_1.log.error({ err }, 'Unable to retrieve JWT');
     }
 }
-exports.fetchJwt = fetchJwt;
+exports.fetchAndUpdateJwt = fetchAndUpdateJwt;
+const refreshJwt = async (clientConfig, clientId, clientSecret) => {
+    logger_1.log.debug({}, 'Refreshing oauth access token');
+    try {
+        const newJwt = await fetchAndUpdateJwt(clientConfig.apiHostname, clientId, clientSecret);
+        if (!newJwt) {
+            throw new Error('Error retrieving new JWT:undefined.');
+        }
+        (0, exports.setAuthConfigKey)('accessToken', {
+            expiresIn: newJwt.expiresIn,
+            authHeader: newJwt.authHeader,
+        });
+        setTimeout(async () => {
+            refreshJwt(clientConfig, clientId, clientSecret);
+        }, clientConfig.AUTH_EXPIRATION_OVERRIDE ?? (newJwt.expiresIn - 60) * 1000);
+    }
+    catch (err) {
+        logger_1.log.error(`Error retrieving new JWT ${err}`);
+    }
+};
+const setfetchAndUpdateJwt = async (clientConfig, clientId, clientSecret) => {
+    const newJwt = await fetchAndUpdateJwt(clientConfig.apiHostname, clientId, clientSecret);
+    logger_1.log.debug({}, 'Setting auth updater.');
+    if (newJwt) {
+        setTimeout(async () => {
+            refreshJwt(clientConfig, clientId, clientSecret);
+        }, clientConfig.AUTH_EXPIRATION_OVERRIDE ?? (newJwt.expiresIn - 60) * 1000);
+    }
+};
+exports.setfetchAndUpdateJwt = setfetchAndUpdateJwt;
 //# sourceMappingURL=oauth.js.map

package/dist/lib/client/auth/oauth.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../lib/client/auth/oauth.ts"],"names":[],"mappings":";;;AAAA,2DAAwE;AAExE,8CAAkD;~~AAQ3C~~,KAAK,UAAU,~~QAAQ~~,~~CAC5B~~,WAAmB,EACnB,QAAgB,EAChB,YAAoB;IAEpB,IAAI;QACF,MAAM,IAAI,GAAG;YACX,UAAU,EAAE,oBAAoB;YAChC,SAAS,EAAE,QAAQ;YACnB,aAAa,EAAE,YAAY;SAC5B,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAE3C,MAAM,OAAO,GAA8B;YACzC,GAAG,EAAE,GAAG,WAAW,eAAe;YAClC,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;YAChE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE;SAC1B,CAAC;QACF,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAuB,EAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,aAAa,CAAC,UAAU,IAAI,GAAG,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,IAAI,KAAK,CACb,GAAG,aAAa,CAAC,UAAU,IAAI,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,iBAAiB,EAAE,CAChF,CAAC;SACH;QACD,MAAM,~~WAAW~~,GAAG,IAAI,CAAC,KAAK,~~CAAC~~,aAAa,CAAC,IAAI,~~CAA0B~~,CAAC;~~QAC5E~~,MAAM,GAAG,GAAG,~~WAAW~~,CAAC,YAAY,CAAC;~~QACrC~~,MAAM,IAAI,GAAG,~~WAAW~~,CAAC,UAAU,CAAC;~~QACpC~~,MAAM,SAAS,GAAG,~~WAAW~~,CAAC,UAAU,CAAC;~~QAEzC~~,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,IAAI,GAAG,EAAE,EAAE,CAAC;KAC/D;IAAC,OAAO,GAAG,EAAE;QACZ,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,wBAAwB,CAAC,CAAC;KACjD;AACH,CAAC;~~AAnCD~~,~~4BAmCC~~"}
1	+ {"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../lib/client/auth/oauth.ts"],"names":[],"mappings":";;;AAAA,2DAAwE;AAExE,8CAAkD;AASlD,MAAM,UAAU,GAAwB,EAAE,CAAC;AAEpC,MAAM,aAAa,GAAG,GAAG,EAAE;IAChC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAEK,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,KAAc,EAAE,EAAE;IAC9D,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC1B,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEK,KAAK,UAAU,iBAAiB,CACrC,WAAmB,EACnB,QAAgB,EAChB,YAAoB;IAEpB,IAAI;QACF,MAAM,IAAI,GAAG;YACX,UAAU,EAAE,oBAAoB;YAChC,SAAS,EAAE,QAAQ;YACnB,aAAa,EAAE,YAAY;SAC5B,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAE3C,MAAM,OAAO,GAA8B;YACzC,GAAG,EAAE,GAAG,WAAW,eAAe;YAClC,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;YAChE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE;SAC1B,CAAC;QACF,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAuB,EAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,aAAa,CAAC,UAAU,IAAI,GAAG,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,IAAI,KAAK,CACb,GAAG,aAAa,CAAC,UAAU,IAAI,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,iBAAiB,EAAE,CAChF,CAAC;SACH;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAChC,aAAa,CAAC,IAAI,CACM,CAAC;QAC3B,MAAM,GAAG,GAAG,eAAe,CAAC,YAAY,CAAC;QACzC,MAAM,IAAI,GAAG,eAAe,CAAC,UAAU,CAAC;QACxC,MAAM,SAAS,GAAG,eAAe,CAAC,UAAU,CAAC;QAE7C,IAAA,wBAAgB,EAAC,aAAa,EAAE;YAC9B,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,GAAG,IAAI,IAAI,GAAG,EAAE;SAC7B,CAAC,CAAC;QACH,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,IAAI,GAAG,EAAE,EAAE,CAAC;KAC/D;IAAC,OAAO,GAAG,EAAE;QACZ,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,wBAAwB,CAAC,CAAC;KACjD;AACH,CAAC;AAzCD,8CAyCC;AAED,MAAM,UAAU,GAAG,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE;IAChE,YAAM,CAAC,KAAK,CAAC,EAAE,EAAE,+BAA+B,CAAC,CAAC;IAClD,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,iBAAiB,CACpC,YAAY,CAAC,WAAW,EACxB,QAAQ,EACR,YAAY,CACb,CAAC;QACF,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACxD;QACD,IAAA,wBAAgB,EAAC,aAAa,EAAE;YAC9B,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAC,CAAC;QACH,UAAU,CAAC,KAAK,IAAI,EAAE;YACpB,UAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QACnD,CAAC,EAAE,YAAY,CAAC,wBAAwB,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;KAC7E;IAAC,OAAO,GAAG,EAAE;QACZ,YAAM,CAAC,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC;KACjD;AACH,CAAC,CAAC;AAEK,MAAM,oBAAoB,GAAG,KAAK,EACvC,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,iBAAiB,CACpC,YAAY,CAAC,WAAW,EACxB,QAAQ,EACR,YAAY,CACb,CAAC;IACF,YAAM,CAAC,KAAK,CAAC,EAAE,EAAE,uBAAuB,CAAC,CAAC;IAC1C,IAAI,MAAM,EAAE;QACV,UAAU,CAAC,KAAK,IAAI,EAAE;YACpB,UAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QACnD,CAAC,EAAE,YAAY,CAAC,wBAAwB,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;KAC7E;AACH,CAAC,CAAC;AAhBW,QAAA,oBAAoB,wBAgB/B"}

package/dist/lib/client/brokerClientPlugins/abstractBrokerPlugin.js CHANGED Viewed

@@ -16,7 +16,7 @@ class BrokerPlugin {
     isDisabled(config) {
         let isDisabled = false;
         if (config[`DISABLE_${this.pluginCode}_PLUGIN`]) {
-            logger_1.log.info({ plugin: this.pluginName }, `Plugin disabled`);
+            logger_1.log.info({ plugin: this.pluginName }, `Plugin disabled.`);
             isDisabled = true;
         }
         return isDisabled;

package/dist/lib/client/brokerClientPlugins/abstractBrokerPlugin.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"abstractBrokerPlugin.js","sourceRoot":"","sources":["../../../../lib/client/brokerClientPlugins/abstractBrokerPlugin.ts"],"names":[],"mappings":";;AAAA,qEAAqE;AACrE,2DAGuC;AAEvC,8CAAkD;AAElD,MAA8B,YAAY;IAgBxC,YAAY,eAAoC;QAC9C,IAAI,CAAC,MAAM,GAAG,YAAM,CAAC;QACrB,IAAI,CAAC,yBAAyB,GAAG,eAAe,CAAC;QACjD,IAAI,CAAC,uBAAuB,GAAG,iCAAuB,CAAC;QACvD,IAAI,CAAC,aAAa,GAAG,IAAA,gCAAgB,GAAE,CAAC;IAC1C,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAChD,IAAI,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CACnE,CAAC;IACJ,CAAC;IACD,UAAU,CAAC,MAAM;QACf,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,UAAU,SAAS,CAAC,EAAE;YAC/C,YAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,~~iBAAiB~~,CAAC,CAAC;~~YAC5D~~,UAAU,GAAG,IAAI,CAAC;SACnB;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAQD,KAAK,CAAC,UAAU,CACd,uBAA4C,EAC5C,yBAAoD,EACpD,aAAmC;QAEnC,YAAM,CAAC,KAAK,CACV;YACE,gBAAgB,EAAE,uBAAuB;YACzC,aAAa,EAAE,aAAa;SAC7B,EACD,4BAA4B,CAC7B,CAAC;QACF,OAAO,yBAAyB,CAAC;IACnC,CAAC;CACF;AAzDD,+BAyDC"}
1	+ {"version":3,"file":"abstractBrokerPlugin.js","sourceRoot":"","sources":["../../../../lib/client/brokerClientPlugins/abstractBrokerPlugin.ts"],"names":[],"mappings":";;AAAA,qEAAqE;AACrE,2DAGuC;AAEvC,8CAAkD;AAElD,MAA8B,YAAY;IAgBxC,YAAY,eAAoC;QAC9C,IAAI,CAAC,MAAM,GAAG,YAAM,CAAC;QACrB,IAAI,CAAC,yBAAyB,GAAG,eAAe,CAAC;QACjD,IAAI,CAAC,uBAAuB,GAAG,iCAAuB,CAAC;QACvD,IAAI,CAAC,aAAa,GAAG,IAAA,gCAAgB,GAAE,CAAC;IAC1C,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAChD,IAAI,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CACnE,CAAC;IACJ,CAAC;IACD,UAAU,CAAC,MAAM;QACf,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,UAAU,SAAS,CAAC,EAAE;YAC/C,YAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,kBAAkB,CAAC,CAAC;YAC7D,UAAU,GAAG,IAAI,CAAC;SACnB;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAQD,KAAK,CAAC,UAAU,CACd,uBAA4C,EAC5C,yBAAoD,EACpD,aAAmC;QAEnC,YAAM,CAAC,KAAK,CACV;YACE,gBAAgB,EAAE,uBAAuB;YACzC,aAAa,EAAE,aAAa;SAC7B,EACD,4BAA4B,CAC7B,CAAC;QACF,OAAO,yBAAyB,CAAC;IACnC,CAAC;CACF;AAzDD,+BAyDC"}

package/dist/lib/client/brokerClientPlugins/plugins/githubServerAppAuth.js CHANGED Viewed

@@ -38,7 +38,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
     // Useful for credentials retrieval, initial setup, etc...
     async startUp(connectionConfig, pluginsConfig) {
         try {
-            this.logger.info({ plugin: this.pluginName }, 'Running Startup');
+            this.logger.info({ plugin: this.pluginName }, 'Running Startup.');
             this.logger.trace({
                 plugin: this.pluginCode,
                 config: connectionConfig,
@@ -51,12 +51,12 @@ class Plugin extends abstractBrokerPlugin_1.default {
                     !connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH ||
                     !connectionConfig.GITHUB_APP_INSTALLATION_ID ||
                     !connectionConfig.GITHUB_APP_ID)) {
-                throw new Error(`Missing environment variable(s) for plugin (GITHUB_APP_CLIENT_ID, GITHUB_APP_PRIVATE_PEM_PATH, GITHUB_APP_INSTALLATION_ID)`);
+                throw new Error(`Missing environment variable(s) for plugin (GITHUB_APP_CLIENT_ID, GITHUB_APP_PRIVATE_PEM_PATH, GITHUB_APP_INSTALLATION_ID).`);
             }
             if (connectionConfig &&
                 connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH &&
                 !(0, node_fs_1.existsSync)(connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH)) {
-                throw new Error(`Pem file path is invalid ${connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH}`);
+                throw new Error(`PEM file path is invalid ${connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH}.`);
             }
             // Generate the JWT
             const now = Date.now();
@@ -64,13 +64,13 @@ class Plugin extends abstractBrokerPlugin_1.default {
                 this._getJWT(Math.floor(now / 1000), // Current time in seconds
                 connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH, connectionConfig.GITHUB_APP_ID);
             if (!(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].JWT_TOKEN) {
-                throw new Error(`Github app  Plugin Error: could not get JWT.`);
+                throw new Error(`Github app plugin error: could not get JWT.`);
             }
             this._setJWTLifecycleHandler(now, connectionConfig);
             (0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken =
                 await this._getAccessToken(connectionConfig.GITHUB_API, connectionConfig.GITHUB_APP_INSTALLATION_ID, (0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].JWT_TOKEN);
             if (!(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken) {
-                throw new Error(`Github app  Plugin Error: could not get Access Token.`);
+                throw new Error(`Github app plugin error: could not get access token.`);
             }
             (0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].GHA_ACCESS_TOKEN =
                 JSON.parse((0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken).token;
@@ -78,12 +78,12 @@ class Plugin extends abstractBrokerPlugin_1.default {
                 this._setAccessTokenLifecycleHandler(connectionConfig);
             }
             else {
-                throw new Error(`Github app  Plugin Error: could not extract access token.`);
+                throw new Error(`Github app plugin Error: could not extract access token.`);
             }
         }
         catch (err) {
             this.logger.error({ err }, `Error in ${this.pluginName}-${this.pluginCode} startup.`);
-            throw new Error(`Error in ${this.pluginName}-${this.pluginCode} startup. ${err}`);
+            throw new Error(`Error in ${this.pluginName}-${this.pluginCode} startup. ${err}.`);
         }
     }
     _getJWT(nowInSeconds, privatePemPath, githubAppId) {
@@ -105,13 +105,13 @@ class Plugin extends abstractBrokerPlugin_1.default {
                 let timeoutHandler = async () => { };
                 timeoutHandler = async () => {
                     try {
-                        this.logger.debug({ plugin: this.pluginCode }, 'Refreshing github app JWT token');
+                        this.logger.debug({ plugin: this.pluginCode }, 'Refreshing github app JWT token.');
                         clearTimeout(timeoutHandlerId);
                         const timeoutHandlerNow = Date.now();
                         (0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].JWT_TOKEN =
                             await this._getJWT(Math.floor(timeoutHandlerNow / 1000), connectionConfig.GITHUB_APP_PRIVATE_PEM_PATH, connectionConfig.GITHUB_APP_ID);
                         if (!(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].JWT_TOKEN) {
-                            throw new Error(`Github app  Plugin Error: could not  refreshed JWT.`);
+                            throw new Error(`Github app plugin error: could not refresh JWT.`);
                         }
                         if (process.env.NODE_ENV != 'test') {
                             timeoutHandlerId = setTimeout(timeoutHandler, this._getTimeDifferenceInMsToFutureDate(timeoutHandlerNow + this.JWT_TTL) - 10000);
@@ -119,7 +119,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
                         }
                     }
                     catch (err) {
-                        this.logger.error({ plugin: this.pluginCode, err }, `Error refreshing JWT`);
+                        this.logger.error({ plugin: this.pluginCode, err }, `Error refreshing JWT.`);
                         throw err;
                     }
                 };
@@ -141,7 +141,6 @@ class Plugin extends abstractBrokerPlugin_1.default {
                     Accept: 'application/vnd.github+json',
                     'X-GitHub-Api-Version': '2022-11-28',
                     Authorization: `Bearer ${jwtToken}`,
-                    'user-agent': 'Snyk Broker Github App Plugin',
                 },
                 method: 'POST',
             };
@@ -153,7 +152,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
             return accessToken;
         }
         catch (err) {
-            this.logger.error({ plugin: this.pluginCode, err }, `Error getting access token`);
+            this.logger.error({ plugin: this.pluginCode, err }, `Error getting access token.`);
             throw err;
         }
     }
@@ -163,14 +162,14 @@ class Plugin extends abstractBrokerPlugin_1.default {
             let timeoutHandler = async () => { };
             timeoutHandler = async () => {
                 try {
-                    this.logger.debug({ plugin: this.pluginCode }, 'Refreshing github app access token');
+                    this.logger.debug({ plugin: this.pluginCode }, 'Refreshing github app access token.');
                     clearTimeout(timeoutHandlerId);
                     (0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken =
                         await this._getAccessToken(connectionConfig.GITHUB_API, connectionConfig.GITHUB_APP_INSTALLATION_ID, (0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].JWT_TOKEN);
                     (0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].GHA_ACCESS_TOKEN =
                         JSON.parse((0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken).token;
                     if (!(0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName].ghaAccessToken) {
-                        throw new Error(`Github app  Plugin Error: could not get refreshed Access Token.`);
+                        throw new Error(`Github app plugin error: could not get refreshed access token.`);
                     }
                     else {
                         this.logger.debug({
@@ -179,7 +178,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
                         }, `Access token renewed!`);
                     }
                     this.logger.debug({ plugin: this.pluginCode }, `Refreshed access token expires at ${JSON.parse((0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName]
-                        .ghaAccessToken).expires_at}`);
+                        .ghaAccessToken).expires_at}.`);
                     if (process.env.NODE_ENV != 'test') {
                         timeoutHandlerId = setTimeout(timeoutHandler, this._getTimeDifferenceInMsToFutureDate(JSON.parse((0, pluginsConfig_1.getPluginsConfig)()[connectionConfig.friendlyName]
                             .ghaAccessToken).expires_at) - 10000);
@@ -187,7 +186,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
                     }
                 }
                 catch (err) {
-                    this.logger.error({ plugin: this.pluginCode, err }, `Error setting Access Token lifecycle handler.`);
+                    this.logger.error({ plugin: this.pluginCode, err }, `Error setting access token lifecycle handler.`);
                     throw err;
                 }
             };
@@ -203,7 +202,7 @@ class Plugin extends abstractBrokerPlugin_1.default {
     }
     // Hook to run pre requests operations - Optional. Uncomment to enable
     async preRequest(connectionConfiguration, postFilterPreparedRequest) {
-        this.logger.debug({ plugin: this.pluginName, connection: connectionConfiguration }, 'Running prerequest plugin');
+        this.logger.debug({ plugin: this.pluginName, connection: connectionConfiguration }, 'Running prerequest plugin.');
         const regexPattern = /\$[A-Za-z0-9_%]+/g;
         const matches = postFilterPreparedRequest.url.match(regexPattern);
         if (matches) {

package/dist/lib/client/brokerClientPlugins/plugins/githubServerAppAuth.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"githubServerAppAuth.js","sourceRoot":"","sources":["../../../../../lib/client/brokerClientPlugins/plugins/githubServerAppAuth.ts"],"names":[],"mappings":";;;;;;AAAA,oFAAoF;AACpF,qCAAmD;AACnD,mFAAmD;AACnD,6CAA+C;AAC/C,+CAAoC;AAEpC,8DAA2E;AAC3E,uDAA2D;AAC3D,wEAAwE;AACxE,qEAA6D;AAE7D,MAAa,MAAO,SAAQ,8BAAY;IAAxC;;QACE,0DAA0D;QAC1D,eAAU,GAAG,0BAA0B,CAAC;QACxC,eAAU,GAAG,yCAAyC,CAAC;QACvD,gBAAW,GAAG;;KAEX,CAAC;QACJ,YAAO,GAAG,KAAK,CAAC;QAChB,0BAAqB,GAAG,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC,CAAC,0BAA0B;QAC7F,YAAO,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;~~IAkU3B~~,CAAC;~~IAhUC~~,iEAAiE;IACjE,cAAc;QACZ,+CAA+C;QAC/C,wEAAwE;QACxE,kBAAkB;QAClB,IAAI;QACJ,OAAO,IAAI,CAAC;IACd,CAAC;IAED,8CAA8C;IAC9C,0DAA0D;IAC1D,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,aAAc;QAC5C,IAAI;YACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,~~iBAAiB~~,CAAC,CAAC;~~YACjE~~,IAAI,CAAC,MAAM,CAAC,KAAK,CACf;gBACE,MAAM,EAAE,IAAI,CAAC,UAAU;gBACvB,MAAM,EAAE,gBAAgB;gBACxB,YAAY,EAAE,aAAa;oBACzB,CAAC,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC;oBAC9C,CAAC,CAAC,EAAE;aACP,EACD,wCAAwC,CACzC,CAAC;YACF,IACE,gBAAgB;gBAChB,CAAC,CAAC,gBAAgB,CAAC,oBAAoB;oBACrC,CAAC,gBAAgB,CAAC,2BAA2B;oBAC7C,CAAC,gBAAgB,CAAC,0BAA0B;oBAC5C,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAClC;gBACA,MAAM,IAAI,KAAK,CACb,~~4HAA4H~~,~~CAC7H~~,CAAC;aACH;YACD,IACE,gBAAgB;gBAChB,gBAAgB,CAAC,2BAA2B;gBAC5C,CAAC,IAAA,oBAAU,EAAC,gBAAgB,CAAC,2BAA2B,CAAC,EACzD;gBACA,MAAM,IAAI,KAAK,CACb,4BAA4B,gBAAgB,CAAC,2BAA2B,~~EAAE~~,~~CAC3E~~,CAAC;aACH;YAED,mBAAmB;YACnB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,SAAS;gBACzD,IAAI,CAAC,OAAO,CACV,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,0BAA0B;gBAClD,gBAAgB,CAAC,2BAA2B,EAC5C,gBAAgB,CAAC,aAAa,CAC/B,CAAC;YACJ,IAAI,CAAC,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,SAAS,EAAE;gBAChE,MAAM,IAAI,KAAK,CAAC,~~8CAA8C~~,CAAC,CAAC;~~aACjE~~;YACD,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;YAEpD,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,cAAc;gBAC9D,MAAM,IAAI,CAAC,eAAe,CACxB,gBAAgB,CAAC,UAAU,EAC3B,gBAAgB,CAAC,0BAA0B,EAC3C,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,SAAS,CAC5D,CAAC;YACJ,IAAI,CAAC,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,cAAc,EAAE;gBACrE,MAAM,IAAI,KAAK,~~CACb~~,~~uDAAuD~~,~~CACxD~~,CAAC;~~aACH~~;YACD,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,gBAAgB;gBAChE,IAAI,CAAC,KAAK,CACR,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,cAAc,CACjE,CAAC,KAAK,CAAC;YACV,IAAI,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE;gBACtE,IAAI,CAAC,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;aACxD;iBAAM;gBACL,MAAM,IAAI,KAAK,CACb,~~2DAA2D~~,~~CAC5D~~,CAAC;aACH;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,GAAG,EAAE,EACP,YAAY,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,WAAW,CAC1D,CAAC;YACF,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,aAAa,GAAG,~~EAAE~~,~~CACjE~~,CAAC;SACH;IACH,CAAC;IAED,OAAO,CACL,YAAoB,EACpB,cAAsB,EACtB,WAAmB;QAEnB,oCAAoC;QACpC,MAAM,UAAU,GAAG,IAAA,sBAAY,EAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QACxD,MAAM,UAAU,GAAG,IAAA,8BAAgB,EAAC,UAAU,CAAC,CAAC;QAEhD,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,YAAY,GAAG,EAAE;YACtB,GAAG,EAAE,YAAY,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI;YACvC,GAAG,EAAE,WAAW,EAAE,kBAAkB;SACrC,CAAC;QACF,mBAAmB;QACnB,OAAO,IAAA,mBAAI,EAAC,OAAO,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,uBAAuB,CAAC,GAAW,EAAE,gBAAgB;QACnD,IAAI;YACF,IAAI,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,SAAS,EAAE;gBAC/D,IAAI,gBAAgB,CAAC;gBACrB,IAAI,cAAc,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;gBACpC,cAAc,GAAG,KAAK,IAAI,EAAE;oBAC1B,IAAI;wBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,EAC3B,~~iCAAiC~~,~~CAClC~~,CAAC;wBACF,YAAY,CAAC,gBAAgB,CAAC,CAAC;wBAC/B,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;wBACrC,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,SAAS;4BACzD,MAAM,IAAI,CAAC,OAAO,CAChB,IAAI,CAAC,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAAC,EACpC,gBAAgB,CAAC,2BAA2B,EAC5C,gBAAgB,CAAC,aAAa,CAC/B,CAAC;wBACJ,IAAI,CAAC,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,SAAS,EAAE;4BAChE,MAAM,IAAI,KAAK,CACb,~~qDAAqD~~,~~CACtD~~,CAAC;yBACH;wBACD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,MAAM,EAAE;4BAClC,gBAAgB,GAAG,UAAU,CAC3B,cAAc,EACd,IAAI,CAAC,kCAAkC,CACrC,iBAAiB,GAAG,IAAI,CAAC,OAAO,CACjC,GAAG,KAAK,CACV,CAAC;4BACF,IAAA,gCAAgB,GAAE,CAChB,gBAAgB,CAAC,YAAY,CAC9B,CAAC,mBAAmB,GAAG,gBAAgB,CAAC;yBAC1C;qBACF;oBAAC,OAAO,GAAG,EAAE;wBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,EAChC,~~sBAAsB~~,~~CACvB~~,CAAC;wBACF,MAAM,GAAG,CAAC;qBACX;gBACH,CAAC,CAAC;gBAEF,gBAAgB,GAAG,UAAU,CAC3B,cAAc,EACd,IAAI,CAAC,kCAAkC,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,CACpE,CAAC;gBACF,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,mBAAmB;oBACnE,gBAAgB,CAAC;aACpB;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,EAChC,sCAAsC,CACvC,CAAC;YACF,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,gBAAwB,EACxB,uBAA+B,EAC/B,QAAgB;QAEhB,IAAI;YACF,MAAM,OAAO,GAA8B;gBACzC,GAAG,EAAE,WAAW,gBAAgB,sBAAsB,uBAAuB,gBAAgB;gBAC7F,OAAO,EAAE;oBACP,MAAM,EAAE,6BAA6B;oBACrC,sBAAsB,EAAE,YAAY;oBACpC,aAAa,EAAE,UAAU,QAAQ,EAAE;~~oBACnC,YAAY,EAAE,+BAA+B~~;~~iBAC9C;~~gBACD,MAAM,EAAE,MAAM;aACf,CAAC;YAEF,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAuB,EAAC,OAAO,CAAC,CAAC;YAC7D,IAAI,aAAa,CAAC,UAAU,IAAI,aAAa,CAAC,UAAU,GAAG,GAAG,EAAE;gBAC9D,MAAM,IAAI,KAAK,CACb,yBAAyB,aAAa,CAAC,UAAU,KAAK,aAAa,CAAC,IAAI,EAAE,CAC3E,CAAC;aACH;YACD,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC;YAC7C,OAAO,WAAW,CAAC;SACpB;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,EAChC,~~4BAA4B~~,~~CAC7B~~,CAAC;YACF,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAED,+BAA+B,CAAC,gBAAgB;QAC9C,IAAI,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,cAAc,EAAE;YACpE,IAAI,gBAAgB,CAAC;YACrB,IAAI,cAAc,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;YACpC,cAAc,GAAG,KAAK,IAAI,EAAE;gBAC1B,IAAI;oBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,EAC3B,~~oCAAoC~~,~~CACrC~~,CAAC;oBACF,YAAY,CAAC,gBAAgB,CAAC,CAAC;oBAC/B,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,cAAc;wBAC9D,MAAM,IAAI,CAAC,eAAe,CACxB,gBAAgB,CAAC,UAAU,EAC3B,gBAAgB,CAAC,0BAA0B,EAC3C,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,SAAS,CAC5D,CAAC;oBACJ,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,gBAAgB;wBAChE,IAAI,CAAC,KAAK,CACR,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,cAAc,CACjE,CAAC,KAAK,CAAC;oBAEV,IACE,CAAC,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,cAAc,EACjE;wBACA,MAAM,IAAI,KAAK,CACb,~~iEAAiE~~,~~CAClE~~,CAAC;qBACH;yBAAM;wBACL,IAAI,CAAC,MAAM,CAAC,KAAK,CACf;4BACE,WAAW,EAAE,IAAA,oBAAY,EACvB,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC;iCAC9C,gBAAgB,CACpB;yBACF,EACD,uBAAuB,CACxB,CAAC;qBACH;oBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,EAC3B,qCACE,IAAI,CAAC,KAAK,CACR,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC;yBAC9C,cAAc,CAClB,CAAC,UACJ,~~EAAE~~,~~CACH~~,CAAC;oBACF,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,MAAM,EAAE;wBAClC,gBAAgB,GAAG,UAAU,CAC3B,cAAc,EACd,IAAI,CAAC,kCAAkC,CACrC,IAAI,CAAC,KAAK,CACR,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC;6BAC9C,cAAc,CAClB,CAAC,UAAU,CACb,GAAG,KAAK,CACV,CAAC;wBACF,IAAA,gCAAgB,GAAE,CAChB,gBAAgB,CAAC,YAAY,CAC9B,CAAC,8BAA8B,GAAG,gBAAgB,CAAC;qBACrD;iBACF;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,EAChC,+CAA+C,CAChD,CAAC;oBACF,MAAM,GAAG,CAAC;iBACX;YACH,CAAC,CAAC;YACF,gBAAgB,GAAG,UAAU,CAC3B,cAAc,EACd,IAAI,CAAC,kCAAkC,CACrC,IAAI,CAAC,KAAK,CACR,IAAA,gCAAgB,GAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,cAAc,CACjE,CAAC,UAAU,CACb,GAAG,KAAK,CACV,CAAC;YACF,IAAA,gCAAgB,GAAE,CAChB,gBAAgB,CAAC,YAAY,CAC9B,CAAC,8BAA8B,GAAG,gBAAgB,CAAC;SACrD;IACH,CAAC;IACD,kCAAkC,CAAC,UAAU;QAC3C,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;QACxC,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;QACpE,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,sEAAsE;IACtE,KAAK,CAAC,UAAU,CACd,uBAA4C,EAC5C,yBAAoD;QAEpD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,uBAAuB,EAAE,EAChE,~~2BAA2B~~,~~CAC5B~~,CAAC;QAEF,MAAM,YAAY,GAAG,mBAAmB,CAAC;QACzC,MAAM,OAAO,GAAG,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAClE,IAAI,OAAO,EAAE;YACX,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE;gBAC9B,MAAM,MAAM,GAAG,IAAA,sBAAO,EACpB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EACjC,uBAAuB,CACxB,CAAC,CAAC,wBAAwB;gBAC3B,yBAAyB,CAAC,GAAG,GAAG,yBAAyB,CAAC,GAAG,CAAC,OAAO,CACnE,QAAQ,EACR,MAAM,CACP,CAAC;aACH;SACF;QAED,OAAO,yBAAyB,CAAC;IACnC,CAAC;CACF;~~AA3UD~~,~~wBA2UC~~"}
1	+ {"version":3,"file":"githubServerAppAuth.js","sourceRoot":"","sources":["../../../../../lib/client/brokerClientPlugins/plugins/githubServerAppAuth.ts"],"names":[],"mappings":"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"}