CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-14 08:15:03 +12:00
Code Issues Releases Wiki Activity

various fixes

Browse source
This commit is contained in:
gorhill 2015-05-08 07:43:23 -04:00
parent 3849a3d4d9
commit 52540c1a9a
6 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
platform/firefox/install.rdf
View file

@ -17,18 +17,9 @@
<targetApplication>
<r:Description>
<id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</id>
<minVersion>24.0</minVersion>
<minVersion>29.0</minVersion>
<maxVersion>40.0</maxVersion>
</r:Description>
</targetApplication>
<!-- SeaMonkey -->
<targetApplication>
<r:Description>
<id>{{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}}</id>
<minVersion>2.21</minVersion>
<maxVersion>2.37</maxVersion>
</r:Description>
</targetApplication>
</r:Description>
</r:RDF>

2
platform/firefox/options.xul
View file

@ -3,7 +3,7 @@
<setting type="control">
<vbox>
<button id="showDashboardButton"/>
<button id="showNetworkLogButton"/>
<button id="showLoggerButton"/>
</vbox>
</setting>
</vbox>

4
platform/firefox/vapi-background.js
View file

@ -1815,7 +1815,7 @@ var optionsObserver = {
}
this.setupOptionsButton(doc, 'showDashboardButton', 'dashboard.html');
this.setupOptionsButton(doc, 'showNetworkLogButton', 'devtools.html');
this.setupOptionsButton(doc, 'showLoggerButton', 'logger-ui.html');
}
};
@ -1895,6 +1895,7 @@ vAPI.browserData.clearOrigin = function(/* domain */) {
/******************************************************************************/
/******************************************************************************/
// https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Interface/nsICookieManager2
// https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Interface/nsICookie2
// https://developer.mozilla.org/en-US/docs/Observer_Notifications#Cookies
@ -1930,7 +1931,6 @@ vAPI.cookies.observe = function(subject, topic, reason) {
if ( topic !== 'cookie-changed' ) {
return;
}
// https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Interface/nsICookieService
if ( reason === 'deleted' || subject instanceof Ci.nsICookie2 === false ) {
return;
}

17
src/_locales/en/messages.json
View file

@ -169,7 +169,7 @@
"description": ""
},
"statsPageDetailedBehindTheScenePage" : {
"message": "Chromium: Behind the scene",
"message": "Behind the scene",
"description": ""
},
"statsPageOverview" : {
@ -337,7 +337,7 @@
"description": "Second part of 'Delete non-blocked session cookies [n] minutes after the last time they have been used'"
},
"privacyDeleteNonBlockedSessionCookiesHelp" : {
"message": "<p><a href='http://www.w3.org/2001/tag/2010/09/ClientSideStorage.html'>W3C</a>: &ldquo;A session cookie ... is erased when you end the browser session. The session cookie is stored in temporary memory and is not retained after the browser is closed.&rdquo;</p><p>Except that this <a href='https://code.google.com/p/chromium/issues/detail?id=128513'>might not be happening</a> when using a Chromium-based browser. Also, to some, having to close the browser in order for the session cookies to clear might not be early enough.</p>",
"message": "<p><a href='http://www.w3.org/2001/tag/2010/09/ClientSideStorage.html'>W3C</a>: &ldquo;A session cookie ... is erased when you end the browser session. The session cookie is stored in temporary memory and is not retained after the browser is closed.&rdquo;</p><p>Except that this <a href='https://code.google.com/p/chromium/issues/detail?id=128513'>might not be happening</a> in some browsers. Also, to some, having to close the browser in order for the session cookies to clear might not be early enough.</p>",
"description": ""
},
"privacyDeleteBlockedLocalStoragePrompt" : {
@ -397,11 +397,11 @@
"description": ""
},
"privacyBehindTheSceneHeader" : {
"message": "Chromium: behind-the-scene requests",
"message": "Behind-the-scene requests",
"description": ""
},
"privacyProcessBehindTheSceneHelp" : {
"message": "<p>According to <a href='https://www.google.com/intl/en/chrome/browser/privacy/whitepaper.html'>Google Chrome Privacy Whitepaper</a>, <i>Chromium</i> might send HTTP requests to <i>Google</i> without the user expressly visiting a web page. Let's call these special requests <strong>behind-the-scene</strong> requests. Also, other installed browser extensions can send <strong>behind-the-scene</strong> HTTP requests.</p><p><i>uMatrix</i> lets you intercept and treat these requests like any other request: they can be processed in order to allow/block them as per your whitelist/blacklist.</p><p>Click the extension icon while viewing this page to get started. Required reading: <a href='https://github.com/gorhill/httpswitchboard/wiki/Behind-the-scene-requests'>Behind-the-scene requests</a>.</p><div class='warn'><p><span style='color:red; font-weight:bold'>Beware!</span> Blocking <strong>behind-the-scene</strong> net requests is potentially causing <a href='https://github.com/gorhill/httpswitchboard/issues/27'>an issue</a> when the user wants to install an extension from the Chrome store (including maybe preventing extensions from being updated), hence the ability to disable the feature here. Blocking can also cause other installed extensions to not work properly (those querying for remote data).</p><p>Even if this feature is not enabled, <strong>behind-the-scene</strong> requests are still logged by <i>uMatrix</i>. You can inspect these requests on the <a href='dashboard.html#statistics'>Statistics</a> page.</p>",
"message": "",
"description": ""
},
@ -667,6 +667,15 @@
"description":"English: {{value}} days ago"
},
"showDashboardButton":{
"message":"Dashboard",
"description":"Appears in Firefox's add-on preferences"
},
"showLoggerButton":{
"message":"Logger",
"description":"Appears in Firefox's add-on preferences"
},
"errorCantConnectTo":{
"message":"Network error: Unable to connect to {{url}}",
"description":""

17
src/js/logger-ui.js
View file

@ -224,7 +224,7 @@ var renderLogEntry = function(entry) {
tr.classList.add('cat_' + entry.cat);
}
rowFilterer.filterOne(tr);
rowFilterer.filterOne(tr, true);
tbody.insertBefore(tr, tbody.firstChild);
};
@ -392,11 +392,11 @@ var rowFilterer = (function() {
if ( not ) {
rawPart = rawPart.slice(1);
}
hardBeg = rawPart.charAt(0) === '[';
hardBeg = rawPart.charAt(0) === '|';
if ( hardBeg ) {
rawPart = rawPart.slice(1);
}
hardEnd = rawPart.slice(-1) === ']';
hardEnd = rawPart.slice(-1) === '|';
if ( hardEnd ) {
rawPart = rawPart.slice(0, -1);
}
@ -419,15 +419,18 @@ var rowFilterer = (function() {
}
};
var filterOne = function(tr) {
var cl = tr.classList;
var filterOne = function(tr, clean) {
var ff = filters;
var fcount = ff.length;
if ( fcount === 0 && clean === true ) {
return;
}
// do not filter out doc boundaries, they help separate important
// section of log.
var cl = tr.classList;
if ( cl.contains('doc') ) {
return;
}
var ff = filters;
var fcount = ff.length;
if ( fcount === 0 ) {
cl.remove('f');
return;

6
src/js/traffic.js
View file

@ -100,12 +100,6 @@ var onBeforeRequestHandler = function(details) {
return;
}
// Do not block myself from updating assets
// https://github.com/gorhill/httpswitchboard/issues/202
if ( requestType === 'xhr' && requestURL.lastIndexOf(µm.projectServerRoot, 0) === 0 ) {
return;
}
// Re-classify orphan HTTP requests as behind-the-scene requests. There is
// not much else which can be done, because there are URLs
// which cannot be handled by µMatrix, i.e. `opera://startpage`,