Skip to content

remove JSPI origin trial mechanisms #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rentallect merged 2 commits into from
Jul 7, 2025
Merged

remove JSPI origin trial mechanisms #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a81147c
remove JSPI origin trial mechanisms
rentallect Jul 7, 2025
1bf705c
remove JSPI origin trial mechanisms
rentallect Jul 7, 2025
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
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,6 @@ const startBootstrapper = async ( logger ) => {
let thirdPartyHTML = '';
let ziti_inject_html = `
${thirdPartyHTML}
<!-- load JSPI Origin Trial Token -->
<meta http-equiv="origin-trial" id="ziti-browzer-origin-trial" content="${common.getOriginTrialToken()}">
<!-- load Ziti browZer Runtime -->
<script id="from-ziti-browzer-bootstrapper" type="text/javascript" src="${zbrSrc}"></script>
`;
Expand Down
7 changes: 0 additions & 7 deletions lib/env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ nconf
ZITI_BROWZER_RUNTIME_LOGLEVEL: 'error',
ZITI_BROWZER_RUNTIME_HOTKEY: 'alt+f12',

// This token is for *.cloudziti.io
ZITI_BROWZER_RUNTIME_ORIGIN_TRIAL_TOKEN: `Arybv/l0GnolTvMW5WE4XZEnlFxRM7+WEgVLRXkGWj7/x6oyXrcXFXuSmhYOgIgr1SbF1McwU0ldUSQ6kGoMugMAAAB4eyJvcmlnaW4iOiJodHRwczovL2Nsb3Vkeml0aS5pbzo0NDMiLCJmZWF0dXJlIjoiV2ViQXNzZW1ibHlKU1Byb21pc2VJbnRlZ3JhdGlvbiIsImV4cGlyeSI6MTc1MzE0MjQwMCwiaXNTdWJkb21haW4iOnRydWV9`,

NODE_EXTRA_CA_CERTS: 'node_modules/node_extra_ca_certs_mozilla_bundle/ca_bundle/ca_intermediate_root_bundle.pem',

ZITI_BROWZER_WHITELABEL: JSON.stringify({
Expand Down Expand Up @@ -212,10 +209,6 @@ nval.addRule('ZITI_BROWZER_BOOTSTRAPPER_LOGLEVEL', function(x) {
return false;
})

if (nconf.get('ZITI_BROWZER_RUNTIME_ORIGIN_TRIAL_TOKEN')) {
nval.addRule('ZITI_BROWZER_RUNTIME_ORIGIN_TRIAL_TOKEN', String);
}

if (nconf.get('ZITI_BROWZER_BOOTSTRAPPER_GITHUB_API_TOKEN')) {
nval.addRule('ZITI_BROWZER_BOOTSTRAPPER_GITHUB_API_TOKEN', String);
}
Expand Down
6 changes: 0 additions & 6 deletions lib/http-proxy/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ common.generateZitiConfigObject = function(url, req, options) {
src: `${common.getZBRname()}`,
css: `${common.getZBRCSSname()}`,
logLevel: `${common.logLevelGetForClient(zitiClient)}`,
originTrialToken: `${common.getOriginTrialToken()}`,
skipDeprecationWarnings: env('ZITI_BROWZER_BOOTSTRAPPER_SKIP_DEPRECATION_WARNINGS'),
},
loadbalancer: {
Expand Down Expand Up @@ -591,11 +590,6 @@ common.addServerHeader = function(headerObj) {
});
}

common.getOriginTrialToken = function() {
var browzer_origin_trial_token = env('ZITI_BROWZER_RUNTIME_ORIGIN_TRIAL_TOKEN')
return browzer_origin_trial_token;
}


/** --------------------------------------------------------------------------------------------------
* Spin up a fresh zitiContext
Expand Down
1 change: 0 additions & 1 deletion lib/http-proxy/passes/web-incoming-zitified.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,6 @@ module.exports = {
'Service-Worker-Allowed': '/',
'Access-Control-Allow-Headers': 'Origin',
'X-Ziti-BrowZer-Bootstrapper': 'OpenZiti browZer Service Worker',
'Origin-Trial': `${common.getOriginTrialToken()}`,
}),
data: data
}
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ziti-browzer-bootstrapper",
"version": "0.89.0",
"version": "0.90.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.118.0",
"@openziti/ziti-browzer-sw": "^0.83.0",
"@openziti/ziti-browzer-runtime": "^0.119.0",
"@openziti/ziti-browzer-sw": "^0.84.0",
"acme-http-01-standalone": "^3.0.5",
"ajv": "^8.17.1",
"ajv-formats": "^3.0.1",
Expand Down Expand Up @@ -57,7 +57,7 @@
"node-cache": "^5.1.2",
"node-cron": "^3.0.3",
"node-fetch": "^3.3.2",
"node_extra_ca_certs_mozilla_bundle": "^1.0.6",
"node_extra_ca_certs_mozilla_bundle": "^1.0.7",
"openid-client": "^5.6.5",
"pump": "^3.0.0",
"request-ip": "^3.3.0",
Expand Down
56 changes: 28 additions & 28 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ __metadata:
languageName: node
linkType: hard

"@openziti/libcrypto-js@npm:^0.24.0":
"@openziti/libcrypto-js@npm:0.24.0":
version: 0.24.0
resolution: "@openziti/libcrypto-js@npm:0.24.0"
dependencies:
Expand All @@ -357,11 +357,11 @@ __metadata:
languageName: node
linkType: hard

"@openziti/ziti-browzer-core@npm:^0.64.0":
version: 0.64.0
resolution: "@openziti/ziti-browzer-core@npm:0.64.0"
"@openziti/ziti-browzer-core@npm:^0.68.0":
version: 0.68.0
resolution: "@openziti/ziti-browzer-core@npm:0.68.0"
dependencies:
"@openziti/libcrypto-js": "npm:^0.24.0"
"@openziti/libcrypto-js": "npm:0.24.0"
"@openziti/ziti-browzer-edge-client": "npm:^0.7.0"
asn1js: "npm:^3.0.5"
assert: "npm:^2.0.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: 28638e40491d21878173a5c1419f6d0efdc2624c50b31f6d363e70e595f596cf1856cdef13f117ef5829f5017e37d84de5ffb04123452ba817befcff88791fc0
checksum: 611deae6a697056f80b430786ecaf9df9a0a37845c76e23d102f9a99362ce554e39cd78827cb781592a2aa3b5294526bcc08bb351fa72ee4ab33606de7df3c00
languageName: node
linkType: hard

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

"@openziti/ziti-browzer-runtime@npm:^0.118.0":
version: 0.118.0
resolution: "@openziti/ziti-browzer-runtime@npm:0.118.0"
"@openziti/ziti-browzer-runtime@npm:^0.119.0":
version: 0.119.0
resolution: "@openziti/ziti-browzer-runtime@npm:0.119.0"
dependencies:
"@auth0/auth0-spa-js": "npm:^2.0.4"
"@babel/runtime": "npm:^7.17.9"
"@openziti/ziti-browzer-core": "npm:^0.64.0"
"@openziti/ziti-browzer-core": "npm:^0.68.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:^7.3.0"
checksum: 8dce7f8bbd6e6c35ef49e28992a364b09222be1ce9cb55a5f314adc2a0a827318228dea3c2192a5950126f6d611db475145a93387df47bb4a2cd4fc6036ed0e1
checksum: 72a2da4e2b4c036382e83515e8dbb820be31b5507ca71ba97ccf474156a3fb5bf9eb6fbc89ec0f53737e9f7931eb7e710075a05f23f610fb3597708ff29972c1
languageName: node
linkType: hard

"@openziti/ziti-browzer-sw-workbox-strategies@npm:^0.88.0":
version: 0.88.0
resolution: "@openziti/ziti-browzer-sw-workbox-strategies@npm:0.88.0"
"@openziti/ziti-browzer-sw-workbox-strategies@npm:^0.89.0":
version: 0.89.0
resolution: "@openziti/ziti-browzer-sw-workbox-strategies@npm:0.89.0"
dependencies:
"@openziti/ziti-browzer-core": "npm:^0.64.0"
"@openziti/ziti-browzer-core": "npm:^0.68.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: 2c5f64e56723485816dad21993de409fc9fd95338872570671b99d5acad390249479aac831659d13f3ef9fc0ba523c02282c8710dadd36e5f60fa2901089675c
checksum: fcd75f1283c8934393c63ebf2589fca4966a29f85cfdd69b49c51f534dd50841290049b876f8ba9dd46b26c61cbd9a54bb8637f8cbd96db7b2cfffcac2cf252c
languageName: node
linkType: hard

"@openziti/ziti-browzer-sw@npm:^0.83.0":
version: 0.83.0
resolution: "@openziti/ziti-browzer-sw@npm:0.83.0"
"@openziti/ziti-browzer-sw@npm:^0.84.0":
version: 0.84.0
resolution: "@openziti/ziti-browzer-sw@npm:0.84.0"
dependencies:
"@openziti/ziti-browzer-sw-workbox-strategies": "npm:^0.88.0"
"@openziti/ziti-browzer-sw-workbox-strategies": "npm:^0.89.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: 8af55d82f33e1d7c4ec24127ad00cfc37fbb601e687f8cc0a3256d06ea6270ab68b8e856fb87d59fa2fb2ef9e91941d4f5570d537e31294b4875b93bb2d42f4a
checksum: 91c50b74403cc27bae1a36d4f424bb7970df3a7cbda4b01dd0f1b15bb79b15704aab79a12b548a93770a4437c17fcfb5bacae7a7f48d59ef49bb4010dde2fc33
languageName: node
linkType: hard

Expand Down Expand Up @@ -4941,14 +4941,14 @@ __metadata:
languageName: node
linkType: hard

"node_extra_ca_certs_mozilla_bundle@npm:^1.0.6":
version: 1.0.6
resolution: "node_extra_ca_certs_mozilla_bundle@npm:1.0.6"
"node_extra_ca_certs_mozilla_bundle@npm:^1.0.7":
version: 1.0.7
resolution: "node_extra_ca_certs_mozilla_bundle@npm:1.0.7"
dependencies:
axios: "npm:^1.6.5"
cross-env: "npm:^7.0.3"
csvtojson: "npm:^2.0.10"
checksum: 06b40da339b9d594d357cea9070eb0b4ea5fe89c2576cdbf7d0026f08caa8ca7213fa6e4d4eebaf3d77162dc3387d092c2a0042a1b3b16a94266ce703d80be70
checksum: a7f270f6101875a2b38d7b97b9c666b4900ba36ae1205eb85118ef85ba04e954fe729d1374434cbd7d27b2692f8e2c36a2df2267db340ba4a29006f2461b0df7
languageName: node
linkType: hard

Expand Down Expand Up @@ -7268,8 +7268,8 @@ __metadata:
resolution: "ziti-browzer-bootstrapper@workspace:."
dependencies:
"@openziti/ziti-browzer-edge-client": "npm:^0.6.2"
"@openziti/ziti-browzer-runtime": "npm:^0.118.0"
"@openziti/ziti-browzer-sw": "npm:^0.83.0"
"@openziti/ziti-browzer-runtime": "npm:^0.119.0"
"@openziti/ziti-browzer-sw": "npm:^0.84.0"
acme-http-01-standalone: "npm:^3.0.5"
ajv: "npm:^8.17.1"
ajv-formats: "npm:^3.0.1"
Expand Down Expand Up @@ -7310,7 +7310,7 @@ __metadata:
node-cache: "npm:^5.1.2"
node-cron: "npm:^3.0.3"
node-fetch: "npm:^3.3.2"
node_extra_ca_certs_mozilla_bundle: "npm:^1.0.6"
node_extra_ca_certs_mozilla_bundle: "npm:^1.0.7"
nyc: "npm:^15.1.0"
openid-client: "npm:^5.6.5"
pump: "npm:^3.0.0"
Expand Down
Loading