July 2015 - tor-commits - lists.torproject.org

[tor/master] Document the torrc format as thoroughly as possible
by nickm＠torproject.org 22 Jul '15

22 Jul '15

commit 7521c3ee91a8c52cc152de6fa8b4c88b44fc3e33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 20 12:05:44 2015 -0400 Document the torrc format as thoroughly as possible Closes ticket 2325 --- changes/ticket2325 | 7 ++ doc/include.am | 3 +- doc/torrc_format.txt | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/common/util.c | 33 +------- 4 files changed, 218 insertions(+), 32 deletions(-) diff --git a/changes/ticket2325 b/changes/ticket2325 new file mode 100644 index 0000000..b96e514 --- /dev/null +++ b/changes/ticket2325 @@ -0,0 +1,7 @@ + o Documentation: + - Include a specific and (hopefully) accurate documentation of the torrc + file's meta-format in doc/torrc_format.txt. This is mainly of + interest to people writing programs to parse or generate torrc files. + This document is not a commitment to long-term compatibility; + some aspects of the current format are a bit ridiculous. + Closes ticket 2325. diff --git a/doc/include.am b/doc/include.am index 783aa95..af99501 100644 --- a/doc/include.am +++ b/doc/include.am @@ -36,7 +36,8 @@ endif EXTRA_DIST+= doc/HACKING doc/asciidoc-helper.sh \ $(html_in) $(man_in) $(txt_in) \ - doc/state-contents.txt + doc/state-contents.txt \ + doc/torrc_format.txt docdir = @docdir@ diff --git a/doc/torrc_format.txt b/doc/torrc_format.txt new file mode 100644 index 0000000..3ca187f --- /dev/null +++ b/doc/torrc_format.txt @@ -0,0 +1,207 @@ + +This document specifies the current format and semantics of the torrc +file, as of July 2015. Note that we make no guarantee about the +stability of this format. If you write something designed for strict +compatibility with this document, please expect us to break it sooner or +later. + +Yes, some of this is quite stupid. My goal here is to explain what it +does, not what it should do. + + - Nick + + + +1. File Syntax + + # A file is interpreted as every Entry in the file, in order. + TorrcFile = Line* + + Line = BlankLine | Entry + + BlankLine = WS* OptComment LF + | WS* LF + + OptComment = + | Comment + + Comment = '#' NonLF* + + # Each Entry is interpreted as an optional "Magic" flag, a key, and a + # value. + Entry = SP* OptMagic Key (SP+ | '\\' NL SP*)+ Val LF + | SP* OptMagic Key (SP* | '\\' NL SP*)* LF + + OptMagic = + | "+" + | "/" + + # Keys are always specified verbatim. They are case insensitive. It + # is an error to specify a key that Tor does not recognize. + Key = KC* + + # Sadly, every kind of value is decoded differently... + Val = QuotedVal | ContinuedVal | PlainVal + + # The text of a PlainVal is the text of its PVBody portion, + # plus the optional trailing backslash. + PlainVal = PVBody* ('\\')? SP* OptComment + + # Note that a PVBody is copied verbatim. Slashes are included + # verbatim. No changes are made. Note that a body may be empty. + PVBody = (VC | '\\' NonLF ) * + + # The text of a ContinuedVal is the text of each of its PVBody + # sub-elements, in order, concatenated. + ContinuedVal = CVal1 CVal2* CVal3 + + CVal1 = PVBody '\\' LF + CVal2 = PVBody ( '\\' LF | Comment LF ) + CVal3 = PVBody + + # The text of a QuotedVal is decoded as if it were a C string. + QuotedVal = DQ QVBody DQ SP* Comment + + QVBody = QC + | '\\' ( 'n' | 'r' | 't' | '\\' | '\'' | DQ | 'x' XD XD | OD OD? OD? ) + + XD = any hexadecimal digit + OD = any octal digit + + NonLF = Any character but '\n' + LF = '\n' | EOF + WS = ' ' | '\t' | '\r' + SP = ' ' | '\t' + DQ = '\"' + KC = Any character except an isspace() character or '#' + VC = Any character except '\\', '\n', or '#' + QC = Any character except '\n', '\\', or '\"' + +2. Mid-level Semantics + + + There are four configuration "domains", from lowest to highest priority: + + * Built-in defaults + * The "torrc_defaults" file, if any + * The "torrc" file, if any + * Arguments provided on the command line, if any. + + Normally, values from high-priority domains override low-priority + domains, but see 'magic' below. + + Configuration keys fall into three categories: singletons, lists, and + groups. + + A singleton key may appear at most once in any domain. Its + corresponding value is equal to its value in the highest-priority + domain in which it occurs. + + A list key may appear any number of times in a domain. By default, + its corresponding value is equal to all of the values specified for + it in the highest-priority domain in which it appears. (See 'magic' + below). + + A group key may appear any number of times in a domain. It is + associated with a number of other keys in the same group. The + relative positions of entries with the keys in a single group + matters, but entries with keys not in the group may be freely + interspersed. By default, the group has a value equal to all keys + and values it contains, from the highest-priority domain in which any + of its keys occurs. + + Magic: + + If the '/' flag is specified for an entry, it sets the value for + that entry to an empty list. (This will cause a higher-priority + domain to clear a list from a lower-priority domain, without + actually adding any entries.) + + If the '+' flag is specified for the first entry in a list or a + group that appears in a given domain, that list or group is + appended to the list or group from the next-lowest-priority + domain, rather than replacing it. + +3. High-level semantics + + There are further constraints on the values that each entry can take. + These constraints are out-of-scope for this document. + +4. Examples + + (Indentation is removed in this section, to avoid confusion.) + +4.1. Syntax examples + +# Here is a simple configuration entry. The key is "Foo"; the value is +# "Bar" + +Foo Bar + +# A configuration entry can have spaces in its value, as below. Here the +# key is "Foo" and the value is "Bar Baz" +Foo Bar Baz + +# This configuration entry has space at the end of the line, but those +# spaces don't count, so the key and value are still "Foo" and "Bar Baz" +Foo Bar Baz + +# There can be an escaped newline between the value and the key. This +# is another way to say key="Hello", value="World" +Hello\ +World + +# In regular entries of this kind, you can have a comment at the end of +# the line, either with a space before it or not. Each of these is a +# different spelling of key="Hello", value="World" + +Hello World #today +Hello World#tomorrow + +# One way to encode a complex entry is as a C string. This is the same +# as key="Hello", value="World!" +Hello "World!" + +# The string can contain the usual set of C escapes. This entry has +# key="Hello", and value="\"World\"\nand\nuniverse" +Hello "\"World\"\nand\nuniverse" + +# And now we get to the more-or-less awful part. +# +# Multi-line entries ending with a backslash on each line aren't so +# bad. The backslash is removed, and everything else is included +# verbatim. So this entry has key="Hello" and value="Worldandfriends" +Hello\ +World\ +and\ +friends + +# Backslashes in the middle of a line are included as-is. The key of +# this one is "Too" and the value is "Many\\Backsl\ashes here" (with +# backslashes in that last string as-is) +Too \ +Many\\\ +Backsl\ashes \\ +here + +# And here's the really yucky part. If a comment appears in a multi-line +# entry, the entry is still able to continue on the next line, as in the +# following, where the key is "This" and the value is +# "entry and some are silly" +This entry \ + # has comments \ + and some \ + are # generally \ + silly + +# But you can also write that without the backslashes at the end of the +# comment lines. That is to say, this entry is exactly the same as the +# one above! +This entry \ + # has comments + and some \ + are # generally + silly + + + diff --git a/src/common/util.c b/src/common/util.c index a5b5488..618e6a1 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2829,38 +2829,9 @@ parse_config_line_from_str_verbose(const char *line, char **key_out, char **value_out, const char **err_out) { - /* I believe the file format here is supposed to be: - FILE = (EMPTYLINE | LINE)* (EMPTYLASTLINE | LASTLINE)? - - EMPTYLASTLINE = SPACE* | COMMENT - EMPTYLINE = EMPTYLASTLINE NL - SPACE = ' ' | '\r' | '\t' - COMMENT = '#' NOT-NL* - NOT-NL = Any character except '\n' - NL = '\n' - - LASTLINE = SPACE* KEY SPACE* VALUES - LINE = LASTLINE NL - KEY = KEYCHAR+ - KEYCHAR = Any character except ' ', '\r', '\n', '\t', '#', "\" - - VALUES = QUOTEDVALUE | NORMALVALUE - QUOTEDVALUE = QUOTE QVCHAR* QUOTE EOLSPACE? - QUOTE = '"' - QVCHAR = KEYCHAR | ESC ('n' | 't' | 'r' | '"' | ESC |'\'' | OCTAL | HEX) - ESC = "\\" - OCTAL = ODIGIT (ODIGIT ODIGIT?)? - HEX = ('x' | 'X') HEXDIGIT HEXDIGIT - ODIGIT = '0' .. '7' - HEXDIGIT = '0'..'9' | 'a' .. 'f' | 'A' .. 'F' - EOLSPACE = SPACE* COMMENT? - - NORMALVALUE = (VALCHAR | ESC ESC_IGNORE | CONTINUATION)* EOLSPACE? - VALCHAR = Any character except ESC, '#', and '\n' - ESC_IGNORE = Any character except '#' or '\n' - CONTINUATION = ESC NL ( COMMENT NL )* + /* + See torrc_format.txt for a description of the (silly) format this parses. */ - const char *key, *val, *cp; int continuation = 0;

