- tor-commits - lists.torproject.org

[metrics-web/master] Tell users when we don't have enough data to answer their request.
by karsten＠torproject.org 13 Jan '12

13 Jan '12

commit 7314596e198da7581eed449c80d688195b1ed5df Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 13 08:36:18 2012 +0100 Tell users when we don't have enough data to answer their request. Fixes #4895. --- .../torproject/ernie/web/RelaySearchServlet.java | 35 ++++++++++++++++++++ web/WEB-INF/relay-search.jsp | 3 ++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/web/RelaySearchServlet.java b/src/org/torproject/ernie/web/RelaySearchServlet.java index 512e25f..fe7e62b 100644 --- a/src/org/torproject/ernie/web/RelaySearchServlet.java +++ b/src/org/torproject/ernie/web/RelaySearchServlet.java @@ -52,6 +52,8 @@ public class RelaySearchServlet extends HttpServlet { private SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + private long minValidAfterMillis; + private DataSource ds; private Logger logger; @@ -74,6 +76,27 @@ public class RelaySearchServlet extends HttpServlet { } catch (NamingException e) { this.logger.log(Level.WARNING, "Could not look up data source", e); } + + /* Look up first consensus in the database. */ + try { + long requestedConnection = System.currentTimeMillis(); + Connection conn = this.ds.getConnection(); + String query = "SELECT MIN(validafter) AS first FROM consensus"; + Statement statement = conn.createStatement(); + ResultSet rs = statement.executeQuery(query); + if (rs.next()) { + this.minValidAfterMillis = rs.getTimestamp(1).getTime(); + } + rs.close(); + statement.close(); + conn.close(); + this.logger.info("Returned a database connection to the pool " + + "after " + (System.currentTimeMillis() + - requestedConnection) + " millis."); + } catch (SQLException e) { + this.logger.log(Level.WARNING, "Could not look up first consensus " + + "valid-after time in the database.", e); + } } public void doGet(HttpServletRequest request, @@ -304,6 +327,12 @@ public class RelaySearchServlet extends HttpServlet { boolean addOr = false; timeIntervalBuilder.append("AND ("); for (long searchTimestamp : searchDayTimestamps) { + if (searchTimestamp < this.minValidAfterMillis) { + request.setAttribute("outsideInterval", "Returned search " + + "results may be incomplete, as our data only dates back " + + "to " + dateTimeFormat.format(this.minValidAfterMillis) + + ". Older archives are not available."); + } timeIntervalBuilder.append((addOr ? "OR " : "") + "(validafter >= '" + dateTimeFormat.format(searchTimestamp) + "' AND " @@ -312,6 +341,12 @@ public class RelaySearchServlet extends HttpServlet { addOr = true; } for (long searchTimestamp : searchMonthTimestamps) { + if (searchTimestamp < this.minValidAfterMillis) { + request.setAttribute("outsideInterval", "Returned search " + + "results may be incomplete, as our data only dates back " + + "to " + dateTimeFormat.format(this.minValidAfterMillis) + + ". Older archives are not available."); + } Calendar firstOfNextMonth = Calendar.getInstance( TimeZone.getTimeZone("UTC")); firstOfNextMonth.setTimeInMillis(searchTimestamp); diff --git a/web/WEB-INF/relay-search.jsp b/web/WEB-INF/relay-search.jsp index 260b7dc..b90938a 100644 --- a/web/WEB-INF/relay-search.jsp +++ b/web/WEB-INF/relay-search.jsp @@ -39,6 +39,9 @@ (e.g., "80.190"). You can also provide at most three months or days in ISO 8601 format (e.g., "2010-09" or "2010-09-17"). </c:if> + <c:if test="${not empty outsideInterval}"> + ${outsideInterval} + </c:if> <c:if test="${not empty searchNotice}"> ${searchNotice} </c:if>

1 0

r25306: {website} update android orbot version. (website/trunk/include)
by Andrew Lewman 13 Jan '12

13 Jan '12

