December 2020 - tor-commits - lists.torproject.org

[orbot/master] Merge pull request #417 from bitmold/correct_bandwidth_labels
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 7e7007e347797f53b0613c1f16df9f3434428130 Merge: f9d5fcf5 590d440d Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Dec 8 17:14:08 2020 -0500 Merge pull request #417 from bitmold/correct_bandwidth_labels Correct data-rate units, Fixes #378 app-mini/src/main/res/values-ar/strings.xml | 2 -- app-mini/src/main/res/values-ay/strings.xml | 2 -- app-mini/src/main/res/values-az/strings.xml | 2 -- app-mini/src/main/res/values-be/strings.xml | 2 -- app-mini/src/main/res/values-bg/strings.xml | 2 -- app-mini/src/main/res/values-ca/strings.xml | 2 -- app-mini/src/main/res/values-cs-rCZ/strings.xml | 2 -- app-mini/src/main/res/values-de/strings.xml | 2 -- app-mini/src/main/res/values-el/strings.xml | 2 -- app-mini/src/main/res/values-es-rAR/strings.xml | 2 -- app-mini/src/main/res/values-es/strings.xml | 2 -- app-mini/src/main/res/values-eu/strings.xml | 2 -- app-mini/src/main/res/values-fa/strings.xml | 2 -- app-mini/src/main/res/values-fi/strings.xml | 2 -- app-mini/src/main/res/values-fr-rFR/strings.xml | 2 -- app-mini/src/main/res/values-fr/strings.xml | 2 -- app-mini/src/main/res/values-gl/strings.xml | 2 -- app-mini/src/main/res/values-he/strings.xml | 2 -- app-mini/src/main/res/values-hi/strings.xml | 2 -- app-mini/src/main/res/values-hr/strings.xml | 2 -- app-mini/src/main/res/values-hu/strings.xml | 2 -- app-mini/src/main/res/values-id/strings.xml | 2 -- app-mini/src/main/res/values-in-rID/strings.xml | 2 -- app-mini/src/main/res/values-is/strings.xml | 2 -- app-mini/src/main/res/values-it/strings.xml | 2 -- app-mini/src/main/res/values-iw/strings.xml | 2 -- app-mini/src/main/res/values-ja/strings.xml | 2 -- app-mini/src/main/res/values-ko/strings.xml | 2 -- app-mini/src/main/res/values-lv/strings.xml | 2 -- app-mini/src/main/res/values-mk/strings.xml | 2 -- app-mini/src/main/res/values-nb/strings.xml | 2 -- app-mini/src/main/res/values-nl/strings.xml | 2 -- app-mini/src/main/res/values-pl/strings.xml | 2 -- app-mini/src/main/res/values-pt-rBR/strings.xml | 2 -- app-mini/src/main/res/values-pt-rPT/strings.xml | 2 -- app-mini/src/main/res/values-pt/strings.xml | 2 -- app-mini/src/main/res/values-ro/strings.xml | 2 -- app-mini/src/main/res/values-ru/strings.xml | 2 -- app-mini/src/main/res/values-sk/strings.xml | 2 -- app-mini/src/main/res/values-sr/strings.xml | 2 -- app-mini/src/main/res/values-sv/strings.xml | 2 -- app-mini/src/main/res/values-th/strings.xml | 2 -- app-mini/src/main/res/values-tl/strings.xml | 2 -- app-mini/src/main/res/values-tr/strings.xml | 2 -- app-mini/src/main/res/values-uk/strings.xml | 2 -- app-mini/src/main/res/values-vi/strings.xml | 2 -- app-mini/src/main/res/values-zh-rCN/strings.xml | 2 -- app-mini/src/main/res/values-zh-rTW/strings.xml | 2 -- app-mini/src/main/res/values/strings.xml | 4 ---- .../java/org/torproject/android/OrbotMainActivity.java | 16 ++++++++-------- app/src/main/res/values-ar/strings.xml | 4 ---- app/src/main/res/values-ay/strings.xml | 4 ---- app/src/main/res/values-az/strings.xml | 4 ---- app/src/main/res/values-be/strings.xml | 4 ---- app/src/main/res/values-bg/strings.xml | 4 ---- app/src/main/res/values-ca/strings.xml | 4 ---- app/src/main/res/values-cs-rCZ/strings.xml | 4 ---- app/src/main/res/values-da/strings.xml | 2 -- app/src/main/res/values-de/strings.xml | 4 ---- app/src/main/res/values-el/strings.xml | 4 ---- app/src/main/res/values-es-rAR/strings.xml | 4 ---- app/src/main/res/values-es/strings.xml | 4 ---- app/src/main/res/values-eu/strings.xml | 4 ---- app/src/main/res/values-fa/strings.xml | 4 ---- app/src/main/res/values-fi/strings.xml | 4 ---- app/src/main/res/values-fr-rFR/strings.xml | 4 ---- app/src/main/res/values-fr/strings.xml | 4 ---- app/src/main/res/values-gl/strings.xml | 4 ---- app/src/main/res/values-he/strings.xml | 4 ---- app/src/main/res/values-hi/strings.xml | 4 ---- app/src/main/res/values-hr/strings.xml | 4 ---- app/src/main/res/values-hu/strings.xml | 4 ---- app/src/main/res/values-id/strings.xml | 4 ---- app/src/main/res/values-in-rID/strings.xml | 4 ---- app/src/main/res/values-is/strings.xml | 4 ---- app/src/main/res/values-it/strings.xml | 4 ---- app/src/main/res/values-iw/strings.xml | 4 ---- app/src/main/res/values-ja/strings.xml | 4 ---- app/src/main/res/values-ko/strings.xml | 4 ---- app/src/main/res/values-lv/strings.xml | 4 ---- app/src/main/res/values-mk/strings.xml | 4 ---- app/src/main/res/values-my/strings.xml | 2 -- app/src/main/res/values-nb/strings.xml | 4 ---- app/src/main/res/values-nl/strings.xml | 4 ---- app/src/main/res/values-pl/strings.xml | 4 ---- app/src/main/res/values-pt-rBR/strings.xml | 4 ---- app/src/main/res/values-pt-rPT/strings.xml | 4 ---- app/src/main/res/values-pt/strings.xml | 4 ---- app/src/main/res/values-ro/strings.xml | 4 ---- app/src/main/res/values-ru/strings.xml | 4 ---- app/src/main/res/values-si-rLK/strings.xml | 2 -- app/src/main/res/values-sk/strings.xml | 4 ---- app/src/main/res/values-sr/strings.xml | 4 ---- app/src/main/res/values-sv/strings.xml | 4 ---- app/src/main/res/values-th/strings.xml | 4 ---- app/src/main/res/values-tl/strings.xml | 4 ---- app/src/main/res/values-tr/strings.xml | 4 ---- app/src/main/res/values-uk/strings.xml | 4 ---- app/src/main/res/values-vi/strings.xml | 4 ---- app/src/main/res/values-zh-rCN/strings.xml | 4 ---- app/src/main/res/values-zh-rTW/strings.xml | 4 ---- app/src/main/res/values/strings.xml | 11 ++++------- 102 files changed, 12 insertions(+), 313 deletions(-)