1 0

[tor/master] Actually, write the torrc format in ABNF
by nickm＠torproject.org 22 Jul '15

22 Jul '15

commit 9d237bb00a32f39a6acd1351f81e905f42247699 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 21 14:40:22 2015 -0400 Actually, write the torrc format in ABNF This should make it more clear what I meant, if you know how to read ABNF. (Thanks to rl1987 for correcting numerous issues here) --- doc/torrc_format.txt | 88 ++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/doc/torrc_format.txt b/doc/torrc_format.txt index 3ca187f..7a80990 100644 --- a/doc/torrc_format.txt +++ b/doc/torrc_format.txt @@ -14,68 +14,66 @@ does, not what it should do. 1. File Syntax - # A file is interpreted as every Entry in the file, in order. - TorrcFile = Line* + ; The syntax here is defined an Augmented Backus-Naur form, as + ; specified in RFC5234. - Line = BlankLine | Entry + ; A file is interpreted as every Entry in the file, in order. + TorrcFile = *Line - BlankLine = WS* OptComment LF - | WS* LF + Line = BlankLine / Entry - OptComment = - | Comment + BlankLine = *WSP OptComment LF + BlankLine =/ *WSP LF - Comment = '#' NonLF* + OptComment = [ Comment ] - # Each Entry is interpreted as an optional "Magic" flag, a key, and a - # value. - Entry = SP* OptMagic Key (SP+ | '\\' NL SP*)+ Val LF - | SP* OptMagic Key (SP* | '\\' NL SP*)* LF + Comment = "#" *NonLF - OptMagic = - | "+" - | "/" + ; Each Entry is interpreted as an optional "Magic" flag, a key, and a + ; value. + Entry = *WSP [ Magic ] Key 1*(1*WSP / "\" NL *WSP) Val LF + Entry =/ *WSP [ Magic ] Key *( *WSP / "\" NL *WSP) LF - # Keys are always specified verbatim. They are case insensitive. It - # is an error to specify a key that Tor does not recognize. - Key = KC* + Magic = "+" / "/" - # Sadly, every kind of value is decoded differently... - Val = QuotedVal | ContinuedVal | PlainVal + ; Keys are always specified verbatim. They are case insensitive. It + ; is an error to specify a key that Tor does not recognize. + Key = 1*KC - # The text of a PlainVal is the text of its PVBody portion, - # plus the optional trailing backslash. - PlainVal = PVBody* ('\\')? SP* OptComment + ; Sadly, every kind of value is decoded differently... + Val = QuotedVal / ContinuedVal / PlainVal - # Note that a PVBody is copied verbatim. Slashes are included - # verbatim. No changes are made. Note that a body may be empty. - PVBody = (VC | '\\' NonLF ) * + ; The text of a PlainVal is the text of its PVBody portion, + ; plus the optional trailing backslash. + PlainVal = PVBody [ "\" ] *WSP OptComment - # The text of a ContinuedVal is the text of each of its PVBody - # sub-elements, in order, concatenated. - ContinuedVal = CVal1 CVal2* CVal3 + ; Note that a PVBody is copied verbatim. Slashes are included + ; verbatim. No changes are made. Note that a body may be empty. + PVBody = * (VC / "\" NonLF ) - CVal1 = PVBody '\\' LF - CVal2 = PVBody ( '\\' LF | Comment LF ) + ; The text of a ContinuedVal is the text of each of its PVBody + ; sub-elements, in order, concatenated. + ContinuedVal = CVal1 *CVal2 CVal3 + + CVal1 = PVBody "\" LF + CVal2 = PVBody ( "\" LF / Comment LF ) CVal3 = PVBody - # The text of a QuotedVal is decoded as if it were a C string. - QuotedVal = DQ QVBody DQ SP* Comment + ; The text of a QuotedVal is decoded as if it were a C string. + QuotedVal = DQ QVBody DQ *WSP Comment + + QVBody = QC + QVBody =/ "\" ( "n" / "r" / "t" / "\" / "'" / DQUOTE ) + QVBOdy =/ "\" ( "x" 2HEXDIG / 1*3OCTDIG ) - QVBody = QC - | '\\' ( 'n' | 'r' | 't' | '\\' | '\'' | DQ | 'x' XD XD | OD OD? OD? ) + ; Anything besides NUL and LF + NonLF = %x01-%x09 / %x0b - %xff - XD = any hexadecimal digit - OD = any octal digit + OCTDIG = '0' - '7' - NonLF = Any character but '\n' - LF = '\n' | EOF - WS = ' ' | '\t' | '\r' - SP = ' ' | '\t' - DQ = '\"' - KC = Any character except an isspace() character or '#' - VC = Any character except '\\', '\n', or '#' - QC = Any character except '\n', '\\', or '\"' + KC = Any character except an isspace() character or '#' or NUL + VC = Any character except '\\', '\n', '#', or NUL + QC = Any character except '\n', '\\', '\"', or NUL 2. Mid-level Semantics

