- tor-commits - lists.torproject.org

[flashproxy/master] Do an XMLHttpRequest facilitator request.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 568dd00403a10ed160c3f8a5e099a0f67e043e01 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 12 01:45:44 2012 -0700 Do an XMLHttpRequest facilitator request. --- flashproxy.js | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 49c033d..2052f5a 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -24,9 +24,8 @@ function FlashProxy() }; this.start = function() { - var fac_addr; - - this.puts("Hello world!"); + var fac_addr, fac_url; + var xhr; fac_addr = DEFAULT_FACILITATOR_ADDR; if (!fac_addr) { @@ -35,7 +34,32 @@ function FlashProxy() } this.puts("Using facilitator " + format_addr(fac_addr) + "."); - } + + fac_url = "http://" + encodeURIComponent(fac_addr.host) + + ":" + encodeURIComponent(fac_addr.port) + "/"; + xhr = new XMLHttpRequest(); + xhr.open("GET", fac_url); + xhr.responseType = "text"; + xhr.onreadystatechange = function() { + /* Status 0 is UNSENT. 4 is DONE. */ + if (xhr.status == 0 && xhr.statusText == null) { + this.puts("Facilitator: cross-domain error."); + } else if (xhr.readyState == 4) { + if (xhr.status == 200) + this.fac_complete(xhr.responseText); + else if (xhr.readyState == 4) + this.puts("Facilitator: got status " + xhr.status + "."); + else + this.puts("Facilitator: unknown error."); + } + }.bind(this); + this.puts("Facilitator: connecting to " + fac_url + "."); + xhr.send(null); + }; + + this.fac_complete = function(text) { + this.puts("Facilitator: got response \"" + text + "\"."); + }; } /* This is the non-functional badge that occupies space when

1 0

[flashproxy/js] Include flashproxy-reg-http.py in "make install".
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 228ddf88eed5f954eea64e724d9ff529e0f7b1b9 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 8 20:34:59 2012 -0700 Include flashproxy-reg-http.py in "make install". --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 94c5d1f..724325e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ all: install: mkdir -p $(BINDIR) - cp -f connector.py facilitator.py $(BINDIR) + cp -f connector.py facilitator.py flashproxy-reg-http.py $(BINDIR) clean: :

1 0

[flashproxy/js] Python 2.4–compatible sha1 import.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit bb9a328ffe0d8234ef6157585b9bee1d63e6107f Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 8 20:31:02 2012 -0700 Python 2.4–compatible sha1 import. --- connector.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/connector.py b/connector.py index d000a54..dad0071 100755 --- a/connector.py +++ b/connector.py @@ -4,7 +4,6 @@ import array import base64 import cStringIO import getopt -import hashlib import httplib import os import re @@ -19,6 +18,12 @@ import urllib import xml.sax.saxutils import BaseHTTPServer +try: + from hashlib import sha1 +except ImportError: + # Python 2.4 uses this name. + from sha import sha as sha1 + DEFAULT_REMOTE_ADDRESS = "0.0.0.0" DEFAULT_REMOTE_PORT = 9000 DEFAULT_LOCAL_ADDRESS = "127.0.0.1" @@ -502,7 +507,7 @@ def handle_websocket_request(fd): # 4.2.2, with the string "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", taking the # SHA-1 hash of this concatenated value to obtain a 20-byte value and # base64-encoding (see Section 4 of [RFC4648]) this 20-byte hash. - accept_key = base64.b64encode(hashlib.sha1(key + MAGIC_GUID).digest()) + accept_key = base64.b64encode(sha1(key + MAGIC_GUID).digest()) handler.send_header("Sec-WebSocket-Accept", accept_key) # 5. Optionally, a |Sec-WebSocket-Protocol| header field, with a value # /subprotocol/ as defined in step 4 in Section 4.2.2.

1 0

[orbot/master] extrnlz more strings; added ActionBar support
by n8fr8＠torproject.org 09 Apr '12

09 Apr '12

commit e3da83657bb93a7cb3bf692e87588d8fdfae12cc Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 27 06:50:35 2012 -0500 extrnlz more strings; added ActionBar support --- res/layout-land/layout_main.xml | 2 +- res/layout-xlarge/layout_main.xml | 2 +- res/layout/layout_main.xml | 2 +- res/layout/layout_settings.xml | 2 +- res/menu-v11/main.xml | 91 +++++++++++++++++++++++++++++++++++++ res/menu-v13/main.xml | 91 +++++++++++++++++++++++++++++++++++++ res/values/strings.xml | 3 +- 7 files changed, 188 insertions(+), 5 deletions(-) diff --git a/res/layout-land/layout_main.xml b/res/layout-land/layout_main.xml index 125f13c..e55fda5 100644 --- a/res/layout-land/layout_main.xml +++ b/res/layout-land/layout_main.xml @@ -23,7 +23,7 @@ <TextView android:id="@+id/radioModeText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="powered by The Tor Project " + android:text="@string/powered_by" android:layout_marginTop="8px" android:layout_marginRight="0px" android:gravity="right" diff --git a/res/layout-xlarge/layout_main.xml b/res/layout-xlarge/layout_main.xml index ac19112..6e89e2c 100644 --- a/res/layout-xlarge/layout_main.xml +++ b/res/layout-xlarge/layout_main.xml @@ -23,7 +23,7 @@ <TextView android:id="@+id/radioModeText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="powered by The Tor Project " + android:text="@string/powered_by" android:layout_marginTop="8px" android:layout_marginRight="0px" android:gravity="right" diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 674e103..6515156 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -26,7 +26,7 @@ <TextView android:id="@+id/radioModeText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="powered by The Tor Project " + android:text="@string/powered_by" android:layout_marginTop="8px" android:layout_marginRight="0px" android:gravity="right" diff --git a/res/layout/layout_settings.xml b/res/layout/layout_settings.xml index ccaa303..f9b6971 100644 --- a/res/layout/layout_settings.xml +++ b/res/layout/layout_settings.xml @@ -21,7 +21,7 @@ <Button android:id="@+id/btnSettingsSave" android:layout_width="fill_parent" android:layout_height="40px" - android:text="Save Settings" + android:text="@string/btn_save_settings" android:layout_margin="0sp" diff --git a/res/menu-v11/main.xml b/res/menu-v11/main.xml new file mode 100755 index 0000000..89b4d9e --- /dev/null +++ b/res/menu-v11/main.xml @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8"?> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:id="@+id/menu_start" + android:title="@string/menu_start" + android:icon="@drawable/menu_start" + android:showAsAction="ifRoom" + + /> + + <item android:id="@+id/menu_settings" + android:title="@string/menu_settings" + android:icon="@drawable/menu_settings" + android:showAsAction="always" + /> + + <item android:id="@+id/menu_verify" + android:title="@string/menu_verify" + android:icon="@drawable/ic_menu_check" + android:showAsAction="always" + + /> + + <item android:id="@+id/menu_about" + android:title="@string/menu_about" + android:icon="@drawable/ic_menu_about" + android:showAsAction="ifRoom" + + /> + + <item android:id="@+id/menu_wizard" + android:title="@string/menu_wizard" + android:icon="@drawable/ic_menu_goto" + android:showAsAction="ifRoom" + + /> + + <item android:id="@+id/menu_exit" + android:title="@string/menu_exit" + android:icon="@drawable/ic_menu_exit" + android:showAsAction="ifRoom" + + /> + +</menu> + diff --git a/res/menu-v13/main.xml b/res/menu-v13/main.xml new file mode 100755 index 0000000..89b4d9e --- /dev/null +++ b/res/menu-v13/main.xml @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8"?> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:id="@+id/menu_start" + android:title="@string/menu_start" + android:icon="@drawable/menu_start" + android:showAsAction="ifRoom" + + /> + + <item android:id="@+id/menu_settings" + android:title="@string/menu_settings" + android:icon="@drawable/menu_settings" + android:showAsAction="always" + /> + + <item android:id="@+id/menu_verify" + android:title="@string/menu_verify" + android:icon="@drawable/ic_menu_check" + android:showAsAction="always" + + /> + + <item android:id="@+id/menu_about" + android:title="@string/menu_about" + android:icon="@drawable/ic_menu_about" + android:showAsAction="ifRoom" + + /> + + <item android:id="@+id/menu_wizard" + android:title="@string/menu_wizard" + android:icon="@drawable/ic_menu_goto" + android:showAsAction="ifRoom" + + /> + + <item android:id="@+id/menu_exit" + android:title="@string/menu_exit" + android:icon="@drawable/ic_menu_exit" + android:showAsAction="ifRoom" + + /> + +</menu> + diff --git a/res/values/strings.xml b/res/values/strings.xml index 2e555c1..57a7fd9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -41,7 +41,6 @@ <string name="menu_verify">Check</string> <string name="menu_exit">Exit</string> -<string name="powered_by">powered by the Tor Project</string> <string name="press_to_start">- long press to start -</string> <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> @@ -266,4 +265,6 @@ <string name="wizard_locale_title">Choose Language</string> <string name="wizard_locale_msg">Leave default or switch the current language</string> +<string name="powered_by">powered by The Tor Project </string> +<string name="btn_save_settings">Save Settings</string> </resources>

1 0

[orbot/master] moving versioning to 1.0.8
by n8fr8＠torproject.org 09 Apr '12

09 Apr '12

commit a7320ea477198e7132c71156a626c66e03784124 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Apr 8 23:25:35 2012 -0400 moving versioning to 1.0.8 --- AndroidManifest.xml | 2 +- CHANGELOG | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2a806d2..8790d7f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.11-alpha-1.0.7.3-ALPHA-2" + android:versionName="0.2.3.11-alpha-1.0.8-RC1" android:versionCode="37" android:installLocation="auto" > diff --git a/CHANGELOG b/CHANGELOG index 95bd499..d3997ad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,11 +1,9 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ -1.0.7.3 +1.0.8 (includes 1.0.7.3 and 1.0.7.2) - fixed tor control port cookie file path lookup related to #5305 - updated strings - adding in manual locale selection - -1.0.7.2 - added obfsproxy binary to res/raw and binary installation process - added new preferences to support obfsproxy bridge configuration - upgraded tor binary to 0.2.3.11-alpha

1 0

[orbot/master] fixed issue with network conn on main thread
by n8fr8＠torproject.org 09 Apr '12

09 Apr '12

commit 82deb40dae2e95a74ef26b73f73b6efda662a47d Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 26 23:38:34 2012 -0500 fixed issue with network conn on main thread --- src/org/torproject/android/service/TorService.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 04e347e..ca803b5 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1127,8 +1127,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; initTorPaths(); - findExistingProc (); - + new Thread () + { + + public void run () + { + findExistingProc (); + } + }.start(); + if (ITorService.class.getName().equals(intent.getAction())) { return mBinder; }

1 0

[orbot/master] udpated build targets to v11
by n8fr8＠torproject.org 09 Apr '12

09 Apr '12

commit 1cb7ed5a6c315df92a8a2478a8f3e2e09a320916 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 27 06:50:54 2012 -0500 udpated build targets to v11 --- project.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/project.properties b/project.properties index f049142..8da376a 100644 --- a/project.properties +++ b/project.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-10 +target=android-15

1 0

[orbot/master] cleaned up tor control cookie file code for #5305
by n8fr8＠torproject.org 09 Apr '12

09 Apr '12

commit d11a6c6f752d70d3c644eda0f8c7b9fc4e80829f Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Apr 8 23:22:54 2012 -0400 cleaned up tor control cookie file code for #5305 --- CHANGELOG | 2 ++ src/org/torproject/android/service/TorService.java | 7 ++----- .../torproject/android/settings/AppManager.java | 4 ++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index cb0d856..95bd499 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ + 1.0.7.3 +- fixed tor control port cookie file path lookup related to #5305 - updated strings - adding in manual locale selection diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index ca803b5..90ec393 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -869,18 +869,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn = TorControlConnection.getConnection(torConnSocket); // conn.authenticate(new byte[0]); // See section 3.2 - logNotice( "SUCCESS connected to control port"); - String torAuthCookie = new File(appCacheHome, TOR_CONTROL_COOKIE).getAbsolutePath(); - - File fileCookie = new File(torAuthCookie); + File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); if (fileCookie.exists()) { byte[] cookie = new byte[(int)fileCookie.length()]; - new FileInputStream(new File(torAuthCookie)).read(cookie); + new FileInputStream(fileCookie).read(cookie); conn.authenticate(cookie); logNotice( "SUCCESS authenticated to control port"); diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index 16a6e7f..2e10ed7 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -202,6 +202,7 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC apps[appIdx] = new TorifiedApp(); + apps[appIdx].setEnabled(aInfo.enabled); apps[appIdx].setUid(aInfo.uid); apps[appIdx].setUsername(pMgr.getNameForUid(apps[appIdx].getUid())); @@ -280,5 +281,8 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC saveAppSettings(this); } + + + }

1 0

[stem/master] Replacing os.uname() calls with platform.system()
by atagar＠torproject.org 08 Apr '12

08 Apr '12

commit 0354e9e656655f33c04fd75ebcb45ff0f70959c6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 8 14:03:55 2012 -0700 Replacing os.uname() calls with platform.system() I was doing os detection by calling 'os.uname()' which has the unfortunate disadvantage of not functioning in Windows. The 'platform.system()' apparently does the same for our purposes but... well, works. Caught thanks to reganeet on... https://trac.torproject.org/projects/tor/ticket/5493 --- stem/util/proc.py | 3 ++- stem/util/system.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stem/util/proc.py b/stem/util/proc.py index e8e253d..7cf12bf 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -27,6 +27,7 @@ import sys import time import socket import base64 +import platform import stem.util.enum import stem.util.log as log @@ -53,7 +54,7 @@ def is_available(): global IS_PROC_AVAILABLE if IS_PROC_AVAILABLE == None: - if os.uname()[0] != "Linux": + if platform.system() != "Linux": IS_PROC_AVAILABLE = False else: # list of process independent proc paths we use diff --git a/stem/util/system.py b/stem/util/system.py index f8f128a..f54e346 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -54,7 +54,7 @@ def is_bsd(): bool to indicate if we're a BSD OS """ - return os.uname()[0] in ("Darwin", "FreeBSD", "OpenBSD") + return platform.system() in ("Darwin", "FreeBSD", "OpenBSD") def is_available(command, cached=True): """ @@ -481,7 +481,7 @@ def get_bsd_jail_id(pid): jid = ps_output[1].strip() if jid.isdigit(): return int(jid) - os_name = os.uname()[0] + os_name = platform.system() if os_name == "FreeBSD": log.warn("Unable to get the jail id for process %s." % pid) else:

1 0

[stem/master] Making system unit tests more platform independent
by atagar＠torproject.org 08 Apr '12

08 Apr '12

commit d9dc5babf533460975895cca1d6cde14dcea8e41 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 8 14:28:00 2012 -0700 Making system unit tests more platform independent On Windows the alternate path separator caused the unit tests for expand_path() to fail. Switching the expand_path() and is_relative_path() to not make any effort to work on Windows and fixing the test to be platform independent. In the future we should make these funtions work on Windows but this isn't vital at the moment and a pita due to its '[A-Z]:\\' prefixes (I really don't wanna do a regex just to check if a path is absolute...). --- stem/util/system.py | 42 ++++++++++++++++++++++++------------------ test/unit/util/system.py | 13 +++++++++++-- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index f54e346..16d1832 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -498,7 +498,10 @@ def is_relative_path(path): False otherwise """ - return path and not path.startswith("/") + if platform.system() == "Windows": + return False # TODO: implement + else: + return path and not path.startswith("/") def expand_path(path, cwd = None): """ @@ -515,26 +518,29 @@ def expand_path(path, cwd = None): str of the path expanded to be an absolute path """ - relative_path = path - - if not path or path[0] == "/": - # empty or already absolute - nothing to do - pass - elif path.startswith("~"): - # prefixed with a ~ or ~user entry - relative_path = os.path.expanduser(path) + if platform.system() == "Windows": + return path # TODO: implement else: - # relative path, expand with the cwd - if not cwd: cwd = os.getcwd() + relative_path = path - # we'll be dealing with both "my/path/" and "./my/path" entries, so - # cropping the later - if path.startswith("./"): path = path[2:] - elif path == ".": path = "" + if not path or path[0] == "/": + # empty or already absolute - nothing to do + pass + elif path.startswith("~"): + # prefixed with a ~ or ~user entry + relative_path = os.path.expanduser(path) + else: + # relative path, expand with the cwd + if not cwd: cwd = os.getcwd() + + # we'll be dealing with both "my/path/" and "./my/path" entries, so + # cropping the later + if path.startswith("./"): path = path[2:] + elif path == ".": path = "" + + relative_path = os.path.join(cwd, path) - relative_path = os.path.join(cwd, path) - - return relative_path.rstrip("/") + return relative_path.rstrip("/") def call(command, suppress_exc = True): """ diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 8ad63a0..b09dca7 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -5,6 +5,8 @@ these tests actually make system calls, use proc, or otherwise deal with the system running the tests. """ +import os +import platform import functools import unittest import stem.util.proc @@ -282,23 +284,28 @@ class TestSystem(unittest.TestCase): expected_response = 1 if test_input == "1111" else 0 self.assertEquals(expected_response, system.get_bsd_jail_id(test_input)) - def test_is_relative_path(self): + def test_is_relative_path_unix(self): """ Tests the is_relative_path function. """ + mocking.mock(platform.system, mocking.return_value("Linux")) self.assertTrue(system.is_relative_path("hello/world")) self.assertTrue(system.is_relative_path("~/hello/world")) self.assertTrue(system.is_relative_path("~user/hello/world")) self.assertFalse(system.is_relative_path("/tmp/hello/world")) - def test_expand_path(self): + def test_expand_path_unix(self): """ Tests the expand_path function. This does not exercise home directory expansions since that deals with our environment (that's left to integ tests). """ + mocking.mock(platform.system, mocking.return_value("Linux")) + original_path_sep = os.path.sep + os.path.sep = "/" + self.assertEquals("", system.expand_path("")) self.assertEquals("/tmp", system.expand_path("/tmp")) self.assertEquals("/tmp", system.expand_path("/tmp/")) @@ -306,4 +313,6 @@ class TestSystem(unittest.TestCase): self.assertEquals("/tmp", system.expand_path("./", "/tmp")) self.assertEquals("/tmp/foo", system.expand_path("foo", "/tmp")) self.assertEquals("/tmp/foo", system.expand_path("./foo", "/tmp")) + + os.path.sep = original_path_sep

1 0