1 0

[orbot/master] enable start/stop of Snowflake client
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit f675a7f126a9595f0525327a12e2feb6feea2b4d Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Dec 8 20:37:52 2020 -0500 enable start/stop of Snowflake client --- .../torproject/android/service/OrbotService.java | 32 +++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) 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 04f4f053..b1b64aeb 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -307,9 +307,12 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb sendCallbackStatus(STATUS_STOPPING); sendCallbackLogMessage(getString(R.string.status_shutting_down)); - if (useIPtProxy()) + if (useIPtObfs4Proxy()) IPtProxy.stopObfs4Proxy(); + if (useIPtSnowflakeProxy()) + IPtProxy.stopSnowflake(); + stopTorDaemon(true); //stop the foreground priority and make sure to remove the persistant notification @@ -326,12 +329,23 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } - private static boolean useIPtProxy () + private static boolean useIPtObfs4Proxy () { String bridgeList = Prefs.getBridgesList(); return bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); } + private static boolean useIPtSnowflakeProxy () + { + String bridgeList = Prefs.getBridgesList(); + return bridgeList.contains("snowflake"); + } + + private void startSnowflakeProxy () { + IPtProxy.startSnowflake( "stun:stun.l.google.com:19302", "https://snowflake-broker.azureedge.net/", + "ajax.aspnetcdn.com", null, true, false, true, 3); + } + /** * if someone stops during startup, we may have to wait for the conn port to be setup, so we can properly shutdown tor * @throws Exception @@ -1403,6 +1417,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb boolean obfs3Bridges = bridgeList.contains("obfs3"); boolean obfs4Bridges = bridgeList.contains("obfs4"); boolean meekBridges = bridgeList.contains("meek"); + boolean snowflakeBridges = bridgeList.contains("snowflake"); //check if any PT bridges are needed if (obfs3Bridges) @@ -1414,7 +1429,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (meekBridges) extraLines.append("ClientTransportPlugin meek_lite socks5 127.0.0.1:" + IPtProxy.MeekSocksPort).append('\n'); - if (bridgeList != null && bridgeList.length() > 5) //longer then 1 = some real values here + if (snowflakeBridges) + extraLines.append("ClientTransportPlugin snowflake socks5 127.0.0.1:" + IPtProxy.SnowflakeSocksPort).append('\n'); + + if (bridgeList != null && bridgeList.length() > 10) //longer then 1 = some real values here { String[] bridgeListLines = parseBridgesFromSettings(bridgeList); int bridgeIdx = (int) Math.floor(Math.random() * ((double) bridgeListLines.length)); @@ -1429,6 +1447,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (meekBridges) type = "meek_lite"; + else if (snowflakeBridges) + type = "snowflake"; getBridges(type, extraLines); @@ -1760,9 +1780,13 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (!TextUtils.isEmpty(action)) { if (action.equals(ACTION_START) || action.equals(ACTION_START_ON_BOOT)) { - if (useIPtProxy()) + if (useIPtObfs4Proxy()) IPtProxy.startObfs4Proxy("DEBUG", false, false); + if (useIPtSnowflakeProxy()) + startSnowflakeProxy(); + + startTor(); replyWithStatus(mIntent);

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 823f4646d45fa6ca54d429def472d71a571ab35c Merge: da347295 7e7007e3 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Dec 8 17:14:14 2020 -0500 Merge branch 'master' of github.com:guardianproject/orbot INSTALL | 40 ---------- LICENSE | 2 +- README => README.md | 0 TODO | 8 -- app-mini/src/main/res/values-ar/strings.xml | 2 - app-mini/src/main/res/values-ay/strings.xml | 2 - app-mini/src/main/res/values-az/strings.xml | 2 - app-mini/src/main/res/values-be/strings.xml | 2 - app-mini/src/main/res/values-bg/strings.xml | 2 - app-mini/src/main/res/values-ca/strings.xml | 2 - app-mini/src/main/res/values-cs-rCZ/strings.xml | 2 - app-mini/src/main/res/values-de/strings.xml | 2 - app-mini/src/main/res/values-el/strings.xml | 2 - app-mini/src/main/res/values-es-rAR/strings.xml | 2 - app-mini/src/main/res/values-es/strings.xml | 2 - app-mini/src/main/res/values-eu/strings.xml | 2 - app-mini/src/main/res/values-fa/strings.xml | 2 - app-mini/src/main/res/values-fi/strings.xml | 2 - app-mini/src/main/res/values-fr-rFR/strings.xml | 2 - app-mini/src/main/res/values-fr/strings.xml | 2 - app-mini/src/main/res/values-gl/strings.xml | 2 - app-mini/src/main/res/values-he/strings.xml | 2 - app-mini/src/main/res/values-hi/strings.xml | 2 - app-mini/src/main/res/values-hr/strings.xml | 2 - app-mini/src/main/res/values-hu/strings.xml | 2 - app-mini/src/main/res/values-id/strings.xml | 2 - app-mini/src/main/res/values-in-rID/strings.xml | 2 - app-mini/src/main/res/values-is/strings.xml | 2 - app-mini/src/main/res/values-it/strings.xml | 2 - app-mini/src/main/res/values-iw/strings.xml | 2 - app-mini/src/main/res/values-ja/strings.xml | 2 - app-mini/src/main/res/values-ko/strings.xml | 2 - app-mini/src/main/res/values-lv/strings.xml | 2 - app-mini/src/main/res/values-mk/strings.xml | 2 - app-mini/src/main/res/values-nb/strings.xml | 2 - app-mini/src/main/res/values-nl/strings.xml | 2 - app-mini/src/main/res/values-pl/strings.xml | 2 - app-mini/src/main/res/values-pt-rBR/strings.xml | 2 - app-mini/src/main/res/values-pt-rPT/strings.xml | 2 - app-mini/src/main/res/values-pt/strings.xml | 2 - app-mini/src/main/res/values-ro/strings.xml | 2 - app-mini/src/main/res/values-ru/strings.xml | 2 - app-mini/src/main/res/values-sk/strings.xml | 2 - app-mini/src/main/res/values-sr/strings.xml | 2 - app-mini/src/main/res/values-sv/strings.xml | 2 - app-mini/src/main/res/values-th/strings.xml | 2 - app-mini/src/main/res/values-tl/strings.xml | 2 - app-mini/src/main/res/values-tr/strings.xml | 2 - app-mini/src/main/res/values-uk/strings.xml | 2 - app-mini/src/main/res/values-vi/strings.xml | 2 - app-mini/src/main/res/values-zh-rCN/strings.xml | 2 - app-mini/src/main/res/values-zh-rTW/strings.xml | 2 - app-mini/src/main/res/values/strings.xml | 4 - .../org/torproject/android/OrbotMainActivity.java | 16 ++-- app/src/main/res/values-ar/strings.xml | 4 - app/src/main/res/values-ay/strings.xml | 4 - app/src/main/res/values-az/strings.xml | 4 - app/src/main/res/values-be/strings.xml | 4 - app/src/main/res/values-bg/strings.xml | 4 - app/src/main/res/values-ca/strings.xml | 4 - app/src/main/res/values-cs-rCZ/strings.xml | 4 - app/src/main/res/values-da/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 4 - app/src/main/res/values-el/strings.xml | 4 - app/src/main/res/values-es-rAR/strings.xml | 4 - app/src/main/res/values-es/strings.xml | 4 - app/src/main/res/values-eu/strings.xml | 4 - app/src/main/res/values-fa/strings.xml | 4 - app/src/main/res/values-fi/strings.xml | 4 - app/src/main/res/values-fr-rFR/strings.xml | 4 - app/src/main/res/values-fr/strings.xml | 4 - app/src/main/res/values-gl/strings.xml | 4 - app/src/main/res/values-he/strings.xml | 4 - app/src/main/res/values-hi/strings.xml | 4 - app/src/main/res/values-hr/strings.xml | 4 - app/src/main/res/values-hu/strings.xml | 4 - app/src/main/res/values-id/strings.xml | 4 - app/src/main/res/values-in-rID/strings.xml | 4 - app/src/main/res/values-is/strings.xml | 4 - app/src/main/res/values-it/strings.xml | 4 - app/src/main/res/values-iw/strings.xml | 4 - app/src/main/res/values-ja/strings.xml | 4 - app/src/main/res/values-ko/strings.xml | 4 - app/src/main/res/values-lv/strings.xml | 4 - app/src/main/res/values-mk/strings.xml | 4 - app/src/main/res/values-my/strings.xml | 2 - app/src/main/res/values-nb/strings.xml | 4 - app/src/main/res/values-nl/strings.xml | 4 - app/src/main/res/values-pl/strings.xml | 4 - app/src/main/res/values-pt-rBR/strings.xml | 4 - app/src/main/res/values-pt-rPT/strings.xml | 4 - app/src/main/res/values-pt/strings.xml | 4 - app/src/main/res/values-ro/strings.xml | 4 - app/src/main/res/values-ru/strings.xml | 4 - app/src/main/res/values-si-rLK/strings.xml | 2 - app/src/main/res/values-sk/strings.xml | 4 - app/src/main/res/values-sr/strings.xml | 4 - app/src/main/res/values-sv/strings.xml | 4 - app/src/main/res/values-th/strings.xml | 4 - app/src/main/res/values-tl/strings.xml | 4 - app/src/main/res/values-tr/strings.xml | 4 - app/src/main/res/values-uk/strings.xml | 4 - app/src/main/res/values-vi/strings.xml | 4 - app/src/main/res/values-zh-rCN/strings.xml | 4 - app/src/main/res/values-zh-rTW/strings.xml | 4 - app/src/main/res/values/strings.xml | 11 +-- docs/GSoC.txt | 45 ----------- docs/WALKTHROUGH | 85 --------------------- ic_launcher.svg => docs/ic_launcher.svg | 0 docs/onionroots.xcf | Bin 1748142 -> 0 bytes docs/orbotnewicons.xcf | Bin 1118257 -> 0 bytes 111 files changed, 13 insertions(+), 492 deletions(-)

