- tor-commits - lists.torproject.org

[orbot/master] Translated using Weblate (Turkish)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2f23db8563d2880398a17e257c5a1dff1ea0051f Author: Oğuz Ersen <oguzersen(a)protonmail.com> Date: Fri Dec 3 08:50:52 2021 +0100 Translated using Weblate (Turkish) Currently translated at 100.0% (211 of 211 strings) Co-authored-by: Oğuz Ersen <oguzersen(a)protonmail.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/tr/ Translation: Guardian Project/Orbot --- app/src/main/res/values-tr/strings.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c55bee2c..eeeb4915 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -18,7 +18,7 @@ <string name="menu_scan">QR kodu tara</string> <string name="menu_share_bridge">QR kodu paylaş</string>  - <string name="wizard_details_msg">Orbot; Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent yapılarını kapsayan açık kaynaklı bir uygulamadır. Tor ağına bağlanmak için bir yerel HTTP vekil sunucu (8118) ve bir SOCKS vekil sunucu (9050) sağlar. Orbot ayrıca, rootlanmış aygıtlarda tüm internet trafiğini Tor üzerinden gönderebilir.</string> + <string name="wizard_details_msg">Orbot; Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent yapılarını kapsayan açık kaynaklı bir uygulamadır. Tor ağına bağlanmak için bir yerel HTTP vekil sunucu (8118) ve bir SOCKS vekil sunucu (9050) sağlar.</string>  <string name="pref_general_group">Genel</string> <string name="pref_start_boot_title">Orbot Açılışta Başlatılsın</string> @@ -81,8 +81,8 @@ <string name="ports_reachable_behind_a_restrictive_firewall">Kısıtlanmış bir güvenlik duvarından erişilebilir bağlantı noktaları</string> <string name="enter_ports">Bağlantı noktalarını girin</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">hata ayıklama günlüğü etkinleştirilsin (görüntülemek için adb ya da aLogCat gerekir)</string> - <string name="project_home">Proje Adres(ler)i:</string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="project_home">Proje Ana Sayfası:</string> + <string name="project_urls">https://orbot.app/</string> <string name="third_party_software">Üçüncü Taraf Yazılım:</string> <string name="tor_version">Tor: https://www.torproject.org</string> <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> @@ -204,7 +204,7 @@ <string name="v3_backup_name_hint">Yedekleme dosyası adı…</string> <string name="v3_delete_client_authorization_confirm">İstemci Yetkilendirmesini Sil</string> <string name="v3_delete_client_authorization">İstemci Yetkilendirme Anahtarını Sil</string> - <string name="v3_backup_key_warning">Uyarı: Bu, Diğer Uygulamaların Anahtarınıza Erişebilmesine Neden Olabilir</string> + <string name="v3_backup_key_warning">Uyarı: Bu, diğer uygulamaların anahtarınıza erişebilmesine neden olabilir</string> <string name="v3_backup_key">İstemci Yetkilendirme Anahtarını Yedekle</string> <string name="v3_onion">v3 .onion Etki Alanı</string> <string name="v3_key_hash">Base 32 olarak x25519 Özel Anahtarı</string> @@ -213,8 +213,10 @@ <string name="v3_hosted_services">Barındırılan v3 Onion Hizmetleri</string> <string name="deny">Reddet</string> <string name="allow">İzin ver</string> - <string name="backup_port_exist">Hata: Bir Onion Hizmeti Zaten %s Bağlantı Noktasını Kullanıyor</string> + <string name="backup_port_exist">Hata: Bir Onion hizmeti zaten %s bağlantı noktasını kullanıyor</string> <string name="be_a_snowflake_title_limit">Snowflake Vekil Sınırları</string> <string name="be_a_snowflake_desc_limit">Yalnızca aygıt prize takılı ve kablosuz ağa bağlıysa</string> - <string name="snowflake_proxy_enabled">SNOWFLAKE VEKİL MODU ETKIN</string> + <string name="snowflake_proxy_enabled">Snowflake vekil modu etkin</string> + <string name="version">Sürüm:</string> + <string name="license">Lisans:</string> </resources> \ No newline at end of file

1 0