1 0

[tor/master] Merge branch 'ticket2325_squashed'
by nickm＠torproject.org 22 Jul '15

22 Jul '15

commit 382c27d8a9b5738356a575fc19fd0db1056293bf Merge: 2d3f88f 9d237bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 22 12:24:21 2015 -0400 Merge branch 'ticket2325_squashed' changes/ticket2325 | 7 ++ doc/include.am | 3 +- doc/torrc_format.txt | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/common/util.c | 33 +------- 4 files changed, 216 insertions(+), 32 deletions(-)

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #16005: Restrict WebGL minimal mode a bit.
by mikeperry＠torproject.org 22 Jul '15

22 Jul '15

commit 9de178cec5b92e32934d206009a6804f7b1a9188 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 21 21:10:46 2015 -0700 Bug #16005: Restrict WebGL minimal mode a bit. Georg found an old netbook with slightly lower values for some properties. --- dom/canvas/WebGLContext.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dom/canvas/WebGLContext.h b/dom/canvas/WebGLContext.h index f72d552..5a769aa 100644 --- a/dom/canvas/WebGLContext.h +++ b/dom/canvas/WebGLContext.h @@ -54,27 +54,27 @@ class nsIDocShell; * Exceptions: some of the following values are set to higher values than in the spec because * the values in the spec are ridiculously low. They are explicitly marked below * - * Tor Browser Modifications: The following values are the minimum between a 2009 laptop, and a 2013 Moto E + * Tor Browser Modifications: The following values are the minimum between an ancient netbook and a 2013 Moto E */ -#define MINVALUE_GL_MAX_TEXTURE_SIZE 4096 // Different from the spec, which sets it to 64 on page 162 -#define MINVALUE_GL_MAX_CUBE_MAP_TEXTURE_SIZE 2048 // Different from the spec, which sets it to 16 on page 162 -#define MINVALUE_GL_MAX_VERTEX_ATTRIBS 16 // Page 164 -#define MINVALUE_GL_MAX_FRAGMENT_UNIFORM_VECTORS 224 // Page 164 +#define MINVALUE_GL_MAX_TEXTURE_SIZE 2048 // Different from the spec, which sets it to 64 on page 162 +#define MINVALUE_GL_MAX_CUBE_MAP_TEXTURE_SIZE 2048 // Different from the spec, which sets it to 16 on page 162 +#define MINVALUE_GL_MAX_VERTEX_ATTRIBS 16 // Page 164 +#define MINVALUE_GL_MAX_FRAGMENT_UNIFORM_VECTORS 224 // Page 164 #define MINVALUE_GL_MAX_VERTEX_UNIFORM_VECTORS 256 // Page 164 -#define MINVALUE_GL_MAX_VARYING_VECTORS 16 // Page 164 -#define MINVALUE_GL_MAX_TEXTURE_IMAGE_UNITS 16 // Page 164 -#define MINVALUE_GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 16 // Page 164 -#define MINVALUE_GL_MAX_RENDERBUFFER_SIZE 4096 // Different from the spec, which sets it to 1 on page 164 -#define MINVALUE_GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 32 // Page 164 +#define MINVALUE_GL_MAX_VARYING_VECTORS 8 // Page 164 +#define MINVALUE_GL_MAX_TEXTURE_IMAGE_UNITS 8 // Page 164 +#define MINVALUE_GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 8 // Page 164 +#define MINVALUE_GL_MAX_RENDERBUFFER_SIZE 2048 // Different from the spec, which sets it to 1 on page 164 +#define MINVALUE_GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 16 // Page 164 /* The following additional values were set specifically for fingerprinting. - * These ranges came from a 2013 Moto E. + * These ranges came from a 2013 Moto E and an old macbook. * * These values specify the upper end of the maximum size of line and point * elements. The lower bounds are 1 in both cases (and the minimum of 1 is * guaranteed by OpenGL). */ #define MINVALUE_GL_ALIASED_LINE_WIDTH_RANGE 5 -#define MINVALUE_GL_ALIASED_POINT_SIZE_RANGE 255 +#define MINVALUE_GL_ALIASED_POINT_SIZE_RANGE 63 /* This value is used to cap the resolution of the viewport to (MAX x MAX) */ #define MINVALUE_GL_MAX_VIEWPORT_DIMS 4096

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 22 Jul '15