1 0

[orbot/master] enable selection of Snowflake from bridge wizard activity
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit bbe63e4ee5ebe1191c4c2a25ff343fa432f11a61 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Dec 8 20:38:00 2020 -0500 enable selection of Snowflake from bridge wizard activity --- .../android/ui/onboarding/BridgeWizardActivity.java | 11 +++++++++++ app/src/main/res/layout/content_bridge_wizard.xml | 7 +++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 19 insertions(+) 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 8a359b1b..465d8c58 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 @@ -41,6 +41,7 @@ public class BridgeWizardActivity extends AppCompatActivity { private RadioButton mBtObfs4; private RadioButton mBtMeek; private RadioButton mBtCustom; + private RadioButton mBtSnowflake; private View mBtnConfgiureCustomBridges; @SuppressWarnings("SameParameterValue") @@ -125,6 +126,14 @@ public class BridgeWizardActivity extends AppCompatActivity { testBridgeConnection(); }); + mBtSnowflake = findViewById(R.id.btnBridgesSnowflake); + mBtSnowflake.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (!isChecked) return; + cancelHostTestIfRunning(); + Prefs.setBridgesList("snowflake"); + Prefs.putBridgesEnabled(true); + }); + mBtCustom = findViewById(R.id.btnCustomBridges); mBtCustom.setOnCheckedChangeListener((buttonView, isChecked) -> { if (isChecked) { @@ -249,6 +258,8 @@ public class BridgeWizardActivity extends AppCompatActivity { mBtMeek.setChecked(true); } else if (Prefs.getBridgesList().equals("obfs4")) { mBtObfs4.setChecked(true); + } else if (Prefs.getBridgesList().equals("snowflake")) { + mBtSnowflake.setChecked(true); } else { mBtCustom.setChecked(true); } diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index 0b75ffa4..d5bdea3d 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -58,6 +58,13 @@ android:layout_margin="12dp" android:text="@string/bridge_cloud" /> + <RadioButton + android:id="@+id/btnBridgesSnowflake" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/bridge_snowflake" /> + <RadioButton android:id="@+id/btnCustomBridges" android:layout_width="wrap_content" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1c5d2425..8f8cbbf2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -253,4 +253,5 @@ <string name="in_a_browser">In a browser, visit %s and tap "Get Bridges" > "Just Give Me Bridges!"</string> <string name="paste_bridges">Paste Bridges</string> <string name="use_qr_code">Use QR Code</string> + <string name="bridge_snowflake">Connect through other Tor peers (experimental)</string> </resources>

1 0

[orbot/master] add snowflake entry to built in bridges
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit fa18797fc904518890f7c73332032a115af9fa97 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Dec 8 20:18:36 2020 -0500 add snowflake entry to built in bridges --- orbotservice/src/main/res/raw-fa/bridges.txt | 1 + orbotservice/src/main/res/raw/bridges.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/orbotservice/src/main/res/raw-fa/bridges.txt b/orbotservice/src/main/res/raw-fa/bridges.txt index 3069edb3..11d7a193 100644 --- a/orbotservice/src/main/res/raw-fa/bridges.txt +++ b/orbotservice/src/main/res/raw-fa/bridges.txt @@ -9,3 +9,4 @@ obfs4 94.242.249.2:40190 C7BE8154678E7537CCAC60B097D51A8A7EF8BCDF cert=8jw57wlMl obfs4 77.81.104.251:443 115C90EBD0EB631C177560A872535772215478D9 cert=UsuF7oN4KNKviZP54JOyTCoCphrdM5gwZK4vT8GnCAcmqLUJEJxyw1dpko9a/ii6He4iZg iat-mode=0 obfs4 5.249.146.133:80 FAF3A0073330D6AD92F3B4874B0D945562A633EF cert=TRe8bAODtjcGij7EPQaUayWEOqR99wDh2l3B4hFtCsn1JTJCph03pRZ9tx8wynpLYKWMQg iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com +snowflake 192.0.2.3:1 \ No newline at end of file diff --git a/orbotservice/src/main/res/raw/bridges.txt b/orbotservice/src/main/res/raw/bridges.txt index c631831b..8787099c 100644 --- a/orbotservice/src/main/res/raw/bridges.txt +++ b/orbotservice/src/main/res/raw/bridges.txt @@ -5,3 +5,4 @@ obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWOD obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0 obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com +snowflake 192.0.2.3:1 \ No newline at end of file

1 0

[orbot/master] more improvements to bridge PT init logic
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 4a2e8b14c8f3a5419453389c947468a95b3d6fc3 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Dec 11 18:09:38 2020 -0500 more improvements to bridge PT init logic --- .../torproject/android/service/OrbotService.java | 41 ++++++++++------------ 1 file changed, 18 insertions(+), 23 deletions(-) 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 d03fd989..227f503e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -307,7 +307,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb sendCallbackStatus(STATUS_STOPPING); sendCallbackLogMessage(getString(R.string.status_shutting_down)); - if (useIPtObfs4Proxy()) + if (useIPtObfsMeekProxy()) IPtProxy.stopObfs4Proxy(); if (useIPtSnowflakeProxy()) @@ -329,10 +329,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } - private static boolean useIPtObfs4Proxy () + private static boolean useIPtObfsMeekProxy () { String bridgeList = Prefs.getBridgesList(); - return bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); + return bridgeList.contains("obfs")||bridgeList.contains("meek"); } private static boolean useIPtSnowflakeProxy () @@ -1415,35 +1415,30 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb // extraLines.append("UpdateBridgesFromAuthority 1").append('\n'); String bridgeList = Prefs.getBridgesList(); - boolean obfsBridges = bridgeList.contains("obfs"); - boolean meekBridges = bridgeList.contains("meek"); - boolean snowflakeBridges = bridgeList.contains("snowflake"); + + String builtInBridgeType = null; //check if any PT bridges are needed - if (obfsBridges) { + if (bridgeList.contains("obfs")) { extraLines.append("ClientTransportPlugin obfs3 socks5 127.0.0.1:" + IPtProxy.Obfs3SocksPort).append('\n'); extraLines.append("ClientTransportPlugin obfs4 socks5 127.0.0.1:" + IPtProxy.Obfs4SocksPort).append('\n'); + + if (bridgeList.equals("obfs4")) + builtInBridgeType = "obfs4"; } - if (meekBridges) + if (bridgeList.equals("meek")) { extraLines.append("ClientTransportPlugin meek_lite socks5 127.0.0.1:" + IPtProxy.MeekSocksPort).append('\n'); + builtInBridgeType = "meek_lite"; + } - if (snowflakeBridges) + if (bridgeList.equals("snowflake")) { extraLines.append("ClientTransportPlugin snowflake socks5 127.0.0.1:" + IPtProxy.SnowflakeSocksPort).append('\n'); - - if (obfsBridges||meekBridges||snowflakeBridges) - { - - String type = "obfs4"; - - if (meekBridges) - type = "meek_lite"; - else if (snowflakeBridges) - type = "snowflake"; - - getBridges(type, extraLines); - + builtInBridgeType = "snowflake"; } + + if (!TextUtils.isEmpty(builtInBridgeType)) + getBridges(builtInBridgeType, extraLines); else { String[] bridgeListLines = parseBridgesFromSettings(bridgeList); @@ -1781,7 +1776,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (!TextUtils.isEmpty(action)) { if (action.equals(ACTION_START) || action.equals(ACTION_START_ON_BOOT)) { - if (useIPtObfs4Proxy()) + if (useIPtObfsMeekProxy()) IPtProxy.startObfs4Proxy("DEBUG", false, false); if (useIPtSnowflakeProxy())

1 0

[orbot/master] Removed outdated repository files, made README a markdown file.
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit cabca2a7be6659efe4d55fd4555591d174380050 Author: bim <dsnake(a)protonmail.com> Date: Sun Nov 29 15:53:48 2020 -0500 Removed outdated repository files, made README a markdown file. It would make sense to eventually populate README.md with instructions about how to use the app, how to get involved with the project etc --- INSTALL | 40 ---------------------------------------- LICENSE | 2 +- README => README.md | 0 TODO | 8 -------- 4 files changed, 1 insertion(+), 49 deletions(-) diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 1624d1a2..00000000 --- a/INSTALL +++ /dev/null @@ -1,40 +0,0 @@ - -Orbot: Android Onion Routing Robot -*********************************************** -Orbot is a freely licensed open-source application developed for the -Android platform. It acts as a front-end to the Tor binary application, -and also provides an HTTP Proxy for connecting web browsers and other -HTTP client applications into the Tor SOCKS interface. - -*** PreReqs *** -You need the Android Developer SDK to compile and build the APK file: -http://developer.android.com/ -The project files including in this distribution are meant to be used -with Eclipse: http://eclipse.org/ - -*** How to use *** -Currently, Orbot will work with any application that supports using -an HTTP or SOCKS Proxy. Once you start Tor using Orbot, you can then -point your application to HTTP port 8118 or SOCKS port 9050 on localhost -IP 127.0.0.1. - -If you have root access, and a version of Android with iptables that -supports the netfilter owner module, then Orbot can setup transparent -proxying for any application. - -Finally, Firefox on Android is available, and we have released an -add-on named ProxyMob for configuring SOCKS proxy settings for use -with the local Tor socks proxy. - -** A Few Notes ** - -To ensure you are connected to the Tor network, you should browse to -https://check.torproject.org/ - -The first time you activate Orbot, it may take a while to connect to -Tor. Check the message log to ensure you are "100% Bootstrapped". - -*********************************************** - -/* Copyright (c) 2009,2010,2011, Nathan Freitas, The Guardian Project - * http://guardianproject.info/ */ diff --git a/LICENSE b/LICENSE index b857146b..194b99d9 100644 --- a/LICENSE +++ b/LICENSE @@ -4,7 +4,7 @@ provide anonymity on the Internet from a Google Android smartphone. It also lists the licenses for other components used by Orbot, including Tor, and iptables. -For more information about Orbot, see https://guardianproject.info/apps/orbot +For more information about Orbot, see https://guardianproject.info/apps/org.torproject.android/ If you got this file as a part of a larger bundle, there may be other license terms that you should be aware of. diff --git a/README b/README.md similarity index 100% rename from README rename to README.md diff --git a/TODO b/TODO deleted file mode 100644 index ba269567..00000000 --- a/TODO +++ /dev/null @@ -1,8 +0,0 @@ - -Current tracked tickets for Orbot can be found here: -https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=new&status=reopened&group=component&component=Orbot&order=priority - -If you would like to join the project, we have some ideas for volunteering here: -http://www.torproject.org/getinvolved/volunteer.html.en#project-orbot - -You can find us in IRC on FREENODE or OFTC in the #guardianproject and #tor-dev channels \ No newline at end of file

1 0

[orbot/master] remove local IPtProxy; use jitpack dependency instead
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 051a5791b1ab32b5b3f6d35b42d628d7658e1ef0 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Dec 8 17:42:18 2020 -0500 remove local IPtProxy; use jitpack dependency instead --- IPtProxy/IPtProxy.aar | Bin 29425327 -> 0 bytes IPtProxy/build.gradle | 2 -- orbotservice/build.gradle | 3 +-- settings.gradle | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/IPtProxy/IPtProxy.aar b/IPtProxy/IPtProxy.aar deleted file mode 100644 index ed76d5fb..00000000 Binary files a/IPtProxy/IPtProxy.aar and /dev/null differ diff --git a/IPtProxy/build.gradle b/IPtProxy/build.gradle deleted file mode 100644 index afc0293e..00000000 --- a/IPtProxy/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('IPtProxy.aar')) \ No newline at end of file diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 447ee60d..c1b99e7b 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -60,6 +60,5 @@ dependencies { implementation 'info.guardianproject:jtorctl:0.4' - /*********** IPtProxy: https://github.com/tladesignz/IPtProxy **********/ - implementation project(path: ':IPtProxy') + implementation 'com.github.tladesignz:IPtProxy:0.5.0' } diff --git a/settings.gradle b/settings.gradle index d9af051e..46cf1758 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,3 @@ -include ':IPtProxy' include ':intentintegrator' include ':appcore' include ':orbotservice',':app',':app-mini'

