Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(android): Add SSL Pinning logic #6314

Merged
merged 9 commits into from
Feb 22, 2023
Merged

feat(android): Add SSL Pinning logic #6314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
187f8c4
feat(cli): add SSL pinning cert copy logic
IT-MikeS Feb 14, 2023
ddff9a3
feat(android): add logic to attach certs to request if ssl pinning pl…
ItsChaceD Feb 15, 2023
12638e4
dont overrwrite public methods
ItsChaceD Feb 20, 2023
a9458e0
minimize changes to public interfaces
ItsChaceD Feb 20, 2023
df51024
remove copy logic
ItsChaceD Feb 20, 2023
23918e0
Update copy.ts
ItsChaceD Feb 20, 2023
587282b
Merge branch 'main' into feat/android-attach-certs
ItsChaceD Feb 20, 2023
1d87cbb
fmt
ItsChaceD Feb 20, 2023
f6a73c7
Merge branch 'main' into feat/android-attach-certs
IT-MikeS Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/capacitor/src/main/java/com/getcapacitor/plugin/CapacitorHttp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ private void http(final PluginCall call, final String httpMethod) {
@Override
public void run() {
try {
HttpRequestHandler.bridge = bridge;
JSObject response = HttpRequestHandler.request(call, httpMethod);
call.resolve(response);
} catch (Exception e) {
Expand Down
16 changes: 16 additions & 0 deletions android/capacitor/src/main/java/com/getcapacitor/plugin/util/CapacitorHttpUrlConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
import android.os.Build;
import android.os.LocaleList;
import android.text.TextUtils;
import com.getcapacitor.Bridge;
import com.getcapacitor.JSArray;
import com.getcapacitor.JSObject;
import com.getcapacitor.JSValue;
import com.getcapacitor.PluginCall;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Method;
import java.net.HttpURLConnection;
import java.net.ProtocolException;
import java.net.SocketTimeoutException;
Expand All @@ -21,6 +23,8 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLSocketFactory;
import org.json.JSONException;

public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
Expand Down Expand Up @@ -363,4 +367,16 @@ private String buildDefaultAcceptLanguageProperty() {
}
return result;
}

public void setSSLSocketFactory(Bridge bridge) {
// Attach SSL Certificates if Enterprise Plugin is available
try {
Class<?> sslPinningImpl = Class.forName("io.ionic.sslpinning.SSLPinning");
Method method = sslPinningImpl.getDeclaredMethod("getSSLSocketFactory", Bridge.class);
SSLSocketFactory sslSocketFactory = (SSLSocketFactory) method.invoke(sslPinningImpl.newInstance(), bridge);
if (sslSocketFactory != null) {
((HttpsURLConnection) this.connection).setSSLSocketFactory(sslSocketFactory);
}
} catch (Exception ignored) {}
}
}
7 changes: 7 additions & 0 deletions android/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.text.TextUtils;
import android.util.Base64;
import com.getcapacitor.Bridge;
import com.getcapacitor.JSArray;
import com.getcapacitor.JSObject;
import com.getcapacitor.JSValue;
Expand All @@ -26,6 +27,8 @@

public class HttpRequestHandler {

public static Bridge bridge = null;

/**
* An enum specifying conventional HTTP Response Types
* See https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/responseType
Expand Down Expand Up @@ -391,6 +394,10 @@ public static JSObject request(PluginCall call, String httpMethod) throws IOExce

CapacitorHttpUrlConnection connection = connectionBuilder.build();

if (null != bridge) {
connection.setSSLSocketFactory(bridge);
}

// Set HTTP body on a non GET or HEAD request
if (isHttpMutate) {
JSValue data = new JSValue(call, "data");
Expand Down