aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java141
1 files changed, 55 insertions, 86 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
index e49085a0e..b048a2cea 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
@@ -22,37 +22,23 @@ import de.measite.minidns.Client;
import de.measite.minidns.Question;
import de.measite.minidns.Record;
import de.measite.minidns.record.SRV;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.helper.TlsHelper;
import org.sufficientlysecure.keychain.pgp.PgpHelper;
import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
import org.sufficientlysecure.keychain.util.Log;
+import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLDecoder;
import java.net.URLEncoder;
-import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.GregorianCalendar;
-import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
import java.util.regex.Matcher;
@@ -200,48 +186,39 @@ public class HkpKeyserver extends Keyserver {
return mSecure ? "https://" : "http://";
}
- private String query(String request) throws QueryFailedException, HttpError {
- List<String> urls = new ArrayList<String>();
- if (mSecure) {
- urls.add(getUrlPrefix() + mHost + ":" + mPort + request);
- } else {
- InetAddress ips[];
+ private HttpURLConnection openConnection(URL url) throws IOException {
+ HttpURLConnection conn = null;
+ if (mHost.endsWith("pool.sks-keyservers.net") && mSecure) {
try {
- ips = InetAddress.getAllByName(mHost);
- } catch (UnknownHostException e) {
- throw new QueryFailedException(e.toString());
- }
- for (InetAddress ip : ips) {
- // Note: This is actually not HTTP 1.1 compliant, as we hide the real "Host" value,
- // but Android's HTTPUrlConnection does not support any other way to set
- // Socket's remote IP address...
- urls.add(getUrlPrefix() + ip.getHostAddress() + ":" + mPort + request);
+ conn = TlsHelper.openCAConnection(Constants.SKS_KEYSERVERS_NET_CA.getBytes(), url);
+ } catch (TlsHelper.TlsHelperException e) {
+ Log.w(Constants.TAG, e);
}
}
+ if (conn == null) {
+ conn = (HttpURLConnection) url.openConnection();
+ }
+ conn.setConnectTimeout(5000);
+ conn.setReadTimeout(25000);
+ return conn;
+ }
- for (String url : urls) {
- try {
- Log.d(Constants.TAG, "hkp keyserver query: " + url);
- URL realUrl = new URL(url);
- HttpURLConnection conn = (HttpURLConnection) realUrl.openConnection();
- conn.setConnectTimeout(5000);
- conn.setReadTimeout(25000);
- conn.connect();
- int response = conn.getResponseCode();
- if (response >= 200 && response < 300) {
- return readAll(conn.getInputStream(), conn.getContentEncoding());
- } else {
- String data = readAll(conn.getErrorStream(), conn.getContentEncoding());
- throw new HttpError(response, data);
- }
- } catch (MalformedURLException e) {
- // nothing to do, try next IP
- } catch (IOException e) {
- // nothing to do, try next IP
+ private String query(String request) throws QueryFailedException, HttpError {
+ try {
+ URL url = new URL(getUrlPrefix() + mHost + ":" + mPort + request);
+ Log.d(Constants.TAG, "hkp keyserver query: " + url);
+ HttpURLConnection conn = openConnection(url);
+ conn.connect();
+ int response = conn.getResponseCode();
+ if (response >= 200 && response < 300) {
+ return readAll(conn.getInputStream(), conn.getContentEncoding());
+ } else {
+ String data = readAll(conn.getErrorStream(), conn.getContentEncoding());
+ throw new HttpError(response, data);
}
+ } catch (IOException e) {
+ throw new QueryFailedException("querying server(s) for '" + mHost + "' failed");
}
-
- throw new QueryFailedException("querying server(s) for '" + mHost + "' failed");
}
@Override
@@ -341,52 +318,44 @@ public class HkpKeyserver extends Keyserver {
@Override
public String get(String keyIdHex) throws QueryFailedException {
- HttpClient client = new DefaultHttpClient();
+ String request = "/pks/lookup?op=get&options=mr&search=" + keyIdHex;
+ Log.d(Constants.TAG, "hkp keyserver get: " + request);
+ String data;
try {
- String query = getUrlPrefix() + mHost + ":" + mPort +
- "/pks/lookup?op=get&options=mr&search=" + keyIdHex;
- Log.d(Constants.TAG, "hkp keyserver get: " + query);
- HttpGet get = new HttpGet(query);
- HttpResponse response = client.execute(get);
- if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
- throw new QueryFailedException("not found");
- }
-
- HttpEntity entity = response.getEntity();
- InputStream is = entity.getContent();
- String data = readAll(is, EntityUtils.getContentCharSet(entity));
- Matcher matcher = PgpHelper.PGP_PUBLIC_KEY.matcher(data);
- if (matcher.find()) {
- return matcher.group(1);
- }
- } catch (IOException e) {
- // nothing to do, better luck on the next keyserver
- } finally {
- client.getConnectionManager().shutdown();
+ data = query(request);
+ } catch (HttpError httpError) {
+ throw new QueryFailedException("not found");
+ }
+ Matcher matcher = PgpHelper.PGP_PUBLIC_KEY.matcher(data);
+ if (matcher.find()) {
+ return matcher.group(1);
}
-
return null;
}
@Override
public void add(String armoredKey) throws AddKeyException {
- HttpClient client = new DefaultHttpClient();
try {
String query = getUrlPrefix() + mHost + ":" + mPort + "/pks/add";
- HttpPost post = new HttpPost(query);
- Log.d(Constants.TAG, "hkp keyserver add: " + query);
- List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(2);
- nameValuePairs.add(new BasicNameValuePair("keytext", armoredKey));
- post.setEntity(new UrlEncodedFormEntity(nameValuePairs));
-
- HttpResponse response = client.execute(post);
- if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
+ String params;
+ try {
+ params = "keytext=" + URLEncoder.encode(armoredKey, "utf8");
+ } catch (UnsupportedEncodingException e) {
throw new AddKeyException();
}
+ Log.d(Constants.TAG, "hkp keyserver add: " + query);
+
+ HttpURLConnection connection = openConnection(new URL(query));
+ connection.setRequestMethod("POST");
+ connection.addRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+ connection.setRequestProperty("Content-Length", Integer.toString(params.getBytes().length));
+ connection.setDoOutput(true);
+ DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
+ wr.writeBytes(params);
+ wr.flush();
+ wr.close();
} catch (IOException e) {
- // nothing to do, better luck on the next keyserver
- } finally {
- client.getConnectionManager().shutdown();
+ throw new AddKeyException();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 16:07:46 +0000