1 0

[orbot/master] clean-up logic for setting PT bridge lines
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit b2fb0e74e6a881eaf87cab61f49e7d8d293b1342 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Dec 11 17:48:34 2020 -0500 clean-up logic for setting PT bridge lines --- .../torproject/android/service/OrbotService.java | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) 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 b1b64aeb..d03fd989 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -342,6 +342,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } private void startSnowflakeProxy () { + //this is using the current, default Tor snowflake infrastructure IPtProxy.startSnowflake( "stun:stun.l.google.com:19302", "https://snowflake-broker.azureedge.net/", "ajax.aspnetcdn.com", null, true, false, true, 3); } @@ -1414,17 +1415,15 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb // extraLines.append("UpdateBridgesFromAuthority 1").append('\n'); String bridgeList = Prefs.getBridgesList(); - boolean obfs3Bridges = bridgeList.contains("obfs3"); - boolean obfs4Bridges = bridgeList.contains("obfs4"); + boolean obfsBridges = bridgeList.contains("obfs"); boolean meekBridges = bridgeList.contains("meek"); boolean snowflakeBridges = bridgeList.contains("snowflake"); //check if any PT bridges are needed - if (obfs3Bridges) + if (obfsBridges) { extraLines.append("ClientTransportPlugin obfs3 socks5 127.0.0.1:" + IPtProxy.Obfs3SocksPort).append('\n'); - - if (obfs4Bridges) extraLines.append("ClientTransportPlugin obfs4 socks5 127.0.0.1:" + IPtProxy.Obfs4SocksPort).append('\n'); + } if (meekBridges) extraLines.append("ClientTransportPlugin meek_lite socks5 127.0.0.1:" + IPtProxy.MeekSocksPort).append('\n'); @@ -1432,16 +1431,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (snowflakeBridges) extraLines.append("ClientTransportPlugin snowflake socks5 127.0.0.1:" + IPtProxy.SnowflakeSocksPort).append('\n'); - if (bridgeList != null && bridgeList.length() > 10) //longer then 1 = some real values here + if (obfsBridges||meekBridges||snowflakeBridges) { - String[] bridgeListLines = parseBridgesFromSettings(bridgeList); - int bridgeIdx = (int) Math.floor(Math.random() * ((double) bridgeListLines.length)); - String bridgeLine = bridgeListLines[bridgeIdx]; - extraLines.append("Bridge "); - extraLines.append(bridgeLine); - extraLines.append("\n"); - - } else { String type = "obfs4"; @@ -1453,6 +1444,16 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb getBridges(type, extraLines); } + else + { + String[] bridgeListLines = parseBridgesFromSettings(bridgeList); + int bridgeIdx = (int) Math.floor(Math.random() * ((double) bridgeListLines.length)); + String bridgeLine = bridgeListLines[bridgeIdx]; + extraLines.append("Bridge "); + extraLines.append(bridgeLine); + extraLines.append("\n"); + + } }

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 9be60c28b603cf9d5138307377aa6dc0e3985483 Merge: 47b7b805 626a341d Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 14 13:46:53 2020 -0500 Merge branch 'master' of github.com:guardianproject/orbot .../torproject/android/service/OrbotService.java | 45 +++++++++++----------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --cc orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 227f503e,10f4a686..6274b18b --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@@ -297,54 -297,35 +297,53 @@@ public class OrbotService extends VpnSe super.onDestroy(); } - private void stopTor() { - new Thread(this::stopTorAsync).start(); - } - private void stopTorAsync() { - Log.i("OrbotService", "stopTor"); + try { - sendCallbackStatus(STATUS_STOPPING); - sendCallbackLogMessage(getString(R.string.status_shutting_down)); + - if (useIPtObfsMeekProxy()) - IPtProxy.stopObfs4Proxy(); + new Thread(() ->{ + Log.i("OrbotService", "stopTor"); + try { + sendCallbackStatus(STATUS_STOPPING); + sendCallbackLogMessage(getString(R.string.status_shutting_down)); - if (useIPtSnowflakeProxy()) - IPtProxy.stopSnowflake(); - if (useIPtProxy()) - IPtProxy.stopObfs4Proxy(); ++ if (useIPtObfsMeekProxy()) ++ IPtProxy.stopObfs4Proxy(); + - stopTorDaemon(true); ++ if (useIPtSnowflakeProxy()) ++ IPtProxy.stopSnowflake(); + - //stop the foreground priority and make sure to remove the persistant notification - stopForeground(true); - sendCallbackLogMessage(getString(R.string.status_disabled)); - } catch (Exception e) { - logNotice("An error occured stopping Tor: " + e.getMessage()); - sendCallbackLogMessage(getString(R.string.something_bad_happened)); - } - clearNotifications(); - sendCallbackStatus(STATUS_OFF); + stopTorDaemon(true); + //stop the foreground priority and make sure to remove the persistant notification + stopForeground(true); + sendCallbackLogMessage(getString(R.string.status_disabled)); + } catch (Exception e) { + logNotice("An error occured stopping Tor: " + e.getMessage()); + sendCallbackLogMessage(getString(R.string.something_bad_happened)); + } + clearNotifications(); + sendCallbackStatus(STATUS_OFF); + }).start(); } - private static boolean useIPtProxy () + private static boolean useIPtObfsMeekProxy () + { + String bridgeList = Prefs.getBridgesList(); + return bridgeList.contains("obfs")||bridgeList.contains("meek"); + } + + private static boolean useIPtSnowflakeProxy () { String bridgeList = Prefs.getBridgesList(); - return bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); + return bridgeList.contains("snowflake"); + } + + private void startSnowflakeProxy () { + //this is using the current, default Tor snowflake infrastructure + IPtProxy.startSnowflake( "stun:stun.l.google.com:19302", "https://snowflake-broker.azureedge.net/", + "ajax.aspnetcdn.com", null, true, false, true, 3); } /**

1 0