mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Whois improvements

This commit is contained in:
M66B 2022-09-04 11:55:12 +02:00
parent d1dcdbfb67
commit 596e482f56
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
View File

@ -461,7 +461,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
ibInfo.setOnClickListener(new View.OnClickListener() { ibInfo.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Uri uri = Uri.parse("https://en.wikipedia.org/wiki/WHOIS"); Uri uri = Uri.parse(Whois.WHOIS_INFO);
Helper.view(v.getContext(), uri, true); Helper.view(v.getContext(), uri, true);
} }
}); });

22
app/src/main/java/eu/faircode/email/Whois.java
View File

@ -23,11 +23,15 @@ import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.Socket; import java.net.Socket;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
public class Whois { public class Whois {
// https://datatracker.ietf.org/doc/html/rfc812 // https://datatracker.ietf.org/doc/html/rfc3912
static final String WHOIS_INFO = "https://en.wikipedia.org/wiki/WHOIS";
private static final int WHOIS_PORT = 43; private static final int WHOIS_PORT = 43;
private static final int WHOIS_TIMEOUT = 15 * 1000; // milliseconds private static final int WHOIS_TIMEOUT = 15 * 1000; // milliseconds
private static final String WHOIS_IANA = "whois.iana.org";
private static final String WHOIS_PREFIX = "whois:";
static String get(String domain) throws IOException { static String get(String domain) throws IOException {
return get(domain, getServer(domain), WHOIS_PORT); return get(domain, getServer(domain), WHOIS_PORT);
@ -41,19 +45,21 @@ public class Whois {
Socket socket = new Socket(); Socket socket = new Socket();
socket.connect(new InetSocketAddress(host, port), WHOIS_TIMEOUT); socket.connect(new InetSocketAddress(host, port), WHOIS_TIMEOUT);
try { try {
socket.getOutputStream().write((domain + "\r\n").getBytes()); byte[] request = (domain + "\r\n").getBytes(StandardCharsets.ISO_8859_1);
return host + ":" + port + "\n" + Helper.readStream(socket.getInputStream()); socket.getOutputStream().write(request);
String response = Helper.readStream(socket.getInputStream(), StandardCharsets.ISO_8859_1);
return host + ":" + port + "\n" + response;
} finally { } finally {
socket.close(); socket.close();
} }
} }
private static String getServer(String domain) throws IOException { private static String getServer(String domain) throws IOException {
String who = get(domain, "whois.iana.org"); String iana = get(domain, WHOIS_IANA);
for (String w : who.split("\\r?\\n")) for (String line : iana.split("\\r?\\n"))
if (w.startsWith("whois:")) if (line.startsWith(WHOIS_PREFIX))
return w.substring(6).trim(); return line.substring(WHOIS_PREFIX.length()).trim();
Log.w(who); Log.w(iana);
throw new UnknownHostException("whois server unknown " + domain); throw new UnknownHostException("whois server unknown " + domain);
} }
} }