mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-07-30 09:06:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

for improved security, a swap repo config will not be saved unless it's on the same wifi network as the device

Browse Source
This commit is contained in:
mnbogner
2026-06-12 14:11:04 -07:00
parent e36f616b91
commit 2fade0c1df
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
View File

@@ -463,8 +463,18 @@ public class SwapWorkflowActivity extends AppCompatActivity {
Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
return;
}
confirmSwapConfig = new NewRepoConfig(this, intent);
checkIfNewRepoOnSameWifi(confirmSwapConfig);
// don't save the repo config unless it's on the same network as the device
// if no config is saved, the confirmation dialog should not be displayed
NewRepoConfig repoConfig = new NewRepoConfig(this, intent);
if (!checkIfNewRepoOnSameWifi(repoConfig)) {
// show a toast here so the user is aware of the issue
String msg = getString(R.string.not_on_same_wifi, repoConfig.getSsid());
Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
return;
}
confirmSwapConfig = repoConfig;
}
private static boolean isSwapUrl(Uri uri) {
@@ -789,8 +799,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
if (scanResult != null) {
if (scanResult.getContents() != null) {
NewRepoConfig repoConfig = new NewRepoConfig(this, scanResult.getContents());
if (repoConfig.isValidRepo()) {
checkIfNewRepoOnSameWifi(repoConfig);
if (repoConfig.isValidRepo() && checkIfNewRepoOnSameWifi(repoConfig)) {
confirmSwapConfig = repoConfig;
showRelevantView();
} else {
@@ -824,24 +833,28 @@ public class SwapWorkflowActivity extends AppCompatActivity {
}
}
private void checkIfNewRepoOnSameWifi(NewRepoConfig newRepo) {
private boolean checkIfNewRepoOnSameWifi(NewRepoConfig newRepo) {
// if this is a local repo, check we're on the same wifi
if (!TextUtils.isEmpty(newRepo.getBssid())) {
WifiManager wifiManager = ContextCompat.getSystemService(getApplicationContext(),
WifiManager.class);
WifiInfo wifiInfo = wifiManager.getConnectionInfo();
String bssid = wifiInfo.getBSSID();
if (TextUtils.isEmpty(bssid)) { /* not all devices have wifi */
return;
if (TextUtils.isEmpty(bssid)) {
// device may not have wifi
return false;
}
bssid = bssid.toLowerCase(Locale.ENGLISH);
String newRepoBssid = Uri.decode(newRepo.getBssid()).toLowerCase(Locale.ENGLISH);
if (!bssid.equals(newRepoBssid)) {
String msg = getString(R.string.not_on_same_wifi, newRepo.getSsid());
Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
// repo config bssid doesn't match device bssid
return false;
}
// TODO we should help the user to the right thing here,
// instead of just showing a message!
// repo config appears to be on same wifi as device
return true;
} else {
// repo config has empty bssid
return false;
}
}