Skip to content

Commit 99a7ac9

Browse files
rentallectrentallect
authored
0.90.0: remove JSPI origin trial mechanisms (#380)
1 parent 659ece7 commit 99a7ac9

File tree

7 files changed

+32
-48
lines changed

7 files changed

+32
-48
lines changed

‎.yarn/install-state.gz‎

-633 Bytes
Binary file not shown.

‎index.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,6 @@ const startBootstrapper = async ( logger ) => {
265265
let thirdPartyHTML = '';
266266
let ziti_inject_html = `
267267
${thirdPartyHTML}
268-
<!-- load JSPI Origin Trial Token -->
269-
<meta http-equiv="origin-trial" id="ziti-browzer-origin-trial" content="${common.getOriginTrialToken()}">
270268
<!-- load Ziti browZer Runtime -->
271269
<script id="from-ziti-browzer-bootstrapper" type="text/javascript" src="${zbrSrc}"></script>
272270
`;

‎lib/env.js‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ nconf
7474
ZITI_BROWZER_RUNTIME_LOGLEVEL: 'error',
7575
ZITI_BROWZER_RUNTIME_HOTKEY: 'alt+f12',
7676

77-
// This token is for *.cloudziti.io
78-
ZITI_BROWZER_RUNTIME_ORIGIN_TRIAL_TOKEN: `Arybv/l0GnolTvMW5WE4XZEnlFxRM7+WEgVLRXkGWj7/x6oyXrcXFXuSmhYOgIgr1SbF1McwU0ldUSQ6kGoMugMAAAB4eyJvcmlnaW4iOiJodHRwczovL2Nsb3Vkeml0aS5pbzo0NDMiLCJmZWF0dXJlIjoiV2ViQXNzZW1ibHlKU1Byb21pc2VJbnRlZ3JhdGlvbiIsImV4cGlyeSI6MTc1MzE0MjQwMCwiaXNTdWJkb21haW4iOnRydWV9`,
79-
8077
NODE_EXTRA_CA_CERTS: 'node_modules/node_extra_ca_certs_mozilla_bundle/ca_bundle/ca_intermediate_root_bundle.pem',
8178

8279
ZITI_BROWZER_WHITELABEL: JSON.stringify({
@@ -212,10 +209,6 @@ nval.addRule('ZITI_BROWZER_BOOTSTRAPPER_LOGLEVEL', function(x) {
212209
return false;
213210
})
214211

215-
if (nconf.get('ZITI_BROWZER_RUNTIME_ORIGIN_TRIAL_TOKEN')) {
216-
nval.addRule('ZITI_BROWZER_RUNTIME_ORIGIN_TRIAL_TOKEN', String);
217-
}
218-
219212
if (nconf.get('ZITI_BROWZER_BOOTSTRAPPER_GITHUB_API_TOKEN')) {
220213
nval.addRule('ZITI_BROWZER_BOOTSTRAPPER_GITHUB_API_TOKEN', String);
221214
}

‎lib/http-proxy/common.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ common.generateZitiConfigObject = function(url, req, options) {
363363
src: `${common.getZBRname()}`,
364364
css: `${common.getZBRCSSname()}`,
365365
logLevel: `${common.logLevelGetForClient(zitiClient)}`,
366-
originTrialToken: `${common.getOriginTrialToken()}`,
367366
skipDeprecationWarnings: env('ZITI_BROWZER_BOOTSTRAPPER_SKIP_DEPRECATION_WARNINGS'),
368367
},
369368
loadbalancer: {
@@ -591,11 +590,6 @@ common.addServerHeader = function(headerObj) {
591590
});
592591
}
593592

594-
common.getOriginTrialToken = function() {
595-
var browzer_origin_trial_token = env('ZITI_BROWZER_RUNTIME_ORIGIN_TRIAL_TOKEN')
596-
return browzer_origin_trial_token;
597-
}
598-
599593

600594
/** --------------------------------------------------------------------------------------------------
601595
* Spin up a fresh zitiContext

‎lib/http-proxy/passes/web-incoming-zitified.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,6 @@ module.exports = {
571571
'Service-Worker-Allowed': '/',
572572
'Access-Control-Allow-Headers': 'Origin',
573573
'X-Ziti-BrowZer-Bootstrapper': 'OpenZiti browZer Service Worker',
574-
'Origin-Trial': `${common.getOriginTrialToken()}`,
575574
}),
576575
data: data
577576
}

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ziti-browzer-bootstrapper",
3-
"version": "0.89.0",
3+
"version": "0.90.0",
44
"compatibleControllerVersion": ">=0.27.9",
55
"description": "Ziti BrowZer Bootstrapper -- providing Ziti network access into Dark web server",
66
"main": "index.js",
@@ -20,8 +20,8 @@
2020
"license": "Apache-2.0",
2121
"dependencies": {
2222
"@openziti/ziti-browzer-edge-client": "^0.6.2",
23-
"@openziti/ziti-browzer-runtime": "^0.118.0",
24-
"@openziti/ziti-browzer-sw": "^0.83.0",
23+
"@openziti/ziti-browzer-runtime": "^0.119.0",
24+
"@openziti/ziti-browzer-sw": "^0.84.0",
2525
"acme-http-01-standalone": "^3.0.5",
2626
"ajv": "^8.17.1",
2727
"ajv-formats": "^3.0.1",
@@ -57,7 +57,7 @@
5757
"node-cache": "^5.1.2",
5858
"node-cron": "^3.0.3",
5959
"node-fetch": "^3.3.2",
60-
"node_extra_ca_certs_mozilla_bundle": "^1.0.6",
60+
"node_extra_ca_certs_mozilla_bundle": "^1.0.7",
6161
"openid-client": "^5.6.5",
6262
"pump": "^3.0.0",
6363
"request-ip": "^3.3.0",

‎yarn.lock‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ __metadata:
347347
languageName: node
348348
linkType: hard
349349

350-
"@openziti/libcrypto-js@npm:^0.24.0":
350+
"@openziti/libcrypto-js@npm:0.24.0":
351351
version: 0.24.0
352352
resolution: "@openziti/libcrypto-js@npm:0.24.0"
353353
dependencies:
@@ -357,11 +357,11 @@ __metadata:
357357
languageName: node
358358
linkType: hard
359359

360-
"@openziti/ziti-browzer-core@npm:^0.64.0":
361-
version: 0.64.0
362-
resolution: "@openziti/ziti-browzer-core@npm:0.64.0"
360+
"@openziti/ziti-browzer-core@npm:^0.68.0":
361+
version: 0.68.0
362+
resolution: "@openziti/ziti-browzer-core@npm:0.68.0"
363363
dependencies:
364-
"@openziti/libcrypto-js": "npm:^0.24.0"
364+
"@openziti/libcrypto-js": "npm:0.24.0"
365365
"@openziti/ziti-browzer-edge-client": "npm:^0.7.0"
366366
asn1js: "npm:^3.0.5"
367367
assert: "npm:^2.0.0"
@@ -400,7 +400,7 @@ __metadata:
400400
url: "npm:^0.11.0"
401401
util: "npm:^0.12.4"
402402
uuid: "npm:^11.1.0"
403-
checksum: 28638e40491d21878173a5c1419f6d0efdc2624c50b31f6d363e70e595f596cf1856cdef13f117ef5829f5017e37d84de5ffb04123452ba817befcff88791fc0
403+
checksum: 611deae6a697056f80b430786ecaf9df9a0a37845c76e23d102f9a99362ce554e39cd78827cb781592a2aa3b5294526bcc08bb351fa72ee4ab33606de7df3c00
404404
languageName: node
405405
linkType: hard
406406

@@ -422,13 +422,13 @@ __metadata:
422422
languageName: node
423423
linkType: hard
424424

425-
"@openziti/ziti-browzer-runtime@npm:^0.118.0":
426-
version: 0.118.0
427-
resolution: "@openziti/ziti-browzer-runtime@npm:0.118.0"
425+
"@openziti/ziti-browzer-runtime@npm:^0.119.0":
426+
version: 0.119.0
427+
resolution: "@openziti/ziti-browzer-runtime@npm:0.119.0"
428428
dependencies:
429429
"@auth0/auth0-spa-js": "npm:^2.0.4"
430430
"@babel/runtime": "npm:^7.17.9"
431-
"@openziti/ziti-browzer-core": "npm:^0.64.0"
431+
"@openziti/ziti-browzer-core": "npm:^0.68.0"
432432
bowser: "npm:^2.11.0"
433433
cookie-interceptor: "npm:^1.0.0"
434434
core-js: "npm:^3.22.8"
@@ -448,15 +448,15 @@ __metadata:
448448
uuid: "npm:^11.1.0"
449449
wasm-feature-detect: "npm:^1.8.0"
450450
workbox-window: "npm:^7.3.0"
451-
checksum: 8dce7f8bbd6e6c35ef49e28992a364b09222be1ce9cb55a5f314adc2a0a827318228dea3c2192a5950126f6d611db475145a93387df47bb4a2cd4fc6036ed0e1
451+
checksum: 72a2da4e2b4c036382e83515e8dbb820be31b5507ca71ba97ccf474156a3fb5bf9eb6fbc89ec0f53737e9f7931eb7e710075a05f23f610fb3597708ff29972c1
452452
languageName: node
453453
linkType: hard
454454

455-
"@openziti/ziti-browzer-sw-workbox-strategies@npm:^0.88.0":
456-
version: 0.88.0
457-
resolution: "@openziti/ziti-browzer-sw-workbox-strategies@npm:0.88.0"
455+
"@openziti/ziti-browzer-sw-workbox-strategies@npm:^0.89.0":
456+
version: 0.89.0
457+
resolution: "@openziti/ziti-browzer-sw-workbox-strategies@npm:0.89.0"
458458
dependencies:
459-
"@openziti/ziti-browzer-core": "npm:^0.64.0"
459+
"@openziti/ziti-browzer-core": "npm:^0.68.0"
460460
async-mutex: "npm:^0.5.0"
461461
cheerio: "npm:^1.0.0-rc.12"
462462
jwt-decode: "npm:^3.1.2"
@@ -465,22 +465,22 @@ __metadata:
465465
workbox-core: "npm:^6.6.0"
466466
workbox-expiration: "npm:^6.6.0"
467467
workbox-strategies: "npm:^6.6.0"
468-
checksum: 2c5f64e56723485816dad21993de409fc9fd95338872570671b99d5acad390249479aac831659d13f3ef9fc0ba523c02282c8710dadd36e5f60fa2901089675c
468+
checksum: fcd75f1283c8934393c63ebf2589fca4966a29f85cfdd69b49c51f534dd50841290049b876f8ba9dd46b26c61cbd9a54bb8637f8cbd96db7b2cfffcac2cf252c
469469
languageName: node
470470
linkType: hard
471471

472-
"@openziti/ziti-browzer-sw@npm:^0.83.0":
473-
version: 0.83.0
474-
resolution: "@openziti/ziti-browzer-sw@npm:0.83.0"
472+
"@openziti/ziti-browzer-sw@npm:^0.84.0":
473+
version: 0.84.0
474+
resolution: "@openziti/ziti-browzer-sw@npm:0.84.0"
475475
dependencies:
476-
"@openziti/ziti-browzer-sw-workbox-strategies": "npm:^0.88.0"
476+
"@openziti/ziti-browzer-sw-workbox-strategies": "npm:^0.89.0"
477477
"@types/lodash-es": "npm:^4.17.6"
478478
workbox-core: "npm:^6.6.0"
479479
workbox-expiration: "npm:^6.6.0"
480480
workbox-precaching: "npm:^6.6.0"
481481
workbox-routing: "npm:^6.6.0"
482482
workbox-strategies: "npm:^6.6.0"
483-
checksum: 8af55d82f33e1d7c4ec24127ad00cfc37fbb601e687f8cc0a3256d06ea6270ab68b8e856fb87d59fa2fb2ef9e91941d4f5570d537e31294b4875b93bb2d42f4a
483+
checksum: 91c50b74403cc27bae1a36d4f424bb7970df3a7cbda4b01dd0f1b15bb79b15704aab79a12b548a93770a4437c17fcfb5bacae7a7f48d59ef49bb4010dde2fc33
484484
languageName: node
485485
linkType: hard
486486

@@ -4941,14 +4941,14 @@ __metadata:
49414941
languageName: node
49424942
linkType: hard
49434943

4944-
"node_extra_ca_certs_mozilla_bundle@npm:^1.0.6":
4945-
version: 1.0.6
4946-
resolution: "node_extra_ca_certs_mozilla_bundle@npm:1.0.6"
4944+
"node_extra_ca_certs_mozilla_bundle@npm:^1.0.7":
4945+
version: 1.0.7
4946+
resolution: "node_extra_ca_certs_mozilla_bundle@npm:1.0.7"
49474947
dependencies:
49484948
axios: "npm:^1.6.5"
49494949
cross-env: "npm:^7.0.3"
49504950
csvtojson: "npm:^2.0.10"
4951-
checksum: 06b40da339b9d594d357cea9070eb0b4ea5fe89c2576cdbf7d0026f08caa8ca7213fa6e4d4eebaf3d77162dc3387d092c2a0042a1b3b16a94266ce703d80be70
4951+
checksum: a7f270f6101875a2b38d7b97b9c666b4900ba36ae1205eb85118ef85ba04e954fe729d1374434cbd7d27b2692f8e2c36a2df2267db340ba4a29006f2461b0df7
49524952
languageName: node
49534953
linkType: hard
49544954

@@ -7268,8 +7268,8 @@ __metadata:
72687268
resolution: "ziti-browzer-bootstrapper@workspace:."
72697269
dependencies:
72707270
"@openziti/ziti-browzer-edge-client": "npm:^0.6.2"
7271-
"@openziti/ziti-browzer-runtime": "npm:^0.118.0"
7272-
"@openziti/ziti-browzer-sw": "npm:^0.83.0"
7271+
"@openziti/ziti-browzer-runtime": "npm:^0.119.0"
7272+
"@openziti/ziti-browzer-sw": "npm:^0.84.0"
72737273
acme-http-01-standalone: "npm:^3.0.5"
72747274
ajv: "npm:^8.17.1"
72757275
ajv-formats: "npm:^3.0.1"
@@ -7310,7 +7310,7 @@ __metadata:
73107310
node-cache: "npm:^5.1.2"
73117311
node-cron: "npm:^3.0.3"
73127312
node-fetch: "npm:^3.3.2"
7313-
node_extra_ca_certs_mozilla_bundle: "npm:^1.0.6"
7313+
node_extra_ca_certs_mozilla_bundle: "npm:^1.0.7"
73147314
nyc: "npm:^15.1.0"
73157315
openid-client: "npm:^5.6.5"
73167316
pump: "npm:^3.0.0"

0 commit comments

Comments
 (0)