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

[orbot/master] have to build pdnsd as an executable, then rename it to libpdnsd.so
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 6afd54bf1dccbd0e81aff9c93848859474d9ee8a Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 9 16:20:32 2021 -0400 have to build pdnsd as an executable, then rename it to libpdnsd.so --- orbotservice/src/main/jni/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orbotservice/src/main/jni/Android.mk b/orbotservice/src/main/jni/Android.mk index 3d32a41b..123954ff 100644 --- a/orbotservice/src/main/jni/Android.mk +++ b/orbotservice/src/main/jni/Android.mk @@ -29,8 +29,8 @@ LOCAL_MODULE := pdnsd LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%) LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd -DHAVE_STPCPY - -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_EXECUTABLE) +##include $(BUILD_SHARED_LIBRARY) ######################################################## ## libancillary

1 0

[orbot/master] update to version 1651100200
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2a0ffa6551423cce546d825b0519e2c8b25e924b Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 9 11:40:04 2021 -0400 update to version 1651100200 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a456a18e..d8f961cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,7 +82,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1651100100 + versionCode 1651100200 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] don't abort on lint
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit fc6a0ea7d7f048e334e0fd2f0e89298027bcc79e Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Feb 24 10:54:40 2021 -0500 don't abort on lint --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 4d9e43a9..c9470670 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,7 +52,7 @@ android { } lintOptions { checkReleaseBuilds false - abortOnError true + abortOnError false htmlReport true xmlReport false

1 0

[orbot/master] move SDK back to 29 so that snowflake-go code can work
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit b35008f38e86c3edbc42623d746b9abd6f2257cb Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Apr 5 15:32:46 2021 -0400 move SDK back to 29 so that snowflake-go code can work --- app/build.gradle | 2 +- orbotservice/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c9470670..b0d45307 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,7 +80,7 @@ android { dimension "free" minSdkVersion 16 applicationId 'org.torproject.android' - targetSdkVersion 30 + targetSdkVersion 29 versionCode 1641200300 versionName getVersionName() diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index e881f448..58ea078d 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -13,7 +13,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 30 + targetSdkVersion 29 } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8

1 0

[orbot/master] for #441, enable queries keyword in manifest, to enable package lookup on Android 11
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit b6c63ea86f9a090b1bd1ff8d6f8dad4a45322e38 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Feb 23 15:27:28 2021 -0500 for #441, enable queries keyword in manifest, to enable package lookup on Android 11 --- app/src/main/AndroidManifest.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ae1a8be8..3bbaf610 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,6 +21,12 @@ android:maxSdkVersion="18" /> <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> + <queries> + <intent> + <action android:name="android.intent.action.MAIN" /> + </intent> + </queries> + <application android:name=".OrbotApp" android:allowBackup="false"

1 0

[orbot/master] Merge pull request #442 from bitmold/v3_backup_bugs
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit ce3f265ddd1e10f7eeb9970bac62fe0073b95024 Merge: fc6a0ea7 894c7ba1 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Mar 9 09:02:14 2021 -0500 Merge pull request #442 from bitmold/v3_backup_bugs Minor v3 Client Auth Backup/Resotre Bugs .../clientauth/ClientAuthActivity.java | 20 +++++++-- .../clientauth/ClientAuthBackupDialogFragment.java | 47 ++++++++++++++++++++-- 2 files changed, 60 insertions(+), 7 deletions(-)

1 0