22 Jul '15

commit e3fae7ba7211c2c843ef3bd86998f146ae74ecdc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 21 20:13:44 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #16625: Fully disable network prediction. It was already partially disabled anyhow. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index af0ffdd..52fa327 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -114,6 +114,7 @@ pref("privacy.thirdparty.isolate", 2); // Always enforce third party isolation pref("dom.workers.sharedWorkers.enabled", false); // See https://bugs.torproject.org/15562 pref("network.http.spdy.enabled.http2", false); // Temporarily disabled pending implementation review pref("network.http.spdy.enabled.http2draft", false); // Temporarily disabled pending implementation review +pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633 // Proxy and proxy security pref("network.proxy.socks", "127.0.0.1");

1 0

[torbutton/master] Bug 15781: Remove the sessionstore filter
by mikeperry＠torproject.org 22 Jul '15

22 Jul '15

commit 3df4216be7d681a000546ede7558801e42a40f57 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 21 18:38:03 2015 -0700 Bug 15781: Remove the sessionstore filter It is now obsolete. Firefox now properly disables session store if private browsing mode is enabled. --- src/chrome.manifest | 4 -- src/components/tbSessionStore.js | 126 -------------------------------------- 2 files changed, 130 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 4dc08da..8323e66 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -141,9 +141,6 @@ contract @mozilla.org/mime;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} contract @mozilla.org/uriloader/external-protocol-service;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} contract @mozilla.org/uriloader/external-helper-app-service;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} -component {aef08952-b003-4697-b935-a392367e214f} components/tbSessionStore.js -contract @torproject.org/torbutton-ss-blocker;1 {aef08952-b003-4697-b935-a392367e214f} - component {06322def-6fde-4c06-aef6-47ae8e799629} components/startup-observer.js contract @torproject.org/startup-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629} @@ -163,6 +160,5 @@ component {e33fd6d4-270f-475f-a96f-ff3140279f68} components/domain-isolator.js contract @torproject.org/domain-isolator;1 {e33fd6d4-270f-475f-a96f-ff3140279f68} category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selector;1 -category profile-after-change TBSessionBlocker @torproject.org/torbutton-ss-blocker;1 category profile-after-change StartupObserver @torproject.org/startup-observer;1 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 diff --git a/src/components/tbSessionStore.js b/src/components/tbSessionStore.js deleted file mode 100644 index 7281bcf..0000000 --- a/src/components/tbSessionStore.js +++ /dev/null @@ -1,126 +0,0 @@ -// Bug 1506 P4: This code blocks the session store from being written to -// disk. It is fairly important, but only one small piece is needed. Search -// this file for 1506 for more details. - -/************************************************************************* - * Torbutton Session Store Control - * - * Uses the new Firefox 3.5+ session store APIs to prevent writing - * of tor-loaded tabs to disk. - * - *************************************************************************/ - -// Module specific constants -const kMODULE_NAME = "Torbutton Session Store Blocker"; -const kMODULE_CONTRACTID = "@torproject.org/torbutton-ss-blocker;1"; -const kMODULE_CID = Components.ID("aef08952-b003-4697-b935-a392367e214f"); - -const Cr = Components.results; -const Cc = Components.classes; -const Ci = Components.interfaces; -const Cu = Components.utils; - -function TBSessionBlocker() { - this.logger = Components.classes["@torproject.org/torbutton-logger;1"] - .getService(Components.interfaces.nsISupports).wrappedJSObject; - this.logger.log(3, "Torbutton Session Store Blocker initialized"); - - var obsSvc = Components.classes["@mozilla.org/observer-service;1"] - .getService(Ci.nsIObserverService); - obsSvc.addObserver(this, "sessionstore-state-write", false); - this.prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); - - this.wrappedJSObject = this; -} - -TBSessionBlocker.prototype = -{ - QueryInterface: function(iid) { - if (!iid.equals(Ci.nsIClassInfo) && - !iid.equals(Ci.nsIObserver) && - !iid.equals(Ci.nsISupports)) { - Components.returnCode = Cr.NS_ERROR_NO_INTERFACE; - return null; - } - return this; - }, - - wrappedJSObject: null, // Initialized by constructor - - // make this an nsIClassInfo object - flags: Ci.nsIClassInfo.DOM_OBJECT, - - // method of nsIClassInfo - classDescription: kMODULE_NAME, - classID: kMODULE_CID, - contractID: kMODULE_CONTRACTID, - - // Hack to get us registered early enough to observe the session store. - _xpcom_categories: [{category:"profile-after-change"}], - - // method of nsIClassInfo - getInterfaces: function(count) { - var interfaceList = [Ci.nsIClassInfo]; - count.value = interfaceList.length; - return interfaceList; - }, - - // method of nsIClassInfo - getHelperForLanguage: function(count) { return null; }, - - _walkObj: function(soFar, obj) { - for (let m in obj) { - this.logger.log(2, soFar+"."+m); - if (obj[m] != obj) - this._walkObj(soFar+"."+m, obj[m]); - } - }, - - // observer interface implementation - // topic: what event occurred - // subject: what nsIPrefBranch we're observing - // data: which pref has been changed (relative to subject) - observe: function(subject, topic, data) - { - if (topic != "sessionstore-state-write") return; - this.logger.log(3, "Got Session Store observe: "+topic); - // In ESR 31 |subject| is |null| in non-private browsing mode. Thus, we - // are not able to clean anything. In Private Browsing Mode nothing is - // written in the first place and therefore no |sessionstore-state-write| - // notification is emitted. - try { - subject = subject.QueryInterface(Ci.nsISupportsString); - } catch (e) { - this.logger.log(3, "We got no data to clean"); - } - // Bug 1506: This is the only important bit, other than - // the registration goop. You don't even need the JSON - // garbage... - // - // Simply block sessionstore writes entirely in Tor Browser - try { - if (this.prefs.getBoolPref("extensions.torbutton.block_disk")) { - this.logger.log(3, "Blocking SessionStore write in Tor Browser"); - subject.data = null; - return; - } - } catch(e) { - this.logger.log(5, "Error blocking SessionStore write in Tor Browser: "+e); - } - - return; - } - -}; - -/** -* XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4). -* XPCOMUtils.generateNSGetModule is for Mozilla 1.9.2 (Firefox 3.6). -*/ -Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); -// XXX: This won't work for FF3... We need to not register ourselves here.. -if (XPCOMUtils.generateNSGetFactory) - var NSGetFactory = XPCOMUtils.generateNSGetFactory([TBSessionBlocker]); -else - var NSGetModule = XPCOMUtils.generateNSGetModule([TBSessionBlocker]);

