nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-09 11:41:29 +00:00
Code Releases Activity

Disable HTTPS (fixes #1255)

Browse source
This commit is contained in:
Audrius Butkevicius 2019-02-22 22:52:46 +00:00
parent a7e6fb9118
commit 1f82ec0fc6
No known key found for this signature in database
GPG key ID: BE3528BA3FAAB362
2 changed files with 4 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
app/src/main/java/com/nutomic/syncthingandroid/http/ApiRequest.java
View file

@ -7,7 +7,6 @@ import android.net.Uri;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import android.widget.ImageView; import android.widget.ImageView;
import com.android.volley.AuthFailureError; import com.android.volley.AuthFailureError;
import com.android.volley.DefaultRetryPolicy; import com.android.volley.DefaultRetryPolicy;
import com.android.volley.RequestQueue; import com.android.volley.RequestQueue;
@ -18,22 +17,10 @@ import com.android.volley.toolbox.StringRequest;
import com.android.volley.toolbox.Volley; import com.android.volley.toolbox.Volley;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.nutomic.syncthingandroid.service.Constants;
import java.io.File;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Map; import java.util.Map;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
public abstract class ApiRequest { public abstract class ApiRequest {
private static final String TAG = "ApiRequest"; private static final String TAG = "ApiRequest";
@ -60,7 +47,7 @@ public abstract class ApiRequest {
private RequestQueue getVolleyQueue() { private RequestQueue getVolleyQueue() {
if (sVolleyQueue == null) { if (sVolleyQueue == null) {
Context context = mContext.getApplicationContext(); Context context = mContext.getApplicationContext();
sVolleyQueue = Volley.newRequestQueue(context, new NetworkStack()); sVolleyQueue = Volley.newRequestQueue(context, new HurlStack());
} }
return sVolleyQueue; return sVolleyQueue;
} }
@ -145,34 +132,4 @@ public abstract class ApiRequest {
getVolleyQueue().add(imageRequest); getVolleyQueue().add(imageRequest);
} }
/**
* Extends {@link HurlStack}, uses {@link #getSslSocketFactory()} and disables hostname
* verification.
*/
private class NetworkStack extends HurlStack {
public NetworkStack() {
super(null, getSslSocketFactory());
}
@Override
protected HttpURLConnection createConnection(URL url) throws IOException {
HttpsURLConnection connection = (HttpsURLConnection) super.createConnection(url);
connection.setHostnameVerifier((hostname, session) -> true);
return connection;
}
}
private SSLSocketFactory getSslSocketFactory() {
try {
SSLContext sslContext = SSLContext.getInstance("TLS");
File httpsCertPath = Constants.getHttpsCertFile(mContext);
sslContext.init(null, new TrustManager[]{new SyncthingTrustManager(httpsCertPath)},
new SecureRandom());
return sslContext.getSocketFactory();
} catch (NoSuchAlgorithmException | KeyManagementException e) {
Log.w(TAG, e);
return null;
}
}
} }

6
app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
View file

@ -107,7 +107,7 @@ public class ConfigXml {
public URL getWebGuiUrl() { public URL getWebGuiUrl() {
try { try {
return new URL("https://" + getGuiElement().getElementsByTagName("address").item(0).getTextContent()); return new URL("http://" + getGuiElement().getElementsByTagName("address").item(0).getTextContent());
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
throw new RuntimeException("Failed to parse web interface URL", e); throw new RuntimeException("Failed to parse web interface URL", e);
} }
@ -154,9 +154,9 @@ public class ConfigXml {
} }
/* Section - GUI */ /* Section - GUI */
// Enforce TLS. // Disable TLS.
Element gui = getGuiElement(); Element gui = getGuiElement();
changed = setConfigElement(gui, "tls", "true") || changed; changed = setConfigElement(gui, "tls", "false") || changed;
// Set user to "syncthing" // Set user to "syncthing"
changed = setConfigElement(gui, "user", "syncthing") || changed; changed = setConfigElement(gui, "user", "syncthing") || changed;