Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .yarn/install-state.gz
Binary file not shown.
23 changes: 17 additions & 6 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -701,12 +701,23 @@ ${thirdPartyHTML}

https.request(options, async function(response) {

if (response.statusCode >= 300 && response.statusCode < 400) {
res.json({ redirectUrl: response.headers.location });
} else {
res.status(400).json({ error: 'expected redirect did not occur' });
}
res.end();
let data = '';

response.on('data', (chunk) => {
data += chunk;
});

response.on('end', () => {

if (response.statusCode >= 300 && response.statusCode < 400) {
res.json({ redirectUrl: response.headers.location });
} else {
logger.error({error: `${data}`, redirect_uri: `${env('ZITI_BROWZER_BOOTSTRAPPER_HOST')}`, error_code: response.statusCode});

res.status(400).json({ error: 'expected redirect did not occur' });
}
res.end();
});

}).end();
}
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ziti-browzer-bootstrapper",
"version": "0.82.4",
"version": "0.83.0",
"compatibleControllerVersion": ">=0.27.9",
"description": "Ziti BrowZer Bootstrapper -- providing Ziti network access into Dark web server",
"main": "index.js",
Expand All @@ -20,8 +20,8 @@
"license": "Apache-2.0",
"dependencies": {
"@openziti/ziti-browzer-edge-client": "^0.6.2",
"@openziti/ziti-browzer-runtime": "^0.101.0",
"@openziti/ziti-browzer-sw": "^0.78.0",
"@openziti/ziti-browzer-runtime": "^0.103.0",
"@openziti/ziti-browzer-sw": "^0.80.0",
"acme-http-01-standalone": "^3.0.5",
"ajv": "^8.17.1",
"ajv-formats": "^3.0.1",
Expand Down
50 changes: 29 additions & 21 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -357,9 +357,9 @@ __metadata:
languageName: node
linkType: hard

"@openziti/ziti-browzer-core@npm:^0.59.0":
version: 0.59.0
resolution: "@openziti/ziti-browzer-core@npm:0.59.0"
"@openziti/ziti-browzer-core@npm:^0.61.0":
version: 0.61.0
resolution: "@openziti/ziti-browzer-core@npm:0.61.0"
dependencies:
"@openziti/libcrypto-js": "npm:^0.24.0"
"@openziti/ziti-browzer-edge-client": "npm:^0.7.0"
Expand Down Expand Up @@ -400,7 +400,7 @@ __metadata:
url: "npm:^0.11.0"
util: "npm:^0.12.4"
uuid: "npm:^11.1.0"
checksum: ccd5225d7eb27123e10c375222141e846bd92caa460042d4ec07774fa32de0fe666aeaac6bb0fc76af23a766e1ac9b0d1d7f91bb657aba2fe5ff7b7a9fa426e3
checksum: 564be5b4e8d324129bd6a583ccf4f2f2cb92fefe531b912b41022ef03c070bb1ea46617826feba3c7425a731a080f7fcaedac489e08e9444c20b8b3e15efbe74
languageName: node
linkType: hard

Expand All @@ -422,13 +422,13 @@ __metadata:
languageName: node
linkType: hard

"@openziti/ziti-browzer-runtime@npm:^0.101.0":
version: 0.101.0
resolution: "@openziti/ziti-browzer-runtime@npm:0.101.0"
"@openziti/ziti-browzer-runtime@npm:^0.103.0":
version: 0.103.0
resolution: "@openziti/ziti-browzer-runtime@npm:0.103.0"
dependencies:
"@auth0/auth0-spa-js": "npm:^2.0.4"
"@babel/runtime": "npm:^7.17.9"
"@openziti/ziti-browzer-core": "npm:^0.59.0"
"@openziti/ziti-browzer-core": "npm:^0.61.0"
bowser: "npm:^2.11.0"
cookie-interceptor: "npm:^1.0.0"
core-js: "npm:^3.22.8"
Expand All @@ -448,15 +448,15 @@ __metadata:
uuid: "npm:^11.1.0"
wasm-feature-detect: "npm:^1.8.0"
workbox-window: "npm:^6.5.3"
checksum: 80aa8b8704b3fabd2b5853f659a3064a895e0cff0724653170763f62ee5b77dad526c3b2b5e955e900d1adde93b5769fa3df44194c737ac3b5bd34b19f96c192
checksum: 942ffcc61725fc3f7f3af5260ba79ce5e91fdfd3e03357a3ac88c32c6272a281fd6cfe994be28e6820452bc3a2e3388fc96d3453c6f3af9443a63de8f4dd824e
languageName: node
linkType: hard

"@openziti/ziti-browzer-sw-workbox-strategies@npm:^0.82.0":
version: 0.82.0
resolution: "@openziti/ziti-browzer-sw-workbox-strategies@npm:0.82.0"
"@openziti/ziti-browzer-sw-workbox-strategies@npm:^0.85.0":
version: 0.85.0
resolution: "@openziti/ziti-browzer-sw-workbox-strategies@npm:0.85.0"
dependencies:
"@openziti/ziti-browzer-core": "npm:^0.59.0"
"@openziti/ziti-browzer-core": "npm:^0.61.0"
async-mutex: "npm:^0.5.0"
cheerio: "npm:^1.0.0-rc.12"
jwt-decode: "npm:^3.1.2"
Expand All @@ -465,22 +465,22 @@ __metadata:
workbox-core: "npm:^6.6.0"
workbox-expiration: "npm:^6.6.0"
workbox-strategies: "npm:^6.6.0"
checksum: c18048b7ea5336e09978622bd37daeb816d4cdfbe7caec0eb89bff21e92d33fbcf86019de1cd8f93107245af8ecf9978e8179f1297fac2aeae504ffc449bb3fa
checksum: 8b101d59ffb95987487bc87b379372d207099acec2a4a7f263720f35a7bd96e9172418cb792a7ecd0d4c90669c5c3f0f0a3c961a1f73abc7f3315916addac0de
languageName: node
linkType: hard

"@openziti/ziti-browzer-sw@npm:^0.78.0":
version: 0.78.0
resolution: "@openziti/ziti-browzer-sw@npm:0.78.0"
"@openziti/ziti-browzer-sw@npm:^0.80.0":
version: 0.80.0
resolution: "@openziti/ziti-browzer-sw@npm:0.80.0"
dependencies:
"@openziti/ziti-browzer-sw-workbox-strategies": "npm:^0.82.0"
"@openziti/ziti-browzer-sw-workbox-strategies": "npm:^0.85.0"
"@types/lodash-es": "npm:^4.17.6"
workbox-core: "npm:^6.6.0"
workbox-expiration: "npm:^6.6.0"
workbox-precaching: "npm:^6.6.0"
workbox-routing: "npm:^6.6.0"
workbox-strategies: "npm:^6.6.0"
checksum: 5927aba94976bff7a1094ad91ca53e030042162f935e237c4b466c84517a3ac9ff2f12747b8aa34d82303bb18ed35cf4a902d924f96d8ee91c04cee04807d708
checksum: 2ba179b00c6175b9813f7697a12e26723df1df2946d8181d7d1dc5bfe4923975c7fcccd7bfa0e037d076d864969b76bb37c3fc415ae64f268138c9da74076128
languageName: node
linkType: hard

Expand Down Expand Up @@ -1614,6 +1614,13 @@ __metadata:
languageName: node
linkType: hard

"cookie@npm:^1.0.2":
version: 1.0.2
resolution: "cookie@npm:1.0.2"
checksum: fd25fe79e8fbcfcaf6aa61cd081c55d144eeeba755206c058682257cb38c4bd6795c6620de3f064c740695bb65b7949ebb1db7a95e4636efb8357a335ad3f54b
languageName: node
linkType: hard

"cookiejar@npm:^2.1.3":
version: 2.1.4
resolution: "cookiejar@npm:2.1.4"
Expand Down Expand Up @@ -7254,8 +7261,8 @@ __metadata:
resolution: "ziti-browzer-bootstrapper@workspace:."
dependencies:
"@openziti/ziti-browzer-edge-client": "npm:^0.6.2"
"@openziti/ziti-browzer-runtime": "npm:^0.101.0"
"@openziti/ziti-browzer-sw": "npm:^0.78.0"
"@openziti/ziti-browzer-runtime": "npm:^0.103.0"
"@openziti/ziti-browzer-sw": "npm:^0.80.0"
acme-http-01-standalone: "npm:^3.0.5"
ajv: "npm:^8.17.1"
ajv-formats: "npm:^3.0.1"
Expand All @@ -7264,6 +7271,7 @@ __metadata:
compare-versions: "npm:^6.0.0-rc.1"
concat-stream: "npm:^2.0.0"
connect: "npm:^3.7.0"
cookie: "npm:^1.0.2"
cookie-parser: "npm:^1.4.6"
dotenv: "npm:^16.4.5"
eventemitter3: "npm:^4.0.0"
Expand Down
Loading