Author: phobos Date: 2012-01-13 00:30:29 +0000 (Fri, 13 Jan 2012) New Revision: 25306 Modified: website/trunk/include/versions.wmi Log: update android orbot version. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-01-12 16:23:59 UTC (rev 25305) +++ website/trunk/include/versions.wmi 2012-01-13 00:30:29 UTC (rev 25306) @@ -54,11 +54,11 @@ <define-tag version-vidalia-stable whitespace=delete>0.2.15</define-tag> -<define-tag version-androidbundle-tor whitespace=delete>0.2.3.7-alpha</define-tag> -<define-tag version-androidbundle-orbot whitespace=delete>1.0.6</define-tag> +<define-tag version-androidbundle-tor whitespace=delete>0.2.3.10-alpha</define-tag> +<define-tag version-androidbundle-orbot whitespace=delete>1.0.7-RC1</define-tag> <define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag> <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> -<define-tag package-androidbundle-alpha whitespace=delete>dist/android/Orbot-<version-androidbundle-orbot>-Tor-<version-androidbundle-tor>-FINAL.apk</define-tag> +<define-tag package-androidbundle-alpha whitespace=delete>dist/android/Orbot-<version-androidbundle-orbot>-Tor-<version-androidbundle-tor>.apk</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32-1.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32-1.exe</define-tag>

1 0

[orbot/master] updated core project files and build numbers
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 8b6133ff264e0a1c1315c189453aabd4cc80cf7a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:22:35 2012 -0500 updated core project files and build numbers --- .classpath | 2 +- AndroidManifest.xml | 2 +- default.properties | 14 -------------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.classpath b/.classpath index 1182977..9a448b2 100644 --- a/.classpath +++ b/.classpath @@ -5,5 +5,5 @@ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="lib" path="libs/jtorctrl.jar"/> <classpathentry kind="lib" path="libs/whispercore.jar"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="bin/classes"/> </classpath> diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 051c847..c6ce88e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <?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.7-alpha-orbot-1.0.7-ALPHA" android:versionCode="21"> + package="org.torproject.android" android:versionName="0.2.3.10-alpha-orbot-1.0.7-ALPHA" android:versionCode="22"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> diff --git a/default.properties b/default.properties deleted file mode 100644 index 08ad68f..0000000 --- a/default.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your -# project structure. - -# Indicates whether an apk should be generated for each density. -split.density=false -# Project target. -target=android-4 -apk-configurations=

1 0

