From df861e16ca40c8bb36f0fc4107a30cb0d66c50ff Mon Sep 17 00:00:00 2001 From: Ray Lothian Date: Tue, 5 Nov 2019 11:02:26 +0000 Subject: [PATCH] optional parser --- LICENSE | 373 ++++++++++++++++++++++++++++++ extension/common.js | 75 ++++-- extension/data/options/index.html | 9 + extension/data/options/index.js | 30 +++ extension/data/popup/index.css | 81 +++++-- extension/data/popup/index.html | 155 ++++++++----- extension/data/popup/index.js | 36 ++- extension/manifest.json | 2 +- 8 files changed, 653 insertions(+), 108 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..14e2f77 --- /dev/null +++ b/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/extension/common.js b/extension/common.js index 3357ad2..2518288 100644 --- a/extension/common.js +++ b/extension/common.js @@ -16,7 +16,8 @@ const prefs = { color: '#777', cache: true, exactMatch: false, - protected: ['google.com/recaptcha', 'gstatic.com/recaptcha'] + protected: ['google.com/recaptcha', 'gstatic.com/recaptcha'], + parser: {} // maps ua string to a ua object }; chrome.storage.local.get(prefs, ps => { Object.assign(prefs, ps); @@ -71,16 +72,53 @@ const ua = { return Object.keys(this._obj).filter(id => id !== 'global').map(s => Number(s)); }, parse: s => { + if (prefs.parser[s]) { + return Object.assign({ + userAgent: s + }, prefs.parser[s]); + } + // build ua string from browser defaults; + s = s.replace(/\${([^}]+)}/g, (a, b) => navigator[b]); const o = {}; o.userAgent = s; o.appVersion = s .replace(/^Mozilla\//, '') .replace(/^Opera\//, ''); + + const isFF = /Firefox/.test(s); + const isCH = /Chrome/.test(s); + const isSF = /Safari/.test(s) && isCH === false; + + if (isFF) { + o.appVersion = '5.0 ' + o.appVersion.replace('5.0 ', '').split(/[\s;]/)[0] + ')'; + } const p = (new UAParser(s)).getResult(); o.platform = p.os.name || ''; o.vendor = p.device.vendor || ''; + if (isSF) { + o.vendor = 'Apple Computer, Inc.'; + } + else if (isFF === false) { + o.vendor = 'Google Inc.'; + } o.product = p.engine.name || ''; - o.oscpu = ((p.os.name || '') + ' ' + (p.os.version || '')).trim(); + if (s.indexOf('Gecko') !== -1) { + o.product = 'Gecko'; + } + if (isFF) { + o.oscpu = ((p.os.name || '') + ' ' + (p.os.version || '')).trim(); + } + else { + o.oscpu = '[delete]'; + } + + if (o.userAgent === 'empty') { + Object.keys(o).forEach(key => { + if (key !== 'userAgent') { + o[key] = ''; + } + }); + } return o; }, @@ -116,7 +154,7 @@ const ua = { } }); }, - toolbar: ({windowId, tabId, str = ua.object(tabId, windowId).userAgent}) => { + toolbar: ({windowId, tabId}) => { if (windowId) { chrome.tabs.query({ windowId @@ -288,29 +326,24 @@ const onCommitted = ({frameId, url, tabId}) => { } const o = cache[tabId] || ua.object(tabId); if (o.userAgent) { - let {userAgent, appVersion, platform, vendor, product, oscpu} = o; - if (o.userAgent === 'empty') { - userAgent = appVersion = platform = vendor = product = ''; - } chrome.tabs.executeScript(tabId, { runAt: 'document_start', frameId, code: `{ const script = document.createElement('script'); script.textContent = \`{ - const userAgent = "${encodeURIComponent(userAgent)}"; - const appVersion = "${encodeURIComponent(appVersion)}"; - const platform = "${encodeURIComponent(platform)}"; - const vendor = "${encodeURIComponent(vendor)}"; - const product = "${encodeURIComponent(product)}"; - const oscpu = "${encodeURIComponent(oscpu)}"; - navigator.__defineGetter__('userAgent', () => decodeURIComponent(userAgent)); - navigator.__defineGetter__('appVersion', () => decodeURIComponent(appVersion)); - navigator.__defineGetter__('platform', () => decodeURIComponent(platform)); - navigator.__defineGetter__('vendor', () => decodeURIComponent(vendor)); - navigator.__defineGetter__('product', () => decodeURIComponent(product)); - navigator.__defineGetter__('oscpu', () => decodeURIComponent(oscpu)); - navigator.__defineGetter__('productSub', () => ''); + const o = JSON.parse('${JSON.stringify(o)}'); + for (const key of Object.keys(o)) { + navigator.__defineGetter__(key, () => { + if (o[key] === '[delete]') { + return undefined; + } + else if (o[key] === 'empty') { + return ''; + } + return o[key]; + }); + } }\`; document.documentElement.appendChild(script); script.remove(); @@ -323,7 +356,7 @@ const onCommitted = ({frameId, url, tabId}) => { } } else if (frameId === 0) { - ua.tooltip('[Custom] ' + userAgent); + ua.tooltip('[Custom] ' + o.userAgent); ua.icon('active', tabId); } }); diff --git a/extension/data/options/index.html b/extension/data/options/index.html index 64bfd8b..b24c35d 100644 --- a/extension/data/options/index.html +++ b/extension/data/options/index.html @@ -12,6 +12,7 @@ .h { text-decoration: underline; text-decoration-style: dashed; + font-weight: bold; } .spacer { padding-bottom: 10px; @@ -45,6 +46,14 @@ + + + Press here to insert a sample JSON object. + + + + + diff --git a/extension/data/options/index.js b/extension/data/options/index.js index 86bd21f..5ad87ad 100644 --- a/extension/data/options/index.js +++ b/extension/data/options/index.js @@ -28,6 +28,18 @@ function save() { }, 1000); } + let parser = {}; + const p = document.getElementById('parser').value; + try { + parser = JSON.parse(p); + } + catch (e) { + window.setTimeout(() => { + notify('Parser JSON error: ' + e.message, 5000); + document.getElementById('parser').value = c; + }, 1000); + } + chrome.storage.local.set({ exactMatch: document.getElementById('exactMatch').checked, faqs: document.getElementById('faqs').checked, @@ -35,6 +47,7 @@ function save() { blacklist: prepare(document.getElementById('blacklist').value), whitelist: prepare(document.getElementById('whitelist').value), custom, + parser, mode: document.querySelector('[name="mode"]:checked').value, protected: document.getElementById('protected').value.split(/\s*,\s*/).filter(s => s.length > 4) }, () => { @@ -55,6 +68,7 @@ function restore() { whitelist: [], blacklist: [], custom: {}, + parser: {}, protected: ['google.com/recaptcha', 'gstatic.com/recaptcha'] }, prefs => { document.getElementById('exactMatch').checked = prefs.exactMatch; @@ -64,6 +78,7 @@ function restore() { document.getElementById('blacklist').value = prefs.blacklist.join(', '); document.getElementById('whitelist').value = prefs.whitelist.join(', '); document.getElementById('custom').value = JSON.stringify(prefs.custom, null, 2); + document.getElementById('parser').value = JSON.stringify(prefs.parser, null, 2); document.getElementById('protected').value = prefs.protected.join(', '); }); } @@ -81,6 +96,21 @@ document.getElementById('sample').addEventListener('click', e => { }, null, 2); }); +document.getElementById('sample-2').addEventListener('click', e => { + e.preventDefault(); + + document.getElementById('parser').value = JSON.stringify({ + 'my-custom-useragent': { + 'appVersion': 'custom app version', + 'platform': 'custom platform', + 'vendor': '[delete]', + 'product': 'custom product', + 'oscpu': 'custom oscpu', + 'custom-variable': 'this is a custom variable' + } + }, null, 2); +}); + document.getElementById('donate').addEventListener('click', () => { chrome.tabs.create({ url: chrome.runtime.getManifest().homepage_url + '?rd=donate' diff --git a/extension/data/popup/index.css b/extension/data/popup/index.css index ec11327..6eaaff2 100644 --- a/extension/data/popup/index.css +++ b/extension/data/popup/index.css @@ -24,9 +24,10 @@ body { background-color: #fff; - font-family: "Helvetica Neue",Helvetica,sans-serif; + font-family: "Helvetica Neue", Helvetica, sans-serif; font-size: 13px; - width: 600px; + width: 650px; + margin: 0; } table { width: 100%; @@ -37,15 +38,21 @@ fieldset { } input[type=search], input[type=text] { - width: 100%; + box-sizing: border-box; margin-right: 2px; text-indent: 5px; padding-right: 5px; } +input[type=text] { + width: 100%; +} +input[type=text]:read-only { + background-color: transparent; +} input { outline: none; background-color: #fff; - color: #000; + color: #000; border: solid 1px #e7e7e7; box-sizing: border-box; height: 24px; @@ -54,8 +61,9 @@ input { } input[type=button] { cursor: pointer; - min-width: 100px; + border: none; transition-delay: 0; + height: 32px; } input[type=button].active { opacity: 0.5; @@ -68,25 +76,25 @@ input[type=button]:disabled { select { -webkit-appearance: none; -moz-appearance: none; - border: none; user-select: none; outline: none; color: #000; - background: rgba(255,255,255,.5) url(list.svg) no-repeat center right 4px; + background: #fff url(list.svg) no-repeat center right 4px; background-size: 8px; font-size: 13px; border-radius: 0; padding: 2px 16px 2px 4px; + border: solid 1px #e7e7e7; } #list { overflow: auto; scroll-behavior: smooth; - height: 300px; - margin-bottom: 10px; + height: 200px; + margin-bottom: 16px; color: #000; - background-color: #fdfafa; - background-position: top 120px center; + background-position: top 88px center; background-repeat: no-repeat; + font-size: 11px; } #list[data-loading=true] { background-image: url(loading.gif); @@ -96,9 +104,9 @@ select { table-layout: fixed; } #list th { - height: 30px; + height: 32px; color: #000; - background-color: #e7e7e7; + background-color: #f5f5f5; white-space: nowrap; padding-left: 10px; } @@ -141,8 +149,15 @@ select { margin: 3px 0 0 5px; } -#filter td:first-child { - width: 100px; +#filter { + background-color: #f5f5f5; +} +#filter th { + height: 32px; +} +#filter th:first-of-type { + text-align: left; + padding-left: 10px; } #filter th:last-of-type { text-align: right; @@ -150,9 +165,11 @@ select { } #agent { - padding: 10px 0; white-space: nowrap; } +#agent input:not(:last-child) { + margin-right: 1px; +} #info { padding: 0 5px; @@ -161,25 +178,19 @@ select { display: none; } -[data-cmd] { - margin-right: 2px; -} [data-cmd="test"] { background-color: #4d72b7; - border: solid 1px #4a6dad; color: #fff; } [data-cmd="window"], [data-cmd="apply"] { color: #fff; background-color: #3c923c; - border: solid 1px #327932; } [data-cmd="reset"] { color: #fff; - background-color: #eea345; - border: solid 1px #ec9730; + background-color: #e6850b; } [data-cmd="reload"], @@ -197,3 +208,27 @@ body[data-android="true"] [data-cmd="reload"], body[data-android="true"] [data-cmd="window"] { display: none; } +#view { + background-color: #f5f5f5; +} +#view td { + text-align: right; + white-space: nowrap; +} +#view td:nth-child(1), +#view td:nth-child(3) { + padding: 0 5px; +} + +#toast { + position: fixed; + bottom: 50px; + right: 10px; + background-color: #e68509; + color: #fff; + padding: 2px 5px; + box-shadow: 0 0 2px #ca7403; +} +#toast:empty { + display: none; +} diff --git a/extension/data/popup/index.html b/extension/data/popup/index.html index b658c2e..656fe33 100644 --- a/extension/data/popup/index.html +++ b/extension/data/popup/index.html @@ -6,6 +6,47 @@ +
+ + + + + + + +
+   + + +   + +
@@ -14,44 +55,6 @@ - - - - - -
-   - - - User-Agent  - -