Skip to content

Commit fa025fc

Browse files
committed
fix: remove cert verification bypass
1 parent 1e8c9e1 commit fa025fc

4 files changed

Lines changed: 46 additions & 43 deletions

File tree

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
android:label="@string/app_name"
88
android:roundIcon="@mipmap/ic_launcher_round"
99
android:supportsRtl="true"
10+
android:networkSecurityConfig="@xml/network_security_config"
1011
android:theme="@style/AppTheme">
1112

1213
<activity

android/app/src/main/java/com/maroonrides/maroonrides/MainActivity.java

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22

33
import android.os.Bundle;
44
import com.getcapacitor.BridgeActivity;
5-
import java.security.SecureRandom;
6-
import java.security.cert.X509Certificate;
7-
import javax.net.ssl.HostnameVerifier;
8-
import javax.net.ssl.HttpsURLConnection;
9-
import javax.net.ssl.SSLContext;
10-
import javax.net.ssl.SSLSession;
11-
import javax.net.ssl.TrustManager;
12-
import javax.net.ssl.X509TrustManager;
135

146
public class MainActivity extends BridgeActivity {
157
@Override
@@ -18,40 +10,5 @@ public void onCreate(Bundle savedInstanceState) {
1810
registerPlugin(LegacyPrefsPlugin.class);
1911

2012
super.onCreate(savedInstanceState);
21-
22-
// DANGER: Forces the native Java layer to accept expired/invalid certs
23-
bypassNativeSSLChecks();
24-
}
25-
26-
private void bypassNativeSSLChecks() {
27-
try {
28-
TrustManager[] trustAllCerts = new TrustManager[] {
29-
new X509TrustManager() {
30-
public X509Certificate[] getAcceptedIssuers() {
31-
return new X509Certificate[0];
32-
}
33-
34-
public void checkClientTrusted(X509Certificate[] certs, String authType) {
35-
}
36-
37-
public void checkServerTrusted(X509Certificate[] certs, String authType) {
38-
}
39-
}
40-
};
41-
42-
SSLContext sc = SSLContext.getInstance("SSL");
43-
sc.init(null, trustAllCerts, new SecureRandom());
44-
45-
// Apply trust-all logic globally to native requests
46-
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
47-
HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
48-
@Override
49-
public boolean verify(String arg0, SSLSession arg1) {
50-
return true;
51-
}
52-
});
53-
} catch (Exception e) {
54-
e.printStackTrace();
55-
}
5613
}
5714
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIGIzCCBAugAwIBAgIRAJa22zsNXLm6Xd6KrItt/ncwDQYJKoZIhvcNAQEMBQAw
3+
XzELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE2MDQGA1UE
4+
AxMtU2VjdGlnbyBQdWJsaWMgU2VydmVyIEF1dGhlbnRpY2F0aW9uIFJvb3QgUjQ2
5+
MB4XDTI1MTEwNjAwMDAwMFoXDTM1MTEwNTIzNTk1OVowSDELMAkGA1UEBhMCVVMx
6+
FjAUBgNVBAoTDUluQ29tbW9uLCBMTEMxITAfBgNVBAMTGEluQ29tbW9uIFJTQSBP
7+
ViBTU0wgQ0EgMzCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAInzD7j/
8+
Ja1OZOvyIIe2hFOdDrois8Iiuyh+RtSKaKyQAvSRdG1b0Iz+fxOZaNPlM2RCTa9N
9+
Ar/bs9Tts4RXTDCuLJfCPPwbRtSZMvBrZVpcPU3xVBbTUHTsYZ+SmlzB+qIwEJV6
10+
TU8vEsdqosCwA/iOXewiRmUf5FxU2WoU4nD8iVFhu/p6h6YmI+AgswZ4lwZdNKW5
11+
9cTvpuY8VefEWHuwvSQlzekLLBqiFJhlCu8dNrBsahT07sjMHVZVHU8Biss3bX04
12+
FTzkDzv5eZ/U2LFA0rV2QzLpeLtIsMsXhlrEmuT4g6cbJJ3ZfWGHX77jnCIczshi
13+
taD1BiTA9PRv9JWW6xQ+cGfHRMyHWTBNhdQI22N9UO65R+6ddwEWupViEGRUuO/O
14+
ZbTtBSkoEBejHBfI3/BnnhLpKXTGC5N20om7nQ2UqOcgOpewiE9P+DnMrnUsqp9e
15+
IS6NgkCCCuhS6eoHS3DwJouIK1T5CE/4xSrEuU0QTFRJfyqlIaMbKMe+awIDAQAB
16+
o4IBbzCCAWswHwYDVR0jBBgwFoAUVnNYZJX5khqwEioEYnmhQBWIIUkwHQYDVR0O
17+
BBYEFNoiNz/l03Ta2Xk+0XJt1ZNLIDevMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMB
18+
Af8ECDAGAQH/AgEAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBMGA1UdIAQMMAowCAYG
19+
Z4EMAQICMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuc2VjdGlnby5jb20v
20+
U2VjdGlnb1B1YmxpY1NlcnZlckF1dGhlbnRpY2F0aW9uUm9vdFI0Ni5jcmwwgYQG
21+
CCsGAQUFBwEBBHgwdjBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5zZWN0aWdvLmNv
22+
bS9TZWN0aWdvUHVibGljU2VydmVyQXV0aGVudGljYXRpb25Sb290UjQ2LnA3YzAj
23+
BggrBgEFBQcwAYYXaHR0cDovL29jc3Auc2VjdGlnby5jb20wDQYJKoZIhvcNAQEM
24+
BQADggIBADoIPZD+zZzMmsZaUIc4WiV5NwHbB5nnmvSaDas20GSsyRiSnQVUwCT6
25+
RzJJhPGJnoIHL7uYyjZDnYrB4MOL/1c0g+7BFmDY+0/csUwdHlouTOrj17T3nyrR
26+
JjEg3/bY16ojl91ji4g4XbvB7L2tKkK2kF+dcIECRbcw+vE2gLSv7wcl78+m0jjb
27+
3nw8Z+bs/R/W7C8kn+6bfgRrI2NGhd2wnJ579xMLUoodj/L2sXokw0/jiDrWgGAd
28+
MijIVvVFSTaI08/8LReuluxbFCvftNBwiBVZm7UMV3hwZ97dqW+Tq4+Lh9GrbnO/
29+
tMMSVSib+KKRMDYh5HGfjmmW9UTmaTL23oP7XPNuuOwqy0Z4RGqMWd8JYvNe0XFw
30+
7rs73SJJN3zccKZvznDSaCzJBCjT3i3JrbbSW1cZKn0RFHhkFZmtP63HiXAo+G0n
31+
Z7C/INTWdQcy9tJ/tYfC/ZVjap7R2C8s7XO2PR3oBvATgaRFIPF7q7+kyN0qmwfl
32+
7Kt0O+dFw88fvjKfMIMQtnNqY7bWpGWg0XstM1L4kwi1FFNElCjFJR3rN5kpf5n1
33+
7LqhsLc296cnFIwf/Yu9FaPkOJiGga6FewBTGqcWj8lL2KgHn95hdky0FzgIKRYw
34+
loK8Ee0Y9wee43mVaHEdRD11fUQZYXsnXIFFtVXsIFH43LTiYfgN
35+
-----END CERTIFICATE-----
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<domain-config>
4+
<domain includeSubdomains="false">aggiespirit.ts.tamu.edu</domain>
5+
<trust-anchors>
6+
<certificates src="system" />
7+
<certificates src="@raw/incommon_rsa_ov_ssl_ca3" />
8+
</trust-anchors>
9+
</domain-config>
10+
</network-security-config>

0 commit comments

Comments
 (0)