[orbot/master] Closes #554, IPtProxy 1.3.0 added
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit c984dcc5254eda6a55e91a6d5bfe74023fb60978 Author: b <dsnake(a)protonmail.com> Date: Tue Dec 14 18:29:43 2021 -0500 Closes #554, IPtProxy 1.3.0 added --- dependencies.gradle | 2 +- .../src/main/java/org/torproject/android/service/OrbotService.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 555c4977..c9b4f783 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -20,7 +20,7 @@ ext { guardian_geoip : "20191217", guardian_jsocks : "1.0.4", guardian_jtorctl : "0.4.5.7", - ipt_proxy : "1.2.0", + ipt_proxy : "1.3.0", portmapper : "2.0.5", tor_android : "0.4.6.7" ] diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 1b15e0da..495e2739 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -354,10 +354,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb String target = getCdnFront("snowflake-target"); String front = getCdnFront("snowflake-front"); String stunServer = getCdnFront("snowflake-stun"); + String ampCache = "https://cdn.ampproject.org/"; - IPtProxy.startSnowflake(stunServer, target, front, + IPtProxy.startSnowflake(stunServer, target, front, ampCache, null, true, false, true, 1); - } /* @@ -368,10 +368,11 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb String broker = "https://snowflake-broker.bamsoftware.com/"; String relay = "wss://snowflake.bamsoftware.com/"; String stun = "stun:stun.stunprotocol.org:3478"; + String natProbe = null; String logFile = null; boolean keepLocalAddresses = true; boolean unsafeLogging = false; - IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, logFile, keepLocalAddresses, unsafeLogging); + IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, logFile, keepLocalAddresses, unsafeLogging, null); logNotice("Snowflake Proxy mode ENABLED"); }

1 0

