mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-06-19 13:20:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added a dns class that caches dns lookups

Browse Source
This commit is contained in:
Matthew Bogner
2024-02-01 11:57:31 +00:00
committed by Torsten Grote
parent eebe7f6d6b
commit cf595783b0
15 changed files with 308 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
app/src/androidTest/java/org/fdroid/fdroid/net/DnsWithCacheTest.java Normal file
View File

@@ -0,0 +1,78 @@
package org.fdroid.fdroid.net;
import static org.junit.Assert.assertEquals;
import org.fdroid.fdroid.Preferences;
import org.junit.Test;
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.List;
public class DnsWithCacheTest {
private static final String URL_1 = "fdroid.com";
private static final String URL_2 = "fdroid.org";
private static final String URL_3 = "fdroid.net";
private static final InetAddress IP_1;
private static final InetAddress IP_2;
private static final InetAddress IP_3;
static {
try {
IP_1 = InetAddress.getByName("127.0.0.1");
IP_2 = InetAddress.getByName("127.0.0.2");
IP_3 = InetAddress.getByName("127.0.0.3");
} catch (UnknownHostException e) {
throw new RuntimeException(e);
}
}
private static final List<InetAddress> LIST_1 = Arrays.asList(IP_1, IP_2, IP_3);
private static final List<InetAddress> LIST_2 = Arrays.asList(IP_2);
private static final List<InetAddress> LIST_3 = Arrays.asList(IP_3);
@Test
public void basicCacheTest() throws IOException, InterruptedException {
// test setup
Preferences prefs = Preferences.get();
prefs.setDnsCacheEnabledValue(true);
DnsWithCache testObject = new DnsWithCache();
// populate cache
testObject.updateCacheAndPrefs(URL_1, LIST_1);
testObject.updateCacheAndPrefs(URL_2, LIST_2);
testObject.updateCacheAndPrefs(URL_3, LIST_3);
// check for cached lookup results
List<InetAddress> testList = testObject.lookup(URL_1);
assertEquals(3, testList.size());
assertEquals(IP_1.getHostAddress(), testList.get(0).getHostAddress());
assertEquals(IP_2.getHostAddress(), testList.get(1).getHostAddress());
assertEquals(IP_3.getHostAddress(), testList.get(2).getHostAddress());
// toggle preference (false)
prefs.setDnsCacheEnabledValue(false);
// attempt non-cached lookup
boolean gotException = false;
try {
testList = testObject.lookup(URL_1);
} catch (UnknownHostException e) {
// test urls are not valid
gotException = true;
}
assertEquals(true, gotException);
// toggle preference (true)
prefs.setDnsCacheEnabledValue(true);
// confirm lookup results remain in cache
testList = testObject.lookup(URL_2);
assertEquals(1, testList.size());
assertEquals(IP_2.getHostAddress(), testList.get(0).getHostAddress());
}
}

8
app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java
View File

@@ -31,7 +31,13 @@ import java.util.concurrent.TimeUnit;
public class HttpDownloaderTest {
private static final String TAG = "HttpDownloaderTest";
private final HttpManager httpManager = new HttpManager(Utils.getUserAgent(), FDroidApp.queryString, null, true);
private final HttpManager httpManager = new HttpManager(
Utils.getUserAgent(),
FDroidApp.queryString,
null,
null,
true
);
private static final Collection<Pair<String, String>> URLS;
// https://developer.android.com/reference/javax/net/ssl/SSLContext