February 2016 - tor-commits - lists.torproject.org

[tor/master] Bump version. (This is not yet the release.)
by nickm＠torproject.org 04 Feb '16

04 Feb '16

commit 5da517e6897c4b997bb165dfd11e95f8f9c2bbbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 4 10:07:06 2016 -0500 Bump version. (This is not yet the release.) --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6d2312d..1a78f41 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.8.0-alpha-dev]) +AC_INIT([tor],[0.2.8.1-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 2da4210..d5866aa 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.0-alpha-dev" +!define VERSION "0.2.8.1-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index c0b14e5..7c6159e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.0-alpha-dev" +#define VERSION "0.2.8.1-alpha"

1 0

[torspec/master] typo and clarification for proposal 249
by arma＠torproject.org 04 Feb '16

04 Feb '16

commit e46dbd41b168580b30545232fedcadc6435cac11 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 4 09:49:36 2016 -0500 typo and clarification for proposal 249 --- proposals/249-large-create-cells.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/proposals/249-large-create-cells.txt b/proposals/249-large-create-cells.txt index 69020cf..e04b4c0 100644 --- a/proposals/249-large-create-cells.txt +++ b/proposals/249-large-create-cells.txt @@ -37,7 +37,7 @@ Status: Draft }; struct created2v_cell_body { - /* Handshake replay length */ + /* Handshake reply length */ u16 hlen; /* Handshake reply data */ u8 hdata[hlen]; @@ -84,8 +84,10 @@ Status: Draft Note that this change leaks the size of the handshake being used to intermediate relays. We should analyze this and see whether it matters. - Clients MAY send RELAY_DROP cells during circuit construction in order to - hide the true size of their handshakes. + Clients and relays MAY send RELAY_DROP cells during circuit + construction in order to hide the true size of their handshakes + (but they can't send these drop cells inside a train of EXTEND2 or + EXTENDED2 cells for a given handshake). 5. Example

1 0

[torspec/master] grammar fixes on proposal 263
by arma＠torproject.org 04 Feb '16

04 Feb '16

commit 04b3871b5cc005d615065e638beb48da7a90e4e5 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 4 09:34:55 2016 -0500 grammar fixes on proposal 263 --- proposals/263-ntru-for-pq-handshake.txt | 39 +++++++++++++++++---------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/proposals/263-ntru-for-pq-handshake.txt b/proposals/263-ntru-for-pq-handshake.txt index e1bd700..149f0a4 100644 --- a/proposals/263-ntru-for-pq-handshake.txt +++ b/proposals/263-ntru-for-pq-handshake.txt @@ -17,8 +17,8 @@ Status: Open and a quantum-safe key encapsulation mechanism where - 0X0101 ntor+qsh -- refers this modular design, no specific KEM is - assigned. + 0X0101 ntor+qsh -- refers to this modular design; no specific Key + Encapsulation Mechanism (KEM) is assigned. 0X0101 ntor+ntru -- the quantum safe KEM is based on NTRUEncrypt, with parameter ntrueess443ep1 @@ -29,8 +29,8 @@ Status: Open 0X0103 ntor+rlwe -- the quantum safe KEM is based on ring learning with error encryption scheme; parameter not specified - DEPENDENCY: - Proposal 249: Allow CREATE cells with >505 bytes of handshake data + DEPENDENCY: + Proposal 249: Allow CREATE cells with >505 bytes of handshake data 1.1 Motivation: Quantum-safe forward-secure key agreement @@ -41,17 +41,17 @@ Status: Open key is compromised due to attackers with quantum-computing capabilities, the prior communication still remains secure. - Current approaches for handling key agreement, for instance, the ntor + Current approaches for handling key agreement, for instance the ntor handshake protocol, do not have this feature. ntor uses ECC, which will be broken when quantum computers become available. This allows the simple yet very effective harvest-then-decrypt attack, where an adversary with - significant storage capabilities harvests Tor handshakes now and decrypt + significant storage capabilities harvests Tor handshakes now and decrypts them in the future. The proposed handshake protocol achieves quantum-safe forward-secrecy and stops those attacks by introducing a secondary short-term pre-master secret - that is transported via a quantum-safe method. In the case where long-term - key is compromised via quantum algorithm, the attacker still need to recover + that is transported via a quantum-safe method. In the case where the long-term + key is compromised via quantum algorithm, the attacker still needs to recover the second pre-master secret to be able to decrypt the communication. 1.2 Motivation: Allowing plug & play for quantum-safe encryption algorithms @@ -104,7 +104,7 @@ Status: Open 2.1.2 General idea: When a client wishes to establish a one-way authenticated key K with a - server, through following steps a session key is established: + server, a session key is established through the following steps: 1) Establish a common secret E (classical cryptography, i.e., ECC) using a one-way authenticated key exchange protocol. #ntor currently uses this approach#; @@ -141,7 +141,7 @@ Status: Open * QSC_LENGTH = XXX length of QSE cipher * PROTOID = "ntor-curve25519-sha3-1-[qseid]" -#pre PORTOID = "ntor-curve25519-sha256-1" +#pre PROTOID = "ntor-curve25519-sha256-1" t_mac = PROTOID | ":mac" t_key = PROTOID | ":key_extract" @@ -176,7 +176,7 @@ Status: Open The client generates a temporary key pair: x, X = KEYGEN(); - an QSE temporary key pair: + and a QSE temporary key pair: * QSSK, QSPK = QSKEYGEN(); ================================================================================ @@ -190,7 +190,7 @@ Status: Open The server generates an ephemeral curve25519 keypair: y, Y = KEYGEN(); - a ephemeral "parallel" secret for encryption with QSE: + and an ephemeral "parallel" secret for encryption with QSE: * PAR_SEC P [H_LENGTH bytes] and computes: @@ -240,7 +240,7 @@ Status: Open The example uses the NTRU parameter set NTRU_EESS443EP1. This has keys and ciphertexts of length 610 bytes. This parameter set delivers 128 bits - classical security and quantum security. For 256 bits classcial and quantum + classical security and quantum security. For 256 bits classical and quantum security, use NTRU_EESS743EP1. We adjust the following parameters: @@ -269,15 +269,15 @@ Status: Open model can be found at https://eprint.iacr.org/2015/287. 3.3 Cryptographic hash function - The default hash function HMAC_SHA256 from Tor. This is suffice to provide + The default hash function HMAC_SHA256 from Tor suffices to provide desired security for the present day. However, to be more future proof, we - propose to use HMAC_SHA3 when Tor starts to migrant to SHA3. + propose to use HMAC_SHA3 when Tor starts to migrate to SHA3. 3.4 Key Encapsulation Mechanism The KEM in our protocol can be proved to be KEM-CCA-2 secure. 3.5 Quantum-safe Forward Secrecy - The quantum-safe forward secrecy is achieved. + Quantum-safe forward secrecy is achieved. 3.6 Quantum-safe authentication The proposed protocol is secure only until a quantum computer is developed @@ -291,9 +291,9 @@ Status: Open 4. Candidate quantum-safe encryption algorithms We do not propose any quantum-safe encryption algorithms in this proposal. - This documents focus on the hybrid design. The implementer should modularize - the protocol with appropriate interfaces that allows any quantum-safe - encryption algorithms to be used in this setting. + This document focuses on the hybrid design. The implementer should modularize + the protocol with appropriate interfaces that allow any quantum-safe + encryption algorithm to be used in this setting. Candidate quantum-safe encryption algorithms will be included in another proposal. This document will refer to the proposal when both proposals are @@ -306,3 +306,4 @@ Status: Open Theory of Cryptography Conference, 2005. http://link.springer.com/chapter/10.1007%2F978-3-540-30576-7_11 (conference version) or http://cs.nyu.edu/~dodis/ps/2enc.pdf (preprint) +

1 0

[tor-messenger-build/master] Add a patch for 17896
by arlo＠torproject.org 04 Feb '16

04 Feb '16

commit 9aca53a522c399d291b8e0ad81c06583792327db Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Feb 4 01:36:30 2016 -0800 Add a patch for 17896 * Add Edit menu to the conversation window on OS X --- ChangeLog | 2 + projects/instantbird/config | 1 + projects/instantbird/trac-17896.patch | 89 +++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/ChangeLog b/ChangeLog index 92f886b..0b2dba9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Tor Messenger -- * All Platforms * Bug 13795: Remove SPI root certificate because Debian no longer ships it * Bug 18094: Remove references to torbutton from start-tor-messenger script + * Mac + * Bug 17896: Add Edit menu to the conversation window on OS X Tor Messenger 0.1.0b4 -- November 22 2015 * All Platforms diff --git a/projects/instantbird/config b/projects/instantbird/config index 213e413..8471b82 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -72,6 +72,7 @@ input_files: - filename: xmpp-gtalk-resource.patch - filename: trac-17552.patch - filename: trac-16489.patch + - filename: trac-17896.patch - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch diff --git a/projects/instantbird/trac-17896.patch b/projects/instantbird/trac-17896.patch new file mode 100644 index 0000000..41781e1 --- /dev/null +++ b/projects/instantbird/trac-17896.patch @@ -0,0 +1,89 @@ +# HG changeset patch +# User aleth <aleth(a)instantbird.org> +# Date 1454183798 -3600 +# Sat Jan 30 20:56:38 2016 +0100 +# Node ID 6eac77f5536560efd9028d80faa8df716d20907a +# Parent bd360247708a91a220b79303b4c0f59be61520f9 +Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian + +Adding an edit menu also enables the emoji panel and dictation. + +diff --git a/im/content/instantbird.xul b/im/content/instantbird.xul +--- a/im/content/instantbird.xul ++++ b/im/content/instantbird.xul +@@ -43,17 +43,38 @@ + #else + <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/> + #endif + <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/> + <script type="application/javascript" src="chrome://instantbird/content/convZoom.js"/> + <script type="application/javascript" src="chrome://instantbird/content/nsContextMenu.js"/> + + #ifdef XP_MACOSX +-#include menus.xul.inc ++# As menus.xul.inc, but with an Edit menu. ++ <commandset id="maincommandset"/> ++ <keyset id="mainkeyset"/> ++ <menubar id="blistMenubar"> ++ <menu id="menu_edit"> ++ <menupopup id="menu_editpopup"> ++ <menuitem id="menu_undo"/> ++ <menuitem id="menu_redo"/> ++ <menuseparator/> ++ <menuitem id="menu_cut"/> ++ <menuitem id="menu_copy"/> ++ <menuitem id="menu_paste"/> ++ <menuitem id="menu_delete"/> ++ <menuseparator/> ++ <menuitem id="menu_selectAll"/> ++ <menuseparator/> ++ <menuitem id="menu_find"/> ++ <menuitem id="menu_findAgain"/> ++ </menupopup> ++ </menu> ++ </menubar> ++ <popupset id="mainPopupSet"/> + #endif + + <commandset id="conversationsCommands"> + <command id="cmd_newtab" oncommand="Conversations.showNewTab()"/> + <command id="cmd_close" oncommand="getTabBrowser().removeCurrentTab()"/> + <command id="cmd_putOnHold" + oncommand="var tabbrowser = getTabBrowser(); + if (!tabbrowser.selectedConversation) return; +diff --git a/im/content/menus.xul b/im/content/menus.xul +--- a/im/content/menus.xul ++++ b/im/content/menus.xul +@@ -38,17 +38,17 @@ + <key id="key_quitApplication" key="&quitApplicationCmdMac.key;" command="cmd_quitApplication" modifiers="accel"/> + <key id="joinChatkey" key="&joinChat.commandkey;" command="cmd_joinchat" modifiers="accel"/> + <key id="addBuddykey" key="&addContact.commandkey;" command="cmd_addbuddy" modifiers="accel"/> + <key id="newtabkey" key="&newtab.commandkey;" command="cmd_newtab" modifiers="accel"/> + <key id="addonskey" key="&addonManager.commandkey;" command="cmd_addons" modifiers="accel"/> + </keyset> + + <menubar id="blistMenubar"> +- <menu label="&file.menu;" id="fileMenu" accesskey="&file.accesskey;"> ++ <menu label="&file.menu;" id="fileMenu" accesskey="&file.accesskey;" insertbefore="menu_edit"> + <menupopup id="fileMenuPopup" onpopupshowing="menus.updateFileMenuitems();"> + <menuitem id="addBuddyMenuItem" label="&addContact;" command="cmd_addbuddy" key="addBuddykey" accesskey="&addContact.accesskey;"/> + <menuitem id="newTabMenuItem" label="&newtab;" command="cmd_newtab" key="newtabkey" accesskey="&newtab.accesskey;"/> + <menuitem id="joinChatMenuItem" label="&joinChat;" command="cmd_joinchat" key="joinChatkey" accesskey="&joinChat.accesskey;"/> + <menuseparator/> + <menu id="setStatusTo" label="&setStatusTo;" oncommand="menus.setStatus(event);" accesskey="&setStatusTo.accesskey;" > + <menupopup id="setStatusMenupopup">  + <menuitem id="statusAvailable" status="available" label="&available;" accesskey="&available.accesskey;" class="menuitem-iconic"/> +diff --git a/im/content/menus.xul.inc b/im/content/menus.xul.inc +--- a/im/content/menus.xul.inc ++++ b/im/content/menus.xul.inc +@@ -1,8 +1,10 @@ + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + ++# Note instantbird.xul contains a modified copy of this file that ++# should be kept in sync. + <commandset id="maincommandset"/> + <keyset id="mainkeyset"/> + <menubar id="blistMenubar"/> + <popupset id="mainPopupSet"/>

1 0

[tor-browser-bundle/maint-5.5] Preparing build3
by gk＠torproject.org 04 Feb '16

04 Feb '16

commit a80752763e5a3e5ae0a71a6c11bce10a6474ff69 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 4 09:23:29 2016 +0000 Preparing build3 --- Bundle-Data/Docs/ChangeLog.txt | 5 ++++- gitian/versions | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 286b370..525d2b3 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,10 +1,13 @@ Tor Browser 5.5.1 -- February 4 2016 * All Platforms * Bug 18168: Don't clear an iframe's window.name (fix of #16620) - * Bug 18172: Add Emoji support * Bug 18137: Add two new obfs4 default bridges * Windows * Bug 18169: Whitelist zh-CN UI font + * OS X + * Bug 18172: Add Emoji support + * Linux + * Bug 18172: Add Emoji support Tor Browser 5.5 -- January 26 2016 * All Platforms diff --git a/gitian/versions b/gitian/versions index a3e9f2f..26e8cd2 100755 --- a/gitian/versions +++ b/gitian/versions @@ -11,7 +11,7 @@ FIREFOX_VERSION=38.6.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build3 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.8 TORBUTTON_TAG=1.9.4.3

1 0

[tor-browser/tor-browser-38.6.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 04 Feb '16

04 Feb '16

commit 919b49a9cdf24a15cb8e637093555ef9bc396ac8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 4 09:15:10 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 18172: Back out the Windows related part as we need a better fix for it. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c022719..791e0d2 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -283,7 +283,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Segoe UI Emoji, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); +pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); #endif #ifdef XP_LINUX

1 0

[snowflake/master] Begin embeddable snowflake badge (issue #16)
by serene＠torproject.org 04 Feb '16

04 Feb '16

commit 7677707249ef92d51a6f00236158a4fad62201ea Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 3 20:28:31 2016 -0800 Begin embeddable snowflake badge (issue #16) --- proxy/Cakefile | 6 ++++++ proxy/proxypair.coffee | 4 ++-- proxy/snowflake.coffee | 21 ++++++++++++--------- proxy/static/embed.html | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 11 deletions(-) diff --git a/proxy/Cakefile b/proxy/Cakefile index 499de94..fa37ce1 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -33,6 +33,12 @@ task 'test', 'snowflake unit tests', -> throw err if err console.log stdout + stderr +# task 'build:embed', 'build the snowflake badge', -> + # exec 'mkdir -p build' + # concatCoffeeFiles() + # copyStaticFiles() + # compileCoffee() + task 'build', 'build the snowflake proxy', -> exec 'mkdir -p build' concatCoffeeFiles() diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index ca9dcca..ac65ac5 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -59,7 +59,7 @@ class ProxyPair channel.onopen = => log 'Data channel opened!' snowflake.state = MODE.WEBRTC_READY - $msglog.className = 'active'; + $msglog.className = 'active' if $msglog # This is the point when the WebRTC datachannel is done, so the next step # is to establish websocket to the server. @connectRelay() @@ -67,7 +67,7 @@ class ProxyPair log 'Data channel closed.' Status.set 'disconnected.' snowflake.state = MODE.INIT - $msglog.className = '' + $msglog.className = '' if $msglog # Change this for multiplexing. snowflake.reset() channel.onerror = -> log 'Data channel error!' diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 99a9698..b59c35a 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -232,19 +232,22 @@ log = (msg) -> # Log to the message window. # Status bar Status = - set: (msg) -> $status.innerHTML = 'Status: ' + msg + set: (msg) -> + $status.innerHTML = 'Status: ' + msg if $status init = -> - $status = document.getElementById('status') - $msglog = document.getElementById('msglog') - $msglog.value = '' + $badge = document.getElementById('badge') + if !badge + $status = document.getElementById('status') + $msglog = document.getElementById('msglog') + $msglog.value = '' - $send = document.getElementById('send') - $send.onclick = Interface.acceptInput + $send = document.getElementById('send') + $send.onclick = Interface.acceptInput - $input = document.getElementById('input') - $input.focus() - $input.onkeydown = (e) -> $send.onclick() if 13 == e.keyCode # enter + $input = document.getElementById('input') + $input.focus() + $input.onkeydown = (e) -> $send.onclick() if 13 == e.keyCode # enter log '== snowflake browser proxy ==' log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED diff --git a/proxy/static/embed.html b/proxy/static/embed.html new file mode 100644 index 0000000..ae361c6 --- /dev/null +++ b/proxy/static/embed.html @@ -0,0 +1,35 @@ +<!doctype html> +<html> +<head> + <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + <script type="text/javascript" src="snowflake.js"></script> + <style> + * { + box-sizing: border-box; + -webkit-transition: all 0.3s; + -moz-transition: all 0.3s; + transition: all 0.3s; + } + body { + position: absolute; + width: 100%; height: 100%; top: 0; margin: 0 auto; + background-color: #424; + color: #000; + text-align: center; + font-size: 16px; + font-variant: small-caps; + } + #badge { + margin: auto; + width: 88px; height: 31px; + background-image: url('koch.jpg'); + color: #fff; + } + </style> +</head> +<body> + <div id="badge"> + Snowflake + </div> +</body> +</html>

1 0

[snowflake/master] Move all DOM related stuff into ui.coffee
by serene＠torproject.org 04 Feb '16

04 Feb '16

commit caba2cc8f8600ce43c12822549c0e80b16688f6c Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 3 20:59:13 2016 -0800 Move all DOM related stuff into ui.coffee --- proxy/Cakefile | 9 ++------ proxy/proxypair.coffee | 8 +++---- proxy/snowflake.coffee | 61 +++++++++----------------------------------------- proxy/ui.coffee | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 62 deletions(-) diff --git a/proxy/Cakefile b/proxy/Cakefile index fa37ce1..fc92934 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -8,6 +8,7 @@ FILES = [ 'proxypair.coffee' 'websocket.coffee' 'broker.coffee' + 'ui.coffee' 'snowflake.coffee' ] FILES_TEST = [ @@ -33,12 +34,6 @@ task 'test', 'snowflake unit tests', -> throw err if err console.log stdout + stderr -# task 'build:embed', 'build the snowflake badge', -> - # exec 'mkdir -p build' - # concatCoffeeFiles() - # copyStaticFiles() - # compileCoffee() - task 'build', 'build the snowflake proxy', -> exec 'mkdir -p build' concatCoffeeFiles() @@ -54,4 +49,4 @@ task 'lint', 'ensure idiomatic coffeescript', -> task 'clean', 'remove all built files', -> exec 'rm -r build' - exec 'rm -r test' + exec 'rm -r test/snowflake.bundle.coffee' diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index ac65ac5..3c62d13 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -59,15 +59,15 @@ class ProxyPair channel.onopen = => log 'Data channel opened!' snowflake.state = MODE.WEBRTC_READY - $msglog.className = 'active' if $msglog + ui.setActive true # This is the point when the WebRTC datachannel is done, so the next step # is to establish websocket to the server. @connectRelay() channel.onclose = -> log 'Data channel closed.' - Status.set 'disconnected.' + ui.setStatus 'disconnected.' snowflake.state = MODE.INIT - $msglog.className = '' if $msglog + ui.setActive false # Change this for multiplexing. snowflake.reset() channel.onerror = -> log 'Data channel error!' @@ -80,7 +80,7 @@ class ProxyPair @relay.label = 'websocket-relay' @relay.onopen = => log '\nRelay ' + @relay.label + ' connected!' - Status.set 'connected' + ui.setStatus 'connected' @relay.onclose = @onClose @relay.onerror = @onError @relay.onmessage = @onRelayToClientMessage diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index b59c35a..60c2751 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -102,7 +102,7 @@ class Snowflake timer = null # Temporary countdown. countdown = (msg, sec) -> - Status.set msg + ' (Retrying in ' + sec + ' seconds...)' + ui.setStatus msg + ' (Retrying in ' + sec + ' seconds...)' sec-- if sec >= 0 setTimeout((-> countdown(msg, sec)), 1000) @@ -113,7 +113,7 @@ class Snowflake clearTimeout timer msg = 'polling for client... ' msg += '[retries: ' + @retries + ']' if @retries > 0 - Status.set msg + ui.setStatus msg recv = broker.getClientOffer() @retries++ recv.then (desc) => @@ -176,32 +176,8 @@ class Snowflake snowflake = null broker = null +ui = null -# -## -- DOM & Inputs -- # -# - -# DOM elements references. -$msglog = null -$send = null -$input = null -$status = null - -Interface = - # Local input from keyboard into message window. - acceptInput: -> - msg = $input.value - if !COPY_PASTE_ENABLED - log 'No input expected - Copy Paste Signalling disabled.' - else switch snowflake.state - when MODE.WEBRTC_CONNECTING - Signalling.receive msg - when MODE.WEBRTC_READY - log 'No input expected - WebRTC connected.' - else - log 'ERROR: ' + msg - $input.value = '' - $input.focus() # Signalling channel - just tells user to copy paste to the peer. # Eventually this should go over the broker. @@ -224,37 +200,20 @@ Signalling = return false snowflake.receiveOffer recv if desc -log = (msg) -> # Log to the message window. +# Log to both console and UI if applicable. +log = (msg) -> console.log msg - if $msglog # Scroll to latest - $msglog.value += msg + '\n' - $msglog.scrollTop = $msglog.scrollHeight - -# Status bar -Status = - set: (msg) -> - $status.innerHTML = 'Status: ' + msg if $status + ui.log msg init = -> - $badge = document.getElementById('badge') - if !badge - $status = document.getElementById('status') - $msglog = document.getElementById('msglog') - $msglog.value = '' - - $send = document.getElementById('send') - $send.onclick = Interface.acceptInput - - $input = document.getElementById('input') - $input.focus() - $input.onkeydown = (e) -> $send.onclick() if 13 == e.keyCode # enter - - log '== snowflake browser proxy ==' + ui = new UI() + log '== snowflake proxy ==' log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED brokerUrl = Params.getString(query, 'broker', DEFAULT_BROKER) broker = new Broker brokerUrl snowflake = new Snowflake(broker) - window.snowflake = snowflake + # window.snowflake = snowflake + # window.ui = ui relayAddr = Params.getAddress(query, 'relay', DEFAULT_RELAY) snowflake.setRelayAddr relayAddr diff --git a/proxy/ui.coffee b/proxy/ui.coffee new file mode 100644 index 0000000..eb54854 --- /dev/null +++ b/proxy/ui.coffee @@ -0,0 +1,61 @@ +### +All of Snowflake's DOM manipulation and inputs. +### + +class UI + debug = false # True when there's no badge + + # DOM elements references. + $msglog = null + $send = null + $input = null + $status = null + + constructor: -> + @$badge = document.getElementById('badge') + debug = !@$badge + return if !debug + + # Setup other DOM handlers if it's debug mode. + @$status = document.getElementById('status') + @$msglog = document.getElementById('msglog') + @$msglog.value = '' + + @$send = document.getElementById('send') + @$send.onclick = => { @acceptInput } + + @$input = document.getElementById('input') + @$input.focus() + @$input.onkeydown = (e) -> @$send.onclick() if 13 == e.keyCode # enter + + # Status bar + setStatus: (msg) => + return if !debug + @$status.innerHTML = 'Status: ' + msg + + setActive: (connected) => + if debug + @$msglog.className = if connected then 'active' else '' + else + # magic + + # Local input from keyboard into message window. + acceptInput: => + msg = @$input.value + if !COPY_PASTE_ENABLED + @log 'No input expected - Copy Paste Signalling disabled.' + else switch snowflake.state + when MODE.WEBRTC_CONNECTING + Signalling.receive msg + when MODE.WEBRTC_READY + @log 'No input expected - WebRTC connected.' + else + @log 'ERROR: ' + msg + @$input.value = '' + @$input.focus() + + log: (msg) => + return if !debug + # Scroll to latest + @$msglog.value += msg + '\n' + @$msglog.scrollTop = @$msglog.scrollHeight

1 0

[snowflake/master] Snowflake badge works, and animates when serving client (issue #16) and some logging cleanups
by serene＠torproject.org 04 Feb '16

04 Feb '16

commit 21c38a04ceac3cfa14dc932c979075c7b6cfbe76 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 3 21:37:21 2016 -0800 Snowflake badge works, and animates when serving client (issue #16) and some logging cleanups --- proxy/broker.coffee | 14 +++++++------- proxy/proxypair.coffee | 19 +++++++++---------- proxy/snowflake.coffee | 11 ++++++----- proxy/static/embed.html | 30 +++++++++++++++++++++--------- proxy/ui.coffee | 2 +- 5 files changed, 44 insertions(+), 32 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 0f5c4ab..2cc39f7 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -24,7 +24,7 @@ class Broker constructor: (@url) -> @clients = 0 @id = genSnowflakeID() - log 'Contacting Broker at ' + @url + '\nSnowflake ID: ' + @id + dbg 'Contacting Broker at ' + @url + '\nSnowflake ID: ' + @id # Ensure url has the right protocol + trailing slash. @url = 'https://' + @url if 0 != @url.indexOf('https://', 0) @url += '/' if '/' != @url.substr -1 @@ -61,8 +61,8 @@ class Broker xhr.send @id sendAnswer: (answer) -> - log @id + ' - Sending answer back to broker...\n' - log answer.sdp + dbg @id + ' - Sending answer back to broker...\n' + dbg answer.sdp xhr = new XMLHttpRequest() try xhr.open 'POST', @url + 'answer' @@ -74,12 +74,12 @@ class Broker return if xhr.DONE != xhr.readyState switch xhr.status when STATUS_OK - log 'Broker: Successfully replied with answer.' - log xhr.responseText + dbg 'Broker: Successfully replied with answer.' + dbg xhr.responseText when STATUS_GONE - log 'Broker: No longer valid to reply with answer.' + dbg 'Broker: No longer valid to reply with answer.' else - log 'Broker ERROR: Unexpected ' + xhr.status + + dbg 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText Status.set ' failure. Please refresh.' xhr.send JSON.stringify(answer) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index 3c62d13..83dc353 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -32,16 +32,15 @@ class ProxyPair if null == evt.candidate # TODO: Use a promise.all to tell Snowflake about all offers at once, # once multiple proxypairs are supported. - log 'Finished gathering ICE candidates.' + dbg 'Finished gathering ICE candidates.' if COPY_PASTE_ENABLED Signalling.send @pc.localDescription else snowflake.broker.sendAnswer @pc.localDescription # OnDataChannel triggered remotely from the client when connection succeeds. @pc.ondatachannel = (dc) => - console.log dc channel = dc.channel - log 'Data Channel established...' + dbg 'Data Channel established...' @prepareDataChannel channel @client = channel @@ -52,19 +51,19 @@ class ProxyPair catch e log 'Invalid SDP message.' return false - log 'SDP ' + offer.type + ' successfully received.' + dbg 'SDP ' + offer.type + ' successfully received.' true prepareDataChannel: (channel) => channel.onopen = => - log 'Data channel opened!' + log 'WebRTC DataChannel opened!' snowflake.state = MODE.WEBRTC_READY ui.setActive true # This is the point when the WebRTC datachannel is done, so the next step # is to establish websocket to the server. @connectRelay() channel.onclose = -> - log 'Data channel closed.' + log 'WebRTC DataChannel closed.' ui.setStatus 'disconnected.' snowflake.state = MODE.INIT ui.setActive false @@ -75,11 +74,11 @@ class ProxyPair # Assumes WebRTC datachannel is connected. connectRelay: => - log 'Connecting to relay...' + dbg 'Connecting to relay...' @relay = makeWebsocket @relayAddr @relay.label = 'websocket-relay' @relay.onopen = => - log '\nRelay ' + @relay.label + ' connected!' + log @relay.label + ' connected!' ui.setStatus 'connected' @relay.onclose = @onClose @relay.onerror = @onError @@ -106,13 +105,13 @@ class ProxyPair onClose: (event) => ws = event.target - log(ws.label + ': closed.') + log ws.label + ' closed.' @flush() @maybeCleanup() onError: (event) => ws = event.target - log ws.label + ': error.' + log ws.label + ' error.' @close() # we can't rely on onclose_callback to cleanup, since one common error # case is when the client fails to connect and the relay never starts. diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 60c2751..a0cce74 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -118,7 +118,7 @@ class Snowflake @retries++ recv.then (desc) => offer = JSON.parse desc - log 'Received:\n\n' + offer.sdp + '\n' + dbg 'Received:\n\n' + offer.sdp + '\n' @receiveOffer offer , (err) -> countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) @@ -133,7 +133,7 @@ class Snowflake sendAnswer: => next = (sdp) => - log 'webrtc: Answer ready.' + dbg 'webrtc: Answer ready.' @proxyPair.pc.setLocalDescription sdp promise = @proxyPair.pc.createAnswer next promise.then next if promise @@ -170,7 +170,7 @@ class Snowflake # Close all existing ProxyPairs and begin finding new clients from scratch. reset: -> @cease() - log '\nSnowflake resetting...' + log 'Snowflake resetting...' @retries = 0 @beginWebRTC() @@ -178,7 +178,6 @@ snowflake = null broker = null ui = null - # Signalling channel - just tells user to copy paste to the peer. # Eventually this should go over the broker. Signalling = @@ -202,9 +201,11 @@ Signalling = # Log to both console and UI if applicable. log = (msg) -> - console.log msg + console.log 'Snowflake: ' + msg ui.log msg +dbg = (msg) -> log msg if ui.debug + init = -> ui = new UI() log '== snowflake proxy ==' diff --git a/proxy/static/embed.html b/proxy/static/embed.html index ae361c6..c59809e 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -13,23 +13,35 @@ body { position: absolute; width: 100%; height: 100%; top: 0; margin: 0 auto; - background-color: #424; - color: #000; - text-align: center; - font-size: 16px; - font-variant: small-caps; + background-color: #424; color: #000; + font-size: 10px; letter-spacing: 1px; font-variant: small-caps; + text-align: center; cursor: default; + margin: 0; padding: 0; } #badge { - margin: auto; - width: 88px; height: 31px; + margin: auto; padding: 0; + width: 88px; height: 16px; background-image: url('koch.jpg'); - color: #fff; + text-shadow: 0 0 5px #fef; + font-weight: 900; + } + .active { + -webkit-animation: bgScroll 8s linear infinite; + animation: bgScroll 8s linear infinite; + } + @-webkit-keyframes bgScroll { + from {background-position: 49% -4%;} + to {background-position: 49% 104%;} + } + @keyframes bgScroll { + from {background-position: 49% -4%;} + to {background-position: 49% 104%;} } </style> </head> <body> <div id="badge"> - Snowflake + Internet Freedom </div> </body> </html> diff --git a/proxy/ui.coffee b/proxy/ui.coffee index eb54854..648a88e 100644 --- a/proxy/ui.coffee +++ b/proxy/ui.coffee @@ -37,7 +37,7 @@ class UI if debug @$msglog.className = if connected then 'active' else '' else - # magic + @$badge.className = if connected then 'active' else '' # Local input from keyboard into message window. acceptInput: =>

1 0

[tor/master] Revise some more changelog entries
by nickm＠torproject.org 04 Feb '16

04 Feb '16

commit 08788a81bc4ab3653e95bb8a7e727a28c53b7342 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 20:24:00 2016 -0500 Revise some more changelog entries --- ChangeLog | 31 +++++++++++++++++-------------- changes/bug17921_bug17984 | 4 ---- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44d4c88..7d55071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,26 +86,29 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? that have them. Closes ticket 13696. o Minor features (accounting): - - Added two modes to AccountingRule in torrc for limiting just the - number of bytes sent ("AccountingRule out") or the number of bytes + - Added two modes to the AccountingRule option: One for limiting only + the number of bytes sent ("AccountingRule out"), and one for + limiting only the number of bytes received ("AccountingRule in"). Closes ticket 15989; patch from "unixninja92". o Minor features (build): - - Since our build process now uses 'make distcheck', we no longer + - Since our build process now uses "make distcheck", we no longer force "make dist" to depend on "make check". Closes ticket 17893; patch from "cypherpunks." - - Repair some compilation issues with some recent (unreleased, - alpha) versions of OpenSSL 1.1. Closes ticket 17549. + - Tor now builds successfully with the recent OpenSSL 1.1 + development branch, and with the latest LibreSSL. Closes tickets + 17549, 17921, and 17984. o Minor features (controller): - - Adds FallbackDir entries to 'GETINFO config/defaults'. Closes + - Adds the FallbackDir entries to 'GETINFO config/defaults'. Closes tickets 16774 and 17817. Patch by George Tankersley. - - New "GETINFO hs/service/desc/id/" command to retrieve a hidden + - New 'GETINFO hs/service/desc/id/' command to retrieve a hidden service descriptor from a service's local hidden service descriptor cache. Closes ticket 14846. - - Add controller getinfo exit-policy/reject-private/[default,relay] - for the reject rules added by ExitPolicyRejectPrivate. This makes + - Add 'GETINFO exit-policy/reject-private/[default,relay]', so + controllers can examine the + the reject rules added by ExitPolicyRejectPrivate. This makes it easier for stem to display exit policies. o Minor features (crypto): @@ -113,20 +116,20 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? George Tankersley. - Add SHA3 and SHAKE support to crypto.c. Closes ticket 17783. - When allocating a digest state object, allocate no more space than - we actually need. Previously, we were allocating as much space as + we actually need. Previously, we would allocate as much space as the state for the largest algorithm would need. This change saves up to 672 bytes per circuit. Closes ticket 17796. - Improve performance when hashing non-multiple of 8 sized buffers, - based on Andrew Moon's Public Domain SipHash-2-4 implementation. + based on Andrew Moon's public domain SipHash-2-4 implementation. Fixes bug 17544; bugfix on 0.2.5.3-alpha. o Minor features (directory downloads): - - Wait for busy authorities and fallbacks to become non-busy when + - Wait for busy authorities and fallback directories to become non-busy when bootstrapping. (A similar change was made in 6c443e987d for - directory servers chosen from the consensus.) Closes ticket 17864; + directory caches chosen from the consensus.) Closes ticket 17864; patch by "teor". - Add UseDefaultFallbackDirs, which enables any hard-coded fallback - directory mirrors. Default is 1, set it to 0 to disable fallbacks. + directory mirrors. The default is 1; set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor". o Minor features (geoip): diff --git a/changes/bug17921_bug17984 b/changes/bug17921_bug17984 deleted file mode 100644 index f254e29..0000000 --- a/changes/bug17921_bug17984 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (compilation): - - Tor builds successfully with the unreleased OpenSSL 1.1 alpha - releases, and with the latest LibreSSL. Closes tickets 17921 and - 17984.

1 0