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

[snowflake/master] Bug 18628: Pass the client_ip parameter in the JavaScript proxy as well.
by dcf＠torproject.org 14 Oct '17

14 Oct '17

commit eca7ebb2652b0a1588e31799da77c1a312eb7287 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Aug 15 18:15:48 2017 -0700 Bug 18628: Pass the client_ip parameter in the JavaScript proxy as well. --- proxy/proxypair.coffee | 15 ++++++++++++++- proxy/websocket.coffee | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index 28696e2..2adbc23 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -93,7 +93,20 @@ class ProxyPair # Assumes WebRTC datachannel is connected. connectRelay: => dbg 'Connecting to relay...' - @relay = makeWebsocket @relayAddr + + # Get a remote IP address from the PeerConnection, if possible. Add it to + # the WebSocket URL's query string if available. + # MDN marks remoteDescription as "experimental". However the other two + # options, currentRemoteDescription and pendingRemoteDescription, which + # are not marked experimental, were undefined when I tried them in Firefox + # 52.2.0. + # https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/remoteDe… + peer_ip = Parse.ipFromSDP((a)pc.remoteDescription?.sdp) + params = [] + if peer_ip? + params.push(["client_ip", peer_ip]) + + @relay = makeWebsocket @relayAddr, params @relay.label = 'websocket-relay' @relay.onopen = => if @timer diff --git a/proxy/websocket.coffee b/proxy/websocket.coffee index a23f53d..5487df1 100644 --- a/proxy/websocket.coffee +++ b/proxy/websocket.coffee @@ -46,9 +46,9 @@ buildUrl = (scheme, host, port, path, params) -> parts.join '' -makeWebsocket = (addr) -> +makeWebsocket = (addr, params) -> wsProtocol = if WSS_ENABLED then 'wss' else 'ws' - url = buildUrl wsProtocol, addr.host, addr.port, '/' + url = buildUrl wsProtocol, addr.host, addr.port, '/', params ws = new WebSocket url ### 'User agents can use this as a hint for how to handle incoming binary data: if

1 0

[snowflake/master] Parse.ipFromSDP function.
by dcf＠torproject.org 14 Oct '17

14 Oct '17

