T

t t t t t t t
gorillazeek · Jul 26, 2021 · e912cf4 · e912cf4
1 parent ccfee43
commit e912cf4
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 24 deletions.
diff --git a/demo/index.js b/demo/index.js
@@ -8,7 +8,7 @@ const ssl = {
 const server = https.createServer(ssl);
 const Corrosion = require('../');
 const proxy = new Corrosion({
-    codec: 'xor',
+    codec: 'base64',
 });
 
 server.on('request', (request, response) => {

diff --git a/lib/browser/document.js b/lib/browser/document.js
@@ -153,7 +153,7 @@ function createDocumentRewriter(ctx) {
             }),
             set: domain.set,
         });
-        Object.defineProperty(ctx.window.Document.prototype, 'title', {
+        if (ctx.config.title) Object.defineProperty(ctx.window.Document.prototype, 'title', {
             get: new Proxy(title.get, {
                 apply: () => spoofTitle,
             }),

diff --git a/lib/browser/index.js b/lib/browser/index.js
@@ -52,7 +52,7 @@ class Corrosion extends require('../rewrite') {
     get windowTop() {
         if (this.serviceWorker) return false;
         try {
-            return this.window.parent.$corrosion ? this.window.parent : this.window;
+            return this.window.top.$corrosion ? this.window.top : this.window;
         } catch(e) {
             return this.window;
         };
@@ -107,6 +107,8 @@ class Corrosion extends require('../rewrite') {
         if (obj == this.window || obj == this.document) {
             if (key == 'location') obj = this;
         };
+        if (obj == this.window.parent) obj = this.windowParent;
+        if (obj == this.window.top) obj = this.windowTop;
 
         switch(operator) {
             case '+=':
@@ -150,10 +152,14 @@ class Corrosion extends require('../rewrite') {
     };
     setIdentifier(identifier, val) {
         if (identifier == this.window.location) return this.location.href = val;
+        if (identifier == this.window.parent) return this.windowParent = val;
+        if (identifier == this.window.top) return this.windowTop = val;
         return identifier = val;
     };
     getIdentifier(identifier) {
         if (identifier == this.window.location) return this.location;
+        if (identifier == this.window.parent) return this.windowParent;
+        if (identifier == this.window.top) return this.windowTop;
         return identifier;
     };
     updateLocation() {

diff --git a/lib/html.js b/lib/html.js
@@ -44,7 +44,7 @@ class HTMLRewriter {
                     if (node.textContent) node.textContent = this.ctx.css.process(node.textContent, meta);
                     break;
                 case 'TITLE':
-                    if (node.textContent) node.textContent = 'Service';
+                    if (node.textContent && this.ctx.config.title) node.textContent = this.ctx.config.title;
                     break;
                 case 'SCRIPT':
                     if (node.getAttribute('type') != 'application/json' && node.textContent) node.textContent = this.ctx.js.process(node.textContent);
@@ -112,7 +112,7 @@ class HTMLRewriter {
                 childNodes: [ 
                     {
                         nodeName: '#text',
-                        value: this.ctx.config.title,
+                        value: this.ctx.config.title || '',
                     } 
                 ], 
                 attrs: [],
@@ -134,7 +134,7 @@ class HTMLRewriter {
                 childNodes: [
                     {
                         nodeName: '#text',
-                        value: `window.$corrosion = new Corrosion({ window, codec: '${this.ctx.config.codec || 'plain'}',  prefix: '${this.ctx.prefix}', ws: ${this.ctx.config.ws}, cookie: ${this.ctx.config.cookie}, title: '${this.ctx.config.title}', }); $corrosion.init(); document.currentScript.remove();`
+                        value: `window.$corrosion = new Corrosion({ window, codec: '${this.ctx.config.codec || 'plain'}',  prefix: '${this.ctx.prefix}', ws: ${this.ctx.config.ws}, cookie: ${this.ctx.config.cookie}, title: ${typeof this.ctx.config.title == 'boolean' ? this.ctx.config.title : '\'' + this.ctx.config.title + '\''}, }); $corrosion.init(); document.currentScript.remove();`
                     },
                 ], 
                 attrs: [],

diff --git a/lib/js.js b/lib/js.js
@@ -15,7 +15,7 @@ class JSRewriter {
                 compact: true,
             },
         };
-        this.rewrite = ['location'];
+        this.rewrite = ['location', 'parent', 'top'];
         this.map = [
             {
                 type: 'MemberExpression',
@@ -73,7 +73,7 @@ class JSRewriter {
         if (parent.type == 'ExportSpecifier') return;
         if (parent.type == 'ImportSpecifier') return;
         if (parent.type == 'FunctionDeclaration' && parent.params.includes(node)) return;
-        if (node.name != 'location') return;
+        if (!this.rewrite.includes(node.name)) return;
         if (node.preventRewrite) return;
         let identifier = '$corrosionGetIdentifier';
         let nodeToRewrite = node;
@@ -95,13 +95,13 @@ class JSRewriter {
         switch(node.property.type) {
             case 'Identifier':
                 //if (node.computed) rewrite = true;
-                if (!node.computed && node.property.name == 'location') {
+                if (!node.computed && this.rewrite.includes(node.property.name)) {
                     node.property = this.createLiteral(node.property.name);
                     rewrite = true;
                 };
                 break;
             case 'Literal':
-                if (node.property.value == 'location') rewrite = true;
+                if (this.rewrite.includes(node.property.name)) rewrite = true;
                 break;
             case 'TemplateLiteral':
                 rewrite = true;

diff --git a/lib/server/ads.js b/lib/server/ads.js
diff --git a/lib/server/index.js b/lib/server/index.js
@@ -4,7 +4,6 @@ const createRequestProxy = require('./request');
 const createGateway = require('./gateway');
 const middleware = {
     ...require('./headers'),
-    reconnectUrl: require('./reconnect-url'),
     decompress: require('./decompress'),
     rewriteBody: require('./rewrite-body'),
 };
@@ -27,7 +26,6 @@ class Corrosion extends require('../rewrite') {
         if (this.config.standardMiddleware) {
             this.config.requestMiddleware.unshift(
                 middleware.requestHeaders,
-                middleware.reconnectUrl
             );  
             this.config.responseMiddleware.unshift(
                 middleware.responseHeaders,

diff --git a/lib/server/reconnect-url.js b/lib/server/reconnect-url.js