[orbot/master] small changes to naming of iptables methods
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 2b1969fea075de5a3441c5394d1b6d0b61a60be3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:23:54 2012 -0500 small changes to naming of iptables methods --- .../android/service/TorBinaryInstaller.java | 18 ++++++++++++++++-- src/org/torproject/android/service/TorService.java | 8 ++++---- .../android/service/TorServiceUtils.java | 4 ++-- .../torproject/android/service/TorTransProxy.java | 9 ++++----- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index a3b1995..ff1e720 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -10,6 +10,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -65,7 +66,20 @@ public class TorBinaryInstaller implements TorServiceConstants { return true; } - + private static void copyAssetFile(Context ctx, String asset, File file) throws IOException, InterruptedException + { + + DataOutputStream out = new DataOutputStream(new FileOutputStream(file)); + InputStream is = new GZIPInputStream(ctx.getAssets().open(asset)); + + byte buf[] = new byte[8172]; + int len; + while ((len = is.read(buf)) > 0) { + out.write(buf, 0, len); + } + out.close(); + is.close(); + } /* * Write the inputstream contents to the file */ @@ -97,7 +111,7 @@ public class TorBinaryInstaller implements TorServiceConstants { } stmOut.close(); - + stm.close(); return true; diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 25d415b..df2990d 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -275,7 +275,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst showToolbarNotification (getString(R.string.status_disabled),NOTIFY_ID,R.drawable.tornotificationoff); sendCallbackStatusMessage(getString(R.string.status_disabled)); - clearTransparentProxy(); + disableTransparentProxy(); } catch (Exception e) { @@ -597,7 +597,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst * * the idea is that if Tor is off then transproxy is off */ - private boolean clearTransparentProxy () throws Exception + private boolean disableTransparentProxy () throws Exception { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); @@ -609,7 +609,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst TorService.logMessage ("Clearing TransProxy rules"); - TorTransProxy.purgeIptables(this); + TorTransProxy.flushIptables(this); showAlert(getString(R.string.status), getString(R.string.transproxy_rules_cleared)); @@ -1095,7 +1095,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - clearTransparentProxy(); + disableTransparentProxy(); enableTransparentProxy(); } catch (Exception e) diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 51d6378..fa27c58 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -24,13 +24,13 @@ public class TorServiceUtils implements TorServiceConstants { try { // Check if Superuser.apk exists - File file = new File("/system/app/Superuser.apk"); + //File file = new File("/system/app/Superuser.apk"); //Check for 'su' binary String[] cmd = {"which su"}; int exitCode = TorServiceUtils.doShellCommand(cmd, log, false, true); - if (file.exists() && exitCode == 0) { + if (exitCode == 0) { TorService.logMessage("Can acquire root permissions"); return true; diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 73dac7c..bf5fee2 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -13,7 +13,7 @@ public class TorTransProxy implements TorServiceConstants { private final static String TAG = TorConstants.TAG; - public static int purgeIptables(Context context) throws Exception { + public static int flushIptables(Context context) throws Exception { String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); @@ -21,7 +21,6 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - script.append(ipTablesPath); script.append(" -t nat"); @@ -177,7 +176,7 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - purgeIptables(context); + flushIptables(context); //build up array of shell cmds to execute under one root context for (int i = 0; i < apps.length; i++) @@ -276,7 +275,7 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - purgeIptables(context); + flushIptables(context); //TCP //iptables -t nat -A PREROUTING -i eth0 -p tcp --dport $srcPortNumber -j REDIRECT --to-port $dstPortNumbe @@ -375,7 +374,7 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - purgeIptables(context); + flushIptables(context); int torUid = context.getApplicationInfo().uid;

1 0

[orbot/master] removed tor and geoip binary
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit de440d398ea35b8f48db94c289bd691e9f23cbd2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:21:11 2012 -0500 removed tor and geoip binary --- res/raw/geoip.zip | Bin 966562 -> 0 bytes res/raw/tor.zip | Bin 1553272 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/geoip.zip b/res/raw/geoip.zip deleted file mode 100644 index e3f1d8f..0000000 Binary files a/res/raw/geoip.zip and /dev/null differ diff --git a/res/raw/tor.zip b/res/raw/tor.zip deleted file mode 100644 index 6ad8f33..0000000 Binary files a/res/raw/tor.zip and /dev/null differ

1 0

[orbot/master] updating project files
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit ce5a1c7d7f612ee5e432f30ed52602d543c9202a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:56:25 2012 -0500 updating project files --- AndroidManifest.xml | 2 -- project.properties | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c6ce88e..c8f2801 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -60,6 +60,4 @@ <uses-sdk android:minSdkVersion="4"/> - - </manifest> diff --git a/project.properties b/project.properties new file mode 100644 index 0000000..1960895 --- /dev/null +++ b/project.properties @@ -0,0 +1,14 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Indicates whether an apk should be generated for each density. +split.density=false +# Project target. +target=android-4 +apk-configurations=

1 0

[orbot/master] removing build files to see if that fixes CI
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 70d805d177ec76b93fd1460356e0b85f2d0852af Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 01:04:34 2012 -0500 removing build files to see if that fixes CI --- build.xml | 85 ---------------------------------------------------- project.properties | 14 -------- 2 files changed, 0 insertions(+), 99 deletions(-) diff --git a/build.xml b/build.xml deleted file mode 100644 index 8a95dfb..0000000 --- a/build.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="Orbot" default="help"> - -  - <loadproperties srcFile="local.properties" /> - -  - <property file="ant.properties" /> - -  - <loadproperties srcFile="project.properties" /> - -  - <fail - message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'" - unless="sdk.dir" - /> - - - - - -  -  - <import file="${sdk.dir}/tools/ant/build.xml" /> - -</project> diff --git a/project.properties b/project.properties deleted file mode 100644 index 1960895..0000000 --- a/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Indicates whether an apk should be generated for each density. -split.density=false -# Project target. -target=android-4 -apk-configurations=

1 0

[orbot/master] updated changelog
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 92029abb6ae7206153144c2f6852648166a317f3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:24:05 2012 -0500 updated changelog --- CHANGELOG | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2c6a339..94ccca6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,14 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +1.0.7 +- updated openssl to 1.0.0f to address recent SSLv3 threat +- check for root mode uses "which su" command and does not look for Superuser.apk +- changed tor binary res/raw storage mechanism to use the "mp3" file ext trick + +1.0.6.1 +- small fixes to wizard UI +- fixed "exit" problem, after running wizard + 1.0.6 - updated tablet layout graphic sizing - stopped Orweb from being transparent proxied (not needed)

1 0

[orbot/master] moved layout for high-res screens
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 369b043408c5f5fdf283defeb5d6e34950262b0a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 01:38:56 2012 -0500 moved layout for high-res screens --- res/layout-sw720dp/layout_main.xml | 55 ------------------------------------ res/layout-xlarge/layout_main.xml | 55 ++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/res/layout-sw720dp/layout_main.xml b/res/layout-sw720dp/layout_main.xml deleted file mode 100644 index ac19112..0000000 --- a/res/layout-sw720dp/layout_main.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@drawable/bgtitanium" android:orientation="vertical"> - - <RelativeLayout android:id="@+id/layoutHeaderMain" - android:layout_width="fill_parent" - android:layout_height="30dp" - android:layout_gravity="center_horizontal" - android:background="#A0909090"> - <ImageView android:id="@+id/radioModeImage" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="3px" - android:layout_marginRight="3px" - android:gravity="right" - android:layout_toRightOf="@+id/radioModeLabel" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:src="@drawable/tor25" - /> - <TextView android:id="@+id/radioModeText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="powered by The Tor Project " - android:layout_marginTop="8px" - android:layout_marginRight="0px" - android:gravity="right" - android:layout_toLeftOf="@+id/radioModeImage" - android:textColor="#cccccc" /> - </RelativeLayout> - - <ImageView - android:id="@+id/imgStatus" - android:layout_width="fill_parent" - android:layout_margin="15dip" - android:layout_height="400dp" - android:layout_gravity="center_horizontal" - android:src="@drawable/toroff" android:layout_weight="1"/> - - <TextView android:id="@+id/lblStatus" - android:text="@string/press_to_start" - android:layout_gravity="center_horizontal" - android:textStyle="bold" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - - android:textColor="#ffffff" - /> - - - -</LinearLayout> - diff --git a/res/layout-xlarge/layout_main.xml b/res/layout-xlarge/layout_main.xml new file mode 100644 index 0000000..ac19112 --- /dev/null +++ b/res/layout-xlarge/layout_main.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@drawable/bgtitanium" android:orientation="vertical"> + + <RelativeLayout android:id="@+id/layoutHeaderMain" + android:layout_width="fill_parent" + android:layout_height="30dp" + android:layout_gravity="center_horizontal" + android:background="#A0909090"> + <ImageView android:id="@+id/radioModeImage" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="3px" + android:layout_marginRight="3px" + android:gravity="right" + android:layout_toRightOf="@+id/radioModeLabel" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:src="@drawable/tor25" + /> + <TextView android:id="@+id/radioModeText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="powered by The Tor Project " + android:layout_marginTop="8px" + android:layout_marginRight="0px" + android:gravity="right" + android:layout_toLeftOf="@+id/radioModeImage" + android:textColor="#cccccc" /> + </RelativeLayout> + + <ImageView + android:id="@+id/imgStatus" + android:layout_width="fill_parent" + android:layout_margin="15dip" + android:layout_height="400dp" + android:layout_gravity="center_horizontal" + android:src="@drawable/toroff" android:layout_weight="1"/> + + <TextView android:id="@+id/lblStatus" + android:text="@string/press_to_start" + android:layout_gravity="center_horizontal" + android:textStyle="bold" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + + android:textColor="#ffffff" + /> + + + +</LinearLayout> +

1 0

[orbot/master] adding in binaries with .mp3 extensions for dev CI
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 1bdbf57ffabe08669a8c695902c0aea9aaa1f5dc Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:32:20 2012 -0500 adding in binaries with .mp3 extensions for dev CI --- res/raw/geoip.mp3 | Bin 0 -> 966562 bytes res/raw/tor.mp3 | Bin 0 -> 1637412 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/geoip.mp3 b/res/raw/geoip.mp3 new file mode 100644 index 0000000..e3f1d8f Binary files /dev/null and b/res/raw/geoip.mp3 differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 new file mode 100644 index 0000000..bc02210 Binary files /dev/null and b/res/raw/tor.mp3 differ

1 0