[orbot/master] for now, disable snowflake proxy limiting
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 9cf66800aa9b6378460499e66fac27773ad46058 Author: b <dsnake(a)protonmail.com> Date: Tue Dec 14 18:06:38 2021 -0500 for now, disable snowflake proxy limiting --- app/src/main/res/xml/preferences.xml | 10 +++++----- .../java/org/torproject/android/service/OrbotService.java | 11 +---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 28e06052..c1fb75ae 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -297,11 +297,11 @@ android:key="pref_be_a_snowflake" android:title="@string/be_a_snowflake_title" android:summary="@string/be_a_snowflake_desc" /> - <CheckBoxPreference - android:defaultValue="true" - android:key="pref_be_a_snowflake_limit" - android:title="@string/be_a_snowflake_title_limit" - android:summary="@string/be_a_snowflake_desc_limit" /> + + + + + </PreferenceCategory> </PreferenceScreen> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 4b9a12e6..1b15e0da 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -1412,16 +1412,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb else if (useIPtSnowflakeProxy()) startSnowflakeClient(); } else if (Prefs.beSnowflakeProxy()) { - - if (Prefs.limitSnowflakeProxying()) - { - if (isChargingAndWifi(OrbotService.this)) - { - enableSnowflakeProxy(); - } - - } - else +// if (Prefs.limitSnowflakeProxying()) { enableSnowflakeProxy(); }

1 0

[orbot/master] Experimental show snowflake toast when client connects to proxy...
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 798ef6eb5d00007f8d0b7b147841061821d8a091 Author: b <dsnake(a)protonmail.com> Date: Tue Dec 14 18:39:18 2021 -0500 Experimental show snowflake toast when client connects to proxy... --- app/src/main/res/values/strings.xml | 3 +++ app/src/main/res/xml/preferences.xml | 7 +++++++ .../android/core/ui/SettingsPreferencesActivity.kt | 1 + .../java/org/torproject/android/service/OrbotService.java | 13 ++++++++++--- .../java/org/torproject/android/service/util/Prefs.java | 5 +++++ orbotservice/src/main/res/values/strings.xml | 3 +++ 6 files changed, 29 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c3a43f01..9ba83a26 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -259,6 +259,9 @@ <string name="be_a_snowflake_title_limit">Snowflake Proxy Limits</string> <string name="be_a_snowflake_desc_limit">Only when device is plugged in and on wifi</string> <string name="snowflake_proxy_enabled">SNOWFLAKE PROXY MODE ENABLED</string> + <string name="snowflake_proxy_msg_title">Show Connection Notification</string> + <string name="snowflake_proxy_msg_description">Show a message when your snowflake helps someone circumvent censorship</string> + </resources> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index a05bce87..60619894 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -297,6 +297,13 @@ android:key="pref_be_a_snowflake" android:title="@string/be_a_snowflake_title" android:summary="@string/be_a_snowflake_desc" /> + + <CheckBoxPreference + android:defaultValue="false" + android:key="pref_show_snowflake_proxy_msg" + android:title="@string/snowflake_proxy_msg_title" + android:summary="@string/snowflake_proxy_msg_description"/> +    diff --git a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt index 79f00544..5fe575ad 100644 --- a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt +++ b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt @@ -35,6 +35,7 @@ class SettingsPreferencesActivity : PreferenceActivity() { val bridgesEnabled = getSharedPreferences("org.torproject.android_preferences", MODE_MULTI_PROCESS).getBoolean("pref_bridges_enabled", false) findPreference("pref_be_a_snowflake")?.isEnabled = !bridgesEnabled findPreference("pref_be_a_snowflake_limit")?.isEnabled = !bridgesEnabled + findPreference("pref_show_snowflake_proxy_msg")?.isEnabled = !bridgesEnabled } override fun attachBaseContext(newBase: Context) = super.attachBaseContext(LocaleHelper.onAttach(newBase)) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 495e2739..8520a815 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -36,6 +36,7 @@ import android.os.IBinder; import android.provider.BaseColumns; import android.text.TextUtils; import android.util.Log; +import android.widget.Toast; import net.freehaven.tor.control.TorControlCommands; import net.freehaven.tor.control.TorControlConnection; @@ -74,7 +75,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; import IPtProxy.IPtProxy; - +import IPtProxy.SnowflakeClientConnected; import androidx.annotation.ChecksSdkIntAtLeast; import androidx.annotation.RequiresApi; import androidx.core.app.NotificationCompat; @@ -372,8 +373,14 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb String logFile = null; boolean keepLocalAddresses = true; boolean unsafeLogging = false; - IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, logFile, keepLocalAddresses, unsafeLogging, null); - + SnowflakeClientConnected callback = null; + if (Prefs.showSnowflakeProxyMessage()) { + callback = (SnowflakeClientConnected) () -> { + String message = String.format(getString(R.string.snowflake_proxy_client_connected_msg), "❄️", "❄️"); + Toast.makeText(this, message, Toast.LENGTH_LONG).show(); + }; + } + IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, logFile, keepLocalAddresses, unsafeLogging, callback); logNotice("Snowflake Proxy mode ENABLED"); } diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index eaec24e5..d12cc6a6 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -21,6 +21,7 @@ public class Prefs { private final static String PREF_USE_VPN = "pref_vpn"; private final static String PREF_EXIT_NODES = "pref_exit_nodes"; private final static String PREF_BE_A_SNOWFLAKE = "pref_be_a_snowflake"; + private final static String PREF_SHOW_SNOWFLAKE_MSG = "pref_show_snowflake_proxy_msg"; private final static String PREF_BE_A_SNOWFLAKE_LIMIT = "pref_be_a_snowflake_limit"; private final static String PREF_HOST_ONION_SERVICES = "pref_host_onionservices"; @@ -78,6 +79,10 @@ public class Prefs { return prefs.getBoolean(PREF_BE_A_SNOWFLAKE,false); } + public static boolean showSnowflakeProxyMessage() { + return prefs.getBoolean(PREF_SHOW_SNOWFLAKE_MSG, false); + } + public static void setBeSnowflakeProxy (boolean beSnowflakeProxy) { putBoolean(PREF_BE_A_SNOWFLAKE,beSnowflakeProxy); } diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml index 80f80ca3..78e527d4 100644 --- a/orbotservice/src/main/res/values/strings.xml +++ b/orbotservice/src/main/res/values/strings.xml @@ -25,5 +25,8 @@ <string name="kibibyte_per_second">KiB/s</string> <string name="mebibyte_per_second">MiB/s</string> + <string name="snowflake_proxy_client_connected_msg">%s Your snowflake proxy helped someone circumvent censorship %s</string> + + </resources>

1 0

[orbot/master] Snowflake proxy uses defaults in IPtProxy, displays cute toast when user connects. activity text for snowflake proxy isn't in ALL CAPS anymore
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 50ef12d356d0a0548f12edc0c028da2dfc6820c5 Author: b <dsnake(a)protonmail.com> Date: Wed Dec 15 17:14:22 2021 -0500 Snowflake proxy uses defaults in IPtProxy, displays cute toast when user connects. activity text for snowflake proxy isn't in ALL CAPS anymore --- app/src/main/res/values/strings.xml | 2 +- .../java/org/torproject/android/service/OrbotService.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9ba83a26..dfdb38ce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -258,7 +258,7 @@ <string name="be_a_snowflake_title_limit">Snowflake Proxy Limits</string> <string name="be_a_snowflake_desc_limit">Only when device is plugged in and on wifi</string> - <string name="snowflake_proxy_enabled">SNOWFLAKE PROXY MODE ENABLED</string> + <string formatted="true" name="snowflake_proxy_enabled">Snowflake proxy mode enabled</string> <string name="snowflake_proxy_msg_title">Show Connection Notification</string> <string name="snowflake_proxy_msg_description">Show a message when your snowflake helps someone circumvent censorship</string> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 8520a815..8fef4543 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -355,10 +355,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb String target = getCdnFront("snowflake-target"); String front = getCdnFront("snowflake-front"); String stunServer = getCdnFront("snowflake-stun"); - String ampCache = "https://cdn.ampproject.org/"; + String ampCache = null; // getCdnFront("snowflake-ampcache"); IPtProxy.startSnowflake(stunServer, target, front, ampCache, - null, true, false, true, 1); + null, true, false, false, 1); } /* @@ -366,9 +366,9 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb */ private void enableSnowflakeProxy () { int capacity = 1; - String broker = "https://snowflake-broker.bamsoftware.com/"; - String relay = "wss://snowflake.bamsoftware.com/"; - String stun = "stun:stun.stunprotocol.org:3478"; + String broker = null; // "https://snowflake-broker.bamsoftware.com/"; + String relay = null; // "wss://snowflake.bamsoftware.com/"; + String stun = null; // "stun:stun.stunprotocol.org:3478"; String natProbe = null; String logFile = null; boolean keepLocalAddresses = true; @@ -377,7 +377,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (Prefs.showSnowflakeProxyMessage()) { callback = (SnowflakeClientConnected) () -> { String message = String.format(getString(R.string.snowflake_proxy_client_connected_msg), "❄️", "❄️"); - Toast.makeText(this, message, Toast.LENGTH_LONG).show(); + new Handler(getMainLooper()).post(() -> Toast.makeText(getApplicationContext(), message, Toast.LENGTH_LONG).show()); }; } IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, logFile, keepLocalAddresses, unsafeLogging, callback);

1 0

[orbot/master] Interface for #540
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 0123927ab563af9afd13924dd3f8a7eb8777ba36 Author: b <dsnake(a)protonmail.com> Date: Thu Dec 9 18:42:42 2021 -0500 Interface for #540 - External apps can request orbot to spin up a v3 service - When cancelled, apps are informed - When service is created, apps get the .onion url Also introdued a change where onion service domains are updated when a fresh connection tor tor is achieved, so users don't have to restart app --- .../org/torproject/android/OrbotMainActivity.java | 40 ++++++++++++++++++++-- .../torproject/android/service/OrbotService.java | 9 ++--- .../android/service/TorServiceConstants.java | 5 +++ 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 3853f957..2310b3b8 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -8,6 +8,7 @@ import android.app.AlertDialog; import android.app.Application; import android.content.BroadcastReceiver; import android.content.ContentResolver; +import android.content.ContentUris; import android.content.ContentValues; import android.content.Context; import android.content.Intent; @@ -16,6 +17,7 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.database.Cursor; import android.net.Uri; import android.net.VpnService; import android.os.Build; @@ -98,6 +100,7 @@ import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED; public class OrbotMainActivity extends AppCompatActivity implements OrbotConstants { private static final String INTENT_ACTION_REQUEST_V3_ONION_SERVICE = "org.torproject.android.REQUEST_V3_ONION_SERVICE"; + private static final String INTENT_EXTRA_REQUESTED_V3_HOSTNAME = "org.torproject.android.REQUESTED_V3_HOSTNAME"; private static final String INTENT_ACTION_REQUEST_START_TOR = "org.torproject.android.START_TOR"; private static final int REQUEST_VPN = 8888; private static final int REQUEST_SETTINGS = 0x9874; @@ -133,6 +136,9 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan private String torStatus = null; //latest status reported from the tor service private Intent lastStatusIntent; // the last ACTION_STATUS Intent received + // used when apps request a new v3 service + private long lastInsertedOnionServiceRowId = -1; + /** * The state and log info from {@link OrbotService} are sent to the UI here in * the form of a local broadcast. Regular broadcasts can be sent by any app, @@ -507,7 +513,8 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan fields.put(OnionServiceContentProvider.OnionService.CREATED_BY_USER, 0); ContentResolver contentResolver = getContentResolver(); - contentResolver.insert(OnionServiceContentProvider.CONTENT_URI, fields); + lastInsertedOnionServiceRowId = ContentUris.parseId(contentResolver.insert(OnionServiceContentProvider.CONTENT_URI, fields)); + if (torStatus.equals(TorServiceConstants.STATUS_OFF)) { startTor(); @@ -538,7 +545,11 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan new AlertDialog.Builder(this) .setMessage(getString(R.string.hidden_service_request, v3LocalPort)) .setPositiveButton(R.string.allow, (d, w) -> enableV3OnionService(v3LocalPort, v3onionPort, finalName)) - .setNegativeButton(R.string.deny, (d, w) -> d.dismiss()) + .setNegativeButton(R.string.deny, (d, w) -> { + setResult(RESULT_CANCELED); + d.dismiss(); + finish(); + }) .show(); return; @@ -804,6 +815,10 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan } + // if new onion hostnames are generated, update local DB + sendIntentToService(TorServiceConstants.ACTION_UPDATE_ONION_NAMES); + + if (autoStartFromIntent) { autoStartFromIntent = false; @@ -858,6 +873,27 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan resetBandwidthStatTextviews(); break; + + case TorServiceConstants.STATUS_V3_NAMES_UPDATED: + if (lastInsertedOnionServiceRowId == -1) break; // another app did not request an onion service + ContentResolver cr = getContentResolver(); + String where = OnionServiceContentProvider.OnionService._ID + "=" + lastInsertedOnionServiceRowId; + Cursor v3Cursor = cr.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION, + where, null, null); + if (v3Cursor == null || v3Cursor.getCount() != 1 || !v3Cursor.moveToFirst()) { + if (v3Cursor != null) v3Cursor.close(); + setResult(RESULT_CANCELED); + finish(); + return; + } + String hostname = v3Cursor.getString(v3Cursor.getColumnIndex(OnionServiceContentProvider.OnionService.DOMAIN)); + v3Cursor.close(); + if (TextUtils.isEmpty(hostname)) break; + Intent response = new Intent(); + response.putExtra(INTENT_EXTRA_REQUESTED_V3_HOSTNAME, hostname); + setResult(RESULT_OK, response); + finish(); + return; } } diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 1b15e0da..3cc7ab40 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -679,7 +679,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb */ private void startTor() { try { - if (torServiceConnection != null && conn != null) { showConnectedToTorNetworkNotification(); @@ -701,7 +700,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } startTorService(); - if (Prefs.hostOnionServicesEnabled()) { try { updateV3OnionNames(); @@ -735,8 +733,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb contentResolver.update(V3_ONION_SERVICES_CONTENT_URI, fields, OnionService._ID + "=" + id, null); } } - } + sendCallbackStatus(STATUS_V3_NAMES_UPDATED); } catch (Exception e) { e.printStackTrace(); } @@ -1436,7 +1434,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } } else if (action.equals(ACTION_STOP)) { stopTorAsync(); - } else if (action.equals(ACTION_START_VPN)) { + } else if (action.equals(ACTION_UPDATE_ONION_NAMES)) { + updateV3OnionNames(); + } + else if (action.equals(ACTION_START_VPN)) { if (mVpnManager != null && (!mVpnManager.isStarted())) { //start VPN here Intent vpnIntent = VpnService.prepare(OrbotService.this); diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index 02ab7429..b9b410ad 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -34,6 +34,8 @@ public interface TorServiceConstants { String ACTION_START_VPN = "org.torproject.android.intent.action.START_VPN"; String ACTION_STOP_VPN = "org.torproject.android.intent.action.STOP_VPN"; + String ACTION_UPDATE_ONION_NAMES = "org.torproject.android.intent.action.UPDATE_ONION_NAMES"; + String ACTION_START_ON_BOOT = "org.torproject.android.intent.action.START_BOOT"; int REQUEST_VPN = 7777; @@ -78,6 +80,9 @@ public interface TorServiceConstants { * All tor-related services and daemons are stopped */ String STATUS_OFF = "OFF"; + + String STATUS_V3_NAMES_UPDATED = "V3_NAMES_UPDATED"; + /** * All tor-related services and daemons have completed starting */

1 0

[orbot/master] add support for snowflake with amp rendezvous
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 0c77144ee3fd423e043b732499766ab37c6e1309 Author: b <dsnake(a)protonmail.com> Date: Wed Dec 15 18:09:58 2021 -0500 add support for snowflake with amp rendezvous --- .../ui/onboarding/BridgeWizardActivity.java | 10 +++++++ .../ui/onboarding/CustomBridgesActivity.java | 2 +- app/src/main/res/layout/content_bridge_wizard.xml | 18 ++++++------ app/src/main/res/values/strings.xml | 3 +- orbotservice/src/main/assets/fronts | 1 - .../torproject/android/service/OrbotService.java | 32 ++++++++++++++++------ 6 files changed, 46 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 19e998d0..5dc4e770 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -25,6 +25,7 @@ public class BridgeWizardActivity extends AppCompatActivity { private RadioButton mBtObfs4; private RadioButton mBtCustom; private RadioButton mBtSnowflake; + private RadioButton mBtnSnowflakeAmp; private View mBtnConfgiureCustomBridges; private static boolean noBridgesSet() { @@ -68,6 +69,13 @@ public class BridgeWizardActivity extends AppCompatActivity { Prefs.putBridgesEnabled(true); }); + mBtnSnowflakeAmp = findViewById(R.id.btnSnowflakeAmp); + mBtnSnowflakeAmp.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (!isChecked) return; + Prefs.setBridgesList("snowflake-amp"); + Prefs.putBridgesEnabled(true); + }); + mBtCustom = findViewById(R.id.btnCustomBridges); mBtCustom.setOnCheckedChangeListener((buttonView, isChecked) -> mBtnConfgiureCustomBridges.setVisibility(isChecked ? View.VISIBLE : View.GONE)); @@ -125,6 +133,8 @@ public class BridgeWizardActivity extends AppCompatActivity { mBtObfs4.setChecked(true); } else if (Prefs.getBridgesList().equals("snowflake")) { mBtSnowflake.setChecked(true); + } else if (Prefs.getBridgesList().equals("snowflake-amp")) { + mBtnSnowflakeAmp.setChecked(true); } else { mBtCustom.setChecked(true); } diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java index 91f50235..3a0babb8 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java @@ -204,6 +204,6 @@ public class CustomBridgesActivity extends AppCompatActivity implements TextWatc private static boolean userHasSetPreconfiguredBridge(String bridges) { if (bridges == null) return false; - return bridges.equals("obfs4") || bridges.equals("meek") || bridges.equals("snowflake"); + return bridges.equals("obfs4") || bridges.equals("meek") || bridges.equals("snowflake") || bridges.equals("snowflake-amp"); } } diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index 6dbca868..65364846 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -67,6 +67,14 @@ android:layout_margin="12dp" android:text="@string/bridge_snowflake" /> + + <RadioButton + android:id="@+id/btnSnowflakeAmp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/bridge_snowflake_amp"/> + <RadioButton android:id="@+id/btnCustomBridges" android:layout_width="wrap_content" @@ -74,6 +82,7 @@ android:layout_margin="12dp" android:text="@string/custom_bridges" /> + </RadioGroup> <Button @@ -84,14 +93,5 @@ android:text="@string/configure_custom_bridges" android:visibility="gone" /> - <TextView - android:id="@+id/lbl_bridge_test_status" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:gravity="center" - android:textColor="@color/bright_green" - android:textSize="16sp" - android:textStyle="bold" /> </LinearLayout> </ScrollView> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b54a1d7..3a4987d0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -249,7 +249,8 @@ <string name="paste_bridges">Paste Bridges</string> <string name="use_qr_code">Use QR Code</string> <string name="snowflake_proxy_pref_category">Snowflake Proxy (Experimental)</string> - <string name="bridge_snowflake">Connect through other Tor peers (experimental)</string> + <string name="bridge_snowflake">Connect through peers via the snowflake proxy (using domain fronting)</string> + <string name="bridge_snowflake_amp">Connect through peers via the snowflake proxy (using AMP cache rendezvous)</string> <string name="be_a_snowflake_title">Run Snowflake Proxy</string> <string name="be_a_snowflake_desc">Allow other Tor users to connect to Tor through your device. (This can\'t be used if you connect alongside bridges)</string> diff --git a/orbotservice/src/main/assets/fronts b/orbotservice/src/main/assets/fronts index 3900c33a..6cafa57b 100644 --- a/orbotservice/src/main/assets/fronts +++ b/orbotservice/src/main/assets/fronts @@ -1,7 +1,6 @@ snowflake-target https://snowflake-broker.torproject.net.global.prod.fastly.net/ snowflake-front cdn.sstatic.net snowflake-stun stun:stun.stunprotocol.org:3478 -snowflake-ampcache https://cdn.ampproject.org/ moat-cdn https://d50gd378qj74g.cloudfront.net/ moat-url https://moat.torproject.org.global.prod.fastly.net/ moat-front cdn.sstatic.net \ No newline at end of file diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 8fef4543..777e641d 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -139,6 +139,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb private static String[] parseBridgesFromSettings(String bridgeList) { // this regex replaces lines that only contain whitespace with an empty String bridgeList = bridgeList.trim().replaceAll("(?m)^[ \t]*\r?\n", ""); + Log.d("bim", "bridgeList=" + bridgeList); return bridgeList.split("\\n"); } @@ -286,7 +287,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (Prefs.bridgesEnabled()) { if (useIPtObfsMeekProxy()) IPtProxy.stopObfs4Proxy(); - else if (useIPtSnowflakeProxy()) + else if (useIPtSnowflakeProxyDomainFronting()) IPtProxy.stopSnowflake(); } else if (Prefs.beSnowflakeProxy()) @@ -318,9 +319,14 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return bridgeList.contains("obfs") || bridgeList.contains("meek"); } - private static boolean useIPtSnowflakeProxy() { + private static boolean useIPtSnowflakeProxyDomainFronting() { String bridgeList = Prefs.getBridgesList(); - return bridgeList.contains("snowflake"); + return bridgeList.equals("snowflake"); + } + + private static boolean useIPtSnowflakeProxyAMPRendezvous() { + String bridgeList = Prefs.getBridgesList(); + return bridgeList.equals("snowflake-amp"); } private static HashMap<String,String> mFronts; @@ -350,17 +356,25 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } - private void startSnowflakeClient() { + private void startSnowflakeClientDomainFronting() { //this is using the current, default Tor snowflake infrastructure String target = getCdnFront("snowflake-target"); String front = getCdnFront("snowflake-front"); String stunServer = getCdnFront("snowflake-stun"); - String ampCache = null; // getCdnFront("snowflake-ampcache"); + String ampCache = null; IPtProxy.startSnowflake(stunServer, target, front, ampCache, null, true, false, false, 1); } + private void startSnowflakeClientAmpRendezvous() { + String stunServers ="stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478"; + String target = "https://snowflake-broker.torproject.net/"; + String front = "www.google.com"; + String ampCache ="https://cdn.ampproject.org/"; + IPtProxy.startSnowflake(stunServers, target, front, ampCache, null, true, false, false, 1); + } + /* This is to host a snowflake entrance node / bridge */ @@ -1072,7 +1086,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb builtInBridgeType = "meek_lite"; } - if (bridgeList.equals("snowflake")) { + if (bridgeList.equals("snowflake") || bridgeList.equals("snowflake-amp")) { extraLines.append("ClientTransportPlugin snowflake socks5 127.0.0.1:" + IPtProxy.snowflakePort()).append('\n'); builtInBridgeType = "snowflake"; } @@ -1417,8 +1431,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (Prefs.bridgesEnabled()) { if (useIPtObfsMeekProxy()) IPtProxy.startObfs4Proxy("DEBUG", false, false, null); - else if (useIPtSnowflakeProxy()) - startSnowflakeClient(); + else if (useIPtSnowflakeProxyDomainFronting()) + startSnowflakeClientDomainFronting(); + else if (useIPtSnowflakeProxyAMPRendezvous()) + startSnowflakeClientAmpRendezvous(); } else if (Prefs.beSnowflakeProxy()) { // if (Prefs.limitSnowflakeProxying()) { enableSnowflakeProxy();

1 0

[orbot/master] tor-android 0.4.6.7 -> 0.4.6.8
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 06453716a47de6342aa43cfc07ba9d76066b22cd Author: b <dsnake(a)protonmail.com> Date: Fri Dec 17 15:44:12 2021 -0500 tor-android 0.4.6.7 -> 0.4.6.8 --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 555c4977..0d4a9da7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -22,7 +22,7 @@ ext { guardian_jtorctl : "0.4.5.7", ipt_proxy : "1.2.0", portmapper : "2.0.5", - tor_android : "0.4.6.7" + tor_android : "0.4.6.8" ] libs = [

1 0

[orbot/master] Snowflake animations had a bug; they'd appear if tor connects and the pref is set to true even if proxy wasn't enabled (because bridges were...)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 843effd93e5f513bc83ef8a1baf9b7e7be5e4a8c Author: b <dsnake(a)protonmail.com> Date: Wed Dec 15 16:50:35 2021 -0500 Snowflake animations had a bug; they'd appear if tor connects and the pref is set to true even if proxy wasn't enabled (because bridges were...) --- orbotservice/src/main/assets/fronts | 1 + .../src/main/java/org/torproject/android/service/util/Prefs.java | 1 + 2 files changed, 2 insertions(+) diff --git a/orbotservice/src/main/assets/fronts b/orbotservice/src/main/assets/fronts index 6cafa57b..3900c33a 100644 --- a/orbotservice/src/main/assets/fronts +++ b/orbotservice/src/main/assets/fronts @@ -1,6 +1,7 @@ snowflake-target https://snowflake-broker.torproject.net.global.prod.fastly.net/ snowflake-front cdn.sstatic.net snowflake-stun stun:stun.stunprotocol.org:3478 +snowflake-ampcache https://cdn.ampproject.org/ moat-cdn https://d50gd378qj74g.cloudfront.net/ moat-url https://moat.torproject.org.global.prod.fastly.net/ moat-front cdn.sstatic.net \ No newline at end of file diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index d12cc6a6..78ef2d81 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -76,6 +76,7 @@ public class Prefs { } public static boolean beSnowflakeProxy () { + if (Prefs.bridgesEnabled()) return false; return prefs.getBoolean(PREF_BE_A_SNOWFLAKE,false); }

1 0

[orbot/master] fixed status bug reported in #556
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit d8f6ebb333a3d2b1886949c7dc44a9870264029d Author: b <dsnake(a)protonmail.com> Date: Fri Dec 17 14:59:10 2021 -0500 fixed status bug reported in #556 --- .../main/java/org/torproject/android/service/OrbotService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 3cc7ab40..190ecc4e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -734,7 +734,15 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } } } + /* + This old status hack is temporary and fixes the issue reported by syphyr at + https://github.com/guardianproject/orbot/pull/556 + Down the line a better approach needs to happen for sending back the onion names updated + status, perhaps just adding it as an extra to the normal Intent callback... + */ + String oldStatus = mCurrentStatus; sendCallbackStatus(STATUS_V3_NAMES_UPDATED); + mCurrentStatus = oldStatus; } catch (Exception e) { e.printStackTrace(); } @@ -1400,7 +1408,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb public void run() { String action = mIntent.getAction(); - if (!TextUtils.isEmpty(action)) { if (action.equals(ACTION_START) || action.equals(ACTION_START_ON_BOOT)) {

1 0