- tor-commits - lists.torproject.org

[orbot/master] update APT Pluggable Transport library to 1.0.7
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 1d45a3d28d548bac4b562df18fee4eef92688119 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Sep 10 00:22:38 2019 -0400 update APT Pluggable Transport library to 1.0.7 - this should fix one issue with installing the correct ofbs4proxy binary - also small changes to ensure no lock states and reduce log noise --- orbotservice/build.gradle | 8 +- .../android/service/TorEventHandler.java | 102 ++++++------- .../org/torproject/android/service/TorService.java | 166 ++++++++++----------- .../android/service/util/CustomNativeLoader.java | 4 +- .../android/service/vpn/OrbotVpnManager.java | 2 +- 5 files changed, 134 insertions(+), 148 deletions(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index bf3dc863..b2e3418c 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -14,7 +14,7 @@ android { minSdkVersion 16 targetSdkVersion 29 versionCode 16111000 - versionName '16.1.1-BETA-2-tor-0.4.0.4-rc-orbotservice' + versionName '16.1.1-BETA-2-tor-0.4.1-5-rc-orbotservice' archivesBaseName = "OrbotService-$versionName" } @@ -37,9 +37,9 @@ android { dependencies { - implementation 'org.torproject:tor-android-binary:0.4.0.4-rc' - implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.6' - implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.6' + implementation 'org.torproject:tor-android-binary:0.4.1.5-rc' + implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.7' + implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.7' implementation 'info.pluggabletransports.aptds:jsocksAndroid:1.0.4' implementation 'com.android.support:appcompat-v7:28.0.0' diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java index 15ec4bc0..ae2841d9 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java @@ -160,69 +160,65 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { if (mService.getCurrentStatus() == STATUS_STARTING && TextUtils.equals(status, "BUILT")) mService.sendCallbackStatus(STATUS_ON); - StringBuilder sb = new StringBuilder(); - sb.append("Circuit ("); - sb.append((circID)); - sb.append(") "); - sb.append(status); - sb.append(": "); - - StringTokenizer st = new StringTokenizer(path,","); - Node node = null; - - while (st.hasMoreTokens()) - { - String nodePath = st.nextToken(); - node = new Node(); + if (Prefs.useDebugLogging()) { + StringBuilder sb = new StringBuilder(); + sb.append("Circuit ("); + sb.append((circID)); + sb.append(") "); + sb.append(status); + sb.append(": "); + + StringTokenizer st = new StringTokenizer(path, ","); + Node node = null; + + while (st.hasMoreTokens()) { + String nodePath = st.nextToken(); + node = new Node(); + + String[] nodeParts; + + if (nodePath.contains("=")) + nodeParts = nodePath.split("="); + else + nodeParts = nodePath.split("~"); + + if (nodeParts.length == 1) { + node.id = nodeParts[0].substring(1); + node.name = node.id; + } else if (nodeParts.length == 2) { + node.id = nodeParts[0].substring(1); + node.name = nodeParts[1]; + } - String[] nodeParts; + node.status = status; - if (nodePath.contains("=")) - nodeParts = nodePath.split("="); - else - nodeParts = nodePath.split("~"); + sb.append(node.name); - if (nodeParts.length == 1) - { - node.id = nodeParts[0].substring(1); - node.name = node.id; + if (st.hasMoreTokens()) + sb.append(" > "); } - else if (nodeParts.length == 2) - { - node.id = nodeParts[0].substring(1); - node.name = nodeParts[1]; - } - node.status = status; + if (Prefs.useDebugLogging()) + mService.debug(sb.toString()); + else if (status.equals("BUILT")) + mService.logNotice(sb.toString()); + else if (status.equals("CLOSED")) + mService.logNotice(sb.toString()); - sb.append(node.name); + if (Prefs.expandedNotifications()) { + //get IP from last nodename + if (status.equals("BUILT")) { - if (st.hasMoreTokens()) - sb.append (" > "); - } - - if (Prefs.useDebugLogging()) - mService.debug(sb.toString()); - else if(status.equals("BUILT")) - mService.logNotice(sb.toString()); - else if (status.equals("CLOSED")) - mService.logNotice(sb.toString()); - - if (Prefs.expandedNotifications()) - { - //get IP from last nodename - if(status.equals("BUILT")){ - - // if (node.ipAddress == null) - // mService.exec(new ExternalIPFetcher(node)); + // if (node.ipAddress == null) + // mService.exec(new ExternalIPFetcher(node)); - hmBuiltNodes.put(circID, node); - } + hmBuiltNodes.put(circID, node); + } - if (status.equals("CLOSED")) - { - hmBuiltNodes.remove(circID); + if (status.equals("CLOSED")) { + hmBuiltNodes.remove(circID); + } } } diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 5b047143..a566b6d4 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -91,7 +91,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon public final static String BINARY_TOR_VERSION = org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION; private String mCurrentStatus = STATUS_OFF; - private final static int CONTROL_SOCKET_TIMEOUT = 0; + private final static int CONTROL_SOCKET_TIMEOUT = 60000; private TorControlConnection conn = null; private int mLastProcessId = -1; @@ -108,8 +108,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private ArrayList<String> configBuffer = null; private ArrayList<String> resetBuffer = null; - private boolean isTorUpgradeAndConfigComplete = false; - private File fileControlPort; private boolean mConnectivity = true; @@ -371,12 +369,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon public void run() { - while (!isTorUpgradeAndConfigComplete) - { - try { Thread.sleep (500);} - catch (Exception e){} - } - String action = mIntent.getAction(); if (action != null) { @@ -602,6 +594,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon fileObfsclient = new TransportManager() { @Override public void startTransportSync(TransportListener transportListener) { + } }.installTransport(this, OBFSCLIENT_ASSET_KEY); @@ -619,8 +612,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } private boolean torUpgradeAndConfig() throws IOException, TimeoutException { - if (isTorUpgradeAndConfigComplete) - return true; SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null); @@ -639,8 +630,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (!fileTorRc.exists()) return false; - isTorUpgradeAndConfigComplete = true; - return true; } @@ -732,8 +721,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { extraLines.append("Log debug syslog").append('\n'); extraLines.append("Log info syslog").append('\n'); - extraLines.append("SafeLogging 0").append('\n'); - + extraLines.append("SafeLogging 0").append('\n'); } extraLines = processSettingsImpl(extraLines); @@ -851,7 +839,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon // make sure there are no stray daemons running -// killAllDaemons(); + killAllDaemons(); SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null); @@ -859,8 +847,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon sendCallbackStatus(STATUS_STARTING); showToolbarNotification(getString(R.string.status_starting_up),NOTIFY_ID,R.drawable.ic_stat_tor); - sendCallbackLogMessage(getString(R.string.status_starting_up)); - logNotice(getString(R.string.status_starting_up)); + //sendCallbackLogMessage(getString(R.string.status_starting_up)); + //logNotice(getString(R.string.status_starting_up)); ArrayList<String> customEnv = new ArrayList<String>(); @@ -874,56 +862,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (success) { - // if (mPortHTTP != -1) - // runPolipoShellCmd(); - - // Tor is running, update new .onion names at db - ContentResolver mCR = getApplicationContext().getContentResolver(); - Cursor hidden_services = mCR.query(HS_CONTENT_URI, hsProjection, null, null, null); - if(hidden_services != null) { - try { - while (hidden_services.moveToNext()) { - String HSDomain = hidden_services.getString(hidden_services.getColumnIndex(HiddenService.DOMAIN)); - Integer HSLocalPort = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.PORT)); - Integer HSAuthCookie = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.AUTH_COOKIE)); - String HSAuthCookieValue = hidden_services.getString(hidden_services.getColumnIndex(HiddenService.AUTH_COOKIE_VALUE)); - - // Update only new domains or restored from backup with auth cookie - if ((HSDomain == null || HSDomain.length() < 1) || (HSAuthCookie == 1 && (HSAuthCookieValue == null || HSAuthCookieValue.length() < 1))) { - String hsDirPath = new File(mHSBasePath.getAbsolutePath(), "hs" + HSLocalPort).getCanonicalPath(); - File file = new File(hsDirPath, "hostname"); - - if (file.exists()) { - ContentValues fields = new ContentValues(); - - try { - String onionHostname = Utils.readString(new FileInputStream(file)).trim(); - if (HSAuthCookie == 1) { - String[] aux = onionHostname.split(" "); - onionHostname = aux[0]; - fields.put(HiddenService.AUTH_COOKIE_VALUE, aux[1]); - } - fields.put(HiddenService.DOMAIN, onionHostname); - mCR.update(HS_CONTENT_URI, fields, "port=" + HSLocalPort, null); - } catch (FileNotFoundException e) { - logException("unable to read onion hostname file", e); - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); - } - } else { - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); - - } - } - } - - } catch (NumberFormatException e) { - Log.e(OrbotConstants.TAG, "error parsing hsport", e); - } catch (Exception e) { - Log.e(OrbotConstants.TAG, "error starting share server", e); - } - - hidden_services.close(); - } + updateOnionNames (); } } catch (Exception e) { @@ -936,6 +875,57 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } } + private void updateOnionNames () + { + // Tor is running, update new .onion names at db + ContentResolver mCR = getApplicationContext().getContentResolver(); + Cursor hidden_services = mCR.query(HS_CONTENT_URI, hsProjection, null, null, null); + if(hidden_services != null) { + try { + while (hidden_services.moveToNext()) { + String HSDomain = hidden_services.getString(hidden_services.getColumnIndex(HiddenService.DOMAIN)); + Integer HSLocalPort = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.PORT)); + Integer HSAuthCookie = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.AUTH_COOKIE)); + String HSAuthCookieValue = hidden_services.getString(hidden_services.getColumnIndex(HiddenService.AUTH_COOKIE_VALUE)); + + // Update only new domains or restored from backup with auth cookie + if ((HSDomain == null || HSDomain.length() < 1) || (HSAuthCookie == 1 && (HSAuthCookieValue == null || HSAuthCookieValue.length() < 1))) { + String hsDirPath = new File(mHSBasePath.getAbsolutePath(), "hs" + HSLocalPort).getCanonicalPath(); + File file = new File(hsDirPath, "hostname"); + + if (file.exists()) { + ContentValues fields = new ContentValues(); + + try { + String onionHostname = Utils.readString(new FileInputStream(file)).trim(); + if (HSAuthCookie == 1) { + String[] aux = onionHostname.split(" "); + onionHostname = aux[0]; + fields.put(HiddenService.AUTH_COOKIE_VALUE, aux[1]); + } + fields.put(HiddenService.DOMAIN, onionHostname); + mCR.update(HS_CONTENT_URI, fields, "port=" + HSLocalPort, null); + } catch (FileNotFoundException e) { + logException("unable to read onion hostname file", e); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + } + } else { + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + + } + } + } + + } catch (NumberFormatException e) { + Log.e(OrbotConstants.TAG, "error parsing hsport", e); + } catch (Exception e) { + Log.e(OrbotConstants.TAG, "error starting share server", e); + } + + hidden_services.close(); + } + } + private boolean runTorShellCmd() throws Exception { boolean result = true; @@ -943,7 +933,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon File fileTorrcCustom = updateTorrcCustomFile(); //make sure Tor exists and we can execute it - if ((!fileTor.exists()) || (!fileTor.canExecute())) + if (fileTor == null || (!fileTor.exists()) || (!fileTor.canExecute())) return false; if ((!fileTorRc.exists()) || (!fileTorRc.canRead()) ) @@ -1052,7 +1042,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT); conn = new TorControlConnection(torConnSocket); - conn.launchThread(false);//is daemon + conn.launchThread(true);//is daemon break; } @@ -1089,9 +1079,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon logNotice( "SUCCESS - authenticated to control port."); sendCallbackLogMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); - - addEventHandler(); - + String torProcId = conn.getInfo("process/pid"); String confSocks = conn.getInfo("net/listeners/socks"); @@ -1127,6 +1115,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon sendCallbackPorts(mPortSOCKS, mPortHTTP, mPortDns, mPortTrans); + addEventHandler(); + return Integer.parseInt(torProcId); } @@ -1189,7 +1179,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return result; } - public synchronized void addEventHandler () throws Exception + public void addEventHandler () throws Exception { // We extend NullEventHandler so that we don't need to provide empty // implementations for all the events we don't care about. @@ -1199,9 +1189,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon conn.setEventHandler(mEventHandler); conn.setEvents(Arrays.asList(new String[]{ - "ORCONN", "CIRC", "NOTICE", "WARN", "ERR","BW"})); - // conn.setEvents(Arrays.asList(new String[]{ - // "DEBUG", "INFO", "NOTICE", "WARN", "ERR"})); + "ORCONN", "CIRC", "NOTICE", "WARN", "ERR","BW"})); logNotice( "SUCCESS added control port event handler"); } @@ -1625,34 +1613,34 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon //check if any PT bridges are needed if (obfs3Bridges) extraLines.append("ClientTransportPlugin obfs3 exec ") - .append(fileObfsclient.getCanonicalPath()).append('\n'); + .append(fileObfsclient.getAbsolutePath()).append('\n'); if (obfs4Bridges) extraLines.append("ClientTransportPlugin obfs4 exec ") - .append(fileObfsclient.getCanonicalPath()).append('\n'); + .append(fileObfsclient.getAbsolutePath()).append('\n'); if (meekBridges) extraLines.append("ClientTransportPlugin meek_lite exec " + fileObfsclient.getCanonicalPath()).append('\n'); if (bridgeList != null && bridgeList.length() > 5) //longer then 1 = some real values here { - String[] bridgeListLines = bridgeList.split("\\n"); + String[] bridgeListLines = bridgeList.trim().split("\\n"); + + int bridgeIdx = (int)Math.round(Math.random()*((double)bridgeListLines.length)); + String bridgeLine = bridgeListLines[bridgeIdx]; + extraLines.append("Bridge "); + extraLines.append(bridgeLine); + extraLines.append("\n"); + /** for (String bridgeConfigLine : bridgeListLines) { if (!TextUtils.isEmpty(bridgeConfigLine)) { extraLines.append("Bridge "); - extraLines.append(bridgeConfigLine); - - /** - StringTokenizer st = new StringTokenizer(bridgeConfigLine, " "); - while (st.hasMoreTokens()) - extraLines.append(st.nextToken()).append(' '); - **/ + extraLines.append(bridgeConfigLine.trim()); extraLines.append("\n"); - } - } + }**/ } else { diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java index e44340b4..24a994d5 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java @@ -26,7 +26,9 @@ public class CustomNativeLoader { zipFile = new ZipFile(context.getApplicationInfo().sourceDir); ZipEntry entry = zipFile.getEntry("lib/" + arch + "/" + libname + ".so"); if (entry == null) { - throw new Exception("Unable to find file in apk:" + "lib/" + arch + "/" + libname); + entry = zipFile.getEntry("jni/" + arch + "/" + libname + ".so"); + if (entry == null) + throw new Exception("Unable to find file in apk:" + "lib/" + arch + "/" + libname); } //how we wrap this in another stream because the native .so is zipped itself diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 03ad79c2..98de7bbb 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -341,7 +341,7 @@ public class OrbotVpnManager implements Handler.Callback { //start PDNSD daemon pointing to actual DNS int pdnsdPort = 8091; - startDNS(filePdnsd.getCanonicalPath(), localhost,mTorDns, virtualGateway, pdnsdPort); + startDNS(filePdnsd.getCanonicalPath(), localhost,mTorDns, virtualGateway, pdnsdPort); final boolean localDnsTransparentProxy = true; Tun2Socks.Start(mService, mInterface, VPN_MTU, virtualIP, virtualNetMask, localSocks , virtualGateway + ":" + pdnsdPort , localDnsTransparentProxy);

1 0

[orbot/master] update to 16.1.2-RC-1-tor-0.4.0.4-rc
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit efec61d2fcd441935a5d07f1c35d515ef6297fbb Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Sep 6 15:34:38 2019 -0400 update to 16.1.2-RC-1-tor-0.4.0.4-rc --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index da5c80ad..0e397815 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,8 +58,8 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 28 - versionCode 16111000 - versionName '16.1.1-BETA-2-tor-0.4.0.4-rc' + versionCode 16121000 + versionName '16.1.2-RC-1-tor-0.4.0.4-rc' archivesBaseName = "Orbot-$versionName" } }

1 0

[orbot/master] shorten the vi full description
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 2c3cc014cfc6ed8f7149c6b009469e81767e9cba Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Sep 10 09:29:11 2019 -0400 shorten the vi full description --- fastlane/metadata/android/vi/full_description.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/fastlane/metadata/android/vi/full_description.txt b/fastlane/metadata/android/vi/full_description.txt index 61d63817..958e5728 100644 --- a/fastlane/metadata/android/vi/full_description.txt +++ b/fastlane/metadata/android/vi/full_description.txt @@ -21,6 +21,3 @@ WEBSITE: https://GuardianProject.info TWITTER: https://twitter.com/guardianproject Mở mã nguồn: Orbot là phần mềm miễn phí. Hãy xem mã nguồn của chúng tôi, hoặc tham gia vào cộng đồng để làm cho nó tốt hơn: https://gitweb.torproject.org/orbot.git VỀ DỰ ÁN TOR: https://TorProject.org -THÔNG ĐIỆP : Có phải chúng ta thiếu tính năng yêu thích của bạn? Tìm thấy một lỗi gây phiền nhiễu? Chúng tôi muốn nghe từ bạn! Gửi email cho chúng tôi: root(a)guardianproject.info -Trợ giúp của chúng tôi MANG ORBOT quốc gia của bạn: Chúng tôi đang cố gắng để có được Orbot thành nhiều ngôn ngữ càng tốt. Ngay bây giờ nó trong -Nếu Orbot không có trong ngôn ngữ của bạn nhưng, chúng tôi rất muốn có bạn tham gia đội ngũ dịch thuật của chúng tôi: https://www.transifex.com/otf/orbot/

1 0

[orbot/master] disable tests for now in CI build
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit a9efc3c38d5a39e1b1d3bfc4f812d31ef63b15c7 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Sep 6 15:23:47 2019 -0400 disable tests for now in CI build --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ee99832..e1b5f0d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ before_script: stages: - build - - test +# - test #lintDebug: # stage: build @@ -38,8 +38,8 @@ assembleDebug: paths: - app/build/outputs/ -debugTests: - stage: test - script: - - ./gradlew -Pci --console=plain :app:testReleaseflavorDebugUnitTest +#debugTests: +# stage: test +# script: +# - ./gradlew -Pci --console=plain :app:testReleaseflavorDebugUnitTest

1 0

[orbot/master] shorten de-DE description as it is too long
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit eee8e7431dfbb3d1594e427b9907f18ed2e633ad Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Sep 10 09:20:00 2019 -0400 shorten de-DE description as it is too long --- fastlane/metadata/android/de-DE/full_description.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt index 3d52a746..dfec1a73 100644 --- a/fastlane/metadata/android/de-DE/full_description.txt +++ b/fastlane/metadata/android/de-DE/full_description.txt @@ -22,5 +22,4 @@ AUF TWITTER: https://twitter.com/guardianproject QUELLOFFEN: Orbot ist freie Software. Werfen Sie einen blick auf den Quellcode, oder schließen Sie sich der Gemeinschaft an um es zu verbessern: https://gitweb.torproject.org/orbot.git ÜBER TOR: https://TorProject.org UNS SCHREIBEN: Haben wir eine Funktion vergessen? Haben Sie einen Fehler gefunden? Wir würden uns freuen, von Ihnen zu hören! Senden Sie uns eine E-Mail an: root(a)guardianproject.info -HELFEN SIE UNS ORBOT IN IHR LAND ZU BRINGEN: Wir versuchen Orbot in so viele Sprachen wie möglich zu bringen. Derzeit gibt es folgende Sprachen: Arabic (العربية), Basque (Euskara), Bulgarian (български език), Chinese (中文简体), Czech (Čeština), Danish (Dansk), Dutch (Nederlands), English, Farsi (فارسی), French (Français), French (Français), German (Deutsch), Greek (Ελληνικά), Hebrew (עברית), Hungarian (Magyar Nyelv), Italian (Italiano), Japanese (日本語) Korean (조선말), Latvian (Latviešu), Malaysian (بهاس ملايو ), Polish (Polski), Portuguese (Português), Russian (Русский), Spanish (Español), Swedish (Svensk), and Vietnamese (Tiếng Việt). Falls Orbot derzeit nicht in ihrer Sprache verfügbar ist, freuen wir uns, wenn Sie sich unserer Übersetzergruppe anschließen: https://www.transifex.com/otf/orbot/

1 0

[orbot/master] update to 16.1.2-RC-2-tor-0.4.1.5-rc
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit c2e679d307b2d2372ff46da460174b470ea5089e Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Sep 10 00:24:17 2019 -0400 update to 16.1.2-RC-2-tor-0.4.1.5-rc --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0e397815..d2e485fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,8 +58,8 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 28 - versionCode 16121000 - versionName '16.1.2-RC-1-tor-0.4.0.4-rc' + versionCode 16123000 + versionName '16.1.2-RC-2-tor-0.4.1.5-rc' archivesBaseName = "Orbot-$versionName" } }

1 0

[orbot/master] add FUNDING.yml to display a sponsor button in GitHub
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 6bf442e3e72c653fb409a4f055aa7595dd72e5ba Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Mon Oct 7 23:18:55 2019 +0200 add FUNDING.yml to display a sponsor button in GitHub https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-rep… --- FUNDING.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/FUNDING.yml b/FUNDING.yml new file mode 100644 index 00000000..8ef6850c --- /dev/null +++ b/FUNDING.yml @@ -0,0 +1,4 @@ +liberapay: GuardianProject +patreon: guardianproject +github: + - eighthave

1 0

[orbot/master] more metadata edits
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 564c17d9c98ecd9b8c664827362e654b01fe942b Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Sep 10 09:45:01 2019 -0400 more metadata edits --- fastlane/metadata/android/en-US/full_description.txt | 2 -- fastlane/metadata/android/es-ES/full_description.txt | 2 -- fastlane/metadata/android/tr-TR/full_description.txt | 2 -- 3 files changed, 6 deletions(-) diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index bdfb3703..d56be037 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -9,8 +9,6 @@ On some devices, a Samsung app is listening on the same network port that Orbot Orbot is the only app that creates a truly private internet connection. As the New York Times writes, “when a communication arrives from Tor, you can never know where or whom it’s from.” Tor won the 2012 Electronic Frontier Foundation (EFF) Pioneer Award. ★ ACCEPT NO SUBSTITUTES: Orbot is the safest way to use the Internet on Android. Period. Orbot bounces your encrypted traffic several times through computers around the world, instead of connecting you directly like VPNs and proxies. This process takes a little longer, but the strongest privacy and identity protection available is worth the wait. -★ PRIVATE WEB SURFING: Use with Orfox, the most anonymous way to access any website, even if it’s normally blocked, monitored, or on the hidden web. Get Orfox: https://play.google.com/store/apps/details?id=info.guardianproject.orfox -★ PRIVATE CHAT MESSAGING: Use ChatSecure with Orbot to chat confidentially with anyone, anywhere for free. Get ChatSecure: https://goo.gl/O3FfS ★ PRIVACY FOR APPS: Any installed app can use Tor if it has a proxy feature, using the settings found here: https://goo.gl/2OA1y Use Orbot with Twitter, or try private web searching with DuckDuckGo: https://goo.gl/lgh1p ★ PRIVACY FOR EVERYONE: Tor can help you confidentially research a competitor, get around the Facebook block at school, or circumvent a firewall to watch sports at work. ★ PRIVACY MADE EASY: Check out our fun, interactive walkthrough: https://guardianproject.info/howto/browsefreely diff --git a/fastlane/metadata/android/es-ES/full_description.txt b/fastlane/metadata/android/es-ES/full_description.txt index b07891ff..5996c6c7 100644 --- a/fastlane/metadata/android/es-ES/full_description.txt +++ b/fastlane/metadata/android/es-ES/full_description.txt @@ -23,5 +23,3 @@ EN TWITTER: https://twitter.com/guardianproject CÓDIGO ABIERTO: Orweb es software libre. Puedes mirar el código fuente o ser parte de la comunidad y ayudar a mejorarlo: https://gitweb.torproject.org/orbot.git ACERCA DE TOR: https://TorProject.org CONTÁCTENOS: ¿Cree que deberíamos añadir una nueva función? ¿Encontró un error? ¡Por favor contáctenos! Envíenos un e-mail a support(a)guardianproject.info -AYÚDENOS A LLEVAR ORBOT A SU PAÍS: Estamos tratando de conseguir Orbot en tantos idiomas como sea posible. En este momento está en: Árabe (العربية), Vasco (Euskara), Búlgaro (български език), Chino (中文简体), Checo (Čeština), Danés (Dansk), Holandés (Nederlands), Inglés (English), Persa (فارسی), Francés (Français), Alemán (Deutsch), Griego (Ελληνικά), Hebreo (עברית), Húngaro (Magyar Nyelv), Italiano, Japonés (日本語) Koreano (조선말), Letón (Latviešu), Malayo (بهاس ملايو ), Polaco (Polski), Portugués (Português), Ruso (Русский), Español, Sueco (Svensk), y Vietnamita (Tiếng Việt). -Si Orbot no está aún en su idioma, nos encantaría que usted se uniera a nuestro equipo de traducción: https://www.transifex.com/otf/orbot/ diff --git a/fastlane/metadata/android/tr-TR/full_description.txt b/fastlane/metadata/android/tr-TR/full_description.txt index d7d29bd7..980279b9 100644 --- a/fastlane/metadata/android/tr-TR/full_description.txt +++ b/fastlane/metadata/android/tr-TR/full_description.txt @@ -22,5 +22,3 @@ TWITTER ADRESİMİZ: https://twitter.com/guardianproject AÇIK KAYNAK KODU: Orbot ücretsiz bir uygulamadır. Kaynak kodumuza bakabilir, ve geliştirmek için destek grubuna katılabilirsiniz: https://gitweb.torproject.org/orbot.git TOR HAKKINDA: https://TorProject.org BİZE YAZIN: İstediğiniz bir özellik eksik mi? Uygulamada bir hata mı buldunuz? Lütfen bize bildirin! Sizden geri bildirim almak bizi çok mutlu eder. Bize e-posta gönderebilirsiniz: root(a)guardianproject.info -ORBOT'U SİZİN ÜLKENİZE ULAŞTIRMAMIZA YARDIM EDİN: Orbot uygulamasını mümkün olan tüm dillere çevirmeye çalışıyoruz. Şimdilik bu dillere çevrildi: Arabic (العربية), Basque (Euskara), Bulgarian (български език), Chinese (中文简体), Czech (Čeština), Danish (Dansk), Dutch (Nederlands), English, Farsi (فارسی), French (Français), French (Français), German (Deutsch), Greek (Ελληνικά), Hebrew (עברית), Hungarian (Magyar Nyelv), Italian (Italiano), Japanese (日本語) Korean (조선말), Latvian (Latviešu), Malaysian (بهاس ملايو ), Polish (Polski), Portuguese (Português), Turkish (Türkçe), Russian (Русский), Spanish (Español), Swedish (Svensk), and Vietnamese (Tiếng Việt). -Eğer Orbot sizin dilinizde yoksa, çeviri ekibimize katılmanız bizi çok mutlu eder: https://www.transifex.com/otf/orbot/

1 0

[orbot/master] Expose *CircuitPadding
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit e71c225ef146f663c1841bcea432d1884601d228 Author: Tad <tad(a)spotco.us> Date: Tue Oct 8 20:44:23 2019 -0400 Expose *CircuitPadding --- app-mini/src/main/res/values/strings.xml | 4 ++++ app-mini/src/main/res/xml/preferences.xml | 14 +++++++++++++- app/src/main/res/values/strings.xml | 4 ++++ app/src/main/res/xml/preferences.xml | 14 +++++++++++++- .../org/torproject/android/service/OrbotConstants.java | 2 ++ .../java/org/torproject/android/service/TorService.java | 12 ++++++++++++ 6 files changed, 48 insertions(+), 2 deletions(-) diff --git a/app-mini/src/main/res/values/strings.xml b/app-mini/src/main/res/values/strings.xml index 810ced96..78723c10 100644 --- a/app-mini/src/main/res/values/strings.xml +++ b/app-mini/src/main/res/values/strings.xml @@ -233,6 +233,10 @@ <string name="pref_connection_padding_summary">Always enables connection padding to defend against some forms of traffic analysis. Default: auto</string> <string name="pref_reduced_connection_padding">Reduced connection padding</string> <string name="pref_reduced_connection_padding_summary">Closes relay connections sooner and sends less padding packets to reduce data and battery usage</string> + <string name="pref_circuit_padding">Circuit padding</string> + <string name="pref_circuit_padding_summary">Enable circuit padding to defend against some forms of traffic analysis</string> + <string name="pref_reduced_circuit_padding">Reduced circuit padding</string> + <string name="pref_reduced_circuit_padding_summary">Use lower overhead padding algorithms to reduce data and battery usage</string> <string name="pref_prefer_ipv6">Prefer IPv6 connections</string> <string name="pref_prefer_ipv6_summary">Tells exits that IPv6 addresses are preferred</string> <string name="pref_disable_ipv4">Disable IPv4 connections</string> diff --git a/app-mini/src/main/res/xml/preferences.xml b/app-mini/src/main/res/xml/preferences.xml index bda86acc..49be87a0 100644 --- a/app-mini/src/main/res/xml/preferences.xml +++ b/app-mini/src/main/res/xml/preferences.xml @@ -198,7 +198,7 @@ android:title="@string/pref_disable_ipv4" /> </PreferenceCategory> - <PreferenceCategory android:title="ConnectionPadding"> + <PreferenceCategory android:title="Padding"> <CheckBoxPreference android:defaultValue="false" android:enabled="true" @@ -211,6 +211,18 @@ android:key="pref_reduced_connection_padding" android:summary="@string/pref_reduced_connection_padding_summary" android:title="@string/pref_reduced_connection_padding" /> + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_circuit_padding" + android:summary="@string/pref_circuit_padding_summary" + android:title="@string/pref_circuit_padding" /> + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_reduced_circuit_padding" + android:summary="@string/pref_reduced_circuit_padding_summary" + android:title="@string/pref_reduced_circuit_padding" /> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_proxy_title"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4400c048..bff412a2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -233,6 +233,10 @@ <string name="pref_connection_padding_summary">Always enables connection padding to defend against some forms of traffic analysis. Default: auto</string> <string name="pref_reduced_connection_padding">Reduced connection padding</string> <string name="pref_reduced_connection_padding_summary">Closes relay connections sooner and sends less padding packets to reduce data and battery usage</string> + <string name="pref_circuit_padding">Circuit padding</string> + <string name="pref_circuit_padding_summary">Enable circuit padding to defend against some forms of traffic analysis</string> + <string name="pref_reduced_circuit_padding">Reduced circuit padding</string> + <string name="pref_reduced_circuit_padding_summary">Use lower overhead padding algorithms to reduce data and battery usage</string> <string name="pref_prefer_ipv6">Prefer IPv6 connections</string> <string name="pref_prefer_ipv6_summary">Tells exits that IPv6 addresses are preferred</string> <string name="pref_disable_ipv4">Disable IPv4 connections</string> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 49b90dfa..8477efbd 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -195,7 +195,7 @@ android:title="@string/pref_disable_ipv4" /> </PreferenceCategory> - <PreferenceCategory android:title="ConnectionPadding"> + <PreferenceCategory android:title="Padding"> <CheckBoxPreference android:defaultValue="false" android:enabled="true" @@ -208,6 +208,18 @@ android:key="pref_reduced_connection_padding" android:summary="@string/pref_reduced_connection_padding_summary" android:title="@string/pref_reduced_connection_padding" /> + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_circuit_padding" + android:summary="@string/pref_circuit_padding_summary" + android:title="@string/pref_circuit_padding" /> + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_reduced_circuit_padding" + android:summary="@string/pref_reduced_circuit_padding_summary" + android:title="@string/pref_reduced_circuit_padding" /> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_proxy_title"> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java index a5dec36e..8416f15e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java @@ -25,6 +25,8 @@ public interface OrbotConstants { String PREF_CONNECTION_PADDING = "pref_connection_padding"; String PREF_REDUCED_CONNECTION_PADDING = "pref_reduced_connection_padding"; + String PREF_CIRCUIT_PADDING = "pref_circuit_padding"; + String PREF_REDUCED_CIRCUIT_PADDING = "pref_reduced_circuit_padding"; String PREF_PREFER_IPV6 = "pref_prefer_ipv6"; String PREF_DISABLE_IPV4 = "pref_disable_ipv4"; diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index e2eb9589..ce6e3086 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -700,6 +700,18 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon extraLines.append("ReducedConnectionPadding 1").append('\n'); } + if(prefs.getBoolean(OrbotConstants.PREF_CIRCUIT_PADDING, true)) + { + extraLines.append("CircuitPadding 1").append('\n'); + } else { + extraLines.append("CircuitPadding 0").append('\n'); + } + + if(prefs.getBoolean(OrbotConstants.PREF_REDUCED_CIRCUIT_PADDING, true)) + { + extraLines.append("ReducedCircuitPadding 1").append('\n'); + } + String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+"");

1 0

[orbot/master] set versionName from git release tags
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 04bdf167d14c12034ff8103ead3d817aa0c9637e Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Nov 22 15:29:07 2017 +0100 set versionName from git release tags This makes git release tags the one canonical place to set the version name --- app/build.gradle | 14 +++++++++++++- make-release-build | 6 +++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3c6e1b6c..d7d8957c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.application' + // Create a variable called keystorePropertiesFile, and initialize it to your // keystore.properties file, in the rootProject folder. def keystorePropertiesFile = rootProject.file("keystore.properties") @@ -12,6 +13,16 @@ if (keystorePropertiesFile.canRead()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } +/* gets the version name from the latest Git tag, stripping the leading v off */ +def getVersionName = { -> + def stdout = new ByteArrayOutputStream() + exec { + commandLine 'git', 'describe', '--tags', '--always' + standardOutput = stdout + } + return stdout.toString().trim() +} + android { signingConfigs { release { @@ -28,6 +39,7 @@ android { buildToolsVersion '29.0.0' defaultConfig { applicationId "org.torproject.android" + versionName getVersionName() minSdkVersion 16 targetSdkVersion 29 } @@ -62,7 +74,7 @@ android { applicationId 'org.torproject.android' targetSdkVersion 28 versionCode 16123000 - versionName '16.1.2-RC-2-tor-0.4.1.5-rc' + versionName getVersionName() archivesBaseName = "Orbot-$versionName" } } diff --git a/make-release-build b/make-release-build index d15e6f0c..fb712011 100755 --- a/make-release-build +++ b/make-release-build @@ -6,9 +6,9 @@ set -e set -x # make sure we're on a signed tag that matches the version name -versionName=`sed -n 's,.*versionName="$[^"]*$".*,\1,p' app/src/main/AndroidManifest.xml` -describe=`git describe` -if [ $versionName != $describe ]; then +describe=`git describe --tags --always` +versionName=`echo $describe | sed 's,-[0-9][0-9]*-g.*,,'` +if [ "$versionName" != "$describe" ]; then echo "WARNING: building $describe, which is not the latest release ($versionName)" else # make a clearer warning above by putting this here

1 0