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

[flashproxy/master] Move max message size to a constant.
by dcf＠torproject.org 18 Jul '13

18 Jul '13

commit 176f87c99305ca3be5c5601d535a8bbe3f2cc35d Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 17 20:11:15 2013 -0700 Move max message size to a constant. --- websocket-transport/websocket-server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index 11e2daf..f5fed31 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -21,6 +21,8 @@ import ( const ptMethodName = "websocket" const requestTimeout = 10 * time.Second +// 16 kilobytes, possibly base64-encoded. +const maxMessageSize = 16*1024*4/3 + 1 var logFile = os.Stderr @@ -186,8 +188,7 @@ func startListener(addr *net.TCPAddr) (*net.TCPListener, error) { go func() { var config WebsocketConfig config.Subprotocols = []string{"base64"} - // 16 kilobytes, possibly base64-encoded. - config.MaxMessageSize = 16*1024*4/3 + 1 + config.MaxMessageSize = maxMessageSize s := &http.Server{ Handler: config.Handler(websocketHandler), ReadTimeout: requestTimeout,

1 0

[flashproxy/master] Increase maximum message size to 64 KB.
by dcf＠torproject.org 18 Jul '13

18 Jul '13

commit a0991bc1ba646bf74ab07532df36ad5271e8c86f Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 17 20:15:13 2013 -0700 Increase maximum message size to 64 KB. Testing obfs3-in-websocket was reliably failing at 50% bootstrapped with a message of about 30 KB. --- websocket-transport/websocket-server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index f5fed31..655cf7b 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -22,7 +22,7 @@ import ( const ptMethodName = "websocket" const requestTimeout = 10 * time.Second // 16 kilobytes, possibly base64-encoded. -const maxMessageSize = 16*1024*4/3 + 1 +const maxMessageSize = 64*1024*4/3 + 1 var logFile = os.Stderr

1 0

[orbot/master] updating tor binary version in constants to force upgrade
by n8fr8＠torproject.org 18 Jul '13

18 Jul '13

commit db49a5996dfae44411e6a6663123ac24613b79f8 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Oct 26 09:49:19 2012 +0530 updating tor binary version in constants to force upgrade --- src/org/torproject/android/service/TorServiceConstants.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 2fe07ae..dc6ea48 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -65,7 +65,6 @@ public interface TorServiceConstants { public final static String TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE = "Bootstrapped 100%"; public final static int STATUS_OFF = 0; - // public final static int STATUS_READY = 0; public final static int STATUS_ON = 1; public final static int STATUS_CONNECTING = 2; @@ -77,7 +76,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.3-alpha"; + public static final String BINARY_TOR_VERSION = "0.2.3.23-RC"; public static final String BINARY_PRIVOXY_VERSION = "3.0.12"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED";

1 0

[orbot/master] proper spelling of Farsi
by n8fr8＠torproject.org 18 Jul '13

18 Jul '13

commit e2bbe4cae6b4ee911ac3d74ccdf0f49af8435ade Author: n8fr8 <nathan(a)freitas.net> Date: Wed Nov 7 01:31:54 2012 +0530 proper spelling of Farsi --- res/values/arrays.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 85074e6..fb0a7c3 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -6,7 +6,7 @@ <item>Default</item> <item>English</item> <item>العربية</item> - <item>پارسی</item> + <item>فارسی</item> <item>中文(简体)</item> <item>Deutsche</item> <item>Español</item> @@ -41,4 +41,4 @@ </string-array> -</resources> \ No newline at end of file +</resources>

1 0

[orbot/master] v11 stable update
by n8fr8＠torproject.org 18 Jul '13

18 Jul '13

commit 2d9e6c04b6e0d19831b32925f7b43ab1191ca9f2 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Nov 7 01:30:16 2012 +0530 v11 stable update --- AndroidManifest.xml | 4 ++-- CHANGELOG | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c527198..0fa75da 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?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.23-rc-1.0.11-RC5-test2" - android:versionCode="51" + android:versionName="0.2.3.23-rc-1.0.11-RC6" + android:versionCode="52" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> diff --git a/CHANGELOG b/CHANGELOG index 15fa59a..d7ada10 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,8 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 1.0.11 -- Tor updated to 0.2.4.4-alpha +- Tor updated to 0.2.3.23-RC +- ActionBarSherlock updated to latest release - libevent2 on 2.2.1-alpha - added data up/down speed and totals display - added new "Log" SlideDrawer log display

1 0

[orbot/master] updated to 0.2.3.25
by n8fr8＠torproject.org 18 Jul '13

18 Jul '13

commit fb0a0fad34408c1cb5c0d7ef69f514461ff3be9a Author: n8fr8 <nathan(a)freitas.net> Date: Thu Feb 7 15:24:13 2013 +0700 updated to 0.2.3.25 --- external/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index fe3b95f..17c24b3 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit fe3b95f3596194276eac8d1644cec56263a0cf0e +Subproject commit 17c24b3118224d6536c41fa4e1493a831fb29f0a

1 0

[orbot/master] updated locale handling to stop flashing
by n8fr8＠torproject.org 18 Jul '13

18 Jul '13

commit 8023d16ce8ca9ca53858cc860c80437720b1cf76 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Feb 7 15:24:01 2013 +0700 updated locale handling to stop flashing --- AndroidManifest.xml | 9 +++++---- src/org/torproject/android/OrbotApp.java | 15 +++++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0fa75da..2df28d5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,22 +1,23 @@ <?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.23-rc-1.0.11-RC6" - android:versionCode="52" + android:versionName="0.2.3.25-1.0.12-alpha-1" + android:versionCode="53" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="15"/> + <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="17"/> + <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:configChanges="locale|orientation|screenSize" android:theme="@style/Theme.Sherlock" > - <activity android:name=".Orbot" android:configChanges="locale|orientation|screenSize"> + <activity android:name=".Orbot" android:configChanges="orientation|screenSize"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> diff --git a/src/org/torproject/android/OrbotApp.java b/src/org/torproject/android/OrbotApp.java index 66a1e9a..d470afb 100644 --- a/src/org/torproject/android/OrbotApp.java +++ b/src/org/torproject/android/OrbotApp.java @@ -35,10 +35,14 @@ public class OrbotApp extends Application implements TorConstants locale = new Locale(lang); Locale.setDefault(locale); - config.locale = locale; - getResources().updateConfiguration(config, getResources().getDisplayMetrics()); + + Configuration myConfig = new Configuration(config); + myConfig.locale = locale; + + getResources().updateConfiguration(myConfig, getResources().getDisplayMetrics()); } + } @Override @@ -51,9 +55,12 @@ public class OrbotApp extends Application implements TorConstants if (! "".equals(lang) && ! newConfig.locale.getLanguage().equals(lang)) { locale = new Locale(lang); - newConfig.locale = locale; Locale.setDefault(locale); - getResources().updateConfiguration(newConfig, getResources().getDisplayMetrics()); + + Configuration myConfig = new Configuration(newConfig); + myConfig.locale = locale; + + getResources().updateConfiguration(myConfig, getResources().getDisplayMetrics()); } } }

1 0

[orbot/master] adding new HS/onion based file sharing service
by n8fr8＠torproject.org 18 Jul '13

18 Jul '13

commit 216a41d89666c168a2422e037e93ed82b3f291ec Author: n8fr8 <nathan(a)freitas.net> Date: Tue Feb 12 14:05:20 2013 +0700 adding new HS/onion based file sharing service --- external/Makefile | 30 +++- external/simple.tar.gz | Bin 0 -> 1083375 bytes src/org/torproject/android/share/ShareItem.java | 10 ++ src/org/torproject/android/share/ShareService.java | 160 ++++++++++++++++++++ 4 files changed, 199 insertions(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index 300a465..45bdafa 100644 --- a/external/Makefile +++ b/external/Makefile @@ -245,6 +245,33 @@ privoxy-clean: -rm -rf privoxy #------------------------------------------------------------------------------# +# SimpleServer library # +simple/bin/simple.jar: + tar xzvf simple.tar.gz + mv simple-* simple + test -d simple/bin || mkdir simple/bin + cd simple/src && \ + javac -source 1.6 -target 1.6 org/simpleframework/http/core/ContainerServer.java -d ../bin + cd simple/src && \ + javac -source 1.6 -target 1.6 org/simpleframework/transport/connect/Connection.java -d ../bin + cd simple/src && \ + javac -source 1.6 -target 1.6 org/simpleframework/transport/connect/SocketConnection.java -d ../bin + cd simple/bin && \ + jar cvf simple.jar * + +simple-build-stamp: simple/bin/simple.jar + touch simple-build-stamp + +simple: simple-build-stamp + test -d bin || mkdir bin + cp simple/bin/simple.jar bin + +simple-clean: + - rm -f bin/simple.jar + - rm -f simple-build-stamp + - rm -rf simple + +#------------------------------------------------------------------------------# # JTorControl library jtorctl/bin/jtorctl.jar: @@ -270,12 +297,13 @@ jtorctl-clean: #in order to stop Android OS (older devices) from trying to compress/decompress it #this is related to a bug in compression of assets and resources > 1MB -assets: tor privoxy jtorctl obfsproxy +assets: tor privoxy jtorctl obfsproxy simple install -d ../res/raw install -d ../libs install bin/privoxy ../res/raw install bin/obfsproxy ../res/raw install bin/jtorctl.jar ../libs + install bin/simple.jar ../libs cd bin && \ zip ../../res/raw/tor.mp3 tor diff --git a/external/simple.tar.gz b/external/simple.tar.gz new file mode 100644 index 0000000..069956b Binary files /dev/null and b/external/simple.tar.gz differ diff --git a/src/org/torproject/android/share/ShareItem.java b/src/org/torproject/android/share/ShareItem.java new file mode 100644 index 0000000..06ec235 --- /dev/null +++ b/src/org/torproject/android/share/ShareItem.java @@ -0,0 +1,10 @@ +package org.torproject.android.share; + +import android.net.Uri; + +public class ShareItem { + + public String mContentType; + public long mContentLength; + public Uri mUriData; +} diff --git a/src/org/torproject/android/share/ShareService.java b/src/org/torproject/android/share/ShareService.java new file mode 100644 index 0000000..c34fe43 --- /dev/null +++ b/src/org/torproject/android/share/ShareService.java @@ -0,0 +1,160 @@ +package org.torproject.android.share; + +import java.io.BufferedOutputStream; +import java.io.InputStream; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.util.HashMap; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; + +import org.simpleframework.http.Path; +import org.simpleframework.http.Request; +import org.simpleframework.http.Response; +import org.simpleframework.http.core.Container; +import org.simpleframework.http.core.ContainerServer; +import org.simpleframework.transport.Server; +import org.simpleframework.transport.connect.Connection; +import org.simpleframework.transport.connect.SocketConnection; + +import android.content.ContentResolver; +import android.content.Context; +import android.content.res.AssetFileDescriptor; +import android.database.Cursor; +import android.provider.MediaStore; +import android.util.Log; + +public class ShareService implements Container { + + private final static String TAG = "OrbotShare"; + + public static class Task implements Runnable { + + private final Response response; + private final Request request; + + public Task(Request request, Response response) { + this.response = response; + this.request = request; + } + + public void run() { + try { + + Path path = request.getPath(); + String rPath = path.toString(); + if (rPath.length() > 0) + rPath = rPath.substring(1); + + ShareItem sItem = sShareItems.get(rPath); + + if (sItem != null) + { + + long time = System.currentTimeMillis(); + + response.setValue("Server", "OrbotShare/1.0 (Orbot 0.0.12-alpha)"); + response.setDate("Date", time); + response.setDate("Last-Modified", time); + response.setValue("Content-Type", sItem.mContentType); + + + ContentResolver cr = sContext.getContentResolver(); + InputStream is = cr.openInputStream(sItem.mUriData); + + AssetFileDescriptor fileDesc = cr.openAssetFileDescriptor(sItem.mUriData, "r"); + fileDesc.getLength(); + + response.setValue("Content-Length", fileDesc.getLength()+""); + + String fileName = rPath; + + String scheme = sItem.mUriData.getScheme(); + if (scheme.equals("file")) { + fileName = sItem.mUriData.getLastPathSegment(); + } + else if (scheme.equals("content")) { + String[] proj = { MediaStore.Images.Media.TITLE }; + Cursor cursor = cr.query(sItem.mUriData, proj, null, null, null); + if (cursor != null && cursor.getCount() != 0) { + int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.TITLE); + cursor.moveToFirst(); + fileName = cursor.getString(columnIndex); + } + } + + //force file to be downloaded + response.setValue("Content-Disposition","attachment; filename=" + fileName); + + BufferedOutputStream bos = new BufferedOutputStream(response.getOutputStream()); + + byte[] buffer = new byte[1024]; + int len = -1; + while ( (len = is.read(buffer)) != -1) + { + bos.write(buffer, 0, len); + } + + bos.flush(); + bos.close(); + } + else + { + response.setCode(404); + response.close(); + } + + } catch(Exception e) { + Log.e(TAG,"error handling request",e); + } + } + } + + public ShareService(int size, Context context) { + this.executor = Executors.newFixedThreadPool(size); + sContext = context; + } + + public void handle(Request request, Response response) { + Task task = new Task(request, response); + + executor.execute(task); + } + + + public void startService (int port) throws Exception { + + mServer = new ContainerServer(this); + mConnection = new SocketConnection(mServer); + SocketAddress address = new InetSocketAddress(port); + + mConnection.connect(address); + } + + public void stopService () throws Exception { + mConnection.close(); + } + + public synchronized String addShare (ShareItem sItem) + { + if (sShareItems == null) + { + sShareItems = new HashMap<String,ShareItem>(); + + } + + String guid = java.util.UUID.randomUUID().toString().substring(0,6);//short guid + + sShareItems.put (guid, sItem); + + return guid; + } + + private final Executor executor; + + private Server mServer; + private Connection mConnection; + + private static HashMap<String, ShareItem> sShareItems; + private static Context sContext; +} \ No newline at end of file

1 0

[orbot/master] added missing path to libevent include
by n8fr8＠torproject.org 18 Jul '13

18 Jul '13

commit 1748cb49e268e1ff2f0d716af3f6e8689f21628d Author: n8fr8 <nathan(a)freitas.net> Date: Tue Feb 12 13:44:09 2013 +0700 added missing path to libevent include --- external/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/external/Makefile b/external/Makefile index 4d3dd1d..300a465 100644 --- a/external/Makefile +++ b/external/Makefile @@ -109,10 +109,10 @@ libevent: openssl-static libevent-build-stamp test -d lib || mkdir lib test -d include || mkdir include cp libevent/.libs/libevent.a lib - cp -R libevent/include/* include + cp -R libevent/include/event2 include libevent-clean: - -rm -f include/*.h + -rm -f include/event2 -rm -f lib/libevent.a -rm -f libevent-build-stamp -cd libevent && \ @@ -153,7 +153,7 @@ tor/Makefile: tor/configure cp config.guess tor cd tor && \ CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" LDFLAGS="$(LDFLAGS)" \ - LIBS="-L$(EXTERNAL_ROOT)/lib" CFLAGS="-I$(EXTERNAL_ROOT)/include" \ + LIBS="-L$(EXTERNAL_ROOT)/lib" CFLAGS="-I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2" \ ./configure \ --host=$(HOST) \ --prefix=$(NDK_TOOLCHAIN) \ @@ -280,7 +280,6 @@ assets: tor privoxy jtorctl obfsproxy zip ../../res/raw/tor.mp3 tor assets-clean: - -rm ../res/raw/tor -rm ../res/raw/tor.mp3 -rm ../res/raw/privoxy -rm ../libs/*

1 0

[orbot/master] updated to latest jar libs
by n8fr8＠torproject.org 18 Jul '13

18 Jul '13

commit fe591d6f3c812cd1c1520f2736737286e2dc7569 Author: n8fr8 <nathan(a)freitas.net> Date: Tue Feb 12 14:07:02 2013 +0700 updated to latest jar libs --- libs/jtorctl.jar | Bin 14733 -> 14733 bytes libs/simple.jar | Bin 0 -> 199011 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar index 2203a09..0750695 100755 Binary files a/libs/jtorctl.jar and b/libs/jtorctl.jar differ diff --git a/libs/simple.jar b/libs/simple.jar new file mode 100755 index 0000000..440f753 Binary files /dev/null and b/libs/simple.jar differ

1 0