1 0

[tor/master] Improve the workqueue test help message.
by nickm＠torproject.org 21 Jul '15

21 Jul '15

commit f4b03f936ef6f97e8710af75b829f0621f0f2433 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Jul 21 12:45:47 2015 +0200 Improve the workqueue test help message. The workqueue test help message has two issues. First, the message uses 4 space indentation when 2 space indentation seems more common. Second, the help message misses some options. This commit fixes both issues. --- src/test/test_workqueue.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index 24d7ffe..a1a9488 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -300,14 +300,16 @@ help(void) { puts( "Options:\n" - " -N <items> Run this many items of work\n" - " -T <threads> Use this many threads\n" - " -I <inflight> Have no more than this many requests queued at once\n" - " -L <lowwater> Add items whenever fewer than this many are pending\n" - " -C <cancel> Try to cancel N items of every batch that we add\n" - " -R <ratio> Make one out of this many items be a slow (RSA) one\n" - " --no-{eventfd2,eventfd,pipe2,pipe,socketpair}\n" - " Disable one of the alert_socket backends."); + " -h Display this information\n" + " -v Be verbose\n" + " -N <items> Run this many items of work\n" + " -T <threads> Use this many threads\n" + " -I <inflight> Have no more than this many requests queued at once\n" + " -L <lowwater> Add items whenever fewer than this many are pending\n" + " -C <cancel> Try to cancel N items of every batch that we add\n" + " -R <ratio> Make one out of this many items be a slow (RSA) one\n" + " --no-{eventfd2,eventfd,pipe2,pipe,socketpair}\n" + " Disable one of the alert_socket backends."); } int

