n/nextdns-mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented more type of DNS records for test

Browse Source
This commit is contained in:
PeratX 2017-06-04 12:38:47 +08:00
parent 13f6fd12ee
commit 5a8fd1ee82
7 changed files with 94 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/itxtech/daedalus/Daedalus.java
View File

@ -50,9 +50,6 @@ public class Daedalus extends Application {
private static final String SHORTCUT_ID_ACTIVATE = "shortcut_activate";
public static final List<DnsServer> DNS_SERVERS = new ArrayList<DnsServer>() {{
/*add(new DnsServer("0", "113.107.249.56", R.string.server_cutedns_north_china));
add(new DnsServer("1", "120.27.103.230", R.string.server_cutedns_east_china));
add(new DnsServer("2", "123.206.61.167", R.string.server_cutedns_south_china));*/
add(new DnsServer("115.159.220.214", R.string.server_puredns_east_china));
add(new DnsServer("123.207.137.88", R.string.server_puredns_north_china));
add(new DnsServer("115.159.146.99", R.string.server_aixyz_east_china));
@ -179,7 +176,7 @@ public class Daedalus extends Application {
prefs = null;
RulesResolver.shutdown();
mResolver.interrupt();
RulesResolver.clean();
RulesResolver.clear();
mResolver = null;
Logger.shutdown();
}

101
app/src/main/java/org/itxtech/daedalus/fragment/DnsTestFragment.java
View File

@ -5,7 +5,6 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.design.widget.Snackbar;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -14,8 +13,6 @@ import android.widget.*;
import de.measite.minidns.DNSMessage;
import de.measite.minidns.Question;
import de.measite.minidns.Record;
import de.measite.minidns.record.A;
import de.measite.minidns.record.AAAA;
import de.measite.minidns.source.NetworkDataSource;
import org.itxtech.daedalus.Daedalus;
import org.itxtech.daedalus.R;
@ -40,7 +37,28 @@ import java.util.Random;
* (at your option) any later version.
*/
public class DnsTestFragment extends ToolbarFragment {
private static final String TAG = "DServerTest";
private class Type {
private Record.TYPE type;
private String name;
private Type(String name, Record.TYPE type) {
this.name = name;
this.type = type;
}
private String getName() {
return name;
}
private Record.TYPE getType() {
return type;
}
@Override
public String toString() {
return getName();
}
}
private static Thread mThread = null;
private static Runnable mRunnable = null;
@ -57,6 +75,32 @@ public class DnsTestFragment extends ToolbarFragment {
spinnerServerChoice.setAdapter(spinnerArrayAdapter);
spinnerServerChoice.setSelection(DnsServerHelper.getPosition(DnsServerHelper.getPrimary()));
ArrayList<Type> types = new ArrayList<Type>() {{
add(new Type("A", Record.TYPE.A));
add(new Type("NS", Record.TYPE.NS));
add(new Type("CNAME", Record.TYPE.CNAME));
add(new Type("SOA", Record.TYPE.SOA));
add(new Type("PTR", Record.TYPE.PTR));
add(new Type("MX", Record.TYPE.MX));
add(new Type("TXT", Record.TYPE.TXT));
add(new Type("AAAA", Record.TYPE.AAAA));
add(new Type("SRV", Record.TYPE.SRV));
add(new Type("OPT", Record.TYPE.OPT));
add(new Type("DS", Record.TYPE.DS));
add(new Type("RRSIG", Record.TYPE.RRSIG));
add(new Type("NSEC", Record.TYPE.NSEC));
add(new Type("DNSKEY", Record.TYPE.DNSKEY));
add(new Type("NSEC3", Record.TYPE.NSEC3));
add(new Type("NSEC3PARAM", Record.TYPE.NSEC3PARAM));
add(new Type("TLSA", Record.TYPE.TLSA));
add(new Type("OPENPGPKEY", Record.TYPE.OPENPGPKEY));
add(new Type("DLV", Record.TYPE.DLV));
}};
final Spinner spinnerType = (Spinner) view.findViewById(R.id.spinner_type);
ArrayAdapter<Type> typeAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_1, types);
spinnerType.setAdapter(typeAdapter);
final AutoCompleteTextView textViewTestUrl = (AutoCompleteTextView) view.findViewById(R.id.autoCompleteTextView_test_url);
ArrayAdapter autoCompleteArrayAdapter = new ArrayAdapter<>(Daedalus.getInstance(), android.R.layout.simple_list_item_1, Daedalus.DEFAULT_TEST_DOMAINS);
textViewTestUrl.setAdapter(autoCompleteArrayAdapter);
@ -78,8 +122,9 @@ public class DnsTestFragment extends ToolbarFragment {
}
}};
DNSQuery dnsQuery = new DNSQuery();
Record.TYPE type = ((Type) spinnerType.getSelectedItem()).getType();
for (String dnsServer : dnsServers) {
testText = testServer(dnsQuery, dnsServer, testDomain, testText);
testText = testServer(dnsQuery, type, dnsServer, testDomain, testText);
}
mHandler.obtainMessage(DnsTestHandler.MSG_TEST_DONE).sendToTarget();
} catch (Exception e) {
@ -87,52 +132,42 @@ public class DnsTestFragment extends ToolbarFragment {
}
}
private StringBuilder testServer(DNSQuery dnsQuery, String dnsServer, String testUrl, StringBuilder testText) {
Log.d(TAG, "Testing DNS " + dnsServer);
testText.append(getString(R.string.test_domain)).append(" ").append(testUrl).append("\n").append(getString(R.string.test_dns_server)).append(" ").append(dnsServer);
private StringBuilder testServer(DNSQuery dnsQuery, Record.TYPE type, String server, String domain, StringBuilder testText) {
Logger.debug("Testing DNS " + server);
testText.append(getString(R.string.test_domain)).append(" ").append(domain).append("\n").append(getString(R.string.test_dns_server)).append(" ").append(server);
mHandler.obtainMessage(DnsTestHandler.MSG_DISPLAY_STATUS, testText.toString()).sendToTarget();
DNSMessage.Builder messageA = DNSMessage.builder();
messageA.addQuestion(new Question(testUrl, Record.TYPE.A));
messageA.setId((new Random()).nextInt());
messageA.setRecursionDesired(true);
messageA.getEdnsBuilder().setUdpPayloadSize(1024).setDnssecOk(false);
DNSMessage.Builder messageAAAA = DNSMessage.builder();
messageAAAA.addQuestion(new Question(testUrl, Record.TYPE.AAAA));
messageAAAA.setId((new Random()).nextInt());
messageAAAA.setRecursionDesired(true);
messageAAAA.getEdnsBuilder().setUdpPayloadSize(1024).setDnssecOk(false);
try {
DNSMessage.Builder message = DNSMessage.builder();
message.addQuestion(new Question(domain, type));
message.setId((new Random()).nextInt());
message.setRecursionDesired(true);
message.getEdnsBuilder().setUdpPayloadSize(1024).setDnssecOk(false);
long startTime = System.currentTimeMillis();
DNSMessage responseAMessage = dnsQuery.query(messageA.build(), InetAddress.getByName(dnsServer), 53);//Auto forward ports
DNSMessage responseAAAAMessage = dnsQuery.query(messageAAAA.build(), InetAddress.getByName(dnsServer), 53);//Auto forward ports
DNSMessage responseAMessage = dnsQuery.query(message.build(), InetAddress.getByName(server), 53);
long endTime = System.currentTimeMillis();
if (responseAMessage.answerSection.size() > 0 || responseAAAAMessage.answerSection.size() > 0) {
for (Record record : responseAAAAMessage.answerSection) {
if (record.getPayload() instanceof AAAA) {
testText.append("\n").append(getString(R.string.test_result_resolved)).append(" ").append(record.getPayload().toString());
}
}
if (responseAMessage.answerSection.size() > 0) {
for (Record record : responseAMessage.answerSection) {
if (record.getPayload() instanceof A) {
if (record.getPayload().getType() == type) {
testText.append("\n").append(getString(R.string.test_result_resolved)).append(" ").append(record.getPayload().toString());
}
}
testText.append("\n").append(getString(R.string.test_time_used)).append(" ").
append(String.valueOf(endTime - startTime)).append(" ms\n\n");
append(String.valueOf(endTime - startTime)).append(" ms");
} else {
testText.append("\n").append(getString(R.string.test_failed)).append("\n\n");
testText.append("\n").append(getString(R.string.test_failed));
}
} catch (Exception e) {
testText.append("\n").append(getString(R.string.test_failed)).append("\n\n");
testText.append("\n").append(getString(R.string.test_failed));
Logger.logException(e);
}
testText.append("\n\n");
mHandler.obtainMessage(DnsTestHandler.MSG_DISPLAY_STATUS, testText.toString()).sendToTarget();
return testText;
}

5
app/src/main/java/org/itxtech/daedalus/provider/UdpDnsProvider.java
View File

@ -345,7 +345,10 @@ public class UdpDnsProvider extends DnsProvider {
String dnsQueryName = dnsMsg.getQuestion().name.toString();
try {
String response = RulesResolver.resolve(dnsQueryName);
String response = null;
if (dnsMsg.getQuestion().type == Record.TYPE.A) {
response = RulesResolver.resolve(dnsQueryName);
}
if (response != null) {
Logger.info("DnsProvider: Resolved " + dnsQueryName + " Local resolver response: " + response);
DNSMessage.Builder builder = dnsMsg.asBuilder();

7
app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
View File

@ -145,7 +145,7 @@ public class DaedalusVpnService extends VpnService implements Runnable {
mThread = null;
}
if (notification != null) {
NotificationManager notificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
notificationManager.cancel(NOTIFICATION_ACTIVATED);
notification = null;
}
@ -156,6 +156,8 @@ public class DaedalusVpnService extends VpnService implements Runnable {
stopSelf();
if (shouldRefresh) {
RulesResolver.clear();
DnsServerHelper.clearPortCache();
Logger.info("Daedalus VPN service has stopped");
}
@ -165,9 +167,6 @@ public class DaedalusVpnService extends VpnService implements Runnable {
} else if (shouldRefresh) {
Daedalus.updateShortcut(getApplicationContext());
}
RulesResolver.clean();
DnsServerHelper.cleanPortCache();
}

2
app/src/main/java/org/itxtech/daedalus/util/DnsServerHelper.java
View File

@ -21,7 +21,7 @@ import java.util.HashMap;
public class DnsServerHelper {
private static HashMap<String, Integer> portCache = null;
public static void cleanPortCache() {
public static void clearPortCache() {
portCache = null;
}

2
app/src/main/java/org/itxtech/daedalus/util/RulesResolver.java
View File

@ -58,7 +58,7 @@ public class RulesResolver implements Runnable {
status = STATUS_PENDING_LOAD;
}
public static void clean() {
public static void clear() {
rules = null;
}

25
app/src/main/res/layout/fragment_dns_test.xml
View File

@ -17,6 +17,22 @@
android:layout_height="wrap_content"
android:id="@+id/spinner_server_choice"
android:layout_alignParentTop="true"/>
<Spinner
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:id="@+id/spinner_type"
android:verticalScrollbarPosition="defaultPosition"
android:layout_alignParentTop="true"/>
<org.itxtech.daedalus.widget.ClearAutoCompleteTextView
android:completionThreshold="1"
android:singleLine="true"
android:hint="@string/test_test_domain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/autoCompleteTextView_test_url"
android:layout_below="@+id/spinner_type"
android:layout_marginTop="10dp"/>
<Button
android:text="@string/action_start_test"
android:layout_width="wrap_content"
@ -38,14 +54,5 @@
android:id="@+id/textView_test_info"
android:textIsSelectable="true"
android:textSize="18sp"/>
<org.itxtech.daedalus.widget.ClearAutoCompleteTextView
android:completionThreshold="1"
android:singleLine="true"
android:hint="@string/test_test_domain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/autoCompleteTextView_test_url"
android:layout_below="@+id/spinner_server_choice"
android:layout_marginTop="10dp"/>
</RelativeLayout>
</ScrollView>