From 51a5eb27e9d2e4d42843cb53a8b4ec630f8997b2 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 14 Apr 2017 17:49:16 -0700 Subject: [PATCH 01/24] Update the rulesets out-of-band from the extension release channel. --- chromium/background-scripts/keys.js | 7 + chromium/background-scripts/update.js | 186 ++++++++++++++++++++++++++ chromium/background-scripts/util.js | 29 +++- chromium/manifest.json | 7 +- chromium/pako_inflate.min.js | 2 + utils/sign-rulesets-airgap.sh | 41 ++++++ utils/sign-rulesets-request.sh | 29 ++++ utils/sign-rulesets-standalone.sh | 22 +++ 8 files changed, 320 insertions(+), 3 deletions(-) create mode 100644 chromium/background-scripts/keys.js create mode 100644 chromium/background-scripts/update.js create mode 100644 chromium/pako_inflate.min.js create mode 100755 utils/sign-rulesets-airgap.sh create mode 100755 utils/sign-rulesets-request.sh create mode 100755 utils/sign-rulesets-standalone.sh diff --git a/chromium/background-scripts/keys.js b/chromium/background-scripts/keys.js new file mode 100644 index 000000000000..c0c192cdb8aa --- /dev/null +++ b/chromium/background-scripts/keys.js @@ -0,0 +1,7 @@ +let keys = { + eff: { + kty: "RSA", + e: "AQAB", + n: "1J6QHCKf7zOkIXLs0pUF0KLy-RlTtXmNhj3OkQMULbQagciDl9ppm1swXHAYi718uoILU_fUzdk8QObXmKVuRMjs7NiXbFOeT0teQou1sX99k-WEJM8SlkXCJDCtYSWnLiadtRCdd1FrjMJcGcMYD_38CcnRBZZOt0PWtoUPMyDX-OUHMd8fQ_b78g-TThmQRxGsQfjYdM7_Hn_djnVON_Iik_lYw9SSazy9GzEJO3naMG2j47NAD8CFBwqqCI9kHkqCqirDDMVIT9ZxoyOFBWBFq4EErKyAjP3l2AD05aCwOPTwVnRfIRPJP6SoCv31e76M41_xsodbICueVWgWP1yRuwxwHNmqPRMhkEA_ZP6R7MpsJP9HLBnPXm9_k4QFndyIdYNgo08cgZTkQcY5y-paOJW5aFzJhxnbC1NQ6AebQyCd-meFVNBiyw3CkI_TsItLgaRSQNzBLgE7Of5aYLk3_cO0rZDfvbo5QzrDXmKym57mhPl01YYUzHyAdWELrvs6hJxwsCROHXCwSqHBtJU5-nPEBgHgAhzc8iH7zVOwL3i1oyPvE0E8UK6eg80FUdwI6iu01-doJywBLD5DOyH2D0ErZNTiAcTkHtAxuxlmbRneaxP2_JqX4WwC1CNyccPp1VzwGFWVlu0rEODPuUm0zkPXPDB0D_0PjHvP_wU" + } +}; diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js new file mode 100644 index 000000000000..801f21f6e7c7 --- /dev/null +++ b/chromium/background-scripts/update.js @@ -0,0 +1,186 @@ +"use strict"; + +(function(exports) { + +// how often we should check for new rulesets +let periodicity = 10; + +// jwk key loaded from keys.js +let importedEffKey = window.crypto.subtle.importKey( + "jwk", + keys.eff, + { + name: "RSASSA-PKCS1-v1_5", + hash: {name: "SHA-256"}, + }, + false, + ["verify"] +); + + +// Determine the time until we should check for new rulesets +async function timeToNextCheck() { + let last_checked = await getLastChecked(); + if(last_checked === undefined) { + return 0; + } else { + let current_timestamp = Date.now() / 1000; + let secs_since_last_checked = current_timestamp - last_checked; + return Math.max(0, periodicity - secs_since_last_checked); + } +} + +// Get the time we last checked for new rulesets +function getLastChecked() { + return new Promise(resolve => { + chrome.storage.local.get("last-checked", root => { + resolve(root['last-checked']); + }); + }); +} + +// Get the currently applied rulesets timestamp +function getRulesetsTimestamp() { + return new Promise(resolve => { + chrome.storage.local.get("rulesets-timestamp", root => { + resolve(root['rulesets-timestamp']); + }); + }); +} + +// Generic ajax promise +let xhr_promise = url => { + return new Promise((resolve, reject) => { + let xhr = new XMLHttpRequest(); + xhr.open("GET", url); + xhr.onreadystatechange = function(){ + if(this.readyState == 4 && this.status == 200) { + resolve(this.response); + } + } + xhr.send(null); + }); +} + +// Check for new rulesets. If found, return the timestamp. If not, return false +async function checkForNewRulesets() { + + let current_timestamp = Date.now() / 1000; + chrome.storage.local.set({ + 'last-checked': current_timestamp + }); + + let timestamp_promise = xhr_promise("http://localhost:8000/rulesets-timestamp"); + let rulesets_timestamp = Number(await timestamp_promise); + + if((await getRulesetsTimestamp() || 0) < rulesets_timestamp){ + return rulesets_timestamp; + } else { + return false; + } +} + +// Download and return new rulesets +async function getNewRulesets(rulesets_timestamp) { + + chrome.storage.local.set({ + 'rulesets-timestamp': rulesets_timestamp + }); + + let signature_promise = xhr_promise("http://localhost:8000/rulesets-signature.sha256.base64"); + let rulesets_promise = xhr_promise("http://localhost:8000/default.rulesets.gz.base64"); + + let resolutions = await Promise.all([ + signature_promise, + rulesets_promise + ]); + + return { + signature_byte_array: util.base64ToUint8Array(resolutions[0]), + rulesets_byte_array: util.stringToUint8Array(resolutions[1]), + rulesets_gz_base64: resolutions[1] + }; +} + +// Returns a promise which verifies that the rulesets have a valid EFF +// signature, and if so, stores them and returns true. +// Otherwise, it throws an exception. +function verifyAndStoreNewRulesets(new_rulesets){ + return new Promise((resolve, reject) => { + importedEffKey.then(publicKey => { + window.crypto.subtle.verify( + { + name: "RSASSA-PKCS1-v1_5", + }, + publicKey, + new_rulesets.signature_byte_array.buffer, + new_rulesets.rulesets_byte_array.buffer + ) + .then(isvalid => { + if(isvalid) { + util.log(util.NOTE, 'Downloaded ruleset signature checks out. Storing rulesets.'); + chrome.storage.local.set({ + rulesets: new_rulesets.rulesets_gz_base64 + }); + resolve(true); + } else { + reject('Downloaded ruleset signature is invalid. Aborting.'); + } + }) + .catch(err => { + reject('Downloaded ruleset signature could not be verified. Aborting.'); + }); + }) + .catch(err => { + reject('Downloaded ruleset signature could not be verified. Aborting.'); + }); + }); +} + +// Base64 decode, unzip, and apply the rulesets we have stored. +async function applyStoredRulesets(){ + chrome.storage.local.get("rulesets", root => { + if(root.rulesets){ + util.log(util.NOTE, 'Applying stored rulesets.'); + + let rulesets_gz = window.atob(root.rulesets); + let rulesets_byte_array = pako.inflate(rulesets_gz); + let rulesets = new TextDecoder("utf-8").decode(rulesets_byte_array); + + background.all_rules = new rules.RuleSets(background.ls); + background.all_rules.addFromJson(rulesets_json); + background.loadStoredUserRules(); + } + }); +} + +// basic workflow for periodic checks +async function performCheck(){ + util.log(util.NOTE, 'Checking for new ruleset bundle.'); + let new_rulesets_timestamp = await checkForNewRulesets(); + if(new_rulesets_timestamp){ + util.log(util.NOTE, 'A new ruleset bundle has been released. Downloading now.'); + let new_rulesets = await getNewRulesets(new_rulesets_timestamp); + try{ + await verifyAndStoreNewRulesets(new_rulesets); + applyStoredRulesets(); + } catch(err) { + util.log(util.WARN, err); + } + } +}; + + +async function setUpRulesetsTimer(){ + let time_to_next_check = await timeToNextCheck(); + + setTimeout(() => { + performCheck(); + setInterval(performCheck, periodicity * 1000); + }, time_to_next_check * 1000); +} + +applyStoredRulesets(); +setUpRulesetsTimer(); + +})(typeof exports == 'undefined' ? window.update = {} : exports); diff --git a/chromium/background-scripts/util.js b/chromium/background-scripts/util.js index 5763ff6b839e..cbd39c9eae9a 100644 --- a/chromium/background-scripts/util.js +++ b/chromium/background-scripts/util.js @@ -60,6 +60,31 @@ function loadExtensionFile(url, returnType) { return xhr.responseText; } +/** + * Convert a string to ArrayBuffer + * + * @param string: a string to convert + */ +function stringToUint8Array(string) { + let len = string.length; + let bytes = new Uint8Array(len); + + for (let i = 0; i < len; i++) { + bytes[i] = string.charCodeAt(i); + } + + return bytes; +} + +/** + * Convert a base64 string to ArrayBuffer + * + * @param base64: a base64 string to convert + */ +function base64ToUint8Array(base64) { + return stringToUint8Array(window.atob(base64)); +} + Object.assign(exports, { VERB, DBUG, @@ -69,7 +94,9 @@ Object.assign(exports, { log, setDefaultLogLevel, getDefaultLogLevel, - loadExtensionFile + loadExtensionFile, + stringToUint8Array, + base64ToUint8Array }); })(typeof exports == 'undefined' ? require.scopes.util = {} : exports); diff --git a/chromium/manifest.json b/chromium/manifest.json index a35f275e6f42..4e006bd39787 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -12,8 +12,11 @@ "background-scripts/util.js", "background-scripts/rules.js", "background-scripts/store.js", - "background-scripts/incognito.js", - "background-scripts/background.js" + "pako_inflate.min.js", + "background-scripts/keys.js", + "background-scripts/update.js", + "background-scripts/background.js", + "background-scripts/incognito.js" ] }, "browser_action": { diff --git a/chromium/pako_inflate.min.js b/chromium/pako_inflate.min.js new file mode 100644 index 000000000000..3484f85d7e54 --- /dev/null +++ b/chromium/pako_inflate.min.js @@ -0,0 +1,2 @@ +/* pako 1.0.5 nodeca/pako */ +!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.pako=e()}}(function(){return function e(t,i,n){function a(o,s){if(!i[o]){if(!t[o]){var f="function"==typeof require&&require;if(!s&&f)return f(o,!0);if(r)return r(o,!0);var l=new Error("Cannot find module '"+o+"'");throw l.code="MODULE_NOT_FOUND",l}var d=i[o]={exports:{}};t[o][0].call(d.exports,function(e){var i=t[o][1][e];return a(i?i:e)},d,d.exports,e,t,i,n)}return i[o].exports}for(var r="function"==typeof require&&require,o=0;o=252?6:f>=248?5:f>=240?4:f>=224?3:f>=192?2:1;s[254]=s[254]=1,i.string2buf=function(e){var t,i,n,r,o,s=e.length,f=0;for(r=0;r>>6,t[o++]=128|63&i):i<65536?(t[o++]=224|i>>>12,t[o++]=128|i>>>6&63,t[o++]=128|63&i):(t[o++]=240|i>>>18,t[o++]=128|i>>>12&63,t[o++]=128|i>>>6&63,t[o++]=128|63&i);return t},i.buf2binstring=function(e){return n(e,e.length)},i.binstring2buf=function(e){for(var t=new a.Buf8(e.length),i=0,n=t.length;i4)l[a++]=65533,i+=o-1;else{for(r&=2===o?31:3===o?15:7;o>1&&i1?l[a++]=65533:r<65536?l[a++]=r:(r-=65536,l[a++]=55296|r>>10&1023,l[a++]=56320|1023&r)}return n(l,a)},i.utf8border=function(e,t){var i;for(t=t||e.length,t>e.length&&(t=e.length),i=t-1;i>=0&&128===(192&e[i]);)i--;return i<0?t:0===i?t:i+s[e[i]]>t?i:t}},{"./common":1}],3:[function(e,t,i){"use strict";function n(e,t,i,n){for(var a=65535&e|0,r=e>>>16&65535|0,o=0;0!==i;){o=i>2e3?2e3:i,i-=o;do a=a+t[n++]|0,r=r+a|0;while(--o);a%=65521,r%=65521}return a|r<<16|0}t.exports=n},{}],4:[function(e,t,i){"use strict";t.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],5:[function(e,t,i){"use strict";function n(){for(var e,t=[],i=0;i<256;i++){e=i;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[i]=e}return t}function a(e,t,i,n){var a=r,o=n+i;e^=-1;for(var s=n;s>>8^a[255&(e^t[s])];return e^-1}var r=n();t.exports=a},{}],6:[function(e,t,i){"use strict";function n(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}t.exports=n},{}],7:[function(e,t,i){"use strict";var n=30,a=12;t.exports=function(e,t){var i,r,o,s,f,l,d,u,c,h,b,w,m,k,_,g,v,p,x,y,S,E,B,Z,A;i=e.state,r=e.next_in,Z=e.input,o=r+(e.avail_in-5),s=e.next_out,A=e.output,f=s-(t-e.avail_out),l=s+(e.avail_out-257),d=i.dmax,u=i.wsize,c=i.whave,h=i.wnext,b=i.window,w=i.hold,m=i.bits,k=i.lencode,_=i.distcode,g=(1<>>24,w>>>=x,m-=x,x=p>>>16&255,0===x)A[s++]=65535&p;else{if(!(16&x)){if(0===(64&x)){p=k[(65535&p)+(w&(1<>>=x,m-=x),m<15&&(w+=Z[r++]<>>24,w>>>=x,m-=x,x=p>>>16&255,!(16&x)){if(0===(64&x)){p=_[(65535&p)+(w&(1<d){e.msg="invalid distance too far back",i.mode=n;break e}if(w>>>=x,m-=x,x=s-f,S>x){if(x=S-x,x>c&&i.sane){e.msg="invalid distance too far back",i.mode=n;break e}if(E=0,B=b,0===h){if(E+=u-x,x2;)A[s++]=B[E++],A[s++]=B[E++],A[s++]=B[E++],y-=3;y&&(A[s++]=B[E++],y>1&&(A[s++]=B[E++]))}else{E=s-S;do A[s++]=A[E++],A[s++]=A[E++],A[s++]=A[E++],y-=3;while(y>2);y&&(A[s++]=A[E++],y>1&&(A[s++]=A[E++]))}break}}break}}while(r>3,r-=y,m-=y<<3,w&=(1<>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function a(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new _.Buf16(320),this.work=new _.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function r(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=D,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new _.Buf32(we),t.distcode=t.distdyn=new _.Buf32(me),t.sane=1,t.back=-1,z):C}function o(e){var t;return e&&e.state?(t=e.state,t.wsize=0,t.whave=0,t.wnext=0,r(e)):C}function s(e,t){var i,n;return e&&e.state?(n=e.state,t<0?(i=0,t=-t):(i=(t>>4)+1,t<48&&(t&=15)),t&&(t<8||t>15)?C:(null!==n.window&&n.wbits!==t&&(n.window=null),n.wrap=i,n.wbits=t,o(e))):C}function f(e,t){var i,n;return e?(n=new a,e.state=n,n.window=null,i=s(e,t),i!==z&&(e.state=null),i):C}function l(e){return f(e,_e)}function d(e){if(ge){var t;for(m=new _.Buf32(512),k=new _.Buf32(32),t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(x(S,e.lens,0,288,m,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;x(E,e.lens,0,32,k,0,e.work,{bits:5}),ge=!1}e.lencode=m,e.lenbits=9,e.distcode=k,e.distbits=5}function u(e,t,i,n){var a,r=e.state;return null===r.window&&(r.wsize=1<=r.wsize?(_.arraySet(r.window,t,i-r.wsize,r.wsize,0),r.wnext=0,r.whave=r.wsize):(a=r.wsize-r.wnext,a>n&&(a=n),_.arraySet(r.window,t,i-n,a,r.wnext),n-=a,n?(_.arraySet(r.window,t,i-n,n,0),r.wnext=n,r.whave=r.wsize):(r.wnext+=a,r.wnext===r.wsize&&(r.wnext=0),r.whave>>8&255,i.check=v(i.check,Ze,2,0),c=0,h=0,i.mode=F;break}if(i.flags=0,i.head&&(i.head.done=!1),!(1&i.wrap)||(((255&c)<<8)+(c>>8))%31){e.msg="incorrect header check",i.mode=ce;break}if((15&c)!==U){e.msg="unknown compression method",i.mode=ce;break}if(c>>>=4,h-=4,xe=(15&c)+8,0===i.wbits)i.wbits=xe;else if(xe>i.wbits){e.msg="invalid window size",i.mode=ce;break}i.dmax=1<>8&1),512&i.flags&&(Ze[0]=255&c,Ze[1]=c>>>8&255,i.check=v(i.check,Ze,2,0)),c=0,h=0,i.mode=L;case L:for(;h<32;){if(0===f)break e;f--,c+=a[o++]<>>8&255,Ze[2]=c>>>16&255,Ze[3]=c>>>24&255,i.check=v(i.check,Ze,4,0)),c=0,h=0,i.mode=H;case H:for(;h<16;){if(0===f)break e;f--,c+=a[o++]<>8),512&i.flags&&(Ze[0]=255&c,Ze[1]=c>>>8&255,i.check=v(i.check,Ze,2,0)),c=0,h=0,i.mode=M;case M:if(1024&i.flags){for(;h<16;){if(0===f)break e;f--,c+=a[o++]<>>8&255,i.check=v(i.check,Ze,2,0)),c=0,h=0}else i.head&&(i.head.extra=null);i.mode=j;case j:if(1024&i.flags&&(m=i.length,m>f&&(m=f),m&&(i.head&&(xe=i.head.extra_len-i.length,i.head.extra||(i.head.extra=new Array(i.head.extra_len)),_.arraySet(i.head.extra,a,o,m,xe)),512&i.flags&&(i.check=v(i.check,a,m,o)),f-=m,o+=m,i.length-=m),i.length))break e;i.length=0,i.mode=K;case K:if(2048&i.flags){if(0===f)break e;m=0;do xe=a[o+m++],i.head&&xe&&i.length<65536&&(i.head.name+=String.fromCharCode(xe));while(xe&&m>9&1,i.head.done=!0),e.adler=i.check=0,i.mode=X;break;case q:for(;h<32;){if(0===f)break e;f--,c+=a[o++]<>>=7&h,h-=7&h,i.mode=le;break}for(;h<3;){if(0===f)break e;f--,c+=a[o++]<>>=1,h-=1,3&c){case 0:i.mode=J;break;case 1:if(d(i),i.mode=ie,t===A){c>>>=2,h-=2;break e}break;case 2:i.mode=$;break;case 3:e.msg="invalid block type",i.mode=ce}c>>>=2,h-=2;break;case J:for(c>>>=7&h,h-=7&h;h<32;){if(0===f)break e;f--,c+=a[o++]<>>16^65535)){e.msg="invalid stored block lengths",i.mode=ce;break}if(i.length=65535&c,c=0,h=0,i.mode=Q,t===A)break e;case Q:i.mode=V;case V:if(m=i.length){if(m>f&&(m=f),m>l&&(m=l),0===m)break e;_.arraySet(r,a,o,m,s),f-=m,o+=m,l-=m,s+=m,i.length-=m;break}i.mode=X;break;case $:for(;h<14;){if(0===f)break e;f--,c+=a[o++]<>>=5,h-=5,i.ndist=(31&c)+1,c>>>=5,h-=5,i.ncode=(15&c)+4,c>>>=4,h-=4,i.nlen>286||i.ndist>30){e.msg="too many length or distance symbols",i.mode=ce;break}i.have=0,i.mode=ee;case ee:for(;i.have>>=3,h-=3}for(;i.have<19;)i.lens[Ae[i.have++]]=0;if(i.lencode=i.lendyn,i.lenbits=7,Se={bits:i.lenbits},ye=x(y,i.lens,0,19,i.lencode,0,i.work,Se),i.lenbits=Se.bits,ye){e.msg="invalid code lengths set",i.mode=ce;break}i.have=0,i.mode=te;case te:for(;i.have>>24,ke=Be>>>16&255,_e=65535&Be,!(me<=h);){if(0===f)break e;f--,c+=a[o++]<>>=me,h-=me,i.lens[i.have++]=_e;else{if(16===_e){for(Ee=me+2;h>>=me,h-=me,0===i.have){e.msg="invalid bit length repeat",i.mode=ce;break}xe=i.lens[i.have-1],m=3+(3&c),c>>>=2,h-=2}else if(17===_e){for(Ee=me+3;h>>=me,h-=me,xe=0,m=3+(7&c),c>>>=3,h-=3}else{for(Ee=me+7;h>>=me,h-=me,xe=0,m=11+(127&c),c>>>=7,h-=7}if(i.have+m>i.nlen+i.ndist){e.msg="invalid bit length repeat",i.mode=ce;break}for(;m--;)i.lens[i.have++]=xe}}if(i.mode===ce)break;if(0===i.lens[256]){e.msg="invalid code -- missing end-of-block",i.mode=ce;break}if(i.lenbits=9,Se={bits:i.lenbits},ye=x(S,i.lens,0,i.nlen,i.lencode,0,i.work,Se),i.lenbits=Se.bits,ye){e.msg="invalid literal/lengths set",i.mode=ce;break}if(i.distbits=6,i.distcode=i.distdyn,Se={bits:i.distbits},ye=x(E,i.lens,i.nlen,i.ndist,i.distcode,0,i.work,Se),i.distbits=Se.bits,ye){e.msg="invalid distances set",i.mode=ce;break}if(i.mode=ie,t===A)break e;case ie:i.mode=ne;case ne:if(f>=6&&l>=258){e.next_out=s,e.avail_out=l,e.next_in=o,e.avail_in=f,i.hold=c,i.bits=h,p(e,w),s=e.next_out,r=e.output,l=e.avail_out,o=e.next_in,a=e.input,f=e.avail_in,c=i.hold,h=i.bits,i.mode===X&&(i.back=-1);break}for(i.back=0;Be=i.lencode[c&(1<>>24,ke=Be>>>16&255,_e=65535&Be,!(me<=h);){if(0===f)break e;f--,c+=a[o++]<>ge)],me=Be>>>24,ke=Be>>>16&255,_e=65535&Be,!(ge+me<=h);){if(0===f)break e;f--,c+=a[o++]<>>=ge,h-=ge,i.back+=ge}if(c>>>=me,h-=me,i.back+=me,i.length=_e,0===ke){i.mode=fe;break}if(32&ke){i.back=-1,i.mode=X;break}if(64&ke){e.msg="invalid literal/length code",i.mode=ce;break}i.extra=15&ke,i.mode=ae;case ae:if(i.extra){for(Ee=i.extra;h>>=i.extra,h-=i.extra,i.back+=i.extra}i.was=i.length,i.mode=re;case re:for(;Be=i.distcode[c&(1<>>24,ke=Be>>>16&255,_e=65535&Be,!(me<=h);){if(0===f)break e;f--,c+=a[o++]<>ge)],me=Be>>>24,ke=Be>>>16&255,_e=65535&Be,!(ge+me<=h);){if(0===f)break e;f--,c+=a[o++]<>>=ge,h-=ge,i.back+=ge}if(c>>>=me,h-=me,i.back+=me,64&ke){e.msg="invalid distance code",i.mode=ce;break}i.offset=_e,i.extra=15&ke,i.mode=oe;case oe:if(i.extra){for(Ee=i.extra;h>>=i.extra,h-=i.extra,i.back+=i.extra}if(i.offset>i.dmax){e.msg="invalid distance too far back",i.mode=ce;break}i.mode=se;case se:if(0===l)break e;if(m=w-l,i.offset>m){if(m=i.offset-m,m>i.whave&&i.sane){e.msg="invalid distance too far back",i.mode=ce;break}m>i.wnext?(m-=i.wnext,k=i.wsize-m):k=i.wnext-m,m>i.length&&(m=i.length),we=i.window}else we=r,k=s-i.offset,m=i.length;m>l&&(m=l),l-=m,i.length-=m;do r[s++]=we[k++];while(--m);0===i.length&&(i.mode=ne);break;case fe:if(0===l)break e;r[s++]=i.length,l--,i.mode=ne;break;case le:if(i.wrap){for(;h<32;){if(0===f)break e;f--,c|=a[o++]<=1&&0===M[C];C--);if(O>C&&(O=C),0===C)return w[m++]=20971520,w[m++]=20971520,_.bits=1,0;for(N=1;N0&&(e===s||1!==C))return-1;for(j[1]=0,z=1;zr||e===l&&D>o)return 1;for(;;){E=z-T,k[R]S?(B=K[P+k[R]],Z=L[H+k[R]]):(B=96,Z=0),g=1<>T)+v]=E<<24|B<<16|Z|0;while(0!==v);for(g=1<>=1;if(0!==g?(F&=g-1,F+=g):F=0,R++,0===--M[z]){if(z===C)break;z=t[i+k[R]]}if(z>O&&(F&x)!==p){for(0===T&&(T=O),y+=N,I=z-T,U=1<r||e===l&&D>o)return 1;p=F&x,w[p]=O<<24|I<<16|y-m|0}}return 0!==F&&(w[y+F]=z-T<<24|64<<16|0),_.bits=O,0}},{"../utils/common":1}],10:[function(e,t,i){"use strict";t.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],11:[function(e,t,i){"use strict";function n(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}t.exports=n},{}],"/lib/inflate.js":[function(e,t,i){"use strict";function n(e){if(!(this instanceof n))return new n(e);this.options=s.assign({chunkSize:16384,windowBits:0,to:""},e||{});var t=this.options;t.raw&&t.windowBits>=0&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(t.windowBits>=0&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),t.windowBits>15&&t.windowBits<48&&0===(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new u,this.strm.avail_out=0;var i=o.inflateInit2(this.strm,t.windowBits);if(i!==l.Z_OK)throw new Error(d[i]);this.header=new c,o.inflateGetHeader(this.strm,this.header)}function a(e,t){var i=new n(t);if(i.push(e,!0),i.err)throw i.msg||d[i.err];return i.result}function r(e,t){return t=t||{},t.raw=!0,a(e,t)}var o=e("./zlib/inflate"),s=e("./utils/common"),f=e("./utils/strings"),l=e("./zlib/constants"),d=e("./zlib/messages"),u=e("./zlib/zstream"),c=e("./zlib/gzheader"),h=Object.prototype.toString;n.prototype.push=function(e,t){var i,n,a,r,d,u,c=this.strm,b=this.options.chunkSize,w=this.options.dictionary,m=!1;if(this.ended)return!1;n=t===~~t?t:t===!0?l.Z_FINISH:l.Z_NO_FLUSH,"string"==typeof e?c.input=f.binstring2buf(e):"[object ArrayBuffer]"===h.call(e)?c.input=new Uint8Array(e):c.input=e,c.next_in=0,c.avail_in=c.input.length;do{if(0===c.avail_out&&(c.output=new s.Buf8(b),c.next_out=0,c.avail_out=b),i=o.inflate(c,l.Z_NO_FLUSH),i===l.Z_NEED_DICT&&w&&(u="string"==typeof w?f.string2buf(w):"[object ArrayBuffer]"===h.call(w)?new Uint8Array(w):w,i=o.inflateSetDictionary(this.strm,u)),i===l.Z_BUF_ERROR&&m===!0&&(i=l.Z_OK,m=!1),i!==l.Z_STREAM_END&&i!==l.Z_OK)return this.onEnd(i),this.ended=!0,!1;c.next_out&&(0!==c.avail_out&&i!==l.Z_STREAM_END&&(0!==c.avail_in||n!==l.Z_FINISH&&n!==l.Z_SYNC_FLUSH)||("string"===this.options.to?(a=f.utf8border(c.output,c.next_out),r=c.next_out-a,d=f.buf2string(c.output,a),c.next_out=r,c.avail_out=b-r,r&&s.arraySet(c.output,c.output,a,r,0),this.onData(d)):this.onData(s.shrinkBuf(c.output,c.next_out)))),0===c.avail_in&&0===c.avail_out&&(m=!0)}while((c.avail_in>0||0===c.avail_out)&&i!==l.Z_STREAM_END);return i===l.Z_STREAM_END&&(n=l.Z_FINISH),n===l.Z_FINISH?(i=o.inflateEnd(this.strm),this.onEnd(i),this.ended=!0,i===l.Z_OK):n!==l.Z_SYNC_FLUSH||(this.onEnd(l.Z_OK),c.avail_out=0,!0)},n.prototype.onData=function(e){this.chunks.push(e)},n.prototype.onEnd=function(e){e===l.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=s.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},i.Inflate=n,i.inflate=a,i.inflateRaw=r,i.ungzip=a},{"./utils/common":1,"./utils/strings":2,"./zlib/constants":4,"./zlib/gzheader":6,"./zlib/inflate":8,"./zlib/messages":10,"./zlib/zstream":11}]},{},[])("/lib/inflate.js")}); diff --git a/utils/sign-rulesets-airgap.sh b/utils/sign-rulesets-airgap.sh new file mode 100755 index 000000000000..43b3ec82ec31 --- /dev/null +++ b/utils/sign-rulesets-airgap.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +set -e + +if [ $# -ne 2 ]; then + echo "Usage: $0 private_key_file sha256_hash" + exit +fi + + +echo metahash for confirmation only $(echo -n $2 | sha256sum | cut -c1-6) ... +read -p "(press enter to continue)" + +SIGNED_SHA256SUM=`mktemp /tmp/ruleset-signature.sha256.XXXXXXXX` +trap 'rm $SIGNED_SHA256SUM' EXIT +ASN1_CONFIG=`mktemp /tmp/asn1.conf.XXXXXXXX` +trap 'rm $ASN1_CONFIG' EXIT +ASN1_DGST=`mktemp /tmp/asn1.dgst.XXXXXXXX` +trap 'rm $ASN1_DGST' EXIT +SIGNED_SHA256SUM_BASE64_QR=`mktemp /tmp/ruleset-signature.sha256.base64.XXXXXXXX.png` +trap 'rm $SIGNED_SHA256SUM_BASE64_QR' EXIT + +cat >$ASN1_CONFIG < /dev/null + +openssl rsautl -sign -in $ASN1_DGST -inkey $1 -out $SIGNED_SHA256SUM + +cat $SIGNED_SHA256SUM | base64 | qrencode -o $SIGNED_SHA256SUM_BASE64_QR +eog $SIGNED_SHA256SUM_BASE64_QR 2>/dev/null diff --git a/utils/sign-rulesets-request.sh b/utils/sign-rulesets-request.sh new file mode 100755 index 000000000000..b2adce2a9f4f --- /dev/null +++ b/utils/sign-rulesets-request.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +set -e + +if [ $# -ne 2 ]; then + echo "Usage: $0 public_key_file output_path" + exit +fi + + +RULESETS_FILE=rules/default.rulesets + +SIGNED_SHA256SUM=`mktemp /tmp/ruleset-signature.sha256.XXXXXXXX` +trap 'rm $SIGNED_SHA256SUM' EXIT + +mkdir -p $2 +cat $RULESETS_FILE | gzip -nc | base64 -w 0 > $2/default.rulesets.gz.base64 + +echo 'Hash for signing: ' +sha256sum $2/default.rulesets.gz.base64 | cut -f1 -d' ' +echo metahash for confirmation only $(sha256sum $2/default.rulesets.gz.base64 | cut -f1 -d' ' | tr -d '\n' | sha256sum | cut -c1-6) ... + +echo 'Paste in the data from the QR code, then type Ctrl-D:' +cat | tr -d '\n' > $2/rulesets-signature.sha256.base64 + +base64 -d $2/rulesets-signature.sha256.base64 > $SIGNED_SHA256SUM +openssl dgst -sha256 -verify $1 -signature $SIGNED_SHA256SUM $2/default.rulesets.gz.base64 + +date +%s > $2/rulesets-timestamp diff --git a/utils/sign-rulesets-standalone.sh b/utils/sign-rulesets-standalone.sh new file mode 100755 index 000000000000..8d45c644d4f0 --- /dev/null +++ b/utils/sign-rulesets-standalone.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +set -e + +if [ $# -ne 2 ]; then + echo "Usage: $0 private_key_file output_path" + exit +fi + + +RULESETS_FILE=rules/default.rulesets + +SIGNED_SHA256SUM=`mktemp /tmp/ruleset-signature.sha256.XXXXXXXX` +trap 'rm $SIGNED_SHA256SUM' EXIT + +mkdir -p $2 +cat $RULESETS_FILE | gzip -nc | base64 -w 0 > $2/default.rulesets.gz.base64 + +openssl dgst -sha256 -sign $1 -out $SIGNED_SHA256SUM $2/default.rulesets.gz.base64 +cat $SIGNED_SHA256SUM | base64 -w 0 > $2/rulesets-signature.sha256.base64 + +date +%s > $2/rulesets-timestamp From 52e5eee3d151b89980a879e7c5140d87e98526c1 Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 25 Apr 2017 19:33:51 -0700 Subject: [PATCH 02/24] Support for an arbitrary number of update channels --- chromium/background-scripts/update.js | 181 +++++++++++------- .../{keys.js => update_channels.js} | 10 +- chromium/manifest.json | 2 +- 3 files changed, 117 insertions(+), 76 deletions(-) rename chromium/background-scripts/{keys.js => update_channels.js} (85%) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 801f21f6e7c7..41041294f5c9 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -6,21 +6,44 @@ let periodicity = 10; // jwk key loaded from keys.js -let importedEffKey = window.crypto.subtle.importKey( - "jwk", - keys.eff, - { - name: "RSASSA-PKCS1-v1_5", - hash: {name: "SHA-256"}, - }, - false, - ["verify"] -); +let imported_keys = {}; +for(let update_channel of update_channels){ + imported_keys[update_channel.name] = window.crypto.subtle.importKey( + "jwk", + update_channel.jwk, + { + name: "RSASSA-PKCS1-v1_5", + hash: {name: "SHA-256"}, + }, + false, + ["verify"] + ); +} + + +// Get an object stored in localstorage +var getStoredLocalObject = object_key => { + return new Promise(resolve => { + chrome.storage.local.get(object_key, root => { + resolve(root[object_key]); + }); + }); +}; +// Get an object stored in localstorage +var setStoredLocalObject = (object_key, object_value) => { + return new Promise(resolve => { + var object = {}; + object[object_key] = object_value; + chrome.storage.local.set(object, () => { + resolve(); + }); + }); +}; // Determine the time until we should check for new rulesets async function timeToNextCheck() { - let last_checked = await getLastChecked(); + let last_checked = await getStoredLocalObject('last-checked'); if(last_checked === undefined) { return 0; } else { @@ -30,24 +53,6 @@ async function timeToNextCheck() { } } -// Get the time we last checked for new rulesets -function getLastChecked() { - return new Promise(resolve => { - chrome.storage.local.get("last-checked", root => { - resolve(root['last-checked']); - }); - }); -} - -// Get the currently applied rulesets timestamp -function getRulesetsTimestamp() { - return new Promise(resolve => { - chrome.storage.local.get("rulesets-timestamp", root => { - resolve(root['rulesets-timestamp']); - }); - }); -} - // Generic ajax promise let xhr_promise = url => { return new Promise((resolve, reject) => { @@ -63,17 +68,12 @@ let xhr_promise = url => { } // Check for new rulesets. If found, return the timestamp. If not, return false -async function checkForNewRulesets() { +async function checkForNewRulesets(update_channel) { - let current_timestamp = Date.now() / 1000; - chrome.storage.local.set({ - 'last-checked': current_timestamp - }); - - let timestamp_promise = xhr_promise("http://localhost:8000/rulesets-timestamp"); + let timestamp_promise = xhr_promise(update_channel.update_path_prefix + "/rulesets-timestamp"); let rulesets_timestamp = Number(await timestamp_promise); - if((await getRulesetsTimestamp() || 0) < rulesets_timestamp){ + if((await getStoredLocalObject('rulesets-timestamp: ' + update_channel.name) || 0) < rulesets_timestamp){ return rulesets_timestamp; } else { return false; @@ -81,14 +81,12 @@ async function checkForNewRulesets() { } // Download and return new rulesets -async function getNewRulesets(rulesets_timestamp) { +async function getNewRulesets(rulesets_timestamp, update_channel) { - chrome.storage.local.set({ - 'rulesets-timestamp': rulesets_timestamp - }); + setStoredLocalObject('rulesets-timestamp: ' + update_channel.name, rulesets_timestamp); - let signature_promise = xhr_promise("http://localhost:8000/rulesets-signature.sha256.base64"); - let rulesets_promise = xhr_promise("http://localhost:8000/default.rulesets.gz.base64"); + let signature_promise = xhr_promise(update_channel.update_path_prefix + "/rulesets-signature.sha256.base64"); + let rulesets_promise = xhr_promise(update_channel.update_path_prefix + "/default.rulesets.gz.base64"); let resolutions = await Promise.all([ signature_promise, @@ -105,9 +103,9 @@ async function getNewRulesets(rulesets_timestamp) { // Returns a promise which verifies that the rulesets have a valid EFF // signature, and if so, stores them and returns true. // Otherwise, it throws an exception. -function verifyAndStoreNewRulesets(new_rulesets){ +function verifyAndStoreNewRulesets(new_rulesets, update_channel){ return new Promise((resolve, reject) => { - importedEffKey.then(publicKey => { + imported_keys[update_channel.name].then(publicKey => { window.crypto.subtle.verify( { name: "RSASSA-PKCS1-v1_5", @@ -116,12 +114,10 @@ function verifyAndStoreNewRulesets(new_rulesets){ new_rulesets.signature_byte_array.buffer, new_rulesets.rulesets_byte_array.buffer ) - .then(isvalid => { + .then(async isvalid => { if(isvalid) { - util.log(util.NOTE, 'Downloaded ruleset signature checks out. Storing rulesets.'); - chrome.storage.local.set({ - rulesets: new_rulesets.rulesets_gz_base64 - }); + util.log(util.NOTE, update_channel.name + ': Downloaded ruleset signature checks out. Storing rulesets.'); + await setStoredLocalObject('rulesets: ' + update_channel.name, new_rulesets.rulesets_gz_base64); resolve(true); } else { reject('Downloaded ruleset signature is invalid. Aborting.'); @@ -139,35 +135,77 @@ function verifyAndStoreNewRulesets(new_rulesets){ // Base64 decode, unzip, and apply the rulesets we have stored. async function applyStoredRulesets(){ - chrome.storage.local.get("rulesets", root => { - if(root.rulesets){ - util.log(util.NOTE, 'Applying stored rulesets.'); - - let rulesets_gz = window.atob(root.rulesets); - let rulesets_byte_array = pako.inflate(rulesets_gz); - let rulesets = new TextDecoder("utf-8").decode(rulesets_byte_array); + let rulesets_promises = []; + for(let update_channel of update_channels){ + rulesets_promises.push(new Promise(resolve => { + let key = 'rulesets: ' + update_channel.name + chrome.storage.local.get(key, root => { + if(root[key]){ + util.log(util.NOTE, update_channel.name + ': Applying stored rulesets.'); + + let rulesets_gz = window.atob(root[key]); + let rulesets_byte_array = pako.inflate(rulesets_gz); + let rulesets = new TextDecoder("utf-8").decode(rulesets_byte_array); + let rulesets_json = JSON.parse(rulesets); + + resolve(rulesets_json); + } else { + resolve(); + } + }); + })); + } - background.all_rules = new rules.RuleSets(background.ls); + let rulesets_jsons = await Promise.all(rulesets_promises); + if(rulesets_jsons.join("").length > 0){ + background.all_rules = new rules.RuleSets(background.ls); + for(let rulesets_json of rulesets_jsons){ background.all_rules.addFromJson(rulesets_json); - background.loadStoredUserRules(); } - }); + background.loadStoredUserRules(); + } } +/* +async function storeUpdateObjects() { + let local_update_channels = await getStoredLocalObject('update-channels'); + if(local_update_channels == undefined){ + let update_promises = []; + let update_channels_array = []; + for(let update_channel of update_channels){ + update_promises.push(setStoredLocalObject( + 'update-channel-' + update_channel.name, + update_channels + )); + + update_channels_array.push(update_channel.name); + } + + update_promises.push(setStoredLocalObject('update-channels', update_channels_array)); + await Promise.all(update_promises); + } +}*/ + // basic workflow for periodic checks -async function performCheck(){ - util.log(util.NOTE, 'Checking for new ruleset bundle.'); - let new_rulesets_timestamp = await checkForNewRulesets(); - if(new_rulesets_timestamp){ - util.log(util.NOTE, 'A new ruleset bundle has been released. Downloading now.'); - let new_rulesets = await getNewRulesets(new_rulesets_timestamp); - try{ - await verifyAndStoreNewRulesets(new_rulesets); - applyStoredRulesets(); - } catch(err) { - util.log(util.WARN, err); +async function performCheck() { + util.log(util.NOTE, 'Checking for new rulesets.'); + + let current_timestamp = Date.now() / 1000; + setStoredLocalObject('last-checked', current_timestamp); + + for(let update_channel of update_channels){ + let new_rulesets_timestamp = await checkForNewRulesets(update_channel); + if(new_rulesets_timestamp){ + util.log(util.NOTE, update_channel.name + ': A new ruleset bundle has been released. Downloading now.'); + let new_rulesets = await getNewRulesets(new_rulesets_timestamp, update_channel); + try{ + await verifyAndStoreNewRulesets(new_rulesets, update_channel); + } catch(err) { + util.log(util.WARN, update_channel.name + ': ' + err); + } } } + applyStoredRulesets(); }; @@ -180,6 +218,7 @@ async function setUpRulesetsTimer(){ }, time_to_next_check * 1000); } + applyStoredRulesets(); setUpRulesetsTimer(); diff --git a/chromium/background-scripts/keys.js b/chromium/background-scripts/update_channels.js similarity index 85% rename from chromium/background-scripts/keys.js rename to chromium/background-scripts/update_channels.js index c0c192cdb8aa..5699fe1046e8 100644 --- a/chromium/background-scripts/keys.js +++ b/chromium/background-scripts/update_channels.js @@ -1,7 +1,9 @@ -let keys = { - eff: { +let update_channels = [{ + name: "EFF Full Rulesets", + jwk: { kty: "RSA", e: "AQAB", n: "1J6QHCKf7zOkIXLs0pUF0KLy-RlTtXmNhj3OkQMULbQagciDl9ppm1swXHAYi718uoILU_fUzdk8QObXmKVuRMjs7NiXbFOeT0teQou1sX99k-WEJM8SlkXCJDCtYSWnLiadtRCdd1FrjMJcGcMYD_38CcnRBZZOt0PWtoUPMyDX-OUHMd8fQ_b78g-TThmQRxGsQfjYdM7_Hn_djnVON_Iik_lYw9SSazy9GzEJO3naMG2j47NAD8CFBwqqCI9kHkqCqirDDMVIT9ZxoyOFBWBFq4EErKyAjP3l2AD05aCwOPTwVnRfIRPJP6SoCv31e76M41_xsodbICueVWgWP1yRuwxwHNmqPRMhkEA_ZP6R7MpsJP9HLBnPXm9_k4QFndyIdYNgo08cgZTkQcY5y-paOJW5aFzJhxnbC1NQ6AebQyCd-meFVNBiyw3CkI_TsItLgaRSQNzBLgE7Of5aYLk3_cO0rZDfvbo5QzrDXmKym57mhPl01YYUzHyAdWELrvs6hJxwsCROHXCwSqHBtJU5-nPEBgHgAhzc8iH7zVOwL3i1oyPvE0E8UK6eg80FUdwI6iu01-doJywBLD5DOyH2D0ErZNTiAcTkHtAxuxlmbRneaxP2_JqX4WwC1CNyccPp1VzwGFWVlu0rEODPuUm0zkPXPDB0D_0PjHvP_wU" - } -}; + }, + update_path_prefix: "http://localhost:8000" +}]; diff --git a/chromium/manifest.json b/chromium/manifest.json index 4e006bd39787..9fd16e28e13d 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -13,7 +13,7 @@ "background-scripts/rules.js", "background-scripts/store.js", "pako_inflate.min.js", - "background-scripts/keys.js", + "background-scripts/update_channels.js", "background-scripts/update.js", "background-scripts/background.js", "background-scripts/incognito.js" From 677679bae0ebcbe0bc0a86ebedaae2470862c0b7 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 12 May 2017 17:12:50 -0700 Subject: [PATCH 03/24] Suppress errors in Firefox by specifying text ajax request --- chromium/background-scripts/update.js | 1 + 1 file changed, 1 insertion(+) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 41041294f5c9..45635a2d48c4 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -63,6 +63,7 @@ let xhr_promise = url => { resolve(this.response); } } + xhr.responseType = "text"; xhr.send(null); }); } From 1286d2f4b187b7bd09cf5f64564941665d072035 Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 25 Jul 2017 15:16:52 -0700 Subject: [PATCH 04/24] Only apply new rulesets if there has been an update on any update channel --- chromium/background-scripts/update.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 45635a2d48c4..ddf13b163a30 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -194,6 +194,7 @@ async function performCheck() { let current_timestamp = Date.now() / 1000; setStoredLocalObject('last-checked', current_timestamp); + let num_updates = 0; for(let update_channel of update_channels){ let new_rulesets_timestamp = await checkForNewRulesets(update_channel); if(new_rulesets_timestamp){ @@ -201,12 +202,15 @@ async function performCheck() { let new_rulesets = await getNewRulesets(new_rulesets_timestamp, update_channel); try{ await verifyAndStoreNewRulesets(new_rulesets, update_channel); + num_updates++; } catch(err) { util.log(util.WARN, update_channel.name + ': ' + err); } } } - applyStoredRulesets(); + if(num_updates > 0){ + applyStoredRulesets(); + } }; From e9d12cdc1a12b94e95ebd1e4909b3bd4067d9ac6 Mon Sep 17 00:00:00 2001 From: William Budington Date: Wed, 20 Sep 2017 16:40:06 -0700 Subject: [PATCH 05/24] Fix: Use Object.assign rather than de-referencing all_rules object --- chromium/background-scripts/update.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index ddf13b163a30..8905267cc88c 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -159,7 +159,7 @@ async function applyStoredRulesets(){ let rulesets_jsons = await Promise.all(rulesets_promises); if(rulesets_jsons.join("").length > 0){ - background.all_rules = new rules.RuleSets(background.ls); + Object.assign(background.all_rules, new rules.RuleSets(background.ls)); for(let rulesets_json of rulesets_jsons){ background.all_rules.addFromJson(rulesets_json); } From 0dadf581ef49a4c1480d6f2edfac1f29eebb9b6a Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 21 Sep 2017 13:35:21 -0700 Subject: [PATCH 06/24] Modularize update_channels.js --- chromium/background-scripts/update_channels.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/chromium/background-scripts/update_channels.js b/chromium/background-scripts/update_channels.js index 5699fe1046e8..da4d29a21371 100644 --- a/chromium/background-scripts/update_channels.js +++ b/chromium/background-scripts/update_channels.js @@ -1,4 +1,6 @@ -let update_channels = [{ +(function(exports) { + +const update_channels = [{ name: "EFF Full Rulesets", jwk: { kty: "RSA", @@ -7,3 +9,6 @@ let update_channels = [{ }, update_path_prefix: "http://localhost:8000" }]; + +Object.assign(exports, update_channels); +})(typeof exports == 'undefined' ? window.update_channels = [] : exports); From e3024382360becc6c63285f81e57505e4c84cc29 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 12 Jan 2018 14:27:25 -0800 Subject: [PATCH 07/24] JS stylistic cleanup --- chromium/background-scripts/update.js | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 8905267cc88c..d58178261ee1 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -3,7 +3,7 @@ (function(exports) { // how often we should check for new rulesets -let periodicity = 10; +const periodicity = 10; // jwk key loaded from keys.js let imported_keys = {}; @@ -22,16 +22,16 @@ for(let update_channel of update_channels){ // Get an object stored in localstorage -var getStoredLocalObject = object_key => { +function getStoredLocalObject(object_key){ return new Promise(resolve => { chrome.storage.local.get(object_key, root => { resolve(root[object_key]); }); }); -}; +} -// Get an object stored in localstorage -var setStoredLocalObject = (object_key, object_value) => { +// Set an object stored in localstorage +function setStoredLocalObject(object_key, object_value){ return new Promise(resolve => { var object = {}; object[object_key] = object_value; @@ -39,22 +39,22 @@ var setStoredLocalObject = (object_key, object_value) => { resolve(); }); }); -}; +} // Determine the time until we should check for new rulesets async function timeToNextCheck() { - let last_checked = await getStoredLocalObject('last-checked'); + const last_checked = await getStoredLocalObject('last-checked'); if(last_checked === undefined) { return 0; } else { - let current_timestamp = Date.now() / 1000; - let secs_since_last_checked = current_timestamp - last_checked; + const current_timestamp = Date.now() / 1000; + const secs_since_last_checked = current_timestamp - last_checked; return Math.max(0, periodicity - secs_since_last_checked); } } // Generic ajax promise -let xhr_promise = url => { +function xhr_promise(url){ return new Promise((resolve, reject) => { let xhr = new XMLHttpRequest(); xhr.open("GET", url); @@ -139,15 +139,15 @@ async function applyStoredRulesets(){ let rulesets_promises = []; for(let update_channel of update_channels){ rulesets_promises.push(new Promise(resolve => { - let key = 'rulesets: ' + update_channel.name + const key = 'rulesets: ' + update_channel.name chrome.storage.local.get(key, root => { if(root[key]){ util.log(util.NOTE, update_channel.name + ': Applying stored rulesets.'); - let rulesets_gz = window.atob(root[key]); - let rulesets_byte_array = pako.inflate(rulesets_gz); - let rulesets = new TextDecoder("utf-8").decode(rulesets_byte_array); - let rulesets_json = JSON.parse(rulesets); + const rulesets_gz = window.atob(root[key]); + const rulesets_byte_array = pako.inflate(rulesets_gz); + const rulesets = new TextDecoder("utf-8").decode(rulesets_byte_array); + const rulesets_json = JSON.parse(rulesets); resolve(rulesets_json); } else { @@ -157,7 +157,7 @@ async function applyStoredRulesets(){ })); } - let rulesets_jsons = await Promise.all(rulesets_promises); + const rulesets_jsons = await Promise.all(rulesets_promises); if(rulesets_jsons.join("").length > 0){ Object.assign(background.all_rules, new rules.RuleSets(background.ls)); for(let rulesets_json of rulesets_jsons){ @@ -191,7 +191,7 @@ async function storeUpdateObjects() { async function performCheck() { util.log(util.NOTE, 'Checking for new rulesets.'); - let current_timestamp = Date.now() / 1000; + const current_timestamp = Date.now() / 1000; setStoredLocalObject('last-checked', current_timestamp); let num_updates = 0; @@ -215,7 +215,7 @@ async function performCheck() { async function setUpRulesetsTimer(){ - let time_to_next_check = await timeToNextCheck(); + const time_to_next_check = await timeToNextCheck(); setTimeout(() => { performCheck(); From 028c9c3c73da3c47dc25304b59beb17a99d53268 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 12 Jan 2018 15:08:56 -0800 Subject: [PATCH 08/24] Use store module for storage --- chromium/background-scripts/update.js | 54 ++++----------------------- 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index d58178261ee1..cbf096930873 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -2,6 +2,8 @@ (function(exports) { +const store = require('./store'); + // how often we should check for new rulesets const periodicity = 10; @@ -21,29 +23,9 @@ for(let update_channel of update_channels){ } -// Get an object stored in localstorage -function getStoredLocalObject(object_key){ - return new Promise(resolve => { - chrome.storage.local.get(object_key, root => { - resolve(root[object_key]); - }); - }); -} - -// Set an object stored in localstorage -function setStoredLocalObject(object_key, object_value){ - return new Promise(resolve => { - var object = {}; - object[object_key] = object_value; - chrome.storage.local.set(object, () => { - resolve(); - }); - }); -} - // Determine the time until we should check for new rulesets async function timeToNextCheck() { - const last_checked = await getStoredLocalObject('last-checked'); + const last_checked = await store.get_promise('last-checked'); if(last_checked === undefined) { return 0; } else { @@ -74,7 +56,7 @@ async function checkForNewRulesets(update_channel) { let timestamp_promise = xhr_promise(update_channel.update_path_prefix + "/rulesets-timestamp"); let rulesets_timestamp = Number(await timestamp_promise); - if((await getStoredLocalObject('rulesets-timestamp: ' + update_channel.name) || 0) < rulesets_timestamp){ + if((await store.get_promise('rulesets-timestamp: ' + update_channel.name) || 0) < rulesets_timestamp){ return rulesets_timestamp; } else { return false; @@ -84,7 +66,7 @@ async function checkForNewRulesets(update_channel) { // Download and return new rulesets async function getNewRulesets(rulesets_timestamp, update_channel) { - setStoredLocalObject('rulesets-timestamp: ' + update_channel.name, rulesets_timestamp); + store.set_promise('rulesets-timestamp: ' + update_channel.name, rulesets_timestamp); let signature_promise = xhr_promise(update_channel.update_path_prefix + "/rulesets-signature.sha256.base64"); let rulesets_promise = xhr_promise(update_channel.update_path_prefix + "/default.rulesets.gz.base64"); @@ -118,7 +100,7 @@ function verifyAndStoreNewRulesets(new_rulesets, update_channel){ .then(async isvalid => { if(isvalid) { util.log(util.NOTE, update_channel.name + ': Downloaded ruleset signature checks out. Storing rulesets.'); - await setStoredLocalObject('rulesets: ' + update_channel.name, new_rulesets.rulesets_gz_base64); + await store.set_promise('rulesets: ' + update_channel.name, new_rulesets.rulesets_gz_base64); resolve(true); } else { reject('Downloaded ruleset signature is invalid. Aborting.'); @@ -140,7 +122,7 @@ async function applyStoredRulesets(){ for(let update_channel of update_channels){ rulesets_promises.push(new Promise(resolve => { const key = 'rulesets: ' + update_channel.name - chrome.storage.local.get(key, root => { + store.get(key, root => { if(root[key]){ util.log(util.NOTE, update_channel.name + ': Applying stored rulesets.'); @@ -167,32 +149,12 @@ async function applyStoredRulesets(){ } } -/* -async function storeUpdateObjects() { - let local_update_channels = await getStoredLocalObject('update-channels'); - if(local_update_channels == undefined){ - let update_promises = []; - let update_channels_array = []; - for(let update_channel of update_channels){ - update_promises.push(setStoredLocalObject( - 'update-channel-' + update_channel.name, - update_channels - )); - - update_channels_array.push(update_channel.name); - } - - update_promises.push(setStoredLocalObject('update-channels', update_channels_array)); - await Promise.all(update_promises); - } -}*/ - // basic workflow for periodic checks async function performCheck() { util.log(util.NOTE, 'Checking for new rulesets.'); const current_timestamp = Date.now() / 1000; - setStoredLocalObject('last-checked', current_timestamp); + store.set_promise('last-checked', current_timestamp); let num_updates = 0; for(let update_channel of update_channels){ From 58fc4d8acdf30df058f241d53303c59d49a5fd97 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 12 Jan 2018 19:16:10 -0800 Subject: [PATCH 09/24] Making the signed rulesets infrastructure play well with other modules, and the new way rulesets are loaded --- chromium/background-scripts/background.js | 4 +- chromium/background-scripts/rules.js | 5 ++- chromium/background-scripts/update.js | 43 ++++++++++--------- .../background-scripts/update_channels.js | 5 --- chromium/manifest.json | 8 ++-- 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/chromium/background-scripts/background.js b/chromium/background-scripts/background.js index 4208e9d0efd5..14d667aaa934 100644 --- a/chromium/background-scripts/background.js +++ b/chromium/background-scripts/background.js @@ -5,7 +5,8 @@ const rules = require('./rules'), store = require('./store'), incognito = require('./incognito'), - util = require('./util'); + util = require('./util'), + update = require('./update'); let all_rules = new rules.RuleSets(); @@ -14,6 +15,7 @@ async function initialize() { await store.initialize(); await store.performMigrations(); await initializeStoredGlobals(); + await update.initialize(store, initializeAllRules); await all_rules.loadFromBrowserStorage(store); await incognito.onIncognitoDestruction(destroy_caches); } diff --git a/chromium/background-scripts/rules.js b/chromium/background-scripts/rules.js index 06030d38de2d..04d5da505160 100644 --- a/chromium/background-scripts/rules.js +++ b/chromium/background-scripts/rules.js @@ -2,7 +2,8 @@ (function(exports) { -const util = require('./util'); +const util = require('./util'), + update = require('./update'); let settings = { enableMixedRulesets: false, @@ -216,7 +217,7 @@ RuleSets.prototype = { loadFromBrowserStorage: async function(store) { this.store = store; this.ruleActiveStates = await this.store.get_promise('ruleActiveStates', {}); - this.addFromJson(util.loadExtensionFile('rules/default.rulesets', 'json')); + await update.applyStoredRulesets(this); this.loadStoredUserRules(); await this.addStoredCustomRulesets(); }, diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index cbf096930873..41492d069afd 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -2,7 +2,8 @@ (function(exports) { -const store = require('./store'); +const util = require('./util'); +let store; // how often we should check for new rulesets const periodicity = 10; @@ -25,13 +26,13 @@ for(let update_channel of update_channels){ // Determine the time until we should check for new rulesets async function timeToNextCheck() { - const last_checked = await store.get_promise('last-checked'); - if(last_checked === undefined) { - return 0; - } else { + const last_checked = await store.get_promise('last-checked', false); + if(last_checked) { const current_timestamp = Date.now() / 1000; const secs_since_last_checked = current_timestamp - last_checked; return Math.max(0, periodicity - secs_since_last_checked); + } else { + return 0; } } @@ -55,8 +56,7 @@ async function checkForNewRulesets(update_channel) { let timestamp_promise = xhr_promise(update_channel.update_path_prefix + "/rulesets-timestamp"); let rulesets_timestamp = Number(await timestamp_promise); - - if((await store.get_promise('rulesets-timestamp: ' + update_channel.name) || 0) < rulesets_timestamp){ + if((await store.get_promise('rulesets-timestamp: ' + update_channel.name, 0)) < rulesets_timestamp){ return rulesets_timestamp; } else { return false; @@ -117,7 +117,7 @@ function verifyAndStoreNewRulesets(new_rulesets, update_channel){ } // Base64 decode, unzip, and apply the rulesets we have stored. -async function applyStoredRulesets(){ +async function applyStoredRulesets(rulesets_obj){ let rulesets_promises = []; for(let update_channel of update_channels){ rulesets_promises.push(new Promise(resolve => { @@ -141,16 +141,16 @@ async function applyStoredRulesets(){ const rulesets_jsons = await Promise.all(rulesets_promises); if(rulesets_jsons.join("").length > 0){ - Object.assign(background.all_rules, new rules.RuleSets(background.ls)); for(let rulesets_json of rulesets_jsons){ - background.all_rules.addFromJson(rulesets_json); + rulesets_obj.addFromJson(rulesets_json); } - background.loadStoredUserRules(); + } else { + rulesets_obj.addFromJson(util.loadExtensionFile('rules/default.rulesets', 'json')); } } // basic workflow for periodic checks -async function performCheck() { +async function performCheck(cb) { util.log(util.NOTE, 'Checking for new rulesets.'); const current_timestamp = Date.now() / 1000; @@ -171,22 +171,25 @@ async function performCheck() { } } if(num_updates > 0){ - applyStoredRulesets(); + cb(); } }; -async function setUpRulesetsTimer(){ +async function initialize(store_param, cb){ + store = store_param; + const time_to_next_check = await timeToNextCheck(); setTimeout(() => { - performCheck(); - setInterval(performCheck, periodicity * 1000); + performCheck(cb); + setInterval(() => { performCheck(cb); }, periodicity * 1000); }, time_to_next_check * 1000); } +Object.assign(exports, { + applyStoredRulesets, + initialize +}); -applyStoredRulesets(); -setUpRulesetsTimer(); - -})(typeof exports == 'undefined' ? window.update = {} : exports); +})(typeof exports == 'undefined' ? require.scopes.update = {} : exports); diff --git a/chromium/background-scripts/update_channels.js b/chromium/background-scripts/update_channels.js index da4d29a21371..cb1c70d063bd 100644 --- a/chromium/background-scripts/update_channels.js +++ b/chromium/background-scripts/update_channels.js @@ -1,5 +1,3 @@ -(function(exports) { - const update_channels = [{ name: "EFF Full Rulesets", jwk: { @@ -9,6 +7,3 @@ const update_channels = [{ }, update_path_prefix: "http://localhost:8000" }]; - -Object.assign(exports, update_channels); -})(typeof exports == 'undefined' ? window.update_channels = [] : exports); diff --git a/chromium/manifest.json b/chromium/manifest.json index 9fd16e28e13d..72d7b9f2792a 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -10,13 +10,13 @@ "scripts": [ "background-scripts/bootstrap.js", "background-scripts/util.js", + "background-scripts/update_channels.js", + "background-scripts/update.js", "background-scripts/rules.js", "background-scripts/store.js", "pako_inflate.min.js", - "background-scripts/update_channels.js", - "background-scripts/update.js", - "background-scripts/background.js", - "background-scripts/incognito.js" + "background-scripts/incognito.js", + "background-scripts/background.js" ] }, "browser_action": { From 0fb4edecddc4b6689d0550c961a2a4710407759b Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 12 Jan 2018 20:05:39 -0800 Subject: [PATCH 10/24] Revert back to local storage for updates, using the storage module --- chromium/background-scripts/store.js | 34 ++++++++++++++++++++++++--- chromium/background-scripts/update.js | 12 +++++----- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/chromium/background-scripts/store.js b/chromium/background-scripts/store.js index 8e296dfe59fc..ce3448136a4a 100644 --- a/chromium/background-scripts/store.js +++ b/chromium/background-scripts/store.js @@ -22,14 +22,34 @@ function initialize() { }); } +/* Storage promise setters and getters */ + +function generic_get_promise(key, default_val, storage) { + return new Promise(res => storage.get({[key]: default_val}, data => res(data[key]))); +} + +function generic_set_promise(key, value, storage) { + return new Promise(res => storage.set({[key]: value}, res)); +} + function get_promise(key, default_val) { - return new Promise(res => exports.get({[key]: default_val}, data => res(data[key]))); + return generic_get_promise(key, default_val, exports); } function set_promise(key, value) { - return new Promise(res => exports.set({[key]: value}, res)); + return generic_set_promise(key, value, exports); +} + +function local_get_promise(key, default_val) { + return generic_get_promise(key, default_val, chrome.storage.local); +} + +function local_set_promise(key, value) { + return generic_set_promise(key, value, chrome.storage.local); } + + async function performMigrations() { const migration_version = await get_promise('migration_version', 0); @@ -56,12 +76,20 @@ async function performMigrations() { await set_promise('migration_version', 1); } +const local = { + get: chrome.storage.local.get, + set: chrome.storage.local.set, + get_promise: local_get_promise, + set_promise: local_set_promise +}; + function setStorage(store) { Object.assign(exports, { get: store.get.bind(store), set: store.set.bind(store), get_promise, - set_promise + set_promise, + local }); } diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 41492d069afd..7920c71e9915 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -26,7 +26,7 @@ for(let update_channel of update_channels){ // Determine the time until we should check for new rulesets async function timeToNextCheck() { - const last_checked = await store.get_promise('last-checked', false); + const last_checked = await store.local.get_promise('last-checked', false); if(last_checked) { const current_timestamp = Date.now() / 1000; const secs_since_last_checked = current_timestamp - last_checked; @@ -56,7 +56,7 @@ async function checkForNewRulesets(update_channel) { let timestamp_promise = xhr_promise(update_channel.update_path_prefix + "/rulesets-timestamp"); let rulesets_timestamp = Number(await timestamp_promise); - if((await store.get_promise('rulesets-timestamp: ' + update_channel.name, 0)) < rulesets_timestamp){ + if((await store.local.get_promise('rulesets-timestamp: ' + update_channel.name, 0)) < rulesets_timestamp){ return rulesets_timestamp; } else { return false; @@ -66,7 +66,7 @@ async function checkForNewRulesets(update_channel) { // Download and return new rulesets async function getNewRulesets(rulesets_timestamp, update_channel) { - store.set_promise('rulesets-timestamp: ' + update_channel.name, rulesets_timestamp); + store.local.set_promise('rulesets-timestamp: ' + update_channel.name, rulesets_timestamp); let signature_promise = xhr_promise(update_channel.update_path_prefix + "/rulesets-signature.sha256.base64"); let rulesets_promise = xhr_promise(update_channel.update_path_prefix + "/default.rulesets.gz.base64"); @@ -100,7 +100,7 @@ function verifyAndStoreNewRulesets(new_rulesets, update_channel){ .then(async isvalid => { if(isvalid) { util.log(util.NOTE, update_channel.name + ': Downloaded ruleset signature checks out. Storing rulesets.'); - await store.set_promise('rulesets: ' + update_channel.name, new_rulesets.rulesets_gz_base64); + await store.local.set_promise('rulesets: ' + update_channel.name, new_rulesets.rulesets_gz_base64); resolve(true); } else { reject('Downloaded ruleset signature is invalid. Aborting.'); @@ -122,7 +122,7 @@ async function applyStoredRulesets(rulesets_obj){ for(let update_channel of update_channels){ rulesets_promises.push(new Promise(resolve => { const key = 'rulesets: ' + update_channel.name - store.get(key, root => { + chrome.storage.local.get(key, root => { if(root[key]){ util.log(util.NOTE, update_channel.name + ': Applying stored rulesets.'); @@ -154,7 +154,7 @@ async function performCheck(cb) { util.log(util.NOTE, 'Checking for new rulesets.'); const current_timestamp = Date.now() / 1000; - store.set_promise('last-checked', current_timestamp); + store.local.set_promise('last-checked', current_timestamp); let num_updates = 0; for(let update_channel of update_channels){ From f6f36ed66ec6d8434d7c3b548ae331db936746c7 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 18 Jan 2018 20:36:31 -0800 Subject: [PATCH 11/24] Add an option to disable auto-updates in options ui --- chromium/background-scripts/update.js | 47 +++++++++++++++++++---- chromium/pages/options/index.html | 6 ++- chromium/pages/options/style.css | 8 +++- chromium/pages/options/ux.js | 7 +++- src/chrome/locale/en/https-everywhere.dtd | 1 + 5 files changed, 57 insertions(+), 12 deletions(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 7920c71e9915..d99292978b39 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -3,7 +3,8 @@ (function(exports) { const util = require('./util'); -let store; +let store, + background_callback; // how often we should check for new rulesets const periodicity = 10; @@ -150,7 +151,7 @@ async function applyStoredRulesets(rulesets_obj){ } // basic workflow for periodic checks -async function performCheck(cb) { +async function performCheck() { util.log(util.NOTE, 'Checking for new rulesets.'); const current_timestamp = Date.now() / 1000; @@ -171,22 +172,52 @@ async function performCheck(cb) { } } if(num_updates > 0){ - cb(); + background_callback(); } }; +chrome.storage.onChanged.addListener(async function(changes, areaName) { + if (areaName === 'sync' || areaName === 'local') { + if ('autoUpdateRulesets' in changes) { + if (changes.autoUpdateRulesets.newValue) { + await createTimer(); + } else { + destroyTimer(); + } + } + } +}); -async function initialize(store_param, cb){ - store = store_param; +let initialCheck, + subsequentChecks; +async function createTimer(){ const time_to_next_check = await timeToNextCheck(); - setTimeout(() => { - performCheck(cb); - setInterval(() => { performCheck(cb); }, periodicity * 1000); + initialCheck = setTimeout(() => { + performCheck(); + subsequentChecks = setInterval(performCheck, periodicity * 1000); }, time_to_next_check * 1000); } +function destroyTimer(){ + if (initialCheck) { + clearTimeout(initialCheck); + } + if (subsequentChecks) { + clearInterval(subsequentChecks); + } +} + +async function initialize(store_param, cb){ + store = store_param; + background_callback = cb; + + if (await store.get_promise('autoUpdateRulesets', true)) { + await createTimer(); + } +} + Object.assign(exports, { applyStoredRulesets, initialize diff --git a/chromium/pages/options/index.html b/chromium/pages/options/index.html index 12e6940f26c3..d8d72dc3fe06 100644 --- a/chromium/pages/options/index.html +++ b/chromium/pages/options/index.html @@ -7,10 +7,14 @@
-
+
+
+ + +
diff --git a/chromium/pages/options/style.css b/chromium/pages/options/style.css index 0787d3f21c10..206ad62ca141 100644 --- a/chromium/pages/options/style.css +++ b/chromium/pages/options/style.css @@ -1,5 +1,9 @@ -#counter-wrapper{ - margin: 10px 0 20px 0; +.general-settings-wrapper{ + margin: 10px 0 0 0; +} + +.general-settings-wrapper#update-wrapper{ + margin-bottom: 20px; } .section-header{ diff --git a/chromium/pages/options/ux.js b/chromium/pages/options/ux.js index a76e4583ab13..29f06fe07886 100644 --- a/chromium/pages/options/ux.js +++ b/chromium/pages/options/ux.js @@ -31,12 +31,17 @@ document.addEventListener("DOMContentLoaded", () => { document.querySelector("form").addEventListener("submit", import_json); const showCounter = document.getElementById("showCounter"); + const autoUpdateRulesets = document.getElementById("autoUpdateRulesets"); - sendMessage("get_option", { showCounter: true }, item => { + sendMessage("get_option", { showCounter: true, autoUpdateRulesets: true }, item => { showCounter.checked = item.showCounter; + autoUpdateRulesets.checked = item.autoUpdateRulesets; showCounter.addEventListener("change", () => { sendMessage("set_option", { showCounter: showCounter.checked }); }); + autoUpdateRulesets.addEventListener("change", () => { + sendMessage("set_option", { autoUpdateRulesets: autoUpdateRulesets.checked }); + }); }); document.onkeydown = function(evt) { diff --git a/src/chrome/locale/en/https-everywhere.dtd b/src/chrome/locale/en/https-everywhere.dtd index e8752886bdc4..430e9f63481b 100644 --- a/src/chrome/locale/en/https-everywhere.dtd +++ b/src/chrome/locale/en/https-everywhere.dtd @@ -14,6 +14,7 @@ + From 6a88b814d7e11c58f356098bb58b708b99c14eb1 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 19 Jan 2018 14:10:11 -0800 Subject: [PATCH 12/24] Pass in applyStoredFunc to remove require, which makes node unittests pass --- chromium/background-scripts/background.js | 4 ++-- chromium/background-scripts/rules.js | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/chromium/background-scripts/background.js b/chromium/background-scripts/background.js index 14d667aaa934..ff563683ebca 100644 --- a/chromium/background-scripts/background.js +++ b/chromium/background-scripts/background.js @@ -16,14 +16,14 @@ async function initialize() { await store.performMigrations(); await initializeStoredGlobals(); await update.initialize(store, initializeAllRules); - await all_rules.loadFromBrowserStorage(store); + await all_rules.loadFromBrowserStorage(store, update.applyStoredRulesets); await incognito.onIncognitoDestruction(destroy_caches); } initialize(); async function initializeAllRules() { const r = new rules.RuleSets(); - await r.loadFromBrowserStorage(store); + await r.loadFromBrowserStorage(store, update.applyStoredRulesets); Object.assign(all_rules, r); } diff --git a/chromium/background-scripts/rules.js b/chromium/background-scripts/rules.js index 04d5da505160..6166b0f7ffa3 100644 --- a/chromium/background-scripts/rules.js +++ b/chromium/background-scripts/rules.js @@ -2,8 +2,7 @@ (function(exports) { -const util = require('./util'), - update = require('./update'); +const util = require('./util'); let settings = { enableMixedRulesets: false, @@ -214,10 +213,10 @@ RuleSets.prototype = { * Load packaged rulesets, and rulesets in browser storage * @param store object from store.js */ - loadFromBrowserStorage: async function(store) { + loadFromBrowserStorage: async function(store, applyStoredFunc) { this.store = store; this.ruleActiveStates = await this.store.get_promise('ruleActiveStates', {}); - await update.applyStoredRulesets(this); + await applyStoredFunc(this); this.loadStoredUserRules(); await this.addStoredCustomRulesets(); }, From e1a2d537afa4b966e5a5fd1fd8d6cb1b4f5d971c Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 19 Jan 2018 15:24:46 -0800 Subject: [PATCH 13/24] Move pako_inflate.min.js into external dependencies path --- chromium/external/README.md | 11 + .../external/pako-1.0.5/pako_inflate.min.js | 3290 +++++++++++++++++ chromium/manifest.json | 2 +- chromium/pako_inflate.min.js | 2 - 4 files changed, 3302 insertions(+), 3 deletions(-) create mode 100644 chromium/external/pako-1.0.5/pako_inflate.min.js delete mode 100644 chromium/pako_inflate.min.js diff --git a/chromium/external/README.md b/chromium/external/README.md index 138cb46cc0ad..10bc76a2dffe 100644 --- a/chromium/external/README.md +++ b/chromium/external/README.md @@ -40,3 +40,14 @@ uglifycss \ --output codemirror-5.31.0.min.css \ codemirror-5.31.0/lib/codemirror.css ``` +## Pako 1.0.5 + +``` +$ npm install pako@1.0.5 +``` + +### pako_inflate.min.js + +``` +$ cp node_modules/pako/dist/pako_inflate.js pako-1.0.5/pako_inflate.min.js +``` diff --git a/chromium/external/pako-1.0.5/pako_inflate.min.js b/chromium/external/pako-1.0.5/pako_inflate.min.js new file mode 100644 index 000000000000..fdd03f31a5be --- /dev/null +++ b/chromium/external/pako-1.0.5/pako_inflate.min.js @@ -0,0 +1,3290 @@ +/* pako 1.0.5 nodeca/pako */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.pako = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o= 252 ? 6 : q >= 248 ? 5 : q >= 240 ? 4 : q >= 224 ? 3 : q >= 192 ? 2 : 1); +} +_utf8len[254] = _utf8len[254] = 1; // Invalid sequence start + + +// convert string to array (typed, when possible) +exports.string2buf = function (str) { + var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0; + + // count binary size + for (m_pos = 0; m_pos < str_len; m_pos++) { + c = str.charCodeAt(m_pos); + if ((c & 0xfc00) === 0xd800 && (m_pos + 1 < str_len)) { + c2 = str.charCodeAt(m_pos + 1); + if ((c2 & 0xfc00) === 0xdc00) { + c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00); + m_pos++; + } + } + buf_len += c < 0x80 ? 1 : c < 0x800 ? 2 : c < 0x10000 ? 3 : 4; + } + + // allocate buffer + buf = new utils.Buf8(buf_len); + + // convert + for (i = 0, m_pos = 0; i < buf_len; m_pos++) { + c = str.charCodeAt(m_pos); + if ((c & 0xfc00) === 0xd800 && (m_pos + 1 < str_len)) { + c2 = str.charCodeAt(m_pos + 1); + if ((c2 & 0xfc00) === 0xdc00) { + c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00); + m_pos++; + } + } + if (c < 0x80) { + /* one byte */ + buf[i++] = c; + } else if (c < 0x800) { + /* two bytes */ + buf[i++] = 0xC0 | (c >>> 6); + buf[i++] = 0x80 | (c & 0x3f); + } else if (c < 0x10000) { + /* three bytes */ + buf[i++] = 0xE0 | (c >>> 12); + buf[i++] = 0x80 | (c >>> 6 & 0x3f); + buf[i++] = 0x80 | (c & 0x3f); + } else { + /* four bytes */ + buf[i++] = 0xf0 | (c >>> 18); + buf[i++] = 0x80 | (c >>> 12 & 0x3f); + buf[i++] = 0x80 | (c >>> 6 & 0x3f); + buf[i++] = 0x80 | (c & 0x3f); + } + } + + return buf; +}; + +// Helper (used in 2 places) +function buf2binstring(buf, len) { + // use fallback for big arrays to avoid stack overflow + if (len < 65537) { + if ((buf.subarray && STR_APPLY_UIA_OK) || (!buf.subarray && STR_APPLY_OK)) { + return String.fromCharCode.apply(null, utils.shrinkBuf(buf, len)); + } + } + + var result = ''; + for (var i = 0; i < len; i++) { + result += String.fromCharCode(buf[i]); + } + return result; +} + + +// Convert byte array to binary string +exports.buf2binstring = function (buf) { + return buf2binstring(buf, buf.length); +}; + + +// Convert binary string (typed, when possible) +exports.binstring2buf = function (str) { + var buf = new utils.Buf8(str.length); + for (var i = 0, len = buf.length; i < len; i++) { + buf[i] = str.charCodeAt(i); + } + return buf; +}; + + +// convert array to string +exports.buf2string = function (buf, max) { + var i, out, c, c_len; + var len = max || buf.length; + + // Reserve max possible length (2 words per char) + // NB: by unknown reasons, Array is significantly faster for + // String.fromCharCode.apply than Uint16Array. + var utf16buf = new Array(len * 2); + + for (out = 0, i = 0; i < len;) { + c = buf[i++]; + // quick process ascii + if (c < 0x80) { utf16buf[out++] = c; continue; } + + c_len = _utf8len[c]; + // skip 5 & 6 byte codes + if (c_len > 4) { utf16buf[out++] = 0xfffd; i += c_len - 1; continue; } + + // apply mask on first byte + c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07; + // join the rest + while (c_len > 1 && i < len) { + c = (c << 6) | (buf[i++] & 0x3f); + c_len--; + } + + // terminated by end of string? + if (c_len > 1) { utf16buf[out++] = 0xfffd; continue; } + + if (c < 0x10000) { + utf16buf[out++] = c; + } else { + c -= 0x10000; + utf16buf[out++] = 0xd800 | ((c >> 10) & 0x3ff); + utf16buf[out++] = 0xdc00 | (c & 0x3ff); + } + } + + return buf2binstring(utf16buf, out); +}; + + +// Calculate max possible position in utf8 buffer, +// that will not break sequence. If that's not possible +// - (very small limits) return max size as is. +// +// buf[] - utf8 bytes array +// max - length limit (mandatory); +exports.utf8border = function (buf, max) { + var pos; + + max = max || buf.length; + if (max > buf.length) { max = buf.length; } + + // go back from last position, until start of sequence found + pos = max - 1; + while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; } + + // Fuckup - very small and broken sequence, + // return max, because we should return something anyway. + if (pos < 0) { return max; } + + // If we came to start of buffer - that means vuffer is too small, + // return max too. + if (pos === 0) { return max; } + + return (pos + _utf8len[buf[pos]] > max) ? pos : max; +}; + +},{"./common":1}],3:[function(require,module,exports){ +'use strict'; + +// Note: adler32 takes 12% for level 0 and 2% for level 6. +// It doesn't worth to make additional optimizationa as in original. +// Small size is preferable. + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +function adler32(adler, buf, len, pos) { + var s1 = (adler & 0xffff) |0, + s2 = ((adler >>> 16) & 0xffff) |0, + n = 0; + + while (len !== 0) { + // Set limit ~ twice less than 5552, to keep + // s2 in 31-bits, because we force signed ints. + // in other case %= will fail. + n = len > 2000 ? 2000 : len; + len -= n; + + do { + s1 = (s1 + buf[pos++]) |0; + s2 = (s2 + s1) |0; + } while (--n); + + s1 %= 65521; + s2 %= 65521; + } + + return (s1 | (s2 << 16)) |0; +} + + +module.exports = adler32; + +},{}],4:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +module.exports = { + + /* Allowed flush values; see deflate() and inflate() below for details */ + Z_NO_FLUSH: 0, + Z_PARTIAL_FLUSH: 1, + Z_SYNC_FLUSH: 2, + Z_FULL_FLUSH: 3, + Z_FINISH: 4, + Z_BLOCK: 5, + Z_TREES: 6, + + /* Return codes for the compression/decompression functions. Negative values + * are errors, positive values are used for special but normal events. + */ + Z_OK: 0, + Z_STREAM_END: 1, + Z_NEED_DICT: 2, + Z_ERRNO: -1, + Z_STREAM_ERROR: -2, + Z_DATA_ERROR: -3, + //Z_MEM_ERROR: -4, + Z_BUF_ERROR: -5, + //Z_VERSION_ERROR: -6, + + /* compression levels */ + Z_NO_COMPRESSION: 0, + Z_BEST_SPEED: 1, + Z_BEST_COMPRESSION: 9, + Z_DEFAULT_COMPRESSION: -1, + + + Z_FILTERED: 1, + Z_HUFFMAN_ONLY: 2, + Z_RLE: 3, + Z_FIXED: 4, + Z_DEFAULT_STRATEGY: 0, + + /* Possible values of the data_type field (though see inflate()) */ + Z_BINARY: 0, + Z_TEXT: 1, + //Z_ASCII: 1, // = Z_TEXT (deprecated) + Z_UNKNOWN: 2, + + /* The deflate compression method */ + Z_DEFLATED: 8 + //Z_NULL: null // Use -1 or null inline, depending on var type +}; + +},{}],5:[function(require,module,exports){ +'use strict'; + +// Note: we can't get significant speed boost here. +// So write code to minimize size - no pregenerated tables +// and array tools dependencies. + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +// Use ordinary array, since untyped makes no boost here +function makeTable() { + var c, table = []; + + for (var n = 0; n < 256; n++) { + c = n; + for (var k = 0; k < 8; k++) { + c = ((c & 1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1)); + } + table[n] = c; + } + + return table; +} + +// Create table on load. Just 255 signed longs. Not a problem. +var crcTable = makeTable(); + + +function crc32(crc, buf, len, pos) { + var t = crcTable, + end = pos + len; + + crc ^= -1; + + for (var i = pos; i < end; i++) { + crc = (crc >>> 8) ^ t[(crc ^ buf[i]) & 0xFF]; + } + + return (crc ^ (-1)); // >>> 0; +} + + +module.exports = crc32; + +},{}],6:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +function GZheader() { + /* true if compressed data believed to be text */ + this.text = 0; + /* modification time */ + this.time = 0; + /* extra flags (not used when writing a gzip file) */ + this.xflags = 0; + /* operating system */ + this.os = 0; + /* pointer to extra field or Z_NULL if none */ + this.extra = null; + /* extra field length (valid if extra != Z_NULL) */ + this.extra_len = 0; // Actually, we don't need it in JS, + // but leave for few code modifications + + // + // Setup limits is not necessary because in js we should not preallocate memory + // for inflate use constant limit in 65536 bytes + // + + /* space at extra (only when reading header) */ + // this.extra_max = 0; + /* pointer to zero-terminated file name or Z_NULL */ + this.name = ''; + /* space at name (only when reading header) */ + // this.name_max = 0; + /* pointer to zero-terminated comment or Z_NULL */ + this.comment = ''; + /* space at comment (only when reading header) */ + // this.comm_max = 0; + /* true if there was or will be a header crc */ + this.hcrc = 0; + /* true when done reading gzip header (not used when writing a gzip file) */ + this.done = false; +} + +module.exports = GZheader; + +},{}],7:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +// See state defs from inflate.js +var BAD = 30; /* got a data error -- remain here until reset */ +var TYPE = 12; /* i: waiting for type bits, including last-flag bit */ + +/* + Decode literal, length, and distance codes and write out the resulting + literal and match bytes until either not enough input or output is + available, an end-of-block is encountered, or a data error is encountered. + When large enough input and output buffers are supplied to inflate(), for + example, a 16K input buffer and a 64K output buffer, more than 95% of the + inflate execution time is spent in this routine. + + Entry assumptions: + + state.mode === LEN + strm.avail_in >= 6 + strm.avail_out >= 258 + start >= strm.avail_out + state.bits < 8 + + On return, state.mode is one of: + + LEN -- ran out of enough output space or enough available input + TYPE -- reached end of block code, inflate() to interpret next block + BAD -- error in block data + + Notes: + + - The maximum input bits used by a length/distance pair is 15 bits for the + length code, 5 bits for the length extra, 15 bits for the distance code, + and 13 bits for the distance extra. This totals 48 bits, or six bytes. + Therefore if strm.avail_in >= 6, then there is enough input to avoid + checking for available input while decoding. + + - The maximum bytes that a single length/distance pair can output is 258 + bytes, which is the maximum length that can be coded. inflate_fast() + requires strm.avail_out >= 258 for each loop to avoid checking for + output space. + */ +module.exports = function inflate_fast(strm, start) { + var state; + var _in; /* local strm.input */ + var last; /* have enough input while in < last */ + var _out; /* local strm.output */ + var beg; /* inflate()'s initial strm.output */ + var end; /* while out < end, enough space available */ +//#ifdef INFLATE_STRICT + var dmax; /* maximum distance from zlib header */ +//#endif + var wsize; /* window size or zero if not using window */ + var whave; /* valid bytes in the window */ + var wnext; /* window write index */ + // Use `s_window` instead `window`, avoid conflict with instrumentation tools + var s_window; /* allocated sliding window, if wsize != 0 */ + var hold; /* local strm.hold */ + var bits; /* local strm.bits */ + var lcode; /* local strm.lencode */ + var dcode; /* local strm.distcode */ + var lmask; /* mask for first level of length codes */ + var dmask; /* mask for first level of distance codes */ + var here; /* retrieved table entry */ + var op; /* code bits, operation, extra bits, or */ + /* window position, window bytes to copy */ + var len; /* match length, unused bytes */ + var dist; /* match distance */ + var from; /* where to copy match from */ + var from_source; + + + var input, output; // JS specific, because we have no pointers + + /* copy state to local variables */ + state = strm.state; + //here = state.here; + _in = strm.next_in; + input = strm.input; + last = _in + (strm.avail_in - 5); + _out = strm.next_out; + output = strm.output; + beg = _out - (start - strm.avail_out); + end = _out + (strm.avail_out - 257); +//#ifdef INFLATE_STRICT + dmax = state.dmax; +//#endif + wsize = state.wsize; + whave = state.whave; + wnext = state.wnext; + s_window = state.window; + hold = state.hold; + bits = state.bits; + lcode = state.lencode; + dcode = state.distcode; + lmask = (1 << state.lenbits) - 1; + dmask = (1 << state.distbits) - 1; + + + /* decode literals and length/distances until end-of-block or not enough + input data or output space */ + + top: + do { + if (bits < 15) { + hold += input[_in++] << bits; + bits += 8; + hold += input[_in++] << bits; + bits += 8; + } + + here = lcode[hold & lmask]; + + dolen: + for (;;) { // Goto emulation + op = here >>> 24/*here.bits*/; + hold >>>= op; + bits -= op; + op = (here >>> 16) & 0xff/*here.op*/; + if (op === 0) { /* literal */ + //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + // "inflate: literal '%c'\n" : + // "inflate: literal 0x%02x\n", here.val)); + output[_out++] = here & 0xffff/*here.val*/; + } + else if (op & 16) { /* length base */ + len = here & 0xffff/*here.val*/; + op &= 15; /* number of extra bits */ + if (op) { + if (bits < op) { + hold += input[_in++] << bits; + bits += 8; + } + len += hold & ((1 << op) - 1); + hold >>>= op; + bits -= op; + } + //Tracevv((stderr, "inflate: length %u\n", len)); + if (bits < 15) { + hold += input[_in++] << bits; + bits += 8; + hold += input[_in++] << bits; + bits += 8; + } + here = dcode[hold & dmask]; + + dodist: + for (;;) { // goto emulation + op = here >>> 24/*here.bits*/; + hold >>>= op; + bits -= op; + op = (here >>> 16) & 0xff/*here.op*/; + + if (op & 16) { /* distance base */ + dist = here & 0xffff/*here.val*/; + op &= 15; /* number of extra bits */ + if (bits < op) { + hold += input[_in++] << bits; + bits += 8; + if (bits < op) { + hold += input[_in++] << bits; + bits += 8; + } + } + dist += hold & ((1 << op) - 1); +//#ifdef INFLATE_STRICT + if (dist > dmax) { + strm.msg = 'invalid distance too far back'; + state.mode = BAD; + break top; + } +//#endif + hold >>>= op; + bits -= op; + //Tracevv((stderr, "inflate: distance %u\n", dist)); + op = _out - beg; /* max distance in output */ + if (dist > op) { /* see if copy from window */ + op = dist - op; /* distance back in window */ + if (op > whave) { + if (state.sane) { + strm.msg = 'invalid distance too far back'; + state.mode = BAD; + break top; + } + +// (!) This block is disabled in zlib defailts, +// don't enable it for binary compatibility +//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR +// if (len <= op - whave) { +// do { +// output[_out++] = 0; +// } while (--len); +// continue top; +// } +// len -= op - whave; +// do { +// output[_out++] = 0; +// } while (--op > whave); +// if (op === 0) { +// from = _out - dist; +// do { +// output[_out++] = output[from++]; +// } while (--len); +// continue top; +// } +//#endif + } + from = 0; // window index + from_source = s_window; + if (wnext === 0) { /* very common case */ + from += wsize - op; + if (op < len) { /* some from window */ + len -= op; + do { + output[_out++] = s_window[from++]; + } while (--op); + from = _out - dist; /* rest from output */ + from_source = output; + } + } + else if (wnext < op) { /* wrap around window */ + from += wsize + wnext - op; + op -= wnext; + if (op < len) { /* some from end of window */ + len -= op; + do { + output[_out++] = s_window[from++]; + } while (--op); + from = 0; + if (wnext < len) { /* some from start of window */ + op = wnext; + len -= op; + do { + output[_out++] = s_window[from++]; + } while (--op); + from = _out - dist; /* rest from output */ + from_source = output; + } + } + } + else { /* contiguous in window */ + from += wnext - op; + if (op < len) { /* some from window */ + len -= op; + do { + output[_out++] = s_window[from++]; + } while (--op); + from = _out - dist; /* rest from output */ + from_source = output; + } + } + while (len > 2) { + output[_out++] = from_source[from++]; + output[_out++] = from_source[from++]; + output[_out++] = from_source[from++]; + len -= 3; + } + if (len) { + output[_out++] = from_source[from++]; + if (len > 1) { + output[_out++] = from_source[from++]; + } + } + } + else { + from = _out - dist; /* copy direct from output */ + do { /* minimum length is three */ + output[_out++] = output[from++]; + output[_out++] = output[from++]; + output[_out++] = output[from++]; + len -= 3; + } while (len > 2); + if (len) { + output[_out++] = output[from++]; + if (len > 1) { + output[_out++] = output[from++]; + } + } + } + } + else if ((op & 64) === 0) { /* 2nd level distance code */ + here = dcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))]; + continue dodist; + } + else { + strm.msg = 'invalid distance code'; + state.mode = BAD; + break top; + } + + break; // need to emulate goto via "continue" + } + } + else if ((op & 64) === 0) { /* 2nd level length code */ + here = lcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))]; + continue dolen; + } + else if (op & 32) { /* end-of-block */ + //Tracevv((stderr, "inflate: end of block\n")); + state.mode = TYPE; + break top; + } + else { + strm.msg = 'invalid literal/length code'; + state.mode = BAD; + break top; + } + + break; // need to emulate goto via "continue" + } + } while (_in < last && _out < end); + + /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ + len = bits >> 3; + _in -= len; + bits -= len << 3; + hold &= (1 << bits) - 1; + + /* update state and return */ + strm.next_in = _in; + strm.next_out = _out; + strm.avail_in = (_in < last ? 5 + (last - _in) : 5 - (_in - last)); + strm.avail_out = (_out < end ? 257 + (end - _out) : 257 - (_out - end)); + state.hold = hold; + state.bits = bits; + return; +}; + +},{}],8:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +var utils = require('../utils/common'); +var adler32 = require('./adler32'); +var crc32 = require('./crc32'); +var inflate_fast = require('./inffast'); +var inflate_table = require('./inftrees'); + +var CODES = 0; +var LENS = 1; +var DISTS = 2; + +/* Public constants ==========================================================*/ +/* ===========================================================================*/ + + +/* Allowed flush values; see deflate() and inflate() below for details */ +//var Z_NO_FLUSH = 0; +//var Z_PARTIAL_FLUSH = 1; +//var Z_SYNC_FLUSH = 2; +//var Z_FULL_FLUSH = 3; +var Z_FINISH = 4; +var Z_BLOCK = 5; +var Z_TREES = 6; + + +/* Return codes for the compression/decompression functions. Negative values + * are errors, positive values are used for special but normal events. + */ +var Z_OK = 0; +var Z_STREAM_END = 1; +var Z_NEED_DICT = 2; +//var Z_ERRNO = -1; +var Z_STREAM_ERROR = -2; +var Z_DATA_ERROR = -3; +var Z_MEM_ERROR = -4; +var Z_BUF_ERROR = -5; +//var Z_VERSION_ERROR = -6; + +/* The deflate compression method */ +var Z_DEFLATED = 8; + + +/* STATES ====================================================================*/ +/* ===========================================================================*/ + + +var HEAD = 1; /* i: waiting for magic header */ +var FLAGS = 2; /* i: waiting for method and flags (gzip) */ +var TIME = 3; /* i: waiting for modification time (gzip) */ +var OS = 4; /* i: waiting for extra flags and operating system (gzip) */ +var EXLEN = 5; /* i: waiting for extra length (gzip) */ +var EXTRA = 6; /* i: waiting for extra bytes (gzip) */ +var NAME = 7; /* i: waiting for end of file name (gzip) */ +var COMMENT = 8; /* i: waiting for end of comment (gzip) */ +var HCRC = 9; /* i: waiting for header crc (gzip) */ +var DICTID = 10; /* i: waiting for dictionary check value */ +var DICT = 11; /* waiting for inflateSetDictionary() call */ +var TYPE = 12; /* i: waiting for type bits, including last-flag bit */ +var TYPEDO = 13; /* i: same, but skip check to exit inflate on new block */ +var STORED = 14; /* i: waiting for stored size (length and complement) */ +var COPY_ = 15; /* i/o: same as COPY below, but only first time in */ +var COPY = 16; /* i/o: waiting for input or output to copy stored block */ +var TABLE = 17; /* i: waiting for dynamic block table lengths */ +var LENLENS = 18; /* i: waiting for code length code lengths */ +var CODELENS = 19; /* i: waiting for length/lit and distance code lengths */ +var LEN_ = 20; /* i: same as LEN below, but only first time in */ +var LEN = 21; /* i: waiting for length/lit/eob code */ +var LENEXT = 22; /* i: waiting for length extra bits */ +var DIST = 23; /* i: waiting for distance code */ +var DISTEXT = 24; /* i: waiting for distance extra bits */ +var MATCH = 25; /* o: waiting for output space to copy string */ +var LIT = 26; /* o: waiting for output space to write literal */ +var CHECK = 27; /* i: waiting for 32-bit check value */ +var LENGTH = 28; /* i: waiting for 32-bit length (gzip) */ +var DONE = 29; /* finished check, done -- remain here until reset */ +var BAD = 30; /* got a data error -- remain here until reset */ +var MEM = 31; /* got an inflate() memory error -- remain here until reset */ +var SYNC = 32; /* looking for synchronization bytes to restart inflate() */ + +/* ===========================================================================*/ + + + +var ENOUGH_LENS = 852; +var ENOUGH_DISTS = 592; +//var ENOUGH = (ENOUGH_LENS+ENOUGH_DISTS); + +var MAX_WBITS = 15; +/* 32K LZ77 window */ +var DEF_WBITS = MAX_WBITS; + + +function zswap32(q) { + return (((q >>> 24) & 0xff) + + ((q >>> 8) & 0xff00) + + ((q & 0xff00) << 8) + + ((q & 0xff) << 24)); +} + + +function InflateState() { + this.mode = 0; /* current inflate mode */ + this.last = false; /* true if processing last block */ + this.wrap = 0; /* bit 0 true for zlib, bit 1 true for gzip */ + this.havedict = false; /* true if dictionary provided */ + this.flags = 0; /* gzip header method and flags (0 if zlib) */ + this.dmax = 0; /* zlib header max distance (INFLATE_STRICT) */ + this.check = 0; /* protected copy of check value */ + this.total = 0; /* protected copy of output count */ + // TODO: may be {} + this.head = null; /* where to save gzip header information */ + + /* sliding window */ + this.wbits = 0; /* log base 2 of requested window size */ + this.wsize = 0; /* window size or zero if not using window */ + this.whave = 0; /* valid bytes in the window */ + this.wnext = 0; /* window write index */ + this.window = null; /* allocated sliding window, if needed */ + + /* bit accumulator */ + this.hold = 0; /* input bit accumulator */ + this.bits = 0; /* number of bits in "in" */ + + /* for string and stored block copying */ + this.length = 0; /* literal or length of data to copy */ + this.offset = 0; /* distance back to copy string from */ + + /* for table and code decoding */ + this.extra = 0; /* extra bits needed */ + + /* fixed and dynamic code tables */ + this.lencode = null; /* starting table for length/literal codes */ + this.distcode = null; /* starting table for distance codes */ + this.lenbits = 0; /* index bits for lencode */ + this.distbits = 0; /* index bits for distcode */ + + /* dynamic table building */ + this.ncode = 0; /* number of code length code lengths */ + this.nlen = 0; /* number of length code lengths */ + this.ndist = 0; /* number of distance code lengths */ + this.have = 0; /* number of code lengths in lens[] */ + this.next = null; /* next available space in codes[] */ + + this.lens = new utils.Buf16(320); /* temporary storage for code lengths */ + this.work = new utils.Buf16(288); /* work area for code table building */ + + /* + because we don't have pointers in js, we use lencode and distcode directly + as buffers so we don't need codes + */ + //this.codes = new utils.Buf32(ENOUGH); /* space for code tables */ + this.lendyn = null; /* dynamic table for length/literal codes (JS specific) */ + this.distdyn = null; /* dynamic table for distance codes (JS specific) */ + this.sane = 0; /* if false, allow invalid distance too far */ + this.back = 0; /* bits back of last unprocessed length/lit */ + this.was = 0; /* initial length of match */ +} + +function inflateResetKeep(strm) { + var state; + + if (!strm || !strm.state) { return Z_STREAM_ERROR; } + state = strm.state; + strm.total_in = strm.total_out = state.total = 0; + strm.msg = ''; /*Z_NULL*/ + if (state.wrap) { /* to support ill-conceived Java test suite */ + strm.adler = state.wrap & 1; + } + state.mode = HEAD; + state.last = 0; + state.havedict = 0; + state.dmax = 32768; + state.head = null/*Z_NULL*/; + state.hold = 0; + state.bits = 0; + //state.lencode = state.distcode = state.next = state.codes; + state.lencode = state.lendyn = new utils.Buf32(ENOUGH_LENS); + state.distcode = state.distdyn = new utils.Buf32(ENOUGH_DISTS); + + state.sane = 1; + state.back = -1; + //Tracev((stderr, "inflate: reset\n")); + return Z_OK; +} + +function inflateReset(strm) { + var state; + + if (!strm || !strm.state) { return Z_STREAM_ERROR; } + state = strm.state; + state.wsize = 0; + state.whave = 0; + state.wnext = 0; + return inflateResetKeep(strm); + +} + +function inflateReset2(strm, windowBits) { + var wrap; + var state; + + /* get the state */ + if (!strm || !strm.state) { return Z_STREAM_ERROR; } + state = strm.state; + + /* extract wrap request from windowBits parameter */ + if (windowBits < 0) { + wrap = 0; + windowBits = -windowBits; + } + else { + wrap = (windowBits >> 4) + 1; + if (windowBits < 48) { + windowBits &= 15; + } + } + + /* set number of window bits, free window if different */ + if (windowBits && (windowBits < 8 || windowBits > 15)) { + return Z_STREAM_ERROR; + } + if (state.window !== null && state.wbits !== windowBits) { + state.window = null; + } + + /* update state and reset the rest of it */ + state.wrap = wrap; + state.wbits = windowBits; + return inflateReset(strm); +} + +function inflateInit2(strm, windowBits) { + var ret; + var state; + + if (!strm) { return Z_STREAM_ERROR; } + //strm.msg = Z_NULL; /* in case we return an error */ + + state = new InflateState(); + + //if (state === Z_NULL) return Z_MEM_ERROR; + //Tracev((stderr, "inflate: allocated\n")); + strm.state = state; + state.window = null/*Z_NULL*/; + ret = inflateReset2(strm, windowBits); + if (ret !== Z_OK) { + strm.state = null/*Z_NULL*/; + } + return ret; +} + +function inflateInit(strm) { + return inflateInit2(strm, DEF_WBITS); +} + + +/* + Return state with length and distance decoding tables and index sizes set to + fixed code decoding. Normally this returns fixed tables from inffixed.h. + If BUILDFIXED is defined, then instead this routine builds the tables the + first time it's called, and returns those tables the first time and + thereafter. This reduces the size of the code by about 2K bytes, in + exchange for a little execution time. However, BUILDFIXED should not be + used for threaded applications, since the rewriting of the tables and virgin + may not be thread-safe. + */ +var virgin = true; + +var lenfix, distfix; // We have no pointers in JS, so keep tables separate + +function fixedtables(state) { + /* build fixed huffman tables if first call (may not be thread safe) */ + if (virgin) { + var sym; + + lenfix = new utils.Buf32(512); + distfix = new utils.Buf32(32); + + /* literal/length table */ + sym = 0; + while (sym < 144) { state.lens[sym++] = 8; } + while (sym < 256) { state.lens[sym++] = 9; } + while (sym < 280) { state.lens[sym++] = 7; } + while (sym < 288) { state.lens[sym++] = 8; } + + inflate_table(LENS, state.lens, 0, 288, lenfix, 0, state.work, { bits: 9 }); + + /* distance table */ + sym = 0; + while (sym < 32) { state.lens[sym++] = 5; } + + inflate_table(DISTS, state.lens, 0, 32, distfix, 0, state.work, { bits: 5 }); + + /* do this just once */ + virgin = false; + } + + state.lencode = lenfix; + state.lenbits = 9; + state.distcode = distfix; + state.distbits = 5; +} + + +/* + Update the window with the last wsize (normally 32K) bytes written before + returning. If window does not exist yet, create it. This is only called + when a window is already in use, or when output has been written during this + inflate call, but the end of the deflate stream has not been reached yet. + It is also called to create a window for dictionary data when a dictionary + is loaded. + + Providing output buffers larger than 32K to inflate() should provide a speed + advantage, since only the last 32K of output is copied to the sliding window + upon return from inflate(), and since all distances after the first 32K of + output will fall in the output data, making match copies simpler and faster. + The advantage may be dependent on the size of the processor's data caches. + */ +function updatewindow(strm, src, end, copy) { + var dist; + var state = strm.state; + + /* if it hasn't been done already, allocate space for the window */ + if (state.window === null) { + state.wsize = 1 << state.wbits; + state.wnext = 0; + state.whave = 0; + + state.window = new utils.Buf8(state.wsize); + } + + /* copy state->wsize or less output bytes into the circular window */ + if (copy >= state.wsize) { + utils.arraySet(state.window, src, end - state.wsize, state.wsize, 0); + state.wnext = 0; + state.whave = state.wsize; + } + else { + dist = state.wsize - state.wnext; + if (dist > copy) { + dist = copy; + } + //zmemcpy(state->window + state->wnext, end - copy, dist); + utils.arraySet(state.window, src, end - copy, dist, state.wnext); + copy -= dist; + if (copy) { + //zmemcpy(state->window, end - copy, copy); + utils.arraySet(state.window, src, end - copy, copy, 0); + state.wnext = copy; + state.whave = state.wsize; + } + else { + state.wnext += dist; + if (state.wnext === state.wsize) { state.wnext = 0; } + if (state.whave < state.wsize) { state.whave += dist; } + } + } + return 0; +} + +function inflate(strm, flush) { + var state; + var input, output; // input/output buffers + var next; /* next input INDEX */ + var put; /* next output INDEX */ + var have, left; /* available input and output */ + var hold; /* bit buffer */ + var bits; /* bits in bit buffer */ + var _in, _out; /* save starting available input and output */ + var copy; /* number of stored or match bytes to copy */ + var from; /* where to copy match bytes from */ + var from_source; + var here = 0; /* current decoding table entry */ + var here_bits, here_op, here_val; // paked "here" denormalized (JS specific) + //var last; /* parent table entry */ + var last_bits, last_op, last_val; // paked "last" denormalized (JS specific) + var len; /* length to copy for repeats, bits to drop */ + var ret; /* return code */ + var hbuf = new utils.Buf8(4); /* buffer for gzip header crc calculation */ + var opts; + + var n; // temporary var for NEED_BITS + + var order = /* permutation of code lengths */ + [ 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 ]; + + + if (!strm || !strm.state || !strm.output || + (!strm.input && strm.avail_in !== 0)) { + return Z_STREAM_ERROR; + } + + state = strm.state; + if (state.mode === TYPE) { state.mode = TYPEDO; } /* skip check */ + + + //--- LOAD() --- + put = strm.next_out; + output = strm.output; + left = strm.avail_out; + next = strm.next_in; + input = strm.input; + have = strm.avail_in; + hold = state.hold; + bits = state.bits; + //--- + + _in = have; + _out = left; + ret = Z_OK; + + inf_leave: // goto emulation + for (;;) { + switch (state.mode) { + case HEAD: + if (state.wrap === 0) { + state.mode = TYPEDO; + break; + } + //=== NEEDBITS(16); + while (bits < 16) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if ((state.wrap & 2) && hold === 0x8b1f) { /* gzip header */ + state.check = 0/*crc32(0L, Z_NULL, 0)*/; + //=== CRC2(state.check, hold); + hbuf[0] = hold & 0xff; + hbuf[1] = (hold >>> 8) & 0xff; + state.check = crc32(state.check, hbuf, 2, 0); + //===// + + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = FLAGS; + break; + } + state.flags = 0; /* expect zlib header */ + if (state.head) { + state.head.done = false; + } + if (!(state.wrap & 1) || /* check if zlib header allowed */ + (((hold & 0xff)/*BITS(8)*/ << 8) + (hold >> 8)) % 31) { + strm.msg = 'incorrect header check'; + state.mode = BAD; + break; + } + if ((hold & 0x0f)/*BITS(4)*/ !== Z_DEFLATED) { + strm.msg = 'unknown compression method'; + state.mode = BAD; + break; + } + //--- DROPBITS(4) ---// + hold >>>= 4; + bits -= 4; + //---// + len = (hold & 0x0f)/*BITS(4)*/ + 8; + if (state.wbits === 0) { + state.wbits = len; + } + else if (len > state.wbits) { + strm.msg = 'invalid window size'; + state.mode = BAD; + break; + } + state.dmax = 1 << len; + //Tracev((stderr, "inflate: zlib header ok\n")); + strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/; + state.mode = hold & 0x200 ? DICTID : TYPE; + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + break; + case FLAGS: + //=== NEEDBITS(16); */ + while (bits < 16) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.flags = hold; + if ((state.flags & 0xff) !== Z_DEFLATED) { + strm.msg = 'unknown compression method'; + state.mode = BAD; + break; + } + if (state.flags & 0xe000) { + strm.msg = 'unknown header flags set'; + state.mode = BAD; + break; + } + if (state.head) { + state.head.text = ((hold >> 8) & 1); + } + if (state.flags & 0x0200) { + //=== CRC2(state.check, hold); + hbuf[0] = hold & 0xff; + hbuf[1] = (hold >>> 8) & 0xff; + state.check = crc32(state.check, hbuf, 2, 0); + //===// + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = TIME; + /* falls through */ + case TIME: + //=== NEEDBITS(32); */ + while (bits < 32) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if (state.head) { + state.head.time = hold; + } + if (state.flags & 0x0200) { + //=== CRC4(state.check, hold) + hbuf[0] = hold & 0xff; + hbuf[1] = (hold >>> 8) & 0xff; + hbuf[2] = (hold >>> 16) & 0xff; + hbuf[3] = (hold >>> 24) & 0xff; + state.check = crc32(state.check, hbuf, 4, 0); + //=== + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = OS; + /* falls through */ + case OS: + //=== NEEDBITS(16); */ + while (bits < 16) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if (state.head) { + state.head.xflags = (hold & 0xff); + state.head.os = (hold >> 8); + } + if (state.flags & 0x0200) { + //=== CRC2(state.check, hold); + hbuf[0] = hold & 0xff; + hbuf[1] = (hold >>> 8) & 0xff; + state.check = crc32(state.check, hbuf, 2, 0); + //===// + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = EXLEN; + /* falls through */ + case EXLEN: + if (state.flags & 0x0400) { + //=== NEEDBITS(16); */ + while (bits < 16) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.length = hold; + if (state.head) { + state.head.extra_len = hold; + } + if (state.flags & 0x0200) { + //=== CRC2(state.check, hold); + hbuf[0] = hold & 0xff; + hbuf[1] = (hold >>> 8) & 0xff; + state.check = crc32(state.check, hbuf, 2, 0); + //===// + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + } + else if (state.head) { + state.head.extra = null/*Z_NULL*/; + } + state.mode = EXTRA; + /* falls through */ + case EXTRA: + if (state.flags & 0x0400) { + copy = state.length; + if (copy > have) { copy = have; } + if (copy) { + if (state.head) { + len = state.head.extra_len - state.length; + if (!state.head.extra) { + // Use untyped array for more conveniend processing later + state.head.extra = new Array(state.head.extra_len); + } + utils.arraySet( + state.head.extra, + input, + next, + // extra field is limited to 65536 bytes + // - no need for additional size check + copy, + /*len + copy > state.head.extra_max - len ? state.head.extra_max : copy,*/ + len + ); + //zmemcpy(state.head.extra + len, next, + // len + copy > state.head.extra_max ? + // state.head.extra_max - len : copy); + } + if (state.flags & 0x0200) { + state.check = crc32(state.check, input, copy, next); + } + have -= copy; + next += copy; + state.length -= copy; + } + if (state.length) { break inf_leave; } + } + state.length = 0; + state.mode = NAME; + /* falls through */ + case NAME: + if (state.flags & 0x0800) { + if (have === 0) { break inf_leave; } + copy = 0; + do { + // TODO: 2 or 1 bytes? + len = input[next + copy++]; + /* use constant limit because in js we should not preallocate memory */ + if (state.head && len && + (state.length < 65536 /*state.head.name_max*/)) { + state.head.name += String.fromCharCode(len); + } + } while (len && copy < have); + + if (state.flags & 0x0200) { + state.check = crc32(state.check, input, copy, next); + } + have -= copy; + next += copy; + if (len) { break inf_leave; } + } + else if (state.head) { + state.head.name = null; + } + state.length = 0; + state.mode = COMMENT; + /* falls through */ + case COMMENT: + if (state.flags & 0x1000) { + if (have === 0) { break inf_leave; } + copy = 0; + do { + len = input[next + copy++]; + /* use constant limit because in js we should not preallocate memory */ + if (state.head && len && + (state.length < 65536 /*state.head.comm_max*/)) { + state.head.comment += String.fromCharCode(len); + } + } while (len && copy < have); + if (state.flags & 0x0200) { + state.check = crc32(state.check, input, copy, next); + } + have -= copy; + next += copy; + if (len) { break inf_leave; } + } + else if (state.head) { + state.head.comment = null; + } + state.mode = HCRC; + /* falls through */ + case HCRC: + if (state.flags & 0x0200) { + //=== NEEDBITS(16); */ + while (bits < 16) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if (hold !== (state.check & 0xffff)) { + strm.msg = 'header crc mismatch'; + state.mode = BAD; + break; + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + } + if (state.head) { + state.head.hcrc = ((state.flags >> 9) & 1); + state.head.done = true; + } + strm.adler = state.check = 0; + state.mode = TYPE; + break; + case DICTID: + //=== NEEDBITS(32); */ + while (bits < 32) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + strm.adler = state.check = zswap32(hold); + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = DICT; + /* falls through */ + case DICT: + if (state.havedict === 0) { + //--- RESTORE() --- + strm.next_out = put; + strm.avail_out = left; + strm.next_in = next; + strm.avail_in = have; + state.hold = hold; + state.bits = bits; + //--- + return Z_NEED_DICT; + } + strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/; + state.mode = TYPE; + /* falls through */ + case TYPE: + if (flush === Z_BLOCK || flush === Z_TREES) { break inf_leave; } + /* falls through */ + case TYPEDO: + if (state.last) { + //--- BYTEBITS() ---// + hold >>>= bits & 7; + bits -= bits & 7; + //---// + state.mode = CHECK; + break; + } + //=== NEEDBITS(3); */ + while (bits < 3) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.last = (hold & 0x01)/*BITS(1)*/; + //--- DROPBITS(1) ---// + hold >>>= 1; + bits -= 1; + //---// + + switch ((hold & 0x03)/*BITS(2)*/) { + case 0: /* stored block */ + //Tracev((stderr, "inflate: stored block%s\n", + // state.last ? " (last)" : "")); + state.mode = STORED; + break; + case 1: /* fixed block */ + fixedtables(state); + //Tracev((stderr, "inflate: fixed codes block%s\n", + // state.last ? " (last)" : "")); + state.mode = LEN_; /* decode codes */ + if (flush === Z_TREES) { + //--- DROPBITS(2) ---// + hold >>>= 2; + bits -= 2; + //---// + break inf_leave; + } + break; + case 2: /* dynamic block */ + //Tracev((stderr, "inflate: dynamic codes block%s\n", + // state.last ? " (last)" : "")); + state.mode = TABLE; + break; + case 3: + strm.msg = 'invalid block type'; + state.mode = BAD; + } + //--- DROPBITS(2) ---// + hold >>>= 2; + bits -= 2; + //---// + break; + case STORED: + //--- BYTEBITS() ---// /* go to byte boundary */ + hold >>>= bits & 7; + bits -= bits & 7; + //---// + //=== NEEDBITS(32); */ + while (bits < 32) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if ((hold & 0xffff) !== ((hold >>> 16) ^ 0xffff)) { + strm.msg = 'invalid stored block lengths'; + state.mode = BAD; + break; + } + state.length = hold & 0xffff; + //Tracev((stderr, "inflate: stored length %u\n", + // state.length)); + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = COPY_; + if (flush === Z_TREES) { break inf_leave; } + /* falls through */ + case COPY_: + state.mode = COPY; + /* falls through */ + case COPY: + copy = state.length; + if (copy) { + if (copy > have) { copy = have; } + if (copy > left) { copy = left; } + if (copy === 0) { break inf_leave; } + //--- zmemcpy(put, next, copy); --- + utils.arraySet(output, input, next, copy, put); + //---// + have -= copy; + next += copy; + left -= copy; + put += copy; + state.length -= copy; + break; + } + //Tracev((stderr, "inflate: stored end\n")); + state.mode = TYPE; + break; + case TABLE: + //=== NEEDBITS(14); */ + while (bits < 14) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.nlen = (hold & 0x1f)/*BITS(5)*/ + 257; + //--- DROPBITS(5) ---// + hold >>>= 5; + bits -= 5; + //---// + state.ndist = (hold & 0x1f)/*BITS(5)*/ + 1; + //--- DROPBITS(5) ---// + hold >>>= 5; + bits -= 5; + //---// + state.ncode = (hold & 0x0f)/*BITS(4)*/ + 4; + //--- DROPBITS(4) ---// + hold >>>= 4; + bits -= 4; + //---// +//#ifndef PKZIP_BUG_WORKAROUND + if (state.nlen > 286 || state.ndist > 30) { + strm.msg = 'too many length or distance symbols'; + state.mode = BAD; + break; + } +//#endif + //Tracev((stderr, "inflate: table sizes ok\n")); + state.have = 0; + state.mode = LENLENS; + /* falls through */ + case LENLENS: + while (state.have < state.ncode) { + //=== NEEDBITS(3); + while (bits < 3) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.lens[order[state.have++]] = (hold & 0x07);//BITS(3); + //--- DROPBITS(3) ---// + hold >>>= 3; + bits -= 3; + //---// + } + while (state.have < 19) { + state.lens[order[state.have++]] = 0; + } + // We have separate tables & no pointers. 2 commented lines below not needed. + //state.next = state.codes; + //state.lencode = state.next; + // Switch to use dynamic table + state.lencode = state.lendyn; + state.lenbits = 7; + + opts = { bits: state.lenbits }; + ret = inflate_table(CODES, state.lens, 0, 19, state.lencode, 0, state.work, opts); + state.lenbits = opts.bits; + + if (ret) { + strm.msg = 'invalid code lengths set'; + state.mode = BAD; + break; + } + //Tracev((stderr, "inflate: code lengths ok\n")); + state.have = 0; + state.mode = CODELENS; + /* falls through */ + case CODELENS: + while (state.have < state.nlen + state.ndist) { + for (;;) { + here = state.lencode[hold & ((1 << state.lenbits) - 1)];/*BITS(state.lenbits)*/ + here_bits = here >>> 24; + here_op = (here >>> 16) & 0xff; + here_val = here & 0xffff; + + if ((here_bits) <= bits) { break; } + //--- PULLBYTE() ---// + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + //---// + } + if (here_val < 16) { + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + state.lens[state.have++] = here_val; + } + else { + if (here_val === 16) { + //=== NEEDBITS(here.bits + 2); + n = here_bits + 2; + while (bits < n) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + if (state.have === 0) { + strm.msg = 'invalid bit length repeat'; + state.mode = BAD; + break; + } + len = state.lens[state.have - 1]; + copy = 3 + (hold & 0x03);//BITS(2); + //--- DROPBITS(2) ---// + hold >>>= 2; + bits -= 2; + //---// + } + else if (here_val === 17) { + //=== NEEDBITS(here.bits + 3); + n = here_bits + 3; + while (bits < n) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + len = 0; + copy = 3 + (hold & 0x07);//BITS(3); + //--- DROPBITS(3) ---// + hold >>>= 3; + bits -= 3; + //---// + } + else { + //=== NEEDBITS(here.bits + 7); + n = here_bits + 7; + while (bits < n) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + len = 0; + copy = 11 + (hold & 0x7f);//BITS(7); + //--- DROPBITS(7) ---// + hold >>>= 7; + bits -= 7; + //---// + } + if (state.have + copy > state.nlen + state.ndist) { + strm.msg = 'invalid bit length repeat'; + state.mode = BAD; + break; + } + while (copy--) { + state.lens[state.have++] = len; + } + } + } + + /* handle error breaks in while */ + if (state.mode === BAD) { break; } + + /* check for end-of-block code (better have one) */ + if (state.lens[256] === 0) { + strm.msg = 'invalid code -- missing end-of-block'; + state.mode = BAD; + break; + } + + /* build code tables -- note: do not change the lenbits or distbits + values here (9 and 6) without reading the comments in inftrees.h + concerning the ENOUGH constants, which depend on those values */ + state.lenbits = 9; + + opts = { bits: state.lenbits }; + ret = inflate_table(LENS, state.lens, 0, state.nlen, state.lencode, 0, state.work, opts); + // We have separate tables & no pointers. 2 commented lines below not needed. + // state.next_index = opts.table_index; + state.lenbits = opts.bits; + // state.lencode = state.next; + + if (ret) { + strm.msg = 'invalid literal/lengths set'; + state.mode = BAD; + break; + } + + state.distbits = 6; + //state.distcode.copy(state.codes); + // Switch to use dynamic table + state.distcode = state.distdyn; + opts = { bits: state.distbits }; + ret = inflate_table(DISTS, state.lens, state.nlen, state.ndist, state.distcode, 0, state.work, opts); + // We have separate tables & no pointers. 2 commented lines below not needed. + // state.next_index = opts.table_index; + state.distbits = opts.bits; + // state.distcode = state.next; + + if (ret) { + strm.msg = 'invalid distances set'; + state.mode = BAD; + break; + } + //Tracev((stderr, 'inflate: codes ok\n')); + state.mode = LEN_; + if (flush === Z_TREES) { break inf_leave; } + /* falls through */ + case LEN_: + state.mode = LEN; + /* falls through */ + case LEN: + if (have >= 6 && left >= 258) { + //--- RESTORE() --- + strm.next_out = put; + strm.avail_out = left; + strm.next_in = next; + strm.avail_in = have; + state.hold = hold; + state.bits = bits; + //--- + inflate_fast(strm, _out); + //--- LOAD() --- + put = strm.next_out; + output = strm.output; + left = strm.avail_out; + next = strm.next_in; + input = strm.input; + have = strm.avail_in; + hold = state.hold; + bits = state.bits; + //--- + + if (state.mode === TYPE) { + state.back = -1; + } + break; + } + state.back = 0; + for (;;) { + here = state.lencode[hold & ((1 << state.lenbits) - 1)]; /*BITS(state.lenbits)*/ + here_bits = here >>> 24; + here_op = (here >>> 16) & 0xff; + here_val = here & 0xffff; + + if (here_bits <= bits) { break; } + //--- PULLBYTE() ---// + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + //---// + } + if (here_op && (here_op & 0xf0) === 0) { + last_bits = here_bits; + last_op = here_op; + last_val = here_val; + for (;;) { + here = state.lencode[last_val + + ((hold & ((1 << (last_bits + last_op)) - 1))/*BITS(last.bits + last.op)*/ >> last_bits)]; + here_bits = here >>> 24; + here_op = (here >>> 16) & 0xff; + here_val = here & 0xffff; + + if ((last_bits + here_bits) <= bits) { break; } + //--- PULLBYTE() ---// + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + //---// + } + //--- DROPBITS(last.bits) ---// + hold >>>= last_bits; + bits -= last_bits; + //---// + state.back += last_bits; + } + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + state.back += here_bits; + state.length = here_val; + if (here_op === 0) { + //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + // "inflate: literal '%c'\n" : + // "inflate: literal 0x%02x\n", here.val)); + state.mode = LIT; + break; + } + if (here_op & 32) { + //Tracevv((stderr, "inflate: end of block\n")); + state.back = -1; + state.mode = TYPE; + break; + } + if (here_op & 64) { + strm.msg = 'invalid literal/length code'; + state.mode = BAD; + break; + } + state.extra = here_op & 15; + state.mode = LENEXT; + /* falls through */ + case LENEXT: + if (state.extra) { + //=== NEEDBITS(state.extra); + n = state.extra; + while (bits < n) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.length += hold & ((1 << state.extra) - 1)/*BITS(state.extra)*/; + //--- DROPBITS(state.extra) ---// + hold >>>= state.extra; + bits -= state.extra; + //---// + state.back += state.extra; + } + //Tracevv((stderr, "inflate: length %u\n", state.length)); + state.was = state.length; + state.mode = DIST; + /* falls through */ + case DIST: + for (;;) { + here = state.distcode[hold & ((1 << state.distbits) - 1)];/*BITS(state.distbits)*/ + here_bits = here >>> 24; + here_op = (here >>> 16) & 0xff; + here_val = here & 0xffff; + + if ((here_bits) <= bits) { break; } + //--- PULLBYTE() ---// + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + //---// + } + if ((here_op & 0xf0) === 0) { + last_bits = here_bits; + last_op = here_op; + last_val = here_val; + for (;;) { + here = state.distcode[last_val + + ((hold & ((1 << (last_bits + last_op)) - 1))/*BITS(last.bits + last.op)*/ >> last_bits)]; + here_bits = here >>> 24; + here_op = (here >>> 16) & 0xff; + here_val = here & 0xffff; + + if ((last_bits + here_bits) <= bits) { break; } + //--- PULLBYTE() ---// + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + //---// + } + //--- DROPBITS(last.bits) ---// + hold >>>= last_bits; + bits -= last_bits; + //---// + state.back += last_bits; + } + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + state.back += here_bits; + if (here_op & 64) { + strm.msg = 'invalid distance code'; + state.mode = BAD; + break; + } + state.offset = here_val; + state.extra = (here_op) & 15; + state.mode = DISTEXT; + /* falls through */ + case DISTEXT: + if (state.extra) { + //=== NEEDBITS(state.extra); + n = state.extra; + while (bits < n) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.offset += hold & ((1 << state.extra) - 1)/*BITS(state.extra)*/; + //--- DROPBITS(state.extra) ---// + hold >>>= state.extra; + bits -= state.extra; + //---// + state.back += state.extra; + } +//#ifdef INFLATE_STRICT + if (state.offset > state.dmax) { + strm.msg = 'invalid distance too far back'; + state.mode = BAD; + break; + } +//#endif + //Tracevv((stderr, "inflate: distance %u\n", state.offset)); + state.mode = MATCH; + /* falls through */ + case MATCH: + if (left === 0) { break inf_leave; } + copy = _out - left; + if (state.offset > copy) { /* copy from window */ + copy = state.offset - copy; + if (copy > state.whave) { + if (state.sane) { + strm.msg = 'invalid distance too far back'; + state.mode = BAD; + break; + } +// (!) This block is disabled in zlib defailts, +// don't enable it for binary compatibility +//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR +// Trace((stderr, "inflate.c too far\n")); +// copy -= state.whave; +// if (copy > state.length) { copy = state.length; } +// if (copy > left) { copy = left; } +// left -= copy; +// state.length -= copy; +// do { +// output[put++] = 0; +// } while (--copy); +// if (state.length === 0) { state.mode = LEN; } +// break; +//#endif + } + if (copy > state.wnext) { + copy -= state.wnext; + from = state.wsize - copy; + } + else { + from = state.wnext - copy; + } + if (copy > state.length) { copy = state.length; } + from_source = state.window; + } + else { /* copy from output */ + from_source = output; + from = put - state.offset; + copy = state.length; + } + if (copy > left) { copy = left; } + left -= copy; + state.length -= copy; + do { + output[put++] = from_source[from++]; + } while (--copy); + if (state.length === 0) { state.mode = LEN; } + break; + case LIT: + if (left === 0) { break inf_leave; } + output[put++] = state.length; + left--; + state.mode = LEN; + break; + case CHECK: + if (state.wrap) { + //=== NEEDBITS(32); + while (bits < 32) { + if (have === 0) { break inf_leave; } + have--; + // Use '|' insdead of '+' to make sure that result is signed + hold |= input[next++] << bits; + bits += 8; + } + //===// + _out -= left; + strm.total_out += _out; + state.total += _out; + if (_out) { + strm.adler = state.check = + /*UPDATE(state.check, put - _out, _out);*/ + (state.flags ? crc32(state.check, output, _out, put - _out) : adler32(state.check, output, _out, put - _out)); + + } + _out = left; + // NB: crc32 stored as signed 32-bit int, zswap32 returns signed too + if ((state.flags ? hold : zswap32(hold)) !== state.check) { + strm.msg = 'incorrect data check'; + state.mode = BAD; + break; + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + //Tracev((stderr, "inflate: check matches trailer\n")); + } + state.mode = LENGTH; + /* falls through */ + case LENGTH: + if (state.wrap && state.flags) { + //=== NEEDBITS(32); + while (bits < 32) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if (hold !== (state.total & 0xffffffff)) { + strm.msg = 'incorrect length check'; + state.mode = BAD; + break; + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + //Tracev((stderr, "inflate: length matches trailer\n")); + } + state.mode = DONE; + /* falls through */ + case DONE: + ret = Z_STREAM_END; + break inf_leave; + case BAD: + ret = Z_DATA_ERROR; + break inf_leave; + case MEM: + return Z_MEM_ERROR; + case SYNC: + /* falls through */ + default: + return Z_STREAM_ERROR; + } + } + + // inf_leave <- here is real place for "goto inf_leave", emulated via "break inf_leave" + + /* + Return from inflate(), updating the total counts and the check value. + If there was no progress during the inflate() call, return a buffer + error. Call updatewindow() to create and/or update the window state. + Note: a memory error from inflate() is non-recoverable. + */ + + //--- RESTORE() --- + strm.next_out = put; + strm.avail_out = left; + strm.next_in = next; + strm.avail_in = have; + state.hold = hold; + state.bits = bits; + //--- + + if (state.wsize || (_out !== strm.avail_out && state.mode < BAD && + (state.mode < CHECK || flush !== Z_FINISH))) { + if (updatewindow(strm, strm.output, strm.next_out, _out - strm.avail_out)) { + state.mode = MEM; + return Z_MEM_ERROR; + } + } + _in -= strm.avail_in; + _out -= strm.avail_out; + strm.total_in += _in; + strm.total_out += _out; + state.total += _out; + if (state.wrap && _out) { + strm.adler = state.check = /*UPDATE(state.check, strm.next_out - _out, _out);*/ + (state.flags ? crc32(state.check, output, _out, strm.next_out - _out) : adler32(state.check, output, _out, strm.next_out - _out)); + } + strm.data_type = state.bits + (state.last ? 64 : 0) + + (state.mode === TYPE ? 128 : 0) + + (state.mode === LEN_ || state.mode === COPY_ ? 256 : 0); + if (((_in === 0 && _out === 0) || flush === Z_FINISH) && ret === Z_OK) { + ret = Z_BUF_ERROR; + } + return ret; +} + +function inflateEnd(strm) { + + if (!strm || !strm.state /*|| strm->zfree == (free_func)0*/) { + return Z_STREAM_ERROR; + } + + var state = strm.state; + if (state.window) { + state.window = null; + } + strm.state = null; + return Z_OK; +} + +function inflateGetHeader(strm, head) { + var state; + + /* check state */ + if (!strm || !strm.state) { return Z_STREAM_ERROR; } + state = strm.state; + if ((state.wrap & 2) === 0) { return Z_STREAM_ERROR; } + + /* save header structure */ + state.head = head; + head.done = false; + return Z_OK; +} + +function inflateSetDictionary(strm, dictionary) { + var dictLength = dictionary.length; + + var state; + var dictid; + var ret; + + /* check state */ + if (!strm /* == Z_NULL */ || !strm.state /* == Z_NULL */) { return Z_STREAM_ERROR; } + state = strm.state; + + if (state.wrap !== 0 && state.mode !== DICT) { + return Z_STREAM_ERROR; + } + + /* check for correct dictionary identifier */ + if (state.mode === DICT) { + dictid = 1; /* adler32(0, null, 0)*/ + /* dictid = adler32(dictid, dictionary, dictLength); */ + dictid = adler32(dictid, dictionary, dictLength, 0); + if (dictid !== state.check) { + return Z_DATA_ERROR; + } + } + /* copy dictionary to window using updatewindow(), which will amend the + existing dictionary if appropriate */ + ret = updatewindow(strm, dictionary, dictLength, dictLength); + if (ret) { + state.mode = MEM; + return Z_MEM_ERROR; + } + state.havedict = 1; + // Tracev((stderr, "inflate: dictionary set\n")); + return Z_OK; +} + +exports.inflateReset = inflateReset; +exports.inflateReset2 = inflateReset2; +exports.inflateResetKeep = inflateResetKeep; +exports.inflateInit = inflateInit; +exports.inflateInit2 = inflateInit2; +exports.inflate = inflate; +exports.inflateEnd = inflateEnd; +exports.inflateGetHeader = inflateGetHeader; +exports.inflateSetDictionary = inflateSetDictionary; +exports.inflateInfo = 'pako inflate (from Nodeca project)'; + +/* Not implemented +exports.inflateCopy = inflateCopy; +exports.inflateGetDictionary = inflateGetDictionary; +exports.inflateMark = inflateMark; +exports.inflatePrime = inflatePrime; +exports.inflateSync = inflateSync; +exports.inflateSyncPoint = inflateSyncPoint; +exports.inflateUndermine = inflateUndermine; +*/ + +},{"../utils/common":1,"./adler32":3,"./crc32":5,"./inffast":7,"./inftrees":9}],9:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +var utils = require('../utils/common'); + +var MAXBITS = 15; +var ENOUGH_LENS = 852; +var ENOUGH_DISTS = 592; +//var ENOUGH = (ENOUGH_LENS+ENOUGH_DISTS); + +var CODES = 0; +var LENS = 1; +var DISTS = 2; + +var lbase = [ /* Length codes 257..285 base */ + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 +]; + +var lext = [ /* Length codes 257..285 extra */ + 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78 +]; + +var dbase = [ /* Distance codes 0..29 base */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, + 8193, 12289, 16385, 24577, 0, 0 +]; + +var dext = [ /* Distance codes 0..29 extra */ + 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, + 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, + 28, 28, 29, 29, 64, 64 +]; + +module.exports = function inflate_table(type, lens, lens_index, codes, table, table_index, work, opts) +{ + var bits = opts.bits; + //here = opts.here; /* table entry for duplication */ + + var len = 0; /* a code's length in bits */ + var sym = 0; /* index of code symbols */ + var min = 0, max = 0; /* minimum and maximum code lengths */ + var root = 0; /* number of index bits for root table */ + var curr = 0; /* number of index bits for current table */ + var drop = 0; /* code bits to drop for sub-table */ + var left = 0; /* number of prefix codes available */ + var used = 0; /* code entries in table used */ + var huff = 0; /* Huffman code */ + var incr; /* for incrementing code, index */ + var fill; /* index for replicating entries */ + var low; /* low bits for current root entry */ + var mask; /* mask for low root bits */ + var next; /* next available space in table */ + var base = null; /* base value table to use */ + var base_index = 0; +// var shoextra; /* extra bits table to use */ + var end; /* use base and extra for symbol > end */ + var count = new utils.Buf16(MAXBITS + 1); //[MAXBITS+1]; /* number of codes of each length */ + var offs = new utils.Buf16(MAXBITS + 1); //[MAXBITS+1]; /* offsets in table for each length */ + var extra = null; + var extra_index = 0; + + var here_bits, here_op, here_val; + + /* + Process a set of code lengths to create a canonical Huffman code. The + code lengths are lens[0..codes-1]. Each length corresponds to the + symbols 0..codes-1. The Huffman code is generated by first sorting the + symbols by length from short to long, and retaining the symbol order + for codes with equal lengths. Then the code starts with all zero bits + for the first code of the shortest length, and the codes are integer + increments for the same length, and zeros are appended as the length + increases. For the deflate format, these bits are stored backwards + from their more natural integer increment ordering, and so when the + decoding tables are built in the large loop below, the integer codes + are incremented backwards. + + This routine assumes, but does not check, that all of the entries in + lens[] are in the range 0..MAXBITS. The caller must assure this. + 1..MAXBITS is interpreted as that code length. zero means that that + symbol does not occur in this code. + + The codes are sorted by computing a count of codes for each length, + creating from that a table of starting indices for each length in the + sorted table, and then entering the symbols in order in the sorted + table. The sorted table is work[], with that space being provided by + the caller. + + The length counts are used for other purposes as well, i.e. finding + the minimum and maximum length codes, determining if there are any + codes at all, checking for a valid set of lengths, and looking ahead + at length counts to determine sub-table sizes when building the + decoding tables. + */ + + /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ + for (len = 0; len <= MAXBITS; len++) { + count[len] = 0; + } + for (sym = 0; sym < codes; sym++) { + count[lens[lens_index + sym]]++; + } + + /* bound code lengths, force root to be within code lengths */ + root = bits; + for (max = MAXBITS; max >= 1; max--) { + if (count[max] !== 0) { break; } + } + if (root > max) { + root = max; + } + if (max === 0) { /* no symbols to code at all */ + //table.op[opts.table_index] = 64; //here.op = (var char)64; /* invalid code marker */ + //table.bits[opts.table_index] = 1; //here.bits = (var char)1; + //table.val[opts.table_index++] = 0; //here.val = (var short)0; + table[table_index++] = (1 << 24) | (64 << 16) | 0; + + + //table.op[opts.table_index] = 64; + //table.bits[opts.table_index] = 1; + //table.val[opts.table_index++] = 0; + table[table_index++] = (1 << 24) | (64 << 16) | 0; + + opts.bits = 1; + return 0; /* no symbols, but wait for decoding to report error */ + } + for (min = 1; min < max; min++) { + if (count[min] !== 0) { break; } + } + if (root < min) { + root = min; + } + + /* check for an over-subscribed or incomplete set of lengths */ + left = 1; + for (len = 1; len <= MAXBITS; len++) { + left <<= 1; + left -= count[len]; + if (left < 0) { + return -1; + } /* over-subscribed */ + } + if (left > 0 && (type === CODES || max !== 1)) { + return -1; /* incomplete set */ + } + + /* generate offsets into symbol table for each length for sorting */ + offs[1] = 0; + for (len = 1; len < MAXBITS; len++) { + offs[len + 1] = offs[len] + count[len]; + } + + /* sort symbols by length, by symbol order within each length */ + for (sym = 0; sym < codes; sym++) { + if (lens[lens_index + sym] !== 0) { + work[offs[lens[lens_index + sym]]++] = sym; + } + } + + /* + Create and fill in decoding tables. In this loop, the table being + filled is at next and has curr index bits. The code being used is huff + with length len. That code is converted to an index by dropping drop + bits off of the bottom. For codes where len is less than drop + curr, + those top drop + curr - len bits are incremented through all values to + fill the table with replicated entries. + + root is the number of index bits for the root table. When len exceeds + root, sub-tables are created pointed to by the root entry with an index + of the low root bits of huff. This is saved in low to check for when a + new sub-table should be started. drop is zero when the root table is + being filled, and drop is root when sub-tables are being filled. + + When a new sub-table is needed, it is necessary to look ahead in the + code lengths to determine what size sub-table is needed. The length + counts are used for this, and so count[] is decremented as codes are + entered in the tables. + + used keeps track of how many table entries have been allocated from the + provided *table space. It is checked for LENS and DIST tables against + the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in + the initial root table size constants. See the comments in inftrees.h + for more information. + + sym increments through all symbols, and the loop terminates when + all codes of length max, i.e. all codes, have been processed. This + routine permits incomplete codes, so another loop after this one fills + in the rest of the decoding tables with invalid code markers. + */ + + /* set up for code type */ + // poor man optimization - use if-else instead of switch, + // to avoid deopts in old v8 + if (type === CODES) { + base = extra = work; /* dummy value--not used */ + end = 19; + + } else if (type === LENS) { + base = lbase; + base_index -= 257; + extra = lext; + extra_index -= 257; + end = 256; + + } else { /* DISTS */ + base = dbase; + extra = dext; + end = -1; + } + + /* initialize opts for loop */ + huff = 0; /* starting code */ + sym = 0; /* starting code symbol */ + len = min; /* starting code length */ + next = table_index; /* current table to fill in */ + curr = root; /* current table index bits */ + drop = 0; /* current bits to drop from code for index */ + low = -1; /* trigger new sub-table when len > root */ + used = 1 << root; /* use root table entries */ + mask = used - 1; /* mask for comparing low */ + + /* check available table space */ + if ((type === LENS && used > ENOUGH_LENS) || + (type === DISTS && used > ENOUGH_DISTS)) { + return 1; + } + + /* process all codes and make table entries */ + for (;;) { + /* create table entry */ + here_bits = len - drop; + if (work[sym] < end) { + here_op = 0; + here_val = work[sym]; + } + else if (work[sym] > end) { + here_op = extra[extra_index + work[sym]]; + here_val = base[base_index + work[sym]]; + } + else { + here_op = 32 + 64; /* end of block */ + here_val = 0; + } + + /* replicate for those indices with low len bits equal to huff */ + incr = 1 << (len - drop); + fill = 1 << curr; + min = fill; /* save offset to next table */ + do { + fill -= incr; + table[next + (huff >> drop) + fill] = (here_bits << 24) | (here_op << 16) | here_val |0; + } while (fill !== 0); + + /* backwards increment the len-bit code huff */ + incr = 1 << (len - 1); + while (huff & incr) { + incr >>= 1; + } + if (incr !== 0) { + huff &= incr - 1; + huff += incr; + } else { + huff = 0; + } + + /* go to next symbol, update count, len */ + sym++; + if (--count[len] === 0) { + if (len === max) { break; } + len = lens[lens_index + work[sym]]; + } + + /* create new sub-table if needed */ + if (len > root && (huff & mask) !== low) { + /* if first time, transition to sub-tables */ + if (drop === 0) { + drop = root; + } + + /* increment past last table */ + next += min; /* here min is 1 << curr */ + + /* determine length of next table */ + curr = len - drop; + left = 1 << curr; + while (curr + drop < max) { + left -= count[curr + drop]; + if (left <= 0) { break; } + curr++; + left <<= 1; + } + + /* check for enough space */ + used += 1 << curr; + if ((type === LENS && used > ENOUGH_LENS) || + (type === DISTS && used > ENOUGH_DISTS)) { + return 1; + } + + /* point entry in root table to sub-table */ + low = huff & mask; + /*table.op[low] = curr; + table.bits[low] = root; + table.val[low] = next - opts.table_index;*/ + table[low] = (root << 24) | (curr << 16) | (next - table_index) |0; + } + } + + /* fill in remaining table entry if code is incomplete (guaranteed to have + at most one remaining entry, since if the code is incomplete, the + maximum code length that was allowed to get this far is one bit) */ + if (huff !== 0) { + //table.op[next + huff] = 64; /* invalid code marker */ + //table.bits[next + huff] = len - drop; + //table.val[next + huff] = 0; + table[next + huff] = ((len - drop) << 24) | (64 << 16) |0; + } + + /* set return parameters */ + //opts.table_index += used; + opts.bits = root; + return 0; +}; + +},{"../utils/common":1}],10:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +module.exports = { + 2: 'need dictionary', /* Z_NEED_DICT 2 */ + 1: 'stream end', /* Z_STREAM_END 1 */ + 0: '', /* Z_OK 0 */ + '-1': 'file error', /* Z_ERRNO (-1) */ + '-2': 'stream error', /* Z_STREAM_ERROR (-2) */ + '-3': 'data error', /* Z_DATA_ERROR (-3) */ + '-4': 'insufficient memory', /* Z_MEM_ERROR (-4) */ + '-5': 'buffer error', /* Z_BUF_ERROR (-5) */ + '-6': 'incompatible version' /* Z_VERSION_ERROR (-6) */ +}; + +},{}],11:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +function ZStream() { + /* next input byte */ + this.input = null; // JS specific, because we have no pointers + this.next_in = 0; + /* number of bytes available at input */ + this.avail_in = 0; + /* total number of input bytes read so far */ + this.total_in = 0; + /* next output byte should be put there */ + this.output = null; // JS specific, because we have no pointers + this.next_out = 0; + /* remaining free space at output */ + this.avail_out = 0; + /* total number of bytes output so far */ + this.total_out = 0; + /* last error message, NULL if no error */ + this.msg = ''/*Z_NULL*/; + /* not visible by applications */ + this.state = null; + /* best guess about the data type: binary or text */ + this.data_type = 2/*Z_UNKNOWN*/; + /* adler32 value of the uncompressed data */ + this.adler = 0; +} + +module.exports = ZStream; + +},{}],"/lib/inflate.js":[function(require,module,exports){ +'use strict'; + + +var zlib_inflate = require('./zlib/inflate'); +var utils = require('./utils/common'); +var strings = require('./utils/strings'); +var c = require('./zlib/constants'); +var msg = require('./zlib/messages'); +var ZStream = require('./zlib/zstream'); +var GZheader = require('./zlib/gzheader'); + +var toString = Object.prototype.toString; + +/** + * class Inflate + * + * Generic JS-style wrapper for zlib calls. If you don't need + * streaming behaviour - use more simple functions: [[inflate]] + * and [[inflateRaw]]. + **/ + +/* internal + * inflate.chunks -> Array + * + * Chunks of output data, if [[Inflate#onData]] not overriden. + **/ + +/** + * Inflate.result -> Uint8Array|Array|String + * + * Uncompressed result, generated by default [[Inflate#onData]] + * and [[Inflate#onEnd]] handlers. Filled after you push last chunk + * (call [[Inflate#push]] with `Z_FINISH` / `true` param) or if you + * push a chunk with explicit flush (call [[Inflate#push]] with + * `Z_SYNC_FLUSH` param). + **/ + +/** + * Inflate.err -> Number + * + * Error code after inflate finished. 0 (Z_OK) on success. + * Should be checked if broken data possible. + **/ + +/** + * Inflate.msg -> String + * + * Error message, if [[Inflate.err]] != 0 + **/ + + +/** + * new Inflate(options) + * - options (Object): zlib inflate options. + * + * Creates new inflator instance with specified params. Throws exception + * on bad params. Supported options: + * + * - `windowBits` + * - `dictionary` + * + * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced) + * for more information on these. + * + * Additional options, for internal needs: + * + * - `chunkSize` - size of generated data chunks (16K by default) + * - `raw` (Boolean) - do raw inflate + * - `to` (String) - if equal to 'string', then result will be converted + * from utf8 to utf16 (javascript) string. When string output requested, + * chunk length can differ from `chunkSize`, depending on content. + * + * By default, when no options set, autodetect deflate/gzip data format via + * wrapper header. + * + * ##### Example: + * + * ```javascript + * var pako = require('pako') + * , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9]) + * , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]); + * + * var inflate = new pako.Inflate({ level: 3}); + * + * inflate.push(chunk1, false); + * inflate.push(chunk2, true); // true -> last chunk + * + * if (inflate.err) { throw new Error(inflate.err); } + * + * console.log(inflate.result); + * ``` + **/ +function Inflate(options) { + if (!(this instanceof Inflate)) return new Inflate(options); + + this.options = utils.assign({ + chunkSize: 16384, + windowBits: 0, + to: '' + }, options || {}); + + var opt = this.options; + + // Force window size for `raw` data, if not set directly, + // because we have no header for autodetect. + if (opt.raw && (opt.windowBits >= 0) && (opt.windowBits < 16)) { + opt.windowBits = -opt.windowBits; + if (opt.windowBits === 0) { opt.windowBits = -15; } + } + + // If `windowBits` not defined (and mode not raw) - set autodetect flag for gzip/deflate + if ((opt.windowBits >= 0) && (opt.windowBits < 16) && + !(options && options.windowBits)) { + opt.windowBits += 32; + } + + // Gzip header has no info about windows size, we can do autodetect only + // for deflate. So, if window size not set, force it to max when gzip possible + if ((opt.windowBits > 15) && (opt.windowBits < 48)) { + // bit 3 (16) -> gzipped data + // bit 4 (32) -> autodetect gzip/deflate + if ((opt.windowBits & 15) === 0) { + opt.windowBits |= 15; + } + } + + this.err = 0; // error code, if happens (0 = Z_OK) + this.msg = ''; // error message + this.ended = false; // used to avoid multiple onEnd() calls + this.chunks = []; // chunks of compressed data + + this.strm = new ZStream(); + this.strm.avail_out = 0; + + var status = zlib_inflate.inflateInit2( + this.strm, + opt.windowBits + ); + + if (status !== c.Z_OK) { + throw new Error(msg[status]); + } + + this.header = new GZheader(); + + zlib_inflate.inflateGetHeader(this.strm, this.header); +} + +/** + * Inflate#push(data[, mode]) -> Boolean + * - data (Uint8Array|Array|ArrayBuffer|String): input data + * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes. + * See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH. + * + * Sends input data to inflate pipe, generating [[Inflate#onData]] calls with + * new output chunks. Returns `true` on success. The last data block must have + * mode Z_FINISH (or `true`). That will flush internal pending buffers and call + * [[Inflate#onEnd]]. For interim explicit flushes (without ending the stream) you + * can use mode Z_SYNC_FLUSH, keeping the decompression context. + * + * On fail call [[Inflate#onEnd]] with error code and return false. + * + * We strongly recommend to use `Uint8Array` on input for best speed (output + * format is detected automatically). Also, don't skip last param and always + * use the same type in your code (boolean or number). That will improve JS speed. + * + * For regular `Array`-s make sure all elements are [0..255]. + * + * ##### Example + * + * ```javascript + * push(chunk, false); // push one of data chunks + * ... + * push(chunk, true); // push last chunk + * ``` + **/ +Inflate.prototype.push = function (data, mode) { + var strm = this.strm; + var chunkSize = this.options.chunkSize; + var dictionary = this.options.dictionary; + var status, _mode; + var next_out_utf8, tail, utf8str; + var dict; + + // Flag to properly process Z_BUF_ERROR on testing inflate call + // when we check that all output data was flushed. + var allowBufError = false; + + if (this.ended) { return false; } + _mode = (mode === ~~mode) ? mode : ((mode === true) ? c.Z_FINISH : c.Z_NO_FLUSH); + + // Convert data if needed + if (typeof data === 'string') { + // Only binary strings can be decompressed on practice + strm.input = strings.binstring2buf(data); + } else if (toString.call(data) === '[object ArrayBuffer]') { + strm.input = new Uint8Array(data); + } else { + strm.input = data; + } + + strm.next_in = 0; + strm.avail_in = strm.input.length; + + do { + if (strm.avail_out === 0) { + strm.output = new utils.Buf8(chunkSize); + strm.next_out = 0; + strm.avail_out = chunkSize; + } + + status = zlib_inflate.inflate(strm, c.Z_NO_FLUSH); /* no bad return value */ + + if (status === c.Z_NEED_DICT && dictionary) { + // Convert data if needed + if (typeof dictionary === 'string') { + dict = strings.string2buf(dictionary); + } else if (toString.call(dictionary) === '[object ArrayBuffer]') { + dict = new Uint8Array(dictionary); + } else { + dict = dictionary; + } + + status = zlib_inflate.inflateSetDictionary(this.strm, dict); + + } + + if (status === c.Z_BUF_ERROR && allowBufError === true) { + status = c.Z_OK; + allowBufError = false; + } + + if (status !== c.Z_STREAM_END && status !== c.Z_OK) { + this.onEnd(status); + this.ended = true; + return false; + } + + if (strm.next_out) { + if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && (_mode === c.Z_FINISH || _mode === c.Z_SYNC_FLUSH))) { + + if (this.options.to === 'string') { + + next_out_utf8 = strings.utf8border(strm.output, strm.next_out); + + tail = strm.next_out - next_out_utf8; + utf8str = strings.buf2string(strm.output, next_out_utf8); + + // move tail + strm.next_out = tail; + strm.avail_out = chunkSize - tail; + if (tail) { utils.arraySet(strm.output, strm.output, next_out_utf8, tail, 0); } + + this.onData(utf8str); + + } else { + this.onData(utils.shrinkBuf(strm.output, strm.next_out)); + } + } + } + + // When no more input data, we should check that internal inflate buffers + // are flushed. The only way to do it when avail_out = 0 - run one more + // inflate pass. But if output data not exists, inflate return Z_BUF_ERROR. + // Here we set flag to process this error properly. + // + // NOTE. Deflate does not return error in this case and does not needs such + // logic. + if (strm.avail_in === 0 && strm.avail_out === 0) { + allowBufError = true; + } + + } while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== c.Z_STREAM_END); + + if (status === c.Z_STREAM_END) { + _mode = c.Z_FINISH; + } + + // Finalize on the last chunk. + if (_mode === c.Z_FINISH) { + status = zlib_inflate.inflateEnd(this.strm); + this.onEnd(status); + this.ended = true; + return status === c.Z_OK; + } + + // callback interim results if Z_SYNC_FLUSH. + if (_mode === c.Z_SYNC_FLUSH) { + this.onEnd(c.Z_OK); + strm.avail_out = 0; + return true; + } + + return true; +}; + + +/** + * Inflate#onData(chunk) -> Void + * - chunk (Uint8Array|Array|String): ouput data. Type of array depends + * on js engine support. When string output requested, each chunk + * will be string. + * + * By default, stores data blocks in `chunks[]` property and glue + * those in `onEnd`. Override this handler, if you need another behaviour. + **/ +Inflate.prototype.onData = function (chunk) { + this.chunks.push(chunk); +}; + + +/** + * Inflate#onEnd(status) -> Void + * - status (Number): inflate status. 0 (Z_OK) on success, + * other if not. + * + * Called either after you tell inflate that the input stream is + * complete (Z_FINISH) or should be flushed (Z_SYNC_FLUSH) + * or if an error happened. By default - join collected chunks, + * free memory and fill `results` / `err` properties. + **/ +Inflate.prototype.onEnd = function (status) { + // On success - join + if (status === c.Z_OK) { + if (this.options.to === 'string') { + // Glue & convert here, until we teach pako to send + // utf8 alligned strings to onData + this.result = this.chunks.join(''); + } else { + this.result = utils.flattenChunks(this.chunks); + } + } + this.chunks = []; + this.err = status; + this.msg = this.strm.msg; +}; + + +/** + * inflate(data[, options]) -> Uint8Array|Array|String + * - data (Uint8Array|Array|String): input data to decompress. + * - options (Object): zlib inflate options. + * + * Decompress `data` with inflate/ungzip and `options`. Autodetect + * format via wrapper header by default. That's why we don't provide + * separate `ungzip` method. + * + * Supported options are: + * + * - windowBits + * + * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced) + * for more information. + * + * Sugar (options): + * + * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify + * negative windowBits implicitly. + * - `to` (String) - if equal to 'string', then result will be converted + * from utf8 to utf16 (javascript) string. When string output requested, + * chunk length can differ from `chunkSize`, depending on content. + * + * + * ##### Example: + * + * ```javascript + * var pako = require('pako') + * , input = pako.deflate([1,2,3,4,5,6,7,8,9]) + * , output; + * + * try { + * output = pako.inflate(input); + * } catch (err) + * console.log(err); + * } + * ``` + **/ +function inflate(input, options) { + var inflator = new Inflate(options); + + inflator.push(input, true); + + // That will never happens, if you don't cheat with options :) + if (inflator.err) { throw inflator.msg || msg[inflator.err]; } + + return inflator.result; +} + + +/** + * inflateRaw(data[, options]) -> Uint8Array|Array|String + * - data (Uint8Array|Array|String): input data to decompress. + * - options (Object): zlib inflate options. + * + * The same as [[inflate]], but creates raw data, without wrapper + * (header and adler32 crc). + **/ +function inflateRaw(input, options) { + options = options || {}; + options.raw = true; + return inflate(input, options); +} + + +/** + * ungzip(data[, options]) -> Uint8Array|Array|String + * - data (Uint8Array|Array|String): input data to decompress. + * - options (Object): zlib inflate options. + * + * Just shortcut to [[inflate]], because it autodetects format + * by header.content. Done for convenience. + **/ + + +exports.Inflate = Inflate; +exports.inflate = inflate; +exports.inflateRaw = inflateRaw; +exports.ungzip = inflate; + +},{"./utils/common":1,"./utils/strings":2,"./zlib/constants":4,"./zlib/gzheader":6,"./zlib/inflate":8,"./zlib/messages":10,"./zlib/zstream":11}]},{},[])("/lib/inflate.js") +}); \ No newline at end of file diff --git a/chromium/manifest.json b/chromium/manifest.json index 72d7b9f2792a..7a236226999e 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -14,7 +14,7 @@ "background-scripts/update.js", "background-scripts/rules.js", "background-scripts/store.js", - "pako_inflate.min.js", + "external/pako-1.0.5/pako_inflate.min.js", "background-scripts/incognito.js", "background-scripts/background.js" ] diff --git a/chromium/pako_inflate.min.js b/chromium/pako_inflate.min.js deleted file mode 100644 index 3484f85d7e54..000000000000 --- a/chromium/pako_inflate.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/* pako 1.0.5 nodeca/pako */ -!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.pako=e()}}(function(){return function e(t,i,n){function a(o,s){if(!i[o]){if(!t[o]){var f="function"==typeof require&&require;if(!s&&f)return f(o,!0);if(r)return r(o,!0);var l=new Error("Cannot find module '"+o+"'");throw l.code="MODULE_NOT_FOUND",l}var d=i[o]={exports:{}};t[o][0].call(d.exports,function(e){var i=t[o][1][e];return a(i?i:e)},d,d.exports,e,t,i,n)}return i[o].exports}for(var r="function"==typeof require&&require,o=0;o=252?6:f>=248?5:f>=240?4:f>=224?3:f>=192?2:1;s[254]=s[254]=1,i.string2buf=function(e){var t,i,n,r,o,s=e.length,f=0;for(r=0;r>>6,t[o++]=128|63&i):i<65536?(t[o++]=224|i>>>12,t[o++]=128|i>>>6&63,t[o++]=128|63&i):(t[o++]=240|i>>>18,t[o++]=128|i>>>12&63,t[o++]=128|i>>>6&63,t[o++]=128|63&i);return t},i.buf2binstring=function(e){return n(e,e.length)},i.binstring2buf=function(e){for(var t=new a.Buf8(e.length),i=0,n=t.length;i4)l[a++]=65533,i+=o-1;else{for(r&=2===o?31:3===o?15:7;o>1&&i1?l[a++]=65533:r<65536?l[a++]=r:(r-=65536,l[a++]=55296|r>>10&1023,l[a++]=56320|1023&r)}return n(l,a)},i.utf8border=function(e,t){var i;for(t=t||e.length,t>e.length&&(t=e.length),i=t-1;i>=0&&128===(192&e[i]);)i--;return i<0?t:0===i?t:i+s[e[i]]>t?i:t}},{"./common":1}],3:[function(e,t,i){"use strict";function n(e,t,i,n){for(var a=65535&e|0,r=e>>>16&65535|0,o=0;0!==i;){o=i>2e3?2e3:i,i-=o;do a=a+t[n++]|0,r=r+a|0;while(--o);a%=65521,r%=65521}return a|r<<16|0}t.exports=n},{}],4:[function(e,t,i){"use strict";t.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],5:[function(e,t,i){"use strict";function n(){for(var e,t=[],i=0;i<256;i++){e=i;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[i]=e}return t}function a(e,t,i,n){var a=r,o=n+i;e^=-1;for(var s=n;s>>8^a[255&(e^t[s])];return e^-1}var r=n();t.exports=a},{}],6:[function(e,t,i){"use strict";function n(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}t.exports=n},{}],7:[function(e,t,i){"use strict";var n=30,a=12;t.exports=function(e,t){var i,r,o,s,f,l,d,u,c,h,b,w,m,k,_,g,v,p,x,y,S,E,B,Z,A;i=e.state,r=e.next_in,Z=e.input,o=r+(e.avail_in-5),s=e.next_out,A=e.output,f=s-(t-e.avail_out),l=s+(e.avail_out-257),d=i.dmax,u=i.wsize,c=i.whave,h=i.wnext,b=i.window,w=i.hold,m=i.bits,k=i.lencode,_=i.distcode,g=(1<>>24,w>>>=x,m-=x,x=p>>>16&255,0===x)A[s++]=65535&p;else{if(!(16&x)){if(0===(64&x)){p=k[(65535&p)+(w&(1<>>=x,m-=x),m<15&&(w+=Z[r++]<>>24,w>>>=x,m-=x,x=p>>>16&255,!(16&x)){if(0===(64&x)){p=_[(65535&p)+(w&(1<d){e.msg="invalid distance too far back",i.mode=n;break e}if(w>>>=x,m-=x,x=s-f,S>x){if(x=S-x,x>c&&i.sane){e.msg="invalid distance too far back",i.mode=n;break e}if(E=0,B=b,0===h){if(E+=u-x,x2;)A[s++]=B[E++],A[s++]=B[E++],A[s++]=B[E++],y-=3;y&&(A[s++]=B[E++],y>1&&(A[s++]=B[E++]))}else{E=s-S;do A[s++]=A[E++],A[s++]=A[E++],A[s++]=A[E++],y-=3;while(y>2);y&&(A[s++]=A[E++],y>1&&(A[s++]=A[E++]))}break}}break}}while(r>3,r-=y,m-=y<<3,w&=(1<>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function a(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new _.Buf16(320),this.work=new _.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function r(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=D,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new _.Buf32(we),t.distcode=t.distdyn=new _.Buf32(me),t.sane=1,t.back=-1,z):C}function o(e){var t;return e&&e.state?(t=e.state,t.wsize=0,t.whave=0,t.wnext=0,r(e)):C}function s(e,t){var i,n;return e&&e.state?(n=e.state,t<0?(i=0,t=-t):(i=(t>>4)+1,t<48&&(t&=15)),t&&(t<8||t>15)?C:(null!==n.window&&n.wbits!==t&&(n.window=null),n.wrap=i,n.wbits=t,o(e))):C}function f(e,t){var i,n;return e?(n=new a,e.state=n,n.window=null,i=s(e,t),i!==z&&(e.state=null),i):C}function l(e){return f(e,_e)}function d(e){if(ge){var t;for(m=new _.Buf32(512),k=new _.Buf32(32),t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(x(S,e.lens,0,288,m,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;x(E,e.lens,0,32,k,0,e.work,{bits:5}),ge=!1}e.lencode=m,e.lenbits=9,e.distcode=k,e.distbits=5}function u(e,t,i,n){var a,r=e.state;return null===r.window&&(r.wsize=1<=r.wsize?(_.arraySet(r.window,t,i-r.wsize,r.wsize,0),r.wnext=0,r.whave=r.wsize):(a=r.wsize-r.wnext,a>n&&(a=n),_.arraySet(r.window,t,i-n,a,r.wnext),n-=a,n?(_.arraySet(r.window,t,i-n,n,0),r.wnext=n,r.whave=r.wsize):(r.wnext+=a,r.wnext===r.wsize&&(r.wnext=0),r.whave>>8&255,i.check=v(i.check,Ze,2,0),c=0,h=0,i.mode=F;break}if(i.flags=0,i.head&&(i.head.done=!1),!(1&i.wrap)||(((255&c)<<8)+(c>>8))%31){e.msg="incorrect header check",i.mode=ce;break}if((15&c)!==U){e.msg="unknown compression method",i.mode=ce;break}if(c>>>=4,h-=4,xe=(15&c)+8,0===i.wbits)i.wbits=xe;else if(xe>i.wbits){e.msg="invalid window size",i.mode=ce;break}i.dmax=1<>8&1),512&i.flags&&(Ze[0]=255&c,Ze[1]=c>>>8&255,i.check=v(i.check,Ze,2,0)),c=0,h=0,i.mode=L;case L:for(;h<32;){if(0===f)break e;f--,c+=a[o++]<>>8&255,Ze[2]=c>>>16&255,Ze[3]=c>>>24&255,i.check=v(i.check,Ze,4,0)),c=0,h=0,i.mode=H;case H:for(;h<16;){if(0===f)break e;f--,c+=a[o++]<>8),512&i.flags&&(Ze[0]=255&c,Ze[1]=c>>>8&255,i.check=v(i.check,Ze,2,0)),c=0,h=0,i.mode=M;case M:if(1024&i.flags){for(;h<16;){if(0===f)break e;f--,c+=a[o++]<>>8&255,i.check=v(i.check,Ze,2,0)),c=0,h=0}else i.head&&(i.head.extra=null);i.mode=j;case j:if(1024&i.flags&&(m=i.length,m>f&&(m=f),m&&(i.head&&(xe=i.head.extra_len-i.length,i.head.extra||(i.head.extra=new Array(i.head.extra_len)),_.arraySet(i.head.extra,a,o,m,xe)),512&i.flags&&(i.check=v(i.check,a,m,o)),f-=m,o+=m,i.length-=m),i.length))break e;i.length=0,i.mode=K;case K:if(2048&i.flags){if(0===f)break e;m=0;do xe=a[o+m++],i.head&&xe&&i.length<65536&&(i.head.name+=String.fromCharCode(xe));while(xe&&m>9&1,i.head.done=!0),e.adler=i.check=0,i.mode=X;break;case q:for(;h<32;){if(0===f)break e;f--,c+=a[o++]<>>=7&h,h-=7&h,i.mode=le;break}for(;h<3;){if(0===f)break e;f--,c+=a[o++]<>>=1,h-=1,3&c){case 0:i.mode=J;break;case 1:if(d(i),i.mode=ie,t===A){c>>>=2,h-=2;break e}break;case 2:i.mode=$;break;case 3:e.msg="invalid block type",i.mode=ce}c>>>=2,h-=2;break;case J:for(c>>>=7&h,h-=7&h;h<32;){if(0===f)break e;f--,c+=a[o++]<>>16^65535)){e.msg="invalid stored block lengths",i.mode=ce;break}if(i.length=65535&c,c=0,h=0,i.mode=Q,t===A)break e;case Q:i.mode=V;case V:if(m=i.length){if(m>f&&(m=f),m>l&&(m=l),0===m)break e;_.arraySet(r,a,o,m,s),f-=m,o+=m,l-=m,s+=m,i.length-=m;break}i.mode=X;break;case $:for(;h<14;){if(0===f)break e;f--,c+=a[o++]<>>=5,h-=5,i.ndist=(31&c)+1,c>>>=5,h-=5,i.ncode=(15&c)+4,c>>>=4,h-=4,i.nlen>286||i.ndist>30){e.msg="too many length or distance symbols",i.mode=ce;break}i.have=0,i.mode=ee;case ee:for(;i.have>>=3,h-=3}for(;i.have<19;)i.lens[Ae[i.have++]]=0;if(i.lencode=i.lendyn,i.lenbits=7,Se={bits:i.lenbits},ye=x(y,i.lens,0,19,i.lencode,0,i.work,Se),i.lenbits=Se.bits,ye){e.msg="invalid code lengths set",i.mode=ce;break}i.have=0,i.mode=te;case te:for(;i.have>>24,ke=Be>>>16&255,_e=65535&Be,!(me<=h);){if(0===f)break e;f--,c+=a[o++]<>>=me,h-=me,i.lens[i.have++]=_e;else{if(16===_e){for(Ee=me+2;h>>=me,h-=me,0===i.have){e.msg="invalid bit length repeat",i.mode=ce;break}xe=i.lens[i.have-1],m=3+(3&c),c>>>=2,h-=2}else if(17===_e){for(Ee=me+3;h>>=me,h-=me,xe=0,m=3+(7&c),c>>>=3,h-=3}else{for(Ee=me+7;h>>=me,h-=me,xe=0,m=11+(127&c),c>>>=7,h-=7}if(i.have+m>i.nlen+i.ndist){e.msg="invalid bit length repeat",i.mode=ce;break}for(;m--;)i.lens[i.have++]=xe}}if(i.mode===ce)break;if(0===i.lens[256]){e.msg="invalid code -- missing end-of-block",i.mode=ce;break}if(i.lenbits=9,Se={bits:i.lenbits},ye=x(S,i.lens,0,i.nlen,i.lencode,0,i.work,Se),i.lenbits=Se.bits,ye){e.msg="invalid literal/lengths set",i.mode=ce;break}if(i.distbits=6,i.distcode=i.distdyn,Se={bits:i.distbits},ye=x(E,i.lens,i.nlen,i.ndist,i.distcode,0,i.work,Se),i.distbits=Se.bits,ye){e.msg="invalid distances set",i.mode=ce;break}if(i.mode=ie,t===A)break e;case ie:i.mode=ne;case ne:if(f>=6&&l>=258){e.next_out=s,e.avail_out=l,e.next_in=o,e.avail_in=f,i.hold=c,i.bits=h,p(e,w),s=e.next_out,r=e.output,l=e.avail_out,o=e.next_in,a=e.input,f=e.avail_in,c=i.hold,h=i.bits,i.mode===X&&(i.back=-1);break}for(i.back=0;Be=i.lencode[c&(1<>>24,ke=Be>>>16&255,_e=65535&Be,!(me<=h);){if(0===f)break e;f--,c+=a[o++]<>ge)],me=Be>>>24,ke=Be>>>16&255,_e=65535&Be,!(ge+me<=h);){if(0===f)break e;f--,c+=a[o++]<>>=ge,h-=ge,i.back+=ge}if(c>>>=me,h-=me,i.back+=me,i.length=_e,0===ke){i.mode=fe;break}if(32&ke){i.back=-1,i.mode=X;break}if(64&ke){e.msg="invalid literal/length code",i.mode=ce;break}i.extra=15&ke,i.mode=ae;case ae:if(i.extra){for(Ee=i.extra;h>>=i.extra,h-=i.extra,i.back+=i.extra}i.was=i.length,i.mode=re;case re:for(;Be=i.distcode[c&(1<>>24,ke=Be>>>16&255,_e=65535&Be,!(me<=h);){if(0===f)break e;f--,c+=a[o++]<>ge)],me=Be>>>24,ke=Be>>>16&255,_e=65535&Be,!(ge+me<=h);){if(0===f)break e;f--,c+=a[o++]<>>=ge,h-=ge,i.back+=ge}if(c>>>=me,h-=me,i.back+=me,64&ke){e.msg="invalid distance code",i.mode=ce;break}i.offset=_e,i.extra=15&ke,i.mode=oe;case oe:if(i.extra){for(Ee=i.extra;h>>=i.extra,h-=i.extra,i.back+=i.extra}if(i.offset>i.dmax){e.msg="invalid distance too far back",i.mode=ce;break}i.mode=se;case se:if(0===l)break e;if(m=w-l,i.offset>m){if(m=i.offset-m,m>i.whave&&i.sane){e.msg="invalid distance too far back",i.mode=ce;break}m>i.wnext?(m-=i.wnext,k=i.wsize-m):k=i.wnext-m,m>i.length&&(m=i.length),we=i.window}else we=r,k=s-i.offset,m=i.length;m>l&&(m=l),l-=m,i.length-=m;do r[s++]=we[k++];while(--m);0===i.length&&(i.mode=ne);break;case fe:if(0===l)break e;r[s++]=i.length,l--,i.mode=ne;break;case le:if(i.wrap){for(;h<32;){if(0===f)break e;f--,c|=a[o++]<=1&&0===M[C];C--);if(O>C&&(O=C),0===C)return w[m++]=20971520,w[m++]=20971520,_.bits=1,0;for(N=1;N0&&(e===s||1!==C))return-1;for(j[1]=0,z=1;zr||e===l&&D>o)return 1;for(;;){E=z-T,k[R]S?(B=K[P+k[R]],Z=L[H+k[R]]):(B=96,Z=0),g=1<>T)+v]=E<<24|B<<16|Z|0;while(0!==v);for(g=1<>=1;if(0!==g?(F&=g-1,F+=g):F=0,R++,0===--M[z]){if(z===C)break;z=t[i+k[R]]}if(z>O&&(F&x)!==p){for(0===T&&(T=O),y+=N,I=z-T,U=1<r||e===l&&D>o)return 1;p=F&x,w[p]=O<<24|I<<16|y-m|0}}return 0!==F&&(w[y+F]=z-T<<24|64<<16|0),_.bits=O,0}},{"../utils/common":1}],10:[function(e,t,i){"use strict";t.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],11:[function(e,t,i){"use strict";function n(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}t.exports=n},{}],"/lib/inflate.js":[function(e,t,i){"use strict";function n(e){if(!(this instanceof n))return new n(e);this.options=s.assign({chunkSize:16384,windowBits:0,to:""},e||{});var t=this.options;t.raw&&t.windowBits>=0&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(t.windowBits>=0&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),t.windowBits>15&&t.windowBits<48&&0===(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new u,this.strm.avail_out=0;var i=o.inflateInit2(this.strm,t.windowBits);if(i!==l.Z_OK)throw new Error(d[i]);this.header=new c,o.inflateGetHeader(this.strm,this.header)}function a(e,t){var i=new n(t);if(i.push(e,!0),i.err)throw i.msg||d[i.err];return i.result}function r(e,t){return t=t||{},t.raw=!0,a(e,t)}var o=e("./zlib/inflate"),s=e("./utils/common"),f=e("./utils/strings"),l=e("./zlib/constants"),d=e("./zlib/messages"),u=e("./zlib/zstream"),c=e("./zlib/gzheader"),h=Object.prototype.toString;n.prototype.push=function(e,t){var i,n,a,r,d,u,c=this.strm,b=this.options.chunkSize,w=this.options.dictionary,m=!1;if(this.ended)return!1;n=t===~~t?t:t===!0?l.Z_FINISH:l.Z_NO_FLUSH,"string"==typeof e?c.input=f.binstring2buf(e):"[object ArrayBuffer]"===h.call(e)?c.input=new Uint8Array(e):c.input=e,c.next_in=0,c.avail_in=c.input.length;do{if(0===c.avail_out&&(c.output=new s.Buf8(b),c.next_out=0,c.avail_out=b),i=o.inflate(c,l.Z_NO_FLUSH),i===l.Z_NEED_DICT&&w&&(u="string"==typeof w?f.string2buf(w):"[object ArrayBuffer]"===h.call(w)?new Uint8Array(w):w,i=o.inflateSetDictionary(this.strm,u)),i===l.Z_BUF_ERROR&&m===!0&&(i=l.Z_OK,m=!1),i!==l.Z_STREAM_END&&i!==l.Z_OK)return this.onEnd(i),this.ended=!0,!1;c.next_out&&(0!==c.avail_out&&i!==l.Z_STREAM_END&&(0!==c.avail_in||n!==l.Z_FINISH&&n!==l.Z_SYNC_FLUSH)||("string"===this.options.to?(a=f.utf8border(c.output,c.next_out),r=c.next_out-a,d=f.buf2string(c.output,a),c.next_out=r,c.avail_out=b-r,r&&s.arraySet(c.output,c.output,a,r,0),this.onData(d)):this.onData(s.shrinkBuf(c.output,c.next_out)))),0===c.avail_in&&0===c.avail_out&&(m=!0)}while((c.avail_in>0||0===c.avail_out)&&i!==l.Z_STREAM_END);return i===l.Z_STREAM_END&&(n=l.Z_FINISH),n===l.Z_FINISH?(i=o.inflateEnd(this.strm),this.onEnd(i),this.ended=!0,i===l.Z_OK):n!==l.Z_SYNC_FLUSH||(this.onEnd(l.Z_OK),c.avail_out=0,!0)},n.prototype.onData=function(e){this.chunks.push(e)},n.prototype.onEnd=function(e){e===l.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=s.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},i.Inflate=n,i.inflate=a,i.inflateRaw=r,i.ungzip=a},{"./utils/common":1,"./utils/strings":2,"./zlib/constants":4,"./zlib/gzheader":6,"./zlib/inflate":8,"./zlib/messages":10,"./zlib/zstream":11}]},{},[])("/lib/inflate.js")}); From 1e73b9773db05e0221e7f957cdada0a8d13d469f Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 19 Jan 2018 16:06:17 -0800 Subject: [PATCH 14/24] Fixing formatting for eslint test --- chromium/background-scripts/update.js | 14 +++++++------- chromium/background-scripts/update_channels.js | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index d99292978b39..e7086e5cfc4d 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -1,3 +1,6 @@ +/* global update_channels */ +/* global pako */ + "use strict"; (function(exports) { @@ -39,7 +42,7 @@ async function timeToNextCheck() { // Generic ajax promise function xhr_promise(url){ - return new Promise((resolve, reject) => { + return new Promise((resolve) => { let xhr = new XMLHttpRequest(); xhr.open("GET", url); xhr.onreadystatechange = function(){ @@ -97,8 +100,7 @@ function verifyAndStoreNewRulesets(new_rulesets, update_channel){ publicKey, new_rulesets.signature_byte_array.buffer, new_rulesets.rulesets_byte_array.buffer - ) - .then(async isvalid => { + ).then(async isvalid => { if(isvalid) { util.log(util.NOTE, update_channel.name + ': Downloaded ruleset signature checks out. Storing rulesets.'); await store.local.set_promise('rulesets: ' + update_channel.name, new_rulesets.rulesets_gz_base64); @@ -106,12 +108,10 @@ function verifyAndStoreNewRulesets(new_rulesets, update_channel){ } else { reject('Downloaded ruleset signature is invalid. Aborting.'); } - }) - .catch(err => { + }).catch(() => { reject('Downloaded ruleset signature could not be verified. Aborting.'); }); - }) - .catch(err => { + }).catch(() => { reject('Downloaded ruleset signature could not be verified. Aborting.'); }); }); diff --git a/chromium/background-scripts/update_channels.js b/chromium/background-scripts/update_channels.js index cb1c70d063bd..b5585df93e2f 100644 --- a/chromium/background-scripts/update_channels.js +++ b/chromium/background-scripts/update_channels.js @@ -1,3 +1,7 @@ +/* exported update_channels */ + +"use strict"; + const update_channels = [{ name: "EFF Full Rulesets", jwk: { From 1e4557bc4780d01a534ba65c7306402078857c54 Mon Sep 17 00:00:00 2001 From: William Budington Date: Wed, 7 Mar 2018 20:53:29 -0800 Subject: [PATCH 15/24] Display version for out-of-band rulesets --- chromium/background-scripts/background.js | 3 +++ chromium/background-scripts/update.js | 17 ++++++++++++++++- chromium/background-scripts/update_channels.js | 2 +- chromium/pages/popup/index.html | 8 +++++++- chromium/pages/popup/style.css | 9 +++++++++ chromium/pages/popup/ux.js | 14 ++++++++++++++ src/chrome/locale/en/https-everywhere.dtd | 1 + 7 files changed, 51 insertions(+), 3 deletions(-) diff --git a/chromium/background-scripts/background.js b/chromium/background-scripts/background.js index ff563683ebca..51cca78d0489 100644 --- a/chromium/background-scripts/background.js +++ b/chromium/background-scripts/background.js @@ -671,6 +671,9 @@ chrome.runtime.onMessage.addListener(function(message, sender, sendResponse){ import_settings(message.object).then(() => { sendResponse(true); }); + } else if (message.type == "get_ruleset_timestamps") { + update.getRulesetTimestamps().then(timestamps => sendResponse(timestamps)); + return true; } }); diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index e7086e5cfc4d..5828883a84d7 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -67,6 +67,19 @@ async function checkForNewRulesets(update_channel) { } } +// Retrieve the timestamp for when a stored ruleset bundle was published +async function getRulesetTimestamps(){ + let timestamp_promises = []; + for(let update_channel of update_channels){ + timestamp_promises.push(new Promise(async resolve => { + let timestamp = await store.local.get_promise('rulesets-stored-timestamp: ' + update_channel.name, 0); + resolve([update_channel.name, timestamp]); + })); + } + let timestamps = await Promise.all(timestamp_promises); + return timestamps; +} + // Download and return new rulesets async function getNewRulesets(rulesets_timestamp, update_channel) { @@ -165,6 +178,7 @@ async function performCheck() { let new_rulesets = await getNewRulesets(new_rulesets_timestamp, update_channel); try{ await verifyAndStoreNewRulesets(new_rulesets, update_channel); + store.local.set_promise('rulesets-stored-timestamp: ' + update_channel.name, new_rulesets_timestamp); num_updates++; } catch(err) { util.log(util.WARN, update_channel.name + ': ' + err); @@ -220,7 +234,8 @@ async function initialize(store_param, cb){ Object.assign(exports, { applyStoredRulesets, - initialize + initialize, + getRulesetTimestamps }); })(typeof exports == 'undefined' ? require.scopes.update = {} : exports); diff --git a/chromium/background-scripts/update_channels.js b/chromium/background-scripts/update_channels.js index b5585df93e2f..41c373600641 100644 --- a/chromium/background-scripts/update_channels.js +++ b/chromium/background-scripts/update_channels.js @@ -3,7 +3,7 @@ "use strict"; const update_channels = [{ - name: "EFF Full Rulesets", + name: "EFF (Full)", jwk: { kty: "RSA", e: "AQAB", diff --git a/chromium/pages/popup/index.html b/chromium/pages/popup/index.html index 95b0cd4aa823..5f25fb192513 100644 --- a/chromium/pages/popup/index.html +++ b/chromium/pages/popup/index.html @@ -69,7 +69,13 @@



-

(Version: )

+

+ + Version: + + + +

diff --git a/chromium/pages/popup/style.css b/chromium/pages/popup/style.css index 1a520badf730..f1ce925e88b9 100644 --- a/chromium/pages/popup/style.css +++ b/chromium/pages/popup/style.css @@ -125,3 +125,12 @@ footer { #add-rule-link { display: none; } + +#rulesets-versions{ + display: block; + clear: both; +} + +.rulesets-version{ + display: block; +} diff --git a/chromium/pages/popup/ux.js b/chromium/pages/popup/ux.js index 980d7da75d15..cbce36599db5 100644 --- a/chromium/pages/popup/ux.js +++ b/chromium/pages/popup/ux.js @@ -166,6 +166,20 @@ document.addEventListener("DOMContentLoaded", function () { var version_info = document.getElementById('current-version'); version_info.innerText = the_manifest.version; + let rulesets_versions = document.getElementById('rulesets-versions'); + sendMessage("get_ruleset_timestamps", null, timestamps => { + for(let [update_channel, timestamp] of timestamps){ + if(timestamp > 0){ + let ruleset_date = new Date(timestamp * 1000); + let ruleset_string = ruleset_date.getUTCFullYear() + "." + (ruleset_date.getUTCMonth() + 1) + "." + ruleset_date.getUTCDate(); + + let timestamp_span = document.createElement("span"); + timestamp_span.className = "rulesets-version"; + timestamp_span.innerText = chrome.i18n.getMessage("about_rulesets_version") + update_channel + ": " + ruleset_string; + rulesets_versions.appendChild(timestamp_span); + } + } + }); e("aboutTitle").title = chrome.i18n.getMessage("about_title"); e("add-rule-link").addEventListener("click", addManualRule); }); diff --git a/src/chrome/locale/en/https-everywhere.dtd b/src/chrome/locale/en/https-everywhere.dtd index 430e9f63481b..c16099cb1891 100644 --- a/src/chrome/locale/en/https-everywhere.dtd +++ b/src/chrome/locale/en/https-everywhere.dtd @@ -2,6 +2,7 @@ + From a85f3fa7719de61ea7dd97933be2aa0fd2b92a88 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 15 Mar 2018 18:54:36 -0700 Subject: [PATCH 16/24] Changing signing algorithm to RSA-PSS --- chromium/background-scripts/update.js | 5 +++-- .../async-airgap.sh} | 22 ++----------------- .../async-request.sh} | 2 +- .../standalone.sh} | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-) rename utils/{sign-rulesets-airgap.sh => sign-rulesets/async-airgap.sh} (53%) rename utils/{sign-rulesets-request.sh => sign-rulesets/async-request.sh} (83%) rename utils/{sign-rulesets-standalone.sh => sign-rulesets/standalone.sh} (75%) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 5828883a84d7..2944f596da01 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -19,7 +19,7 @@ for(let update_channel of update_channels){ "jwk", update_channel.jwk, { - name: "RSASSA-PKCS1-v1_5", + name: "RSA-PSS", hash: {name: "SHA-256"}, }, false, @@ -108,7 +108,8 @@ function verifyAndStoreNewRulesets(new_rulesets, update_channel){ imported_keys[update_channel.name].then(publicKey => { window.crypto.subtle.verify( { - name: "RSASSA-PKCS1-v1_5", + name: "RSA-PSS", + saltLength: 32 }, publicKey, new_rulesets.signature_byte_array.buffer, diff --git a/utils/sign-rulesets-airgap.sh b/utils/sign-rulesets/async-airgap.sh similarity index 53% rename from utils/sign-rulesets-airgap.sh rename to utils/sign-rulesets/async-airgap.sh index 43b3ec82ec31..2441cdeb212e 100755 --- a/utils/sign-rulesets-airgap.sh +++ b/utils/sign-rulesets/async-airgap.sh @@ -13,29 +13,11 @@ read -p "(press enter to continue)" SIGNED_SHA256SUM=`mktemp /tmp/ruleset-signature.sha256.XXXXXXXX` trap 'rm $SIGNED_SHA256SUM' EXIT -ASN1_CONFIG=`mktemp /tmp/asn1.conf.XXXXXXXX` -trap 'rm $ASN1_CONFIG' EXIT -ASN1_DGST=`mktemp /tmp/asn1.dgst.XXXXXXXX` -trap 'rm $ASN1_DGST' EXIT SIGNED_SHA256SUM_BASE64_QR=`mktemp /tmp/ruleset-signature.sha256.base64.XXXXXXXX.png` trap 'rm $SIGNED_SHA256SUM_BASE64_QR' EXIT -cat >$ASN1_CONFIG < /dev/null - -openssl rsautl -sign -in $ASN1_DGST -inkey $1 -out $SIGNED_SHA256SUM +echo $2 | xxd -r -p | openssl pkeyutl -sign -inkey $1 -pkeyopt digest:sha256 -pkeyopt rsa_padding_mode:pss -pkeyopt rsa_pss_saltlen:32 -out $SIGNED_SHA256SUM +echo $SIGNED_SHA256SUM cat $SIGNED_SHA256SUM | base64 | qrencode -o $SIGNED_SHA256SUM_BASE64_QR eog $SIGNED_SHA256SUM_BASE64_QR 2>/dev/null diff --git a/utils/sign-rulesets-request.sh b/utils/sign-rulesets/async-request.sh similarity index 83% rename from utils/sign-rulesets-request.sh rename to utils/sign-rulesets/async-request.sh index b2adce2a9f4f..5f7bddce27fc 100755 --- a/utils/sign-rulesets-request.sh +++ b/utils/sign-rulesets/async-request.sh @@ -24,6 +24,6 @@ echo 'Paste in the data from the QR code, then type Ctrl-D:' cat | tr -d '\n' > $2/rulesets-signature.sha256.base64 base64 -d $2/rulesets-signature.sha256.base64 > $SIGNED_SHA256SUM -openssl dgst -sha256 -verify $1 -signature $SIGNED_SHA256SUM $2/default.rulesets.gz.base64 +openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -verify $1 -signature $SIGNED_SHA256SUM $2/default.rulesets.gz.base64 date +%s > $2/rulesets-timestamp diff --git a/utils/sign-rulesets-standalone.sh b/utils/sign-rulesets/standalone.sh similarity index 75% rename from utils/sign-rulesets-standalone.sh rename to utils/sign-rulesets/standalone.sh index 8d45c644d4f0..c56afe13620b 100755 --- a/utils/sign-rulesets-standalone.sh +++ b/utils/sign-rulesets/standalone.sh @@ -16,7 +16,7 @@ trap 'rm $SIGNED_SHA256SUM' EXIT mkdir -p $2 cat $RULESETS_FILE | gzip -nc | base64 -w 0 > $2/default.rulesets.gz.base64 -openssl dgst -sha256 -sign $1 -out $SIGNED_SHA256SUM $2/default.rulesets.gz.base64 +openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -sign $1 -out $SIGNED_SHA256SUM $2/default.rulesets.gz.base64 cat $SIGNED_SHA256SUM | base64 -w 0 > $2/rulesets-signature.sha256.base64 date +%s > $2/rulesets-timestamp From 67eaf9059d5fea89ec0d2f3f27b285dfad6b7aca Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 16 Mar 2018 12:07:20 -0700 Subject: [PATCH 17/24] Adding unit tests for update.js --- chromium/background-scripts/update.js | 19 +++++ .../background-scripts/update_channels.js | 2 +- chromium/background-scripts/util.js | 5 ++ chromium/package.json | 10 ++- chromium/test/example.rulesets.gz | Bin 0 -> 101 bytes chromium/test/update_test.js | 69 ++++++++++++++++++ 6 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 chromium/test/example.rulesets.gz create mode 100644 chromium/test/update_test.js diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 2944f596da01..3f75c6de043b 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -1,8 +1,27 @@ /* global update_channels */ /* global pako */ +/* global __dirname */ "use strict"; +// Determine if we're in the tests. If so, define some necessary components. +if(typeof(window) == "undefined"){ + const fs = require('fs'); + const WebCrypto = require("node-webcrypto-ossl"), + atob = require("atob"), + encoding = require('text-encoding'); + + var window = { + crypto: new WebCrypto(), + atob + }; + + var update_channels = Function(fs.readFileSync(__dirname + '/update_channels.js').toString() + "return update_channels;")(), + pako = Function(fs.readFileSync(__dirname + '/../external/pako-1.0.5/pako_inflate.min.js').toString() + "return pako;")(), + TextDecoder = encoding.TextDecoder, + chrome = require("sinon-chrome"); +} + (function(exports) { const util = require('./util'); diff --git a/chromium/background-scripts/update_channels.js b/chromium/background-scripts/update_channels.js index 41c373600641..834f74625a9f 100644 --- a/chromium/background-scripts/update_channels.js +++ b/chromium/background-scripts/update_channels.js @@ -2,7 +2,7 @@ "use strict"; -const update_channels = [{ +var update_channels = [{ name: "EFF (Full)", jwk: { kty: "RSA", diff --git a/chromium/background-scripts/util.js b/chromium/background-scripts/util.js index cbd39c9eae9a..bab6460eb86f 100644 --- a/chromium/background-scripts/util.js +++ b/chromium/background-scripts/util.js @@ -1,5 +1,10 @@ "use strict"; +// Determine if we're in the tests. If so, define some necessary components. +if(typeof(window) == "undefined"){ + var chrome = require("sinon-chrome"); +} + (function(exports) { var VERB = 1; diff --git a/chromium/package.json b/chromium/package.json index ba50bed95a3b..1bbf4052fc45 100644 --- a/chromium/package.json +++ b/chromium/package.json @@ -5,10 +5,16 @@ "main": "utils.js", "dependencies": {}, "devDependencies": { + "atob": "^2.0.3", "chai": "^4.1.2", "coveralls": "^3.0.0", - "mocha": "^4.0.0", - "nyc": "^11.2.1" + "fetch-mock": "^6.1.0", + "mocha": "^4.1.0", + "node-webcrypto-ossl": "^1.0.35", + "nyc": "^11.6.0", + "sinon": "^4.4.6", + "sinon-chrome": "^2.3.1", + "text-encoding": "^0.6.4" }, "scripts": { "test": "mocha", diff --git a/chromium/test/example.rulesets.gz b/chromium/test/example.rulesets.gz new file mode 100644 index 0000000000000000000000000000000000000000..f82323308a15ac4f5bb1a5db6e8ebcc53e5f12cc GIT binary patch literal 101 zcmb2|=3oE==I(W2r@YVjhHeT9C|c`rM)!p0Rqu1>LoWpeXnE>*`Rg)zxo9t4bZW}< z>8};Jk1`$Y@+x*{a|zd8D$3Z}aO`O6lqn(+jlQSYKRVt?(q4M&#;pj3IS%pLN`a;W E0J=gb=Kufz literal 0 HcmV?d00001 diff --git a/chromium/test/update_test.js b/chromium/test/update_test.js new file mode 100644 index 000000000000..3df0f5bfb8c7 --- /dev/null +++ b/chromium/test/update_test.js @@ -0,0 +1,69 @@ +'use strict' + +const assert = require('chai').assert, + update = require('../background-scripts/update'), + chrome = require("sinon-chrome"), + util = require('../background-scripts/util'), + atob = require("atob"), + TextDecoder = require('text-encoding').TextDecoder, + sinon = require('sinon'); + +const fs = require('fs'), + update_channels = Function(fs.readFileSync(__dirname + '/../background-scripts/update_channels.js').toString() + "return update_channels;")(), + pako = Function(fs.readFileSync(__dirname + '/../external/pako-1.0.5/pako_inflate.min.js').toString() + "return pako;")(); + +util.setDefaultLogLevel(util.WARN); + +describe('update.js', function() { + const example_rulesets_gz = fs.readFileSync(__dirname + '/example.rulesets.gz'); + + describe('applyStoredRulesets', function() { + beforeEach(() => { + chrome.flush(); + if(util.loadExtensionFile.restore){ util.loadExtensionFile.restore(); } + }); + + it('applies compressed rulesets from chrome.storage', function(done) { + let apply_promises = []; + + for(let update_channel of update_channels){ + const key = 'rulesets: ' + update_channel.name; + chrome.storage.local.get.withArgs(key).yields({[key]: example_rulesets_gz}); + } + + update.applyStoredRulesets({addFromJson: response => { + apply_promises.push(new Promise(resolve => { + assert.isArray(response); + assert.equal(response[0].name, "Example.com"); + resolve(); + })); + + if(apply_promises.length == update_channels.length){ + Promise.all(apply_promises).then(() => done()); + } + }}); + + }); + + it('applies rulesets from local extension file', function(done) { + for(let update_channel of update_channels){ + const key = 'rulesets: ' + update_channel.name; + chrome.storage.local.get.withArgs(key).yields({}); + } + + const example_rulesets_byte_array = pako.inflate(atob(example_rulesets_gz)); + const example_rulesets = new TextDecoder("utf-8").decode(example_rulesets_byte_array); + const example_rulesets_json = JSON.parse(example_rulesets); + + sinon.stub(util, "loadExtensionFile").returns(example_rulesets_json); + + update.applyStoredRulesets({addFromJson: response => { + assert.isArray(response); + assert.equal(response[0].name, "Example.com"); + done(); + }}); + }); + + }); + +}) From 8bfbda0fcf1fdb44b3fb713a4c7030df1ab455ff Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 16 Jan 2018 11:07:55 -0800 Subject: [PATCH 18/24] Change key and update path for EFF (Full) --- chromium/background-scripts/update_channels.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium/background-scripts/update_channels.js b/chromium/background-scripts/update_channels.js index 834f74625a9f..e8032d874c37 100644 --- a/chromium/background-scripts/update_channels.js +++ b/chromium/background-scripts/update_channels.js @@ -7,7 +7,7 @@ var update_channels = [{ jwk: { kty: "RSA", e: "AQAB", - n: "1J6QHCKf7zOkIXLs0pUF0KLy-RlTtXmNhj3OkQMULbQagciDl9ppm1swXHAYi718uoILU_fUzdk8QObXmKVuRMjs7NiXbFOeT0teQou1sX99k-WEJM8SlkXCJDCtYSWnLiadtRCdd1FrjMJcGcMYD_38CcnRBZZOt0PWtoUPMyDX-OUHMd8fQ_b78g-TThmQRxGsQfjYdM7_Hn_djnVON_Iik_lYw9SSazy9GzEJO3naMG2j47NAD8CFBwqqCI9kHkqCqirDDMVIT9ZxoyOFBWBFq4EErKyAjP3l2AD05aCwOPTwVnRfIRPJP6SoCv31e76M41_xsodbICueVWgWP1yRuwxwHNmqPRMhkEA_ZP6R7MpsJP9HLBnPXm9_k4QFndyIdYNgo08cgZTkQcY5y-paOJW5aFzJhxnbC1NQ6AebQyCd-meFVNBiyw3CkI_TsItLgaRSQNzBLgE7Of5aYLk3_cO0rZDfvbo5QzrDXmKym57mhPl01YYUzHyAdWELrvs6hJxwsCROHXCwSqHBtJU5-nPEBgHgAhzc8iH7zVOwL3i1oyPvE0E8UK6eg80FUdwI6iu01-doJywBLD5DOyH2D0ErZNTiAcTkHtAxuxlmbRneaxP2_JqX4WwC1CNyccPp1VzwGFWVlu0rEODPuUm0zkPXPDB0D_0PjHvP_wU" + n: "1cwvFQu3Kw-Pz8bcEFuV5zx0ZheDsc4Tva7Qv6BL90_sDLqCW79Y543nDkPtNVfFH_89pt2kSPp_IcS5XnYiw6zBQeFuILFw5JpvZt14K0s4e025Q9CXfhYKIBKT9PnqihwAacjMa6rQb7RTu7XxVvqxRb3b0vx2CR40LSlYZ8H_KpeaUwq2oz-fyrI6LFTeYvbO3ZuLKeK5xV1a32xeTVMFkIj3LxnQalxq-DRHfj7LRRoTnbRDW4uoDc8aVpLFliuO79jUKbobz4slpiWJ4wjKR_O6OK13HbZUiOSxi8Bms-UqBPOyzbMVpmA7lv_zWdaLu1IVlVXQyLVbbrqI6llRqfHdcJoEl-eC48AofuB-relQtjTEK_hyBf7sPwrbqAarjRjlyEx6Qy5gTXyxM9attfNAeupYR6jm8LKm6TFpfWkyDxUmj_f5pJMBWNTomV74f8iQ2M18_KWMUDCOf80tR0t21Q1iCWdvA3K_KJn05tTLyumlwwlQijMqRkYuao-CX9L3DJIaB3VPYPTSIPUr7oi16agsuamOyiOtlZiRpEvoNg2ksJMZtwnj5xhBQydkdhMW2ZpHDzcLuZlhJYZL_l3_7wuzRM7vpyA9obP92CpZRFJErGZmFxJC93I4U9-0B0wg-sbyMKGJ5j1BWTnibCklDXtWzXtuiz18EgE" }, - update_path_prefix: "http://localhost:8000" + update_path_prefix: "https://www.https-rulesets.org/v1/" }]; From 5cc47f94d7f02e4533ab78f735a7f5a71cc4eaf3 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 22 Mar 2018 20:39:18 -0700 Subject: [PATCH 19/24] Avoid base64 encoding the compressed rulesets, which adds to the download size --- chromium/background-scripts/update.js | 41 ++++++++++++++++----------- chromium/background-scripts/util.js | 39 ++++++++++++------------- chromium/package.json | 7 +++-- utils/sign-rulesets/async-airgap.sh | 2 +- utils/sign-rulesets/async-request.sh | 16 +++++------ utils/sign-rulesets/standalone.sh | 8 ++---- 6 files changed, 59 insertions(+), 54 deletions(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 3f75c6de043b..60487e52a3fe 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -9,11 +9,13 @@ if(typeof(window) == "undefined"){ const fs = require('fs'); const WebCrypto = require("node-webcrypto-ossl"), atob = require("atob"), + btoa = require("btoa"), encoding = require('text-encoding'); var window = { crypto: new WebCrypto(), - atob + atob, + btoa }; var update_channels = Function(fs.readFileSync(__dirname + '/update_channels.js').toString() + "return update_channels;")(), @@ -76,14 +78,15 @@ function xhr_promise(url){ // Check for new rulesets. If found, return the timestamp. If not, return false async function checkForNewRulesets(update_channel) { + let timestamp_result = await fetch(update_channel.update_path_prefix + "/rulesets-timestamp"); + if(timestamp_result.status == 200) { + let rulesets_timestamp = Number(await timestamp_result.text()); - let timestamp_promise = xhr_promise(update_channel.update_path_prefix + "/rulesets-timestamp"); - let rulesets_timestamp = Number(await timestamp_promise); - if((await store.local.get_promise('rulesets-timestamp: ' + update_channel.name, 0)) < rulesets_timestamp){ - return rulesets_timestamp; - } else { - return false; + if((await store.local.get_promise('rulesets-timestamp: ' + update_channel.name, 0)) < rulesets_timestamp){ + return rulesets_timestamp; + } } + return false; } // Retrieve the timestamp for when a stored ruleset bundle was published @@ -104,18 +107,22 @@ async function getNewRulesets(rulesets_timestamp, update_channel) { store.local.set_promise('rulesets-timestamp: ' + update_channel.name, rulesets_timestamp); - let signature_promise = xhr_promise(update_channel.update_path_prefix + "/rulesets-signature.sha256.base64"); - let rulesets_promise = xhr_promise(update_channel.update_path_prefix + "/default.rulesets.gz.base64"); + let signature_promise = fetch(update_channel.update_path_prefix + "/rulesets-signature.sha256"); + let rulesets_promise = fetch(update_channel.update_path_prefix + "/default.rulesets.gz"); - let resolutions = await Promise.all([ + let responses = await Promise.all([ signature_promise, rulesets_promise ]); + let resolutions = await Promise.all([ + util.slurp(responses[0]), + util.slurp(responses[1]) + ]); + return { - signature_byte_array: util.base64ToUint8Array(resolutions[0]), - rulesets_byte_array: util.stringToUint8Array(resolutions[1]), - rulesets_gz_base64: resolutions[1] + signature_array_buffer: resolutions[0], + rulesets_array_buffer: resolutions[1] }; } @@ -131,12 +138,12 @@ function verifyAndStoreNewRulesets(new_rulesets, update_channel){ saltLength: 32 }, publicKey, - new_rulesets.signature_byte_array.buffer, - new_rulesets.rulesets_byte_array.buffer + new_rulesets.signature_array_buffer, + new_rulesets.rulesets_array_buffer ).then(async isvalid => { if(isvalid) { util.log(util.NOTE, update_channel.name + ': Downloaded ruleset signature checks out. Storing rulesets.'); - await store.local.set_promise('rulesets: ' + update_channel.name, new_rulesets.rulesets_gz_base64); + await store.local.set_promise('rulesets: ' + update_channel.name, window.btoa(util.ArrayBufferToString(new_rulesets.rulesets_array_buffer))); resolve(true); } else { reject('Downloaded ruleset signature is invalid. Aborting.'); @@ -150,7 +157,7 @@ function verifyAndStoreNewRulesets(new_rulesets, update_channel){ }); } -// Base64 decode, unzip, and apply the rulesets we have stored. +// Unzip and apply the rulesets we have stored. async function applyStoredRulesets(rulesets_obj){ let rulesets_promises = []; for(let update_channel of update_channels){ diff --git a/chromium/background-scripts/util.js b/chromium/background-scripts/util.js index bab6460eb86f..9d7dfc98bde3 100644 --- a/chromium/background-scripts/util.js +++ b/chromium/background-scripts/util.js @@ -1,10 +1,5 @@ "use strict"; -// Determine if we're in the tests. If so, define some necessary components. -if(typeof(window) == "undefined"){ - var chrome = require("sinon-chrome"); -} - (function(exports) { var VERB = 1; @@ -66,28 +61,34 @@ function loadExtensionFile(url, returnType) { } /** - * Convert a string to ArrayBuffer + * Convert an ArrayBuffer to string * - * @param string: a string to convert + * @param array: an ArrayBuffer to convert */ -function stringToUint8Array(string) { - let len = string.length; - let bytes = new Uint8Array(len); +function ArrayBufferToString(ab) { + let array = new Uint8Array(ab); + let string = ""; - for (let i = 0; i < len; i++) { - bytes[i] = string.charCodeAt(i); + for (let byte of array){ + string += String.fromCharCode(byte); } - return bytes; + return string; } /** - * Convert a base64 string to ArrayBuffer + * Return the entire contents of a fetch response object * - * @param base64: a base64 string to convert + * @param response: fetch response to read from + * @return a promise which resolves to an ArrayBuffer of the fetch response contents */ -function base64ToUint8Array(base64) { - return stringToUint8Array(window.atob(base64)); +function slurp(response) { + return new Promise(res => { + let reader = new FileReader(); + reader.addEventListener("loadend", () => res(reader.result)); + + response.blob().then(blob => reader.readAsArrayBuffer(blob)); + }); } Object.assign(exports, { @@ -100,8 +101,8 @@ Object.assign(exports, { setDefaultLogLevel, getDefaultLogLevel, loadExtensionFile, - stringToUint8Array, - base64ToUint8Array + ArrayBufferToString, + slurp }); })(typeof exports == 'undefined' ? require.scopes.util = {} : exports); diff --git a/chromium/package.json b/chromium/package.json index 1bbf4052fc45..655cb5a6942e 100644 --- a/chromium/package.json +++ b/chromium/package.json @@ -6,13 +6,14 @@ "dependencies": {}, "devDependencies": { "atob": "^2.0.3", + "btoa": "^1.1.2", "chai": "^4.1.2", "coveralls": "^3.0.0", - "fetch-mock": "^6.1.0", + "fetch-mock": "^6.3.0", "mocha": "^4.1.0", - "node-webcrypto-ossl": "^1.0.35", + "node-webcrypto-ossl": "^1.0.36", "nyc": "^11.6.0", - "sinon": "^4.4.6", + "sinon": "^4.4.8", "sinon-chrome": "^2.3.1", "text-encoding": "^0.6.4" }, diff --git a/utils/sign-rulesets/async-airgap.sh b/utils/sign-rulesets/async-airgap.sh index 2441cdeb212e..292c21ad86a1 100755 --- a/utils/sign-rulesets/async-airgap.sh +++ b/utils/sign-rulesets/async-airgap.sh @@ -18,6 +18,6 @@ trap 'rm $SIGNED_SHA256SUM_BASE64_QR' EXIT echo $2 | xxd -r -p | openssl pkeyutl -sign -inkey $1 -pkeyopt digest:sha256 -pkeyopt rsa_padding_mode:pss -pkeyopt rsa_pss_saltlen:32 -out $SIGNED_SHA256SUM -echo $SIGNED_SHA256SUM +cat $SIGNED_SHA256SUM | base64 cat $SIGNED_SHA256SUM | base64 | qrencode -o $SIGNED_SHA256SUM_BASE64_QR eog $SIGNED_SHA256SUM_BASE64_QR 2>/dev/null diff --git a/utils/sign-rulesets/async-request.sh b/utils/sign-rulesets/async-request.sh index 5f7bddce27fc..fd516d856452 100755 --- a/utils/sign-rulesets/async-request.sh +++ b/utils/sign-rulesets/async-request.sh @@ -10,20 +10,20 @@ fi RULESETS_FILE=rules/default.rulesets -SIGNED_SHA256SUM=`mktemp /tmp/ruleset-signature.sha256.XXXXXXXX` -trap 'rm $SIGNED_SHA256SUM' EXIT +SIGNED_SHA256SUM_BASE64=`mktemp /tmp/ruleset-signature.sha256.base64.XXXXXXXX` +trap 'rm $SIGNED_SHA256SUM_BASE64' EXIT mkdir -p $2 -cat $RULESETS_FILE | gzip -nc | base64 -w 0 > $2/default.rulesets.gz.base64 +cat $RULESETS_FILE | gzip -nc > $2/default.rulesets.gz echo 'Hash for signing: ' -sha256sum $2/default.rulesets.gz.base64 | cut -f1 -d' ' -echo metahash for confirmation only $(sha256sum $2/default.rulesets.gz.base64 | cut -f1 -d' ' | tr -d '\n' | sha256sum | cut -c1-6) ... +sha256sum $2/default.rulesets.gz | cut -f1 -d' ' +echo metahash for confirmation only $(sha256sum $2/default.rulesets.gz | cut -f1 -d' ' | tr -d '\n' | sha256sum | cut -c1-6) ... echo 'Paste in the data from the QR code, then type Ctrl-D:' -cat | tr -d '\n' > $2/rulesets-signature.sha256.base64 +cat | tr -d '\n' > $SIGNED_SHA256SUM_BASE64 -base64 -d $2/rulesets-signature.sha256.base64 > $SIGNED_SHA256SUM -openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -verify $1 -signature $SIGNED_SHA256SUM $2/default.rulesets.gz.base64 +base64 -d $SIGNED_SHA256SUM_BASE64 > $2/rulesets-signature.sha256 +openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -verify $1 -signature $2/rulesets-signature.sha256 $2/default.rulesets.gz date +%s > $2/rulesets-timestamp diff --git a/utils/sign-rulesets/standalone.sh b/utils/sign-rulesets/standalone.sh index c56afe13620b..7f7a8adbfc57 100755 --- a/utils/sign-rulesets/standalone.sh +++ b/utils/sign-rulesets/standalone.sh @@ -10,13 +10,9 @@ fi RULESETS_FILE=rules/default.rulesets -SIGNED_SHA256SUM=`mktemp /tmp/ruleset-signature.sha256.XXXXXXXX` -trap 'rm $SIGNED_SHA256SUM' EXIT - mkdir -p $2 -cat $RULESETS_FILE | gzip -nc | base64 -w 0 > $2/default.rulesets.gz.base64 +cat $RULESETS_FILE | gzip -nc > $2/default.rulesets.gz -openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -sign $1 -out $SIGNED_SHA256SUM $2/default.rulesets.gz.base64 -cat $SIGNED_SHA256SUM | base64 -w 0 > $2/rulesets-signature.sha256.base64 +openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -sign $1 -out $2/rulesets-signature.sha256 $2/default.rulesets.gz date +%s > $2/rulesets-timestamp From 47d2e6c1d49d8d33dfb3747d717c5f0d63aebad7 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 23 Mar 2018 16:47:22 -0700 Subject: [PATCH 20/24] Protect against downgrade attacks. A sophisticated attacker would previously be able to switch `default.rulesets.gz` with an old signed ruleset file. We now combine the fact that the JavaScript checks that `latest-rulesets-timestamp` has a greater value than what is currently stored *and*, vitally, that it matches the timestamp bundled with the signed ruleset file. --- chromium/background-scripts/update.js | 26 ++++++++++++++++++-------- utils/sign-rulesets/async-request.sh | 13 +++++++------ utils/sign-rulesets/standalone.sh | 7 ++++--- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 60487e52a3fe..46e327cc522e 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -78,7 +78,7 @@ function xhr_promise(url){ // Check for new rulesets. If found, return the timestamp. If not, return false async function checkForNewRulesets(update_channel) { - let timestamp_result = await fetch(update_channel.update_path_prefix + "/rulesets-timestamp"); + let timestamp_result = await fetch(update_channel.update_path_prefix + "/latest-rulesets-timestamp"); if(timestamp_result.status == 200) { let rulesets_timestamp = Number(await timestamp_result.text()); @@ -107,8 +107,8 @@ async function getNewRulesets(rulesets_timestamp, update_channel) { store.local.set_promise('rulesets-timestamp: ' + update_channel.name, rulesets_timestamp); - let signature_promise = fetch(update_channel.update_path_prefix + "/rulesets-signature.sha256"); - let rulesets_promise = fetch(update_channel.update_path_prefix + "/default.rulesets.gz"); + let signature_promise = fetch(update_channel.update_path_prefix + "/rulesets-signature." + rulesets_timestamp + ".sha256"); + let rulesets_promise = fetch(update_channel.update_path_prefix + "/default.rulesets." + rulesets_timestamp + ".gz"); let responses = await Promise.all([ signature_promise, @@ -129,7 +129,7 @@ async function getNewRulesets(rulesets_timestamp, update_channel) { // Returns a promise which verifies that the rulesets have a valid EFF // signature, and if so, stores them and returns true. // Otherwise, it throws an exception. -function verifyAndStoreNewRulesets(new_rulesets, update_channel){ +function verifyAndStoreNewRulesets(new_rulesets, rulesets_timestamp, update_channel){ return new Promise((resolve, reject) => { imported_keys[update_channel.name].then(publicKey => { window.crypto.subtle.verify( @@ -143,8 +143,18 @@ function verifyAndStoreNewRulesets(new_rulesets, update_channel){ ).then(async isvalid => { if(isvalid) { util.log(util.NOTE, update_channel.name + ': Downloaded ruleset signature checks out. Storing rulesets.'); - await store.local.set_promise('rulesets: ' + update_channel.name, window.btoa(util.ArrayBufferToString(new_rulesets.rulesets_array_buffer))); - resolve(true); + + const rulesets_gz = util.ArrayBufferToString(new_rulesets.rulesets_array_buffer); + const rulesets_byte_array = pako.inflate(rulesets_gz); + const rulesets = new TextDecoder("utf-8").decode(rulesets_byte_array); + const rulesets_json = JSON.parse(rulesets); + + if(rulesets_json.timestamp != rulesets_timestamp){ + reject('Downloaded ruleset had an incorrect timestamp. This may be an attempted downgrade attack. Aborting.'); + } else { + await store.local.set_promise('rulesets: ' + update_channel.name, window.btoa(rulesets_gz)); + resolve(true); + } } else { reject('Downloaded ruleset signature is invalid. Aborting.'); } @@ -183,7 +193,7 @@ async function applyStoredRulesets(rulesets_obj){ const rulesets_jsons = await Promise.all(rulesets_promises); if(rulesets_jsons.join("").length > 0){ for(let rulesets_json of rulesets_jsons){ - rulesets_obj.addFromJson(rulesets_json); + rulesets_obj.addFromJson(rulesets_json.rulesets); } } else { rulesets_obj.addFromJson(util.loadExtensionFile('rules/default.rulesets', 'json')); @@ -204,7 +214,7 @@ async function performCheck() { util.log(util.NOTE, update_channel.name + ': A new ruleset bundle has been released. Downloading now.'); let new_rulesets = await getNewRulesets(new_rulesets_timestamp, update_channel); try{ - await verifyAndStoreNewRulesets(new_rulesets, update_channel); + await verifyAndStoreNewRulesets(new_rulesets, new_rulesets_timestamp, update_channel); store.local.set_promise('rulesets-stored-timestamp: ' + update_channel.name, new_rulesets_timestamp); num_updates++; } catch(err) { diff --git a/utils/sign-rulesets/async-request.sh b/utils/sign-rulesets/async-request.sh index fd516d856452..f16893449bc1 100755 --- a/utils/sign-rulesets/async-request.sh +++ b/utils/sign-rulesets/async-request.sh @@ -14,16 +14,17 @@ SIGNED_SHA256SUM_BASE64=`mktemp /tmp/ruleset-signature.sha256.base64.XXXXXXXX` trap 'rm $SIGNED_SHA256SUM_BASE64' EXIT mkdir -p $2 -cat $RULESETS_FILE | gzip -nc > $2/default.rulesets.gz +TIMESTAMP=`date +%s` +echo "{ \"timestamp\": $TIMESTAMP, \"rulesets\":" "`cat $RULESETS_FILE`" "}" | tr -d '\n' | gzip -nc > $2/default.rulesets.$TIMESTAMP.gz echo 'Hash for signing: ' -sha256sum $2/default.rulesets.gz | cut -f1 -d' ' -echo metahash for confirmation only $(sha256sum $2/default.rulesets.gz | cut -f1 -d' ' | tr -d '\n' | sha256sum | cut -c1-6) ... +sha256sum $2/default.rulesets.$TIMESTAMP.gz | cut -f1 -d' ' +echo metahash for confirmation only $(sha256sum $2/default.rulesets.$TIMESTAMP.gz | cut -f1 -d' ' | tr -d '\n' | sha256sum | cut -c1-6) ... echo 'Paste in the data from the QR code, then type Ctrl-D:' cat | tr -d '\n' > $SIGNED_SHA256SUM_BASE64 -base64 -d $SIGNED_SHA256SUM_BASE64 > $2/rulesets-signature.sha256 -openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -verify $1 -signature $2/rulesets-signature.sha256 $2/default.rulesets.gz +base64 -d $SIGNED_SHA256SUM_BASE64 > $2/rulesets-signature.$TIMESTAMP.sha256 +openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -verify $1 -signature $2/rulesets-signature.$TIMESTAMP.sha256 $2/default.rulesets.$TIMESTAMP.gz -date +%s > $2/rulesets-timestamp +echo $TIMESTAMP > $2/latest-rulesets-timestamp diff --git a/utils/sign-rulesets/standalone.sh b/utils/sign-rulesets/standalone.sh index 7f7a8adbfc57..ee7c266966d8 100755 --- a/utils/sign-rulesets/standalone.sh +++ b/utils/sign-rulesets/standalone.sh @@ -11,8 +11,9 @@ fi RULESETS_FILE=rules/default.rulesets mkdir -p $2 -cat $RULESETS_FILE | gzip -nc > $2/default.rulesets.gz +TIMESTAMP=`date +%s` +echo "{ \"timestamp\": $TIMESTAMP, \"rulesets\":" "`cat $RULESETS_FILE`" "}" | tr -d '\n' | gzip -nc > $2/default.rulesets.$TIMESTAMP.gz -openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -sign $1 -out $2/rulesets-signature.sha256 $2/default.rulesets.gz +openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -sign $1 -out $2/rulesets-signature.$TIMESTAMP.sha256 $2/default.rulesets.$TIMESTAMP.gz -date +%s > $2/rulesets-timestamp +echo $TIMESTAMP > $2/latest-rulesets-timestamp From 09e591bf6e23fcfe2a67f2e654cdefc1e1bd7466 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 23 Mar 2018 17:27:40 -0700 Subject: [PATCH 21/24] Fix tests --- chromium/background-scripts/update.js | 15 --------------- chromium/package.json | 1 + chromium/test/example.rulesets.gz | Bin 101 -> 131 bytes chromium/test/update_test.js | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 46e327cc522e..4bc11fb6deb0 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -61,21 +61,6 @@ async function timeToNextCheck() { } } -// Generic ajax promise -function xhr_promise(url){ - return new Promise((resolve) => { - let xhr = new XMLHttpRequest(); - xhr.open("GET", url); - xhr.onreadystatechange = function(){ - if(this.readyState == 4 && this.status == 200) { - resolve(this.response); - } - } - xhr.responseType = "text"; - xhr.send(null); - }); -} - // Check for new rulesets. If found, return the timestamp. If not, return false async function checkForNewRulesets(update_channel) { let timestamp_result = await fetch(update_channel.update_path_prefix + "/latest-rulesets-timestamp"); diff --git a/chromium/package.json b/chromium/package.json index 655cb5a6942e..8c378d77b776 100644 --- a/chromium/package.json +++ b/chromium/package.json @@ -11,6 +11,7 @@ "coveralls": "^3.0.0", "fetch-mock": "^6.3.0", "mocha": "^4.1.0", + "nan": "^2.10.0", "node-webcrypto-ossl": "^1.0.36", "nyc": "^11.6.0", "sinon": "^4.4.8", diff --git a/chromium/test/example.rulesets.gz b/chromium/test/example.rulesets.gz index f82323308a15ac4f5bb1a5db6e8ebcc53e5f12cc..401811763ff8ce3d88223c40c347f5bc5b814cbe 100644 GIT binary patch literal 131 zcmb2|=3oE==G9>VS|`u=>gsu((GA!XWME=yw8g-5gNgBlzyK|+v!1$sx|(cV?%~=` zRi7af&uW!1@_JG~rSRXbf@u2fY}^;)^Y=;_m^RVSP_1}G~YTPn)f+HmY> j>Xa!W5skj5*grbnNzz_=>&C5!)+h#NgfOZ1_7RfU{ delta 83 zcmZo>Om&j)=3oE==I(W2r@YVjhHeT9C|c`rM)!p0Rqu1>LoWpeXnE>*`Rg)zxo9t4 kbZW}<>8};Jk1`$Y@+x*{a|zd;7$?QaFvlT&TPe^S0N*Gc9RL6T diff --git a/chromium/test/update_test.js b/chromium/test/update_test.js index 3df0f5bfb8c7..a2976279e71a 100644 --- a/chromium/test/update_test.js +++ b/chromium/test/update_test.js @@ -55,7 +55,7 @@ describe('update.js', function() { const example_rulesets = new TextDecoder("utf-8").decode(example_rulesets_byte_array); const example_rulesets_json = JSON.parse(example_rulesets); - sinon.stub(util, "loadExtensionFile").returns(example_rulesets_json); + sinon.stub(util, "loadExtensionFile").returns(example_rulesets_json.rulesets); update.applyStoredRulesets({addFromJson: response => { assert.isArray(response); From 414e3cf2eb45238b713ef2a03dd0a0c7421f0a4a Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 30 Mar 2018 14:52:06 -0700 Subject: [PATCH 22/24] Cleaning up variable names and catch messages --- chromium/background-scripts/update.js | 8 ++++---- chromium/pages/popup/ux.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 4bc11fb6deb0..629a8e1c9662 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -135,19 +135,19 @@ function verifyAndStoreNewRulesets(new_rulesets, rulesets_timestamp, update_chan const rulesets_json = JSON.parse(rulesets); if(rulesets_json.timestamp != rulesets_timestamp){ - reject('Downloaded ruleset had an incorrect timestamp. This may be an attempted downgrade attack. Aborting.'); + reject(update_channel.name + ': Downloaded ruleset had an incorrect timestamp. This may be an attempted downgrade attack. Aborting.'); } else { await store.local.set_promise('rulesets: ' + update_channel.name, window.btoa(rulesets_gz)); resolve(true); } } else { - reject('Downloaded ruleset signature is invalid. Aborting.'); + reject(update_channel.name + ': Downloaded ruleset signature is invalid. Aborting.'); } }).catch(() => { - reject('Downloaded ruleset signature could not be verified. Aborting.'); + reject(update_channel.name + ': Downloaded ruleset signature could not be verified. Aborting.'); }); }).catch(() => { - reject('Downloaded ruleset signature could not be verified. Aborting.'); + reject(update_channel.name + ': Could not import key. Aborting.'); }); }); } diff --git a/chromium/pages/popup/ux.js b/chromium/pages/popup/ux.js index cbce36599db5..e94f35508e65 100644 --- a/chromium/pages/popup/ux.js +++ b/chromium/pages/popup/ux.js @@ -171,11 +171,11 @@ document.addEventListener("DOMContentLoaded", function () { for(let [update_channel, timestamp] of timestamps){ if(timestamp > 0){ let ruleset_date = new Date(timestamp * 1000); - let ruleset_string = ruleset_date.getUTCFullYear() + "." + (ruleset_date.getUTCMonth() + 1) + "." + ruleset_date.getUTCDate(); + let ruleset_version_string = ruleset_date.getUTCFullYear() + "." + (ruleset_date.getUTCMonth() + 1) + "." + ruleset_date.getUTCDate(); let timestamp_span = document.createElement("span"); timestamp_span.className = "rulesets-version"; - timestamp_span.innerText = chrome.i18n.getMessage("about_rulesets_version") + update_channel + ": " + ruleset_string; + timestamp_span.innerText = chrome.i18n.getMessage("about_rulesets_version") + update_channel + ": " + ruleset_version_string; rulesets_versions.appendChild(timestamp_span); } } From 8cfaec6687c5222f7666073d7974556be7c6e8f3 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 30 Mar 2018 15:00:51 -0700 Subject: [PATCH 23/24] Update periodicity to two days --- chromium/background-scripts/update.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 629a8e1c9662..2fef0ef0a43f 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -31,7 +31,7 @@ let store, background_callback; // how often we should check for new rulesets -const periodicity = 10; +const periodicity = 7200; // jwk key loaded from keys.js let imported_keys = {}; From 033f82d59b4408777beb11250eb9472c2ae8d279 Mon Sep 17 00:00:00 2001 From: William Budington Date: Mon, 2 Apr 2018 19:52:33 -0700 Subject: [PATCH 24/24] Updating periodicity to two days, not two hours --- chromium/background-scripts/update.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 2fef0ef0a43f..9f30f8fbcab1 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -31,7 +31,7 @@ let store, background_callback; // how often we should check for new rulesets -const periodicity = 7200; +const periodicity = 172800; // jwk key loaded from keys.js let imported_keys = {};