1 0

[tor/master] Limit the number of inflight items to the number of items.
by nickm＠torproject.org 21 Jul '15

21 Jul '15

commit c68b3418821ddbe6cfaf94fb8959be52e55f2fe1 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Jul 21 12:43:03 2015 +0200 Limit the number of inflight items to the number of items. --- src/test/test_workqueue.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index edefb29..24d7ffe 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -353,6 +353,7 @@ main(int argc, char **argv) return 1; } } + if (opt_n_threads < 1 || opt_n_items < 1 || opt_n_inflight < 1 || opt_n_lowwater < 0 || opt_n_cancel > opt_n_inflight || opt_n_inflight > MAX_INFLIGHT || @@ -361,6 +362,10 @@ main(int argc, char **argv) return 1; } + if (opt_n_inflight > opt_n_items) { + opt_n_inflight = opt_n_items; + } + init_logging(1); crypto_global_init(1, NULL, NULL); crypto_seed_rng();

1 0

[tor/master] Remove casting of void pointers when handling signals.
by nickm＠torproject.org 21 Jul '15

21 Jul '15

commit 2d3f88f6b9c4db7a4f65f1dcebae296f662cbeb7 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Jul 2 09:43:20 2015 +0200 Remove casting of void pointers when handling signals. --- src/or/main.c | 12 +++++++----- src/or/main.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index fe93cdc..5bff82b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2227,7 +2227,8 @@ run_main_loop_until_done(void) static void signal_callback(int fd, short events, void *arg) { - uintptr_t sig = (uintptr_t)arg; + const int *sigptr = arg; + const int sig = *sigptr; (void)fd; (void)events; @@ -2237,7 +2238,7 @@ signal_callback(int fd, short events, void *arg) /** Do the work of acting on a signal received in <b>sig</b> */ void -process_signal(uintptr_t sig) +process_signal(int sig) { switch (sig) { @@ -2482,9 +2483,10 @@ handle_signals(int is_parent) static struct event *signal_events[16]; /* bigger than it has to be. */ if (is_parent) { for (i = 0; signals[i] >= 0; ++i) { - signal_events[i] = tor_evsignal_new( - tor_libevent_get_base(), signals[i], signal_callback, - (void*)(uintptr_t)signals[i]); + signal_events[i] = tor_evsignal_new(tor_libevent_get_base(), signals[i], + signal_callback, + /* Cast away const */ + (int*)&signals[i]); if (event_add(signal_events[i], NULL)) log_warn(LD_BUG, "Error from libevent when adding event for signal %d", signals[i]); diff --git a/src/or/main.h b/src/or/main.h index 542eab6..be0bd64 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -60,7 +60,7 @@ MOCK_DECL(long,get_uptime,(void)); unsigned get_signewnym_epoch(void); void handle_signals(int is_parent); -void process_signal(uintptr_t sig); +void process_signal(int sig); int try_locking(const or_options_t *options, int err_if_locked); int have_lockfile(void);

1 0

[tor/master] Fix some potential memory leaks in the thread pool code.
by nickm＠torproject.org 21 Jul '15

21 Jul '15

commit 3b3b447f75772cc5bbfb48a9e951482dca3c8c0d Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Jul 7 10:17:32 2015 +0200 Fix some potential memory leaks in the thread pool code. --- src/common/compat_pthreads.c | 8 ++++++-- src/common/workqueue.c | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index 487f7e5..b78ab3d 100644 --- a/src/common/compat_pthreads.c +++ b/src/common/compat_pthreads.c @@ -64,13 +64,17 @@ spawn_func(void (*func)(void *), void *data) { pthread_t thread; tor_pthread_data_t *d; - if (PREDICT_UNLIKELY(!threads_initialized)) + if (PREDICT_UNLIKELY(!threads_initialized)) { tor_threads_init(); + } d = tor_malloc(sizeof(tor_pthread_data_t)); d->data = data; d->func = func; - if (pthread_create(&thread,&attr_detached,tor_pthread_helper_fn,d)) + if (pthread_create(&thread, &attr_detached, tor_pthread_helper_fn, d)) { + tor_free(d); return -1; + } + return 0; } diff --git a/src/common/workqueue.c b/src/common/workqueue.c index ed896d7..3f9a063 100644 --- a/src/common/workqueue.c +++ b/src/common/workqueue.c @@ -255,6 +255,7 @@ workerthread_new(void *state, threadpool_t *pool, replyqueue_t *replyqueue) if (spawn_func(worker_thread_main, thr) < 0) { log_err(LD_GENERAL, "Can't launch worker thread."); + tor_free(thr); return NULL; } @@ -382,6 +383,7 @@ threadpool_start_threads(threadpool_t *pool, int n) workerthread_t *thr = workerthread_new(state, pool, pool->reply_queue); if (!thr) { + pool->free_thread_state_fn(state); tor_mutex_release(&pool->lock); return -1; }

1 0