commit 0c7ddeb1d0de1699109c85f82a4f3e1112793a90 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Aug 15 17:09:53 2017 -0700 Parse.ipFromSDP function. --- proxy/spec/util.spec.coffee | 111 ++++++++++++++++++++++++++++++++++++++++++++ proxy/util.coffee | 11 +++++ 2 files changed, 122 insertions(+) diff --git a/proxy/spec/util.spec.coffee b/proxy/spec/util.spec.coffee index 4e5ab45..1d99b04 100644 --- a/proxy/spec/util.spec.coffee +++ b/proxy/spec/util.spec.coffee @@ -90,6 +90,117 @@ describe 'Parse', -> expect Parse.address '[1:2::ffff:1.2.3.4]:4444' .toEqual { host: '1:2::ffff:1.2.3.4', port: 4444 } + describe 'ipFromSDP', -> + testCases = [ + # https://tools.ietf.org/html/rfc4566#section-5 + sdp: """ + v=0 + o=jdoe 2890844526 2890842807 IN IP4 10.47.16.5 + s=SDP Seminar + i=A Seminar on the session description protocol + u=http://www.example.com/seminars/sdp.pdf + e=j.doe(a)example.com (Jane Doe) + c=IN IP4 224.2.17.12/127 + t=2873397496 2873404696 + a=recvonly + m=audio 49170 RTP/AVP 0 + m=video 51372 RTP/AVP 99 + a=rtpmap:99 h263-1998/90000 + """ + expected: '224.2.17.12' + , + # Missing c= line + sdp: """ + v=0 + o=jdoe 2890844526 2890842807 IN IP4 10.47.16.5 + s=SDP Seminar + i=A Seminar on the session description protocol + u=http://www.example.com/seminars/sdp.pdf + e=j.doe(a)example.com (Jane Doe) + t=2873397496 2873404696 + a=recvonly + m=audio 49170 RTP/AVP 0 + m=video 51372 RTP/AVP 99 + a=rtpmap:99 h263-1998/90000 + """ + expected: undefined + , + # Single line, IP address only + sdp: "c=IN IP4 224.2.1.1\n" + expected: '224.2.1.1' + , + # Same, with TTL + sdp: "c=IN IP4 224.2.1.1/127\n" + expected: '224.2.1.1' + , + # Same, with TTL and multicast addresses + sdp: "c=IN IP4 224.2.1.1/127/3\n" + expected: '224.2.1.1' + , + # IPv6, address only + sdp: "c=IN IP6 FF15::101\n" + expected: 'ff15::101' + , + # Same, with multicast addresses + sdp: "c=IN IP6 FF15::101/3\n" + expected: 'ff15::101' + , + # Multiple c= lines + sdp: """ + c=IN IP4 1.2.3.4 + c=IN IP4 5.6.7.8 + """ + expected: '1.2.3.4' + , + # Modified from SDP sent by snowflake-client. + sdp: """ + v=0 + o=- 7860378660295630295 2 IN IP4 127.0.0.1 + s=- + t=0 0 + a=group:BUNDLE data + a=msid-semantic: WMS + m=application 54653 DTLS/SCTP 5000 + c=IN IP4 1.2.3.4 + a=candidate:3581707038 1 udp 2122260223 192.168.0.1 54653 typ host generation 0 network-id 1 network-cost 50 + a=candidate:2617212910 1 tcp 1518280447 192.168.0.1 59673 typ host tcptype passive generation 0 network-id 1 network-cost 50 + a=candidate:2082671819 1 udp 1686052607 1.2.3.4 54653 typ srflx raddr 192.168.0.1 rport 54653 generation 0 network-id 1 network-cost 50 + a=ice-ufrag:IBdf + a=ice-pwd:G3lTrrC9gmhQx481AowtkhYz + a=fingerprint:sha-256 53:F8:84:D9:3C:1F:A0:44:AA:D6:3C:65:80:D3:CB:6F:23:90:17:41:06:F9:9C:10:D8:48:4A:A8:B6:FA:14:A1 + a=setup:actpass + a=mid:data + a=sctpmap:5000 webrtc-datachannel 1024 + """ + expected: '1.2.3.4' + , + # Improper character within IPv4 + sdp: """ + c=IN IP4 224.2z.1.1 + """ + expected: undefined + , + # Improper character within IPv6 + sdp: """ + c=IN IP6 ff15:g::101 + """ + expected: undefined + , + # Bogus "IP7" addrtype + sdp: "c=IN IP7 1.2.3.4\n" + expected: undefined + ] + + it 'parses SDP', -> + for test in testCases + # https://tools.ietf.org/html/rfc4566#section-5: "The sequence # CRLF + # (0x0d0a) is used to end a record, although parsers SHOULD be tolerant + # and also accept records terminated with a single newline character." + # We represent the test cases with LF line endings for convenience, and + # test them both that way and with CRLF line endings. + expect(Parse.ipFromSDP(test.sdp)?.toLowerCase()).toEqual(test.expected) + expect(Parse.ipFromSDP(test.sdp.replace(/\n/, "\r\n"))?.toLowerCase()).toEqual(test.expected) + describe 'query string', -> it 'should parse correctly', -> expect Query.parse '' diff --git a/proxy/util.coffee b/proxy/util.coffee index 3e0a08c..3cb4ff6 100644 --- a/proxy/util.coffee +++ b/proxy/util.coffee @@ -112,6 +112,17 @@ Parse = return null if null == units count * Number(units) + # Parse a connection-address out of the "c=" Connection Data field of a session + # description. Return undefined if none is found. + # https://tools.ietf.org/html/rfc4566#section-5.7 + ipFromSDP: (sdp) -> + for pattern in [ + /^c=IN IP4 ([\d.]+)(?:(?:\/\d+)?\/\d+)?(:? |$)/m, + /^c=IN IP6 ([0-9A-Fa-f:.]+)(?:\/\d+)?(:? |$)/m, + ] + m = pattern.exec(sdp) + return m[1] if m? + Params = getBool: (query, param, defaultValue) ->

1 0

[snowflake/master] Pass the incoming client_ip into the ExtORPort.
by dcf＠torproject.org 14 Oct '17

14 Oct '17

commit 9e5eb7f5ee1c15122425ab4fe47fa6ad6ec75f92 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 14 14:57:53 2017 -0400 Pass the incoming client_ip into the ExtORPort. --- server/server.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/server/server.go b/server/server.go index 3e29a0b..562ccf8 100644 --- a/server/server.go +++ b/server/server.go @@ -139,10 +139,18 @@ func webSocketHandler(ws *websocket.WebSocket) { handlerChan <- -1 }() - // Pass an empty string for the client address. The remote address on - // the incoming connection reflects that of the browser proxy, not of - // the client. See https://bugs.torproject.org/18628. - or, err := pt.DialOr(&ptInfo, "", ptMethodName) + // Check if client addr is a valid IP + addr := ws.Request().URL.Query().Get("client_ip") + clientIP := net.ParseIP(addr) + + if clientIP == nil { + // Set client addr to empty + addr = "" + } + + // Pass the address of client as the remote address of incoming connection + or, err := pt.DialOr(&ptInfo, addr, ptMethodName) + if err != nil { log.Printf("failed to connect to ORPort: %s", err) return

1 0

[tor-messenger-build/master] Bug 23542: download tor-browser alpha
by arlo＠torproject.org 14 Oct '17

14 Oct '17

commit a9059897742431dd0b043e0402e8b83cb32afe9f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Oct 14 13:34:56 2017 -0400 Bug 23542: download tor-browser alpha --- projects/tor-browser-alpha/build | 3 --- projects/tor-browser-alpha/config | 34 ---------------------------------- projects/tor-browser/config | 5 +++++ projects/tor-messenger/config | 3 ++- 4 files changed, 7 insertions(+), 38 deletions(-) diff --git a/projects/tor-browser-alpha/build b/projects/tor-browser-alpha/build deleted file mode 100644 index a78518d..0000000 --- a/projects/tor-browser-alpha/build +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -cp -p [% c('input_files_by_name/torbrowser-alpha') %] [% dest_dir %]/[% c('filename') %] diff --git a/projects/tor-browser-alpha/config b/projects/tor-browser-alpha/config deleted file mode 100644 index d9dec20..0000000 --- a/projects/tor-browser-alpha/config +++ /dev/null @@ -1,34 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 7.5a5 -filename: 'tor-browser-alpha-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' - -input_files: - - URL: "[% c('var/base_url') %]/tor-browser-[% c('var/tb_osname') %]-[% c('version') %]_en-US.tar.xz" - name: torbrowser-alpha - file_gpg_id: 1 - sig_ext: asc - gpg_keyring: torbrowser.gpg - var: - base_url: "https://dist.torproject.org/torbrowser/[% c('version') %]" - targets: - windows-i686: - URL: "[% c('var/base_url') %]/torbrowser-install-[% c('version') %]_en-US.exe" - osx-x86_64: - URL: "[% c('var/base_url') %]/TorBrowser-[% c('version') %]-osx64_en-US.dmg" - -var: - extension: 'tar.xz' - -targets: - linux-x86_64: - var: - tb_osname: linux64 - linux-i686: - var: - tb_osname: linux32 - windows-i686: - var: - extension: 'exe' - osx-x86_64: - var: - extension: 'dmg' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index f2b40c8..fb92e8e 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -19,6 +19,11 @@ input_files: var: extension: 'tar.xz' +steps: + tor-browser-alpha: + tor-browser-alpha: '[% INCLUDE build %]' + version: 7.5a5 + targets: linux-x86_64: var: diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 2301270..92fc588 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -10,8 +10,9 @@ input_files: name: tor-launcher - project: tor-browser name: tor-browser - - project: tor-browser-alpha + - project: tor-browser name: tor-browser-alpha + pkg_type: tor-browser-alpha - project: bundle-data name: bundle-data - project: gcc

1 0

[tor-messenger-build/master] Update changelog for de4f50f
by arlo＠torproject.org 14 Oct '17

14 Oct '17

commit 2f3586099f39332f7d77b3fd7263a2c633a452f2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Oct 14 13:29:54 2017 -0400 Update changelog for de4f50f --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 634af73..cb9d4ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ Tor Messenger 0.5.0b2 -- * Update tor-browser-build to 8c4c05d * Linux * Trac 23806: libotr.so and libgcrypt.so are using RPATH + * Trac 23542: Add snowflake pt + * Mac + * Trac 23542: Add snowflake pt Tor Messenger 0.5.0b1 -- September 28, 2017 * All Platforms

1 0

[tor-messenger-build/master] Some cleanup in tor-messenger/build*
by arlo＠torproject.org 14 Oct '17

14 Oct '17

commit c4f8bc7d46074f734223dccba4c1b360de10e858 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Oct 14 08:52:43 2017 -0400 Some cleanup in tor-messenger/build* --- projects/tor-messenger/build | 50 ++++++++++++++++++++-------------------- projects/tor-messenger/build.osx | 46 +++++++++++++++++++----------------- 2 files changed, 50 insertions(+), 46 deletions(-) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 2ae3953..cffd8a1 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -40,6 +40,8 @@ mv Bundle-Data/linux/* bundle/Browser/TorBrowser/ mv Bundle-Data/windows/* bundle/Browser/TorBrowser/ [% END -%] +cp cert_override.txt bundle/Browser/TorBrowser/Data/Browser/profile.default/ + [% IF c("var/linux") %] tar xf [% c('input_files_by_name/gcc') %] chmod 755 start-tor-messenger start-tor-messenger.desktop execdesktop @@ -53,33 +55,19 @@ mkdir -p bundle/Browser/lib cp -L gcc/lib[% c('arch') == 'x86_64' ? '64' : '' %]/libstdc++.so.6 bundle/Browser/lib/ [% END %] -cp cert_override.txt bundle/Browser/TorBrowser/Data/Browser/profile.default/ - -cd bundle/Browser/TorBrowser/Data/Browser/profile.default/ -mkdir extensions -cd extensions/ -tar xf ../../../../../../../[% c('input_files_by_name/ctypes-otr') %] -mv ctypes-otr* 'ctypes-otr@tormessenger' - -mkdir tor-launcher(a)torproject.org -7z x -y -otor-launcher(a)torproject.org ../../../../../../../[% c('input_files_by_name/tor-launcher') %] -cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ - tor-launcher(a)torproject.org/defaults/preferences/prefs.js - [% IF c("var/windows") -%] -7z x ../../../../../../../[% c('input_files_by_name/tor-browser') %] +7z x [% c('input_files_by_name/tor-browser') %] # The version of 7z (9.02) we are using for the builds creates redundant $PLUGINSDIR which we remove. rm -rf \$PLUGINSDIR Browser/\$PLUGINSDIR mv \$_OUTDIR tor-browser_en-US cp -pf tor-browser_en-US/Browser/libssp-0.dll tor-browser_en-US/Browser/TorBrowser/Tor/ - [% ELSE -%] -tar xf ../../../../../../../[% c('input_files_by_name/tor-browser') %] - +tar xf [% c('input_files_by_name/tor-browser') %] [% END -%] sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults +# meek [% IF c("var/windows") -%] # use meek in standalone mode: https://lists.torproject.org/pipermail/tor-dev/2015-November/009887.html sed -i 's/$ClientTransportPlugin meek exec$ [^ ]\+ [^ ]\+ -- /\1 /' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults @@ -90,20 +78,32 @@ sed -i 's/$ClientTransportPlugin meek exec$ [^ ]\+ -- /\1 /' tor-browser_en-US rm -f tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser [% END -%] -cd ../../../../../../ +mv tor-browser_en-US/Browser/TorBrowser/Tor bundle/Browser/TorBrowser/ +cp tor-browser_en-US/Browser/TorBrowser/Data/Tor/* bundle/Browser/TorBrowser/Data/Tor/ -mv Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-browser_en-US/Browser/TorBrowser/Tor Browser/TorBrowser/ -cp Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-browser_en-US/Browser/TorBrowser/Data/Tor/* Browser/TorBrowser/Data/Tor/ +# extensions +extdir=$rootdir/bundle/Browser/TorBrowser/Data/Browser/profile.default/extensions +mkdir -p $extdir -rm -Rf Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-browser_en-US +# tor-launcher +mkdir tor-launcher(a)torproject.org +7z x -y -otor-launcher(a)torproject.org [% c('input_files_by_name/tor-launcher') %] +cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ + tor-launcher(a)torproject.org/defaults/preferences/prefs.js +mv tor-launcher(a)torproject.org $extdir + +# ctypes-otr +mkdir ctypes-otr +cd ctypes-otr +tar xf ../[% c('input_files_by_name/ctypes-otr') %] +mv ctypes-otr* $extdir/ctypes-otr@tormessenger +cd .. # Recreate precomplete file (needs to be accurate for full MAR updates). -cd Browser +cd tor-browser_en-US/Browser rm -f precomplete python $MARTOOLS/createprecomplete.py -cd .. - -cd .. +cd ../.. mv bundle tor-messenger OUTDIR='[% dest_dir _ "/" _ c("filename") %]' diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 59ed644..317daa7 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -11,40 +11,44 @@ tar xf [% c('input_files_by_name/bundle-data') %] mkdir torbrowser cd torbrowser -mkdir tor-launcher(a)torproject.org -7z x -y -otor-launcher(a)torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] - -# FTE is disabled on OS X. See #13252. -sed -i '/default_bridge\.fte/d' $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js - -cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ - tor-launcher(a)torproject.org/defaults/preferences/prefs.js 7z x $rootdir/[% c('input_files_by_name/tor-browser') %] bsdtar xf '0.unknown partition' sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults +cd .. + +# meek # use meek in standalone mode: https://lists.torproject.org/pipermail/tor-dev/2015-November/009887.html -sed -i 's/$ClientTransportPlugin meek exec$ [^ ]\+ -- /\1 /' TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults +sed -i 's/$ClientTransportPlugin meek exec$ [^ ]\+ -- /\1 /' torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults +# Trac 17476: These files aren't being used because we're running meek in +# standalone mode above. Remove the bloat. +rm -Rf torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/Tor/PluggableTransports/template-profile.meek-http-helper/ +rm -f torbrowser/TorBrowser.app/Contents/MacOS/Tor/PluggableTransports/meek-client-torbrowser + +mkdir TorMessenger.app/TorBrowser/ +mv torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/ $rootdir/TorMessenger.app/Contents/Resources/ +mv torbrowser/TorBrowser.app/Contents/MacOS/Tor/ $rootdir/TorMessenger.app/Contents/MacOS/ -# trac 17476 -rm -Rf TorBrowser.app/Contents/Resources/TorBrowser/Tor/PluggableTransports/template-profile.meek-http-helper/ -rm -f TorBrowser.app/Contents/MacOS/Tor/PluggableTransports/meek-client-torbrowser +# extensions +extdir=$rootdir/TorMessenger.app/Contents/Resources/distribution/extensions +mkdir -p $extdir -mkdir -p $rootdir/TorMessenger.app/Contents/Resources/distribution/extensions/ -mv tor-launcher(a)torproject.org $rootdir/TorMessenger.app/Contents/Resources/distribution/extensions/ -cd .. +# tor-launcher +mkdir tor-launcher(a)torproject.org +7z x -y -otor-launcher(a)torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] +# FTE is disabled on OS X. See #13252. +sed -i '/default_bridge\.fte/d' $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js +cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ + tor-launcher(a)torproject.org/defaults/preferences/prefs.js +mv tor-launcher(a)torproject.org $extdir +# ctypes-otr mkdir ctypes-otr cd ctypes-otr tar xf $rootdir/[% c('input_files_by_name/ctypes-otr') %] -mv ctypes-otr* $rootdir/TorMessenger.app/Contents/Resources/distribution/extensions/ctypes-otr@tormessenger +mv ctypes-otr* $extdir/ctypes-otr@tormessenger cd .. -mkdir TorMessenger.app/TorBrowser/ -mv torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/ $rootdir/TorMessenger.app/Contents/Resources/ - -mv torbrowser/TorBrowser.app/Contents/MacOS/Tor/ $rootdir/TorMessenger.app/Contents/MacOS/ - # Adjust the Info.plist file INFO_PLIST=$rootdir/TorMessenger.app/Contents/Info.plist mv $INFO_PLIST tmp.plist

1 0

[tor-messenger-build/master] Trac 23542: Add snowflake pt
by arlo＠torproject.org 14 Oct '17

14 Oct '17

commit de4f50f02929b36f7ecdcb654e3dfe2b7e8ca5d2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Oct 14 08:53:55 2017 -0400 Trac 23542: Add snowflake pt --- projects/tor-browser-alpha/build | 3 +++ projects/tor-browser-alpha/config | 34 ++++++++++++++++++++++++++++++++++ projects/tor-messenger/build | 14 ++++++++++++++ projects/tor-messenger/build.osx | 13 +++++++++++++ projects/tor-messenger/config | 2 ++ 5 files changed, 66 insertions(+) diff --git a/projects/tor-browser-alpha/build b/projects/tor-browser-alpha/build new file mode 100644 index 0000000..a78518d --- /dev/null +++ b/projects/tor-browser-alpha/build @@ -0,0 +1,3 @@ +#!/bin/sh +set -e +cp -p [% c('input_files_by_name/torbrowser-alpha') %] [% dest_dir %]/[% c('filename') %] diff --git a/projects/tor-browser-alpha/config b/projects/tor-browser-alpha/config new file mode 100644 index 0000000..d9dec20 --- /dev/null +++ b/projects/tor-browser-alpha/config @@ -0,0 +1,34 @@ +# vim: filetype=yaml sw=2 +version: 7.5a5 +filename: 'tor-browser-alpha-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' + +input_files: + - URL: "[% c('var/base_url') %]/tor-browser-[% c('var/tb_osname') %]-[% c('version') %]_en-US.tar.xz" + name: torbrowser-alpha + file_gpg_id: 1 + sig_ext: asc + gpg_keyring: torbrowser.gpg + var: + base_url: "https://dist.torproject.org/torbrowser/[% c('version') %]" + targets: + windows-i686: + URL: "[% c('var/base_url') %]/torbrowser-install-[% c('version') %]_en-US.exe" + osx-x86_64: + URL: "[% c('var/base_url') %]/TorBrowser-[% c('version') %]-osx64_en-US.dmg" + +var: + extension: 'tar.xz' + +targets: + linux-x86_64: + var: + tb_osname: linux64 + linux-i686: + var: + tb_osname: linux32 + windows-i686: + var: + extension: 'exe' + osx-x86_64: + var: + extension: 'dmg' diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index cffd8a1..aa75f35 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -78,6 +78,20 @@ sed -i 's/$ClientTransportPlugin meek exec$ [^ ]\+ -- /\1 /' tor-browser_en-US rm -f tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser [% END -%] +# snowflake +[% IF c("var/linux") -%] +mkdir snowflake +cd snowflake +tar xf ../[% c('input_files_by_name/tor-browser-alpha') %] +cp tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/snowflake-client ../tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/snowflake-client +echo 'ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.com -ice stun:stun.l.google.com:19302' >> \ + ../tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults +# This needs to happen before "tor-launcher" below +echo 'pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");' >> \ + $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js +cd .. +[% END -%] + mv tor-browser_en-US/Browser/TorBrowser/Tor bundle/Browser/TorBrowser/ cp tor-browser_en-US/Browser/TorBrowser/Data/Tor/* bundle/Browser/TorBrowser/Data/Tor/ diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 317daa7..bc5970b 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -25,6 +25,19 @@ sed -i 's/$ClientTransportPlugin meek exec$ [^ ]\+ -- /\1 /' torbrowser/TorBro rm -Rf torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/Tor/PluggableTransports/template-profile.meek-http-helper/ rm -f torbrowser/TorBrowser.app/Contents/MacOS/Tor/PluggableTransports/meek-client-torbrowser +# snowflake +mkdir snowflake +cd snowflake +7z x $rootdir/[% c('input_files_by_name/tor-browser-alpha') %] +bsdtar xf '0.unknown partition' +cp TorBrowser.app/Contents/MacOS/Tor/PluggableTransports/snowflake-client ../torbrowser/TorBrowser.app/Contents/MacOS/Tor/PluggableTransports/snowflake-client +echo 'ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.com -ice stun:stun.l.google.com:19302' >> \ + ../torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults +# This needs to happen before "tor-launcher" below +echo 'pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");' >> \ + $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js +cd .. + mkdir TorMessenger.app/TorBrowser/ mv torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/ $rootdir/TorMessenger.app/Contents/Resources/ mv torbrowser/TorBrowser.app/Contents/MacOS/Tor/ $rootdir/TorMessenger.app/Contents/MacOS/ diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index ee2f401..2301270 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -10,6 +10,8 @@ input_files: name: tor-launcher - project: tor-browser name: tor-browser + - project: tor-browser-alpha + name: tor-browser-alpha - project: bundle-data name: bundle-data - project: gcc

1 0

[orbot/master] update target SDK to 23 so we don't have perm downgrade issues
by n8fr8＠torproject.org 14 Oct '17

14 Oct '17

commit 5b255df92d8ddffb2b6941e2f1be1efc0714e8a4 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 9 10:19:47 2017 -0400 update target SDK to 23 so we don't have perm downgrade issues --- app/build.gradle | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 883eafad..b7f031a4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,8 @@ android { minimalperm { minSdkVersion 16 applicationId 'org.torproject.android' - targetSdkVersion 22 - maxSdkVersion 22 + targetSdkVersion 23 + maxSdkVersion 23 versionCode 15420000 versionName '15.4.2-RC-1-multi-SDK16' } @@ -36,6 +36,11 @@ android { versionCode 15420001 versionName '15.4.2-RC-1-multi-SDK23' } + orbotgo { + minSdkVersion 16 + applicationId 'org.torproject.android.go' + targetSdkVersion 25 + } } }

1 0

[orbot/master] add copyright notice from Obfs4 in the LICENSE file
by n8fr8＠torproject.org 14 Oct '17

14 Oct '17

commit ebc362c4d7ace471174558eef437716386293da9 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Oct 11 23:24:35 2017 -0400 add copyright notice from Obfs4 in the LICENSE file --- LICENSE | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/LICENSE b/LICENSE index 7c98f549..be3f2a99 100644 --- a/LICENSE +++ b/LICENSE @@ -187,3 +187,34 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =============================================================================== + +=============================================================================== +Orbot includes the Obfs4 pluggable transport: +https://gitweb.torproject.org/pluggable-transports/obfs4.git + +Copyright (c) 2014, Yawning Angel <yawning at torproject dot org> +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +=============================================================================== +

1 0

[orbot/master] update license for better Obfs4proxy display
by n8fr8＠torproject.org 14 Oct '17

14 Oct '17

commit cc3c4514e86915e1bcd117510747e6da569f925d Author: n8fr8 <nathan(a)freitas.net> Date: Sat Oct 14 12:17:48 2017 -0400 update license for better Obfs4proxy display --- LICENSE | 66 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/LICENSE b/LICENSE index be3f2a99..81852dd0 100644 --- a/LICENSE +++ b/LICENSE @@ -42,6 +42,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***** + +=============================================================================== +Orbot includes the Obfs4 pluggable transport: +https://gitweb.torproject.org/pluggable-transports/obfs4.git + +Copyright (c) 2014, Yawning Angel <yawning at torproject dot org> +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +=============================================================================== + + +***** + +***** Orbot contains a binary distribution of Privoxy (http://www.privoxy.org/) Copyright © 2001-2010 by Privoxy Developers <ijbswa-developers(a)lists.sourceforge.net> http://www.privoxy.org/user-manual/copyright.html @@ -187,34 +222,3 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =============================================================================== - -=============================================================================== -Orbot includes the Obfs4 pluggable transport: -https://gitweb.torproject.org/pluggable-transports/obfs4.git - -Copyright (c) 2014, Yawning Angel <yawning at torproject dot org> -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. -=============================================================================== -

1 0