[orbot/master] update version code to 1641200300
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 03ed12073f313be338ddad25887d8af93879eaae Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Feb 23 15:28:41 2021 -0500 update version code to 1641200300 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 32e828e1..4d9e43a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,7 +81,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 30 - versionCode 1641200200 + versionCode 1641200300 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] - Fixed .auth_privates being saved as .auth_private.txt
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 894c7ba11e1357833e4f40f2988ba856c96ae487 Author: bim <dsnake(a)protonmail.com> Date: Mon Mar 1 15:51:49 2021 -0500 - Fixed .auth_privates being saved as .auth_private.txt - Better input validation on backing up client auth keys - Fixed minor bug where backup filename would clear on device rotation --- .../clientauth/ClientAuthActivity.java | 20 +++++++-- .../clientauth/ClientAuthBackupDialogFragment.java | 47 ++++++++++++++++++++-- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java index e33ddf78..761ce171 100644 --- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java +++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java @@ -8,6 +8,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.os.Handler; +import android.provider.OpenableColumns; import android.view.Menu; import android.view.MenuItem; import android.widget.ListView; @@ -22,7 +23,6 @@ import org.torproject.android.R; import org.torproject.android.core.DiskUtils; import org.torproject.android.core.LocaleHelper; import org.torproject.android.ui.hiddenservices.backup.BackupUtils; -import org.torproject.android.ui.hiddenservices.backup.ZipUtilities; import java.io.File; import java.util.List; @@ -36,6 +36,9 @@ public class ClientAuthActivity extends AppCompatActivity { private ContentResolver mResolver; private ClientAuthListAdapter mAdapter; + static final String CLIENT_AUTH_FILE_EXTENSION = ".auth_private", + CLIENT_AUTH_SAF_MIME_TYPE = "*/*"; + @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -69,14 +72,22 @@ public class ClientAuthActivity extends AppCompatActivity { if (requestCode == REQUEST_CODE_READ_ZIP_BACKUP && resultCode == RESULT_OK) { Uri uri = data.getData(); if (uri != null) { + Cursor cursor = getContentResolver().query(uri, null, null, null, null); + int nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME); + cursor.moveToFirst(); + String filename = cursor.getString(nameIndex); + cursor.close(); + if (!filename.endsWith(CLIENT_AUTH_FILE_EXTENSION)) { + Toast.makeText(this, R.string.error, Toast.LENGTH_LONG).show(); + return; + } String authText = DiskUtils.readFileFromInputStream(getContentResolver(), uri); new BackupUtils(this).restoreClientAuthBackup(authText); } } else { super.onActivityResult(requestCode, resultCode, data); List<Fragment> frags = getSupportFragmentManager().getFragments(); - if (frags != null) - for (Fragment f : frags) f.onActivityResult(requestCode, resultCode, data); + for (Fragment f : frags) f.onActivityResult(requestCode, resultCode, data); } } @@ -103,7 +114,8 @@ public class ClientAuthActivity extends AppCompatActivity { public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.menu_import_auth_priv) { if (DiskUtils.supportsStorageAccessFramework()) { - Intent readFileIntent = DiskUtils.createReadFileIntent("text/*"); + // unfortunately no good way to filter .auth_private files + Intent readFileIntent = DiskUtils.createReadFileIntent(CLIENT_AUTH_SAF_MIME_TYPE); startActivityForResult(readFileIntent, REQUEST_CODE_READ_ZIP_BACKUP); } else { // APIs 16, 17, 18 doRestoreLegacy(); diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java index c924fe0e..b56bc337 100644 --- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java +++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java @@ -3,9 +3,13 @@ package org.torproject.android.ui.v3onionservice.clientauth; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; +import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.text.Editable; +import android.text.TextUtils; +import android.text.TextWatcher; import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.Toast; @@ -23,6 +27,9 @@ import java.io.File; public class ClientAuthBackupDialogFragment extends DialogFragment { private NoPersonalizedLearningEditText etFilename; + private TextWatcher fileNameTextWatcher; + + private static final String BUNDLE_KEY_FILENAME = "filename"; public ClientAuthBackupDialogFragment() { } @@ -50,18 +57,52 @@ public class ClientAuthBackupDialogFragment extends DialogFragment { etFilename = new NoPersonalizedLearningEditText(ad.getContext(), null); etFilename.setSingleLine(true); etFilename.setHint(R.string.v3_backup_name_hint); + if (savedInstanceState != null) + etFilename.setText(savedInstanceState.getString(BUNDLE_KEY_FILENAME, "")); + fileNameTextWatcher = new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + ad.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(!TextUtils.isEmpty(s.toString().trim())); + } + }; + etFilename.addTextChangedListener(fileNameTextWatcher); etFilename.setLayoutParams(params); container.addView(etFilename); ad.setView(container); return ad; } + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putString(BUNDLE_KEY_FILENAME, etFilename.getText().toString()); + } + + + @Override + public void onStart() { + super.onStart(); + fileNameTextWatcher.afterTextChanged(etFilename.getEditableText()); + } + + + private void doBackup() { String filename = etFilename.getText().toString().trim(); - if (filename.equals("")) filename = "filename"; - filename += ".auth_private"; + if (!filename.endsWith(ClientAuthActivity.CLIENT_AUTH_FILE_EXTENSION)) + filename += ClientAuthActivity.CLIENT_AUTH_FILE_EXTENSION; if (DiskUtils.supportsStorageAccessFramework()) { - Intent createFileIntent = DiskUtils.createWriteFileIntent(filename, "text/*"); + Intent createFileIntent = DiskUtils.createWriteFileIntent(filename, ClientAuthActivity.CLIENT_AUTH_SAF_MIME_TYPE); getActivity().startActivityForResult(createFileIntent, REQUEST_CODE_WRITE_FILE); } else { // APIs 16, 17, 18 attemptToWriteBackup(Uri.fromFile(new File(DiskUtils.getOrCreateLegacyBackupDir("Orbot"), filename)));

1 0

[orbot/master] add configuration file for domain fronting
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 74b9d2f57859031be38d168335f6397ca366fa7d Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Apr 5 15:33:04 2021 -0400 add configuration file for domain fronting --- .../android/ui/onboarding/MoatActivity.java | 10 +++-- orbotservice/src/main/assets/fronts | 4 ++ .../torproject/android/service/OrbotService.java | 43 +++++++++++++++++++++- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java index 756a9f5c..2bb0807e 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java @@ -36,6 +36,7 @@ import com.android.volley.DefaultRetryPolicy; import com.android.volley.Request; import com.android.volley.RequestQueue; import com.android.volley.Response; +import com.android.volley.toolbox.HurlStack; import com.android.volley.toolbox.JsonObjectRequest; import com.android.volley.toolbox.Volley; @@ -151,6 +152,8 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe LocalBroadcastManager.getInstance(this).registerReceiver(mBroadcastReceiver, new IntentFilter(TorServiceConstants.ACTION_STATUS)); + + OrbotService.loadCdnFronts(this); } @Override @@ -184,9 +187,10 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe IPtProxy.startObfs4Proxy("DEBUG", false, false); ProxiedHurlStack phs = new ProxiedHurlStack("127.0.0.1", (int) IPtProxy.MeekSocksPort, - "url=https://onion.azureedge.net/;front=ajax.aspnetcdn.com", "\0"); + "url=" + OrbotService.getCdnFront(this,"moat-url") + + ";front=" + OrbotService.getCdnFront(this,"moat-front"), "\0"); - mQueue = Volley.newRequestQueue(MoatActivity.this, phs); + mQueue = Volley.newRequestQueue(this, phs); if (mCaptcha == null) { new Handler(Looper.getMainLooper()).postDelayed(this::fetchCaptcha, 1000); @@ -416,7 +420,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe Log.d(MoatActivity.class.getSimpleName(), "Set up Volley queue. host=" + host + ", port=" + port); - mQueue = Volley.newRequestQueue(this, new ProxiedHurlStack(host, port)); + // mQueue = Volley.newRequestQueue(this, new ProxiedHurlStack(host, port)); sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); diff --git a/orbotservice/src/main/assets/fronts b/orbotservice/src/main/assets/fronts new file mode 100644 index 00000000..57b500ec --- /dev/null +++ b/orbotservice/src/main/assets/fronts @@ -0,0 +1,4 @@ +snowflake https://d2kt284300pde7.cloudfront.net/ +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 884e07dd..126f9e9a 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -65,6 +65,8 @@ import java.io.InputStreamReader; import java.io.PrintStream; import java.io.PrintWriter; import java.net.Socket; +import java.net.URL; +import java.net.URLConnection; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -351,10 +353,45 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return bridgeList.contains("snowflake"); } + private static HashMap<String,String> mFronts; + + public static void loadCdnFronts (Context context) + { + + if (mFronts == null) + { + mFronts = new HashMap<>(); + + try { + BufferedReader reader = new BufferedReader(new InputStreamReader(context.getAssets().open("fronts"))); + String line = null; + while ((line = reader.readLine())!=null) + { + String[] front = line.split(" "); + + //add some code to test the connection here + + mFronts.put(front[0],front[1]); + + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + public static String getCdnFront (Context context, String service) + { + + return mFronts.get(service); + } + + private void startSnowflakeClient() { //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); + String front = getCdnFront(this,"snowflake"); + IPtProxy.startSnowflake("stun:stun.l.google.com:19302", front, + null, null, true, false, true, 3); } /* @@ -502,6 +539,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb mVpnManager = new OrbotVpnManager(this); + loadCdnFronts(this); + } catch (Exception e) { //what error here Log.e(OrbotConstants.TAG, "Error installing Orbot binaries", e);

1 0

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

22 Dec '21

commit 99620a0bc03e7ef30c5568d9a9d748a76c01862e Merge: 74b9d2f5 ce3f265d Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Apr 5 15:33:30 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot .../clientauth/ClientAuthActivity.java | 20 +++++++-- .../clientauth/ClientAuthBackupDialogFragment.java | 47 ++++++++++++++++++++-- 2 files changed, 60 insertions(+), 7 deletions(-)

1 0