October 2014 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-31.1.1esr-4.x-1] Merge remote-tracking branch 'brade/bug13016' into tor-browser-31.1.1esr-4.x-1
by mikeperry＠torproject.org 09 Oct '14

09 Oct '14

commit 8daaea30f4141b4c5b19ef5bcf362969542ee21f Merge: f52b2a0 bbc88ab Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 23:53:50 2014 -0700 Merge remote-tracking branch 'brade/bug13016' into tor-browser-31.1.1esr-4.x-1 layout/style/nsComputedDOMStyle.cpp | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 09 Oct '14

09 Oct '14

commit f52b2a0e1b8aaa88b2c64b6dee7290dd92113d89 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 18:47:29 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #13346: disable "slow to start" warning. --- browser/app/profile/000-tor-browser.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0a16f35..e0eb834 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -12,6 +12,12 @@ pref("browser.startup.homepage_override.mstone", "ignore"); pref("startup.homepage_welcome_url", ""); pref("startup.homepage_override_url", ""); +// Disable "Slow startup" warnings and associated disk history +// (bug #13346) +pref("browser.slowStartup.notificationDisabled", true); +pref("browser.slowStartup.maxSamples", 0); +pref("browser.slowStartup.samples", 0); + // Disk activity: Disable Browsing History Storage pref("browser.privatebrowsing.autostart", true); pref("browser.cache.disk.enable", false);

1 0

[tor-browser-spec/master] Update network audit notes for gstreamer.
by mikeperry＠torproject.org 09 Oct '14

09 Oct '14

commit 59bc2593c5d30d8bc459710000dfd70250eda6b7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 18:39:57 2014 -0700 Update network audit notes for gstreamer. --- audits/FF31_NETWORK_AUDIT | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/audits/FF31_NETWORK_AUDIT b/audits/FF31_NETWORK_AUDIT index 9a8c84d..163a4e6 100644 --- a/audits/FF31_NETWORK_AUDIT +++ b/audits/FF31_NETWORK_AUDIT @@ -280,6 +280,9 @@ Misc XPCOM: + ./netwerk/protocol/ftp/nsFtpControlConnection.cpp: + ./dom/network/src/TCPSocket.js -- Gstreamer - - ./content/media/gstreamer/GStreamerDecoder.cpp - - ./content/media/DecoderTraits.cpp ++ Gstreamer + + ./content/media/gstreamer/GStreamerDecoder.cpp + + Uses ChannelMediaResource underneath, and ultimately an nsIChannel + - Only exception seems to be if an RtspMediaResource could be used, + but this appears to be FxOS-only. + - XXX: Note for FxOS tor support. This may be an issue.

1 0

[goptlib/master] Typos.
by dcf＠torproject.org 08 Oct '14

08 Oct '14

commit 99ea2c51f294fbd4cb016d96acde1b4288fc63e7 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 8 15:45:07 2014 -0700 Typos. --- pt_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_test.go b/pt_test.go index 983bf55..8cdf6da 100644 --- a/pt_test.go +++ b/pt_test.go @@ -806,13 +806,13 @@ func TestMakeStateDir(t *testing.T) { os.Setenv("TOR_PT_STATE_LOCATION", tempFile) _, err = MakeStateDir() if err == nil { - t.Errorf("MakeStateDir with a file unexpectedly succeded") + t.Errorf("MakeStateDir with a file unexpectedly succeeded") } // Directory name that cannot be created. (Subdir of a file) os.Setenv("TOR_PT_STATE_LOCATION", path.Join(tempFile, "subDir")) _, err = MakeStateDir() if err == nil { - t.Errorf("MakeStateDir with a subdirectory of a file unexpectedly succeded") + t.Errorf("MakeStateDir with a subdirectory of a file unexpectedly succeeded") } }

1 0

[goptlib/master] Test that escape doesn't modify strings without NL and '\x00'.
by dcf＠torproject.org 08 Oct '14

08 Oct '14

commit 1f47c1e30389fbf9e14d29deac1abcb30617d9ec Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 8 14:44:35 2014 -0700 Test that escape doesn't modify strings without NL and '\x00'. The problem here is double-escaping of backslashes, because backslash is used to escape SMETHOD ARGS, and the escape function is escaping them again. https://trac.torproject.org/projects/tor/ticket/12930#comment:3 --- pt_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pt_test.go b/pt_test.go index f104cb0..456313a 100644 --- a/pt_test.go +++ b/pt_test.go @@ -35,8 +35,11 @@ func TestEscape(t *testing.T) { check := func(input string) { output := escape(input) + if stringIsSafe(input) && input != output { + t.Errorf("escape(%q) → %q despite being safe", input, output) + } if !stringIsSafe(output) { - t.Errorf("escape(%q) → %q", input, output) + t.Errorf("escape(%q) → %q is not safe", input, output) } } for _, input := range tests {

1 0

[goptlib/master] Don't escape, just panic in formatline.
by dcf＠torproject.org 08 Oct '14

08 Oct '14

commit 5791268c391c9388d664c654e2278a50463c2c74 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 8 15:39:45 2014 -0700 Don't escape, just panic in formatline. Backslash escaping in formatline was conflicting with pt-spec.txt's specified backslash escaping for SMETHOD ARGS. https://trac.torproject.org/projects/tor/ticket/13370 Arguably we could just ignore any illegal bytes, but I made it panic in order to make any application bugs more obvious. --- pt.go | 56 +++++++++++++++++++++++++++++-------------- pt_test.go | 77 +++++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 86 insertions(+), 47 deletions(-) diff --git a/pt.go b/pt.go index 62dfc38..b02b9c2 100644 --- a/pt.go +++ b/pt.go @@ -201,35 +201,57 @@ func getenvRequired(key string) (string, error) { return value, nil } -// Escape a string so it contains no byte values over 127 and doesn't contain -// any of the characters '\x00' or '\n'. -func escape(s string) string { - var buf bytes.Buffer - for _, b := range []byte(s) { - if b == '\n' { - buf.WriteString("\\n") - } else if b == '\\' { - buf.WriteString("\\\\") - } else if 0 < b && b < 128 { - buf.WriteByte(b) - } else { - fmt.Fprintf(&buf, "\\x%02x", b) +// Returns true iff keyword contains only bytes allowed in a PT→Tor output line +// keyword. +// <KeywordChar> ::= <any US-ASCII alphanumeric, dash, and underscore> +func keywordIsSafe(keyword string) bool { + for _, b := range []byte(keyword) { + if b >= '0' && b <= '9' { + continue + } + if b >= 'A' && b <= 'Z' { + continue + } + if b >= 'a' && b <= 'z' { + continue } + if b == '-' || b == '_' { + continue + } + return false } - return buf.String() + return true +} + +// Returns true iff arg contains only bytes allowed in a PT→Tor output line arg. +// <ArgChar> ::= <any US-ASCII character but NUL or NL> +func argIsSafe(arg string) bool { + for _, b := range []byte(arg) { + if b >= '\x80' || b == '\x00' || b == '\n' { + return false + } + } + return true } func formatline(keyword string, v ...string) string { var buf bytes.Buffer + if !keywordIsSafe(keyword) { + panic(fmt.Sprintf("keyword %q contains forbidden bytes", keyword)) + } buf.WriteString(keyword) for _, x := range v { - buf.WriteString(" " + escape(x)) + if !argIsSafe(x) { + panic(fmt.Sprintf("arg %q contains forbidden bytes", x)) + } + buf.WriteString(" " + x) } return buf.String() } -// Print a pluggable transports protocol line to Stdout. The line consists of an -// unescaped keyword, followed by any number of escaped strings. +// Print a pluggable transports protocol line to Stdout. The line consists of a +// keyword followed by any number of space-separated arg strings. Panics if +// there are forbidden bytes in the keyword or the args (pt-spec.txt 2.2.1). func line(keyword string, v ...string) { fmt.Fprintln(Stdout, formatline(keyword, v...)) } diff --git a/pt_test.go b/pt_test.go index 456313a..983bf55 100644 --- a/pt_test.go +++ b/pt_test.go @@ -13,43 +13,60 @@ import ( "testing" ) -func stringIsSafe(s string) bool { - for _, c := range []byte(s) { - if c == '\x00' || c == '\n' || c > 127 { - return false +func TestKeywordIsSafe(t *testing.T) { + tests := [...]struct { + keyword string + expected bool + }{ + {"", true}, + {"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_", true}, + {"CMETHOD", true}, + {"CMETHOD:", false}, + {"a b c", false}, + {"CMETHOD\x7f", false}, + {"CMETHOD\x80", false}, + {"CMETHOD\x81", false}, + {"CMETHOD\xff", false}, + {"CMÉTHOD", false}, + } + + for _, input := range tests { + isSafe := keywordIsSafe(input.keyword) + if isSafe != input.expected { + t.Errorf("keywordIsSafe(%q) → %v (expected %v)", + input.keyword, isSafe, input.expected) } } - return true } -func TestEscape(t *testing.T) { - tests := [...]string{ - "", - "abc", - "a\nb", - "a\\b", - "ab\\", - "ab\\\n", - "ab\n\\", +func TestArgIsSafe(t *testing.T) { + tests := [...]struct { + arg string + expected bool + }{ + {"", true}, + {"abc", true}, + {"127.0.0.1:8000", true}, + {"étude", false}, + {"a\nb", false}, + {"a\\b", true}, + {"ab\\", true}, + {"ab\\\n", false}, + {"ab\n\\", false}, + {"abc\x7f", true}, + {"abc\x80", false}, + {"abc\x81", false}, + {"abc\xff", false}, + {"abc\xff", false}, + {"var=GVsbG8\\=", true}, } - check := func(input string) { - output := escape(input) - if stringIsSafe(input) && input != output { - t.Errorf("escape(%q) → %q despite being safe", input, output) - } - if !stringIsSafe(output) { - t.Errorf("escape(%q) → %q is not safe", input, output) - } - } for _, input := range tests { - check(input) - } - for b := 0; b < 256; b++ { - // check one-byte string with each byte value 0–255 - check(string([]byte{byte(b)})) - // check UTF-8 encoding of each character 0–255 - check(string(b)) + isSafe := argIsSafe(input.arg) + if isSafe != input.expected { + t.Errorf("argIsSafe(%q) → %v (expected %v)", + input.arg, isSafe, input.expected) + } } }

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 13356: symlinks missing after complete update.
by mikeperry＠torproject.org 08 Oct '14

08 Oct '14

commit 5630a27f53486655c14eae06276989f4e10632ef Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 7 17:17:08 2014 -0400 Bug 13356: symlinks missing after complete update. Include the symlink remove and add directives in the updatev2.manifest file that is used by 4.0-alpha-3 browsers (as well as in the updatev3.manifest file that is used by ESR31-based browsers). --- tools/update-packaging/common.sh | 4 +++- tools/update-packaging/make_full_update.sh | 4 ++-- tools/update-packaging/make_incremental_update.sh | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh index ecdc5dd..7f93a21 100755 --- a/tools/update-packaging/common.sh +++ b/tools/update-packaging/common.sh @@ -115,9 +115,11 @@ make_add_if_not_instruction() { make_addsymlink_instruction() { link="$1" target="$2" - filev3="$3" + filev2="$3" + filev3="$4" verbose_notice " addsymlink: $link -> $target" + echo "addsymlink \"$link\" \"$target\"" >> "$filev2" echo "addsymlink \"$link\" \"$target\"" >> "$filev3" } diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index 77c3de3..b5813f2 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -124,12 +124,12 @@ for ((i=0; $i<$num_files; i=$i+1)); do done notice "" -notice "Adding symlink add instructions to file 'updatev3.manifest'" +notice "Adding symlink add instructions to update manifests" num_symlinks=${#symlinks[*]} for ((i=0; $i<$num_symlinks; i=$i+1)); do link="${symlinks[$i]}" target="${symlink_targets[$i]}" - make_addsymlink_instruction "$link" "$target" "$updatemanifestv3" + make_addsymlink_instruction "$link" "$target" "$updatemanifestv2" "$updatemanifestv3" done # Append remove instructions for any dead files. diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index fb5313f..60c5a4b 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -249,11 +249,12 @@ done # Remove and re-add symlinks notice "" -notice "Adding symlink remove/add instructions to file 'updatev3.manifest'" +notice "Adding symlink remove/add instructions to update manifests" num_oldsymlinks=${#oldsymlinks[*]} for ((i=0; $i<$num_oldsymlinks; i=$i+1)); do link="${oldsymlinks[$i]}" verbose_notice " remove: $link" + echo "remove \"$link\"" >> "$updatemanifestv2" echo "remove \"$link\"" >> "$updatemanifestv3" done @@ -261,7 +262,7 @@ num_newsymlinks=${#newsymlinks[*]} for ((i=0; $i<$num_newsymlinks; i=$i+1)); do link="${newsymlinks[$i]}" target="${newsymlink_targets[$i]}" - make_addsymlink_instruction "$link" "$target" "$updatemanifestv3" + make_addsymlink_instruction "$link" "$target" "$updatemanifestv2" "$updatemanifestv3" done # Newly added files

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Merge remote-tracking branch 'brade/bug4234-esr31-fixup-01' into tor-browser-31.1.1esr-4.x-1
by mikeperry＠torproject.org 08 Oct '14

08 Oct '14

commit 30bdf17443a32c902f623af4de0736adb3976b25 Merge: 58b604e 5630a27 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 14:23:52 2014 -0700 Merge remote-tracking branch 'brade/bug4234-esr31-fixup-01' into tor-browser-31.1.1esr-4.x-1 tools/update-packaging/common.sh | 4 +++- tools/update-packaging/make_full_update.sh | 4 ++-- tools/update-packaging/make_incremental_update.sh | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-)

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 13025: Lie about screen orientation.
by mikeperry＠torproject.org 08 Oct '14

08 Oct '14

commit 58b604e6fc832bf4044c9ab951eba6cf9767ad67 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 7 11:37:12 2014 +0000 Bug 13025: Lie about screen orientation. In a non-chrome context we give 'landscape-primary' back if asked about the screen orientation. --- dom/base/nsScreen.cpp | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp index 76674da..7b80f8e 100644 --- a/dom/base/nsScreen.cpp +++ b/dom/base/nsScreen.cpp @@ -174,22 +174,26 @@ nsScreen::Notify(const hal::ScreenConfiguration& aConfiguration) void nsScreen::GetMozOrientation(nsString& aOrientation) { - switch (mOrientation) { - case eScreenOrientation_PortraitPrimary: - aOrientation.AssignLiteral("portrait-primary"); - break; - case eScreenOrientation_PortraitSecondary: - aOrientation.AssignLiteral("portrait-secondary"); - break; - case eScreenOrientation_LandscapePrimary: + if (!IsChrome()) { aOrientation.AssignLiteral("landscape-primary"); - break; - case eScreenOrientation_LandscapeSecondary: - aOrientation.AssignLiteral("landscape-secondary"); - break; - case eScreenOrientation_None: - default: - MOZ_CRASH("Unacceptable mOrientation value"); + } else { + switch (mOrientation) { + case eScreenOrientation_PortraitPrimary: + aOrientation.AssignLiteral("portrait-primary"); + break; + case eScreenOrientation_PortraitSecondary: + aOrientation.AssignLiteral("portrait-secondary"); + break; + case eScreenOrientation_LandscapePrimary: + aOrientation.AssignLiteral("landscape-primary"); + break; + case eScreenOrientation_LandscapeSecondary: + aOrientation.AssignLiteral("landscape-secondary"); + break; + case eScreenOrientation_None: + default: + MOZ_CRASH("Unacceptable mOrientation value"); + } } }

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 08 Oct '14

08 Oct '14

commit f162d6eba669034f6d2a2f4e1c4bec4596af9562 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 8 20:47:12 2014 +0000 Update translations for tor-and-https --- ug(a)Arab.po | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/ug(a)Arab.po b/ug(a)Arab.po new file mode 100644 index 0000000..11e9cc8 --- /dev/null +++ b/ug(a)Arab.po @@ -0,0 +1,135 @@ +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2014-07-17 14:23+0000\n" +"PO-Revision-Date: 2014-05-21 08:40+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Uighur (Arabic) (http://www.transifex.com/projects/p/torproject/language/ug@Arab/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ug@Arab\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. (itstool) path: C/tor-and-https.svg/svg@direction +#. (itstool) comment: C/tor-and-https.svg/svg@direction +#. Specify "ltr" for left-to-right languages or "rtl" for right-to-left +#. languages (e.g. Arabic or Hebrew). +#: C/tor-and-https.svg:3 +msgid "ltr" +msgstr "" + +#. (itstool) path: svg/title +#: C/tor-and-https.svg:14 +#, no-wrap +msgid "Tor and HTTPS" +msgstr "" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Site.com" +msgstr "" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "user / pw" +msgstr "" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "data" +msgstr "" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "location" +msgstr "" + +#. (itstool) path: defs/text +#. Keep it short: 3em max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "WiFi" +msgstr "" + +#. (itstool) path: defs/text +#. Keep it short: 4em max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "ISP" +msgstr "" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Hacker" +msgstr "" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Lawyer" +msgstr "" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Sysadmin" +msgstr "" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Police" +msgstr "" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "NSA" +msgstr "" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Tor relay" +msgstr "" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Key" +msgstr "" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Internet connection" +msgstr "" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Eavesdropping" +msgstr "" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Data sharing" +msgstr ""

1 0