From 429f8214b005f9449c239f7f9865bf8dddc418c3 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sat, 18 Jun 2022 23:29:05 +0300
Subject: [PATCH] ssl + debug check

---
 .../ru/vtosters/lite/utils/Preferences.java   |  9 ++++--
 .../res/xml/network_security_config_debug.xml | 31 +++++++++++++++++++
 .../com/vk/core/network/proxy/j.smali         |  4 ++-
 .../network/security/NetworkKeyStore.smali    | 11 +++++++
 .../com/vk/core/network/security/a.smali      | 31 +++++++++++++++++--
 5 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 smali/res/xml/network_security_config_debug.xml

diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
index c4ca745ef..103b1fbb9 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
@@ -26,6 +26,7 @@ import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.os.Debug;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
@@ -49,6 +50,8 @@ public class Preferences {
     public static Integer VKBUILD = 12116; // 3439 orig
     public static String VKVER = "7.24"; // 5.29 orig
 
+    static final boolean isDebug = Debug.isDebuggerConnected();
+
     public static void init(Application application) {
         setupFilters();
         fixGapps();
@@ -185,11 +188,11 @@ public class Preferences {
     }
 
     public static boolean dev() {
-        return getBoolValue("dev", false);
+        return getBoolValue("dev", false) || isDebug;
     }
 
     public static boolean devmenu() {
-        return getBoolValue("devmenu", false);
+        return getBoolValue("devmenu", false) || isDebug;
     }
 
     public static boolean dnr() {
@@ -305,7 +308,7 @@ public class Preferences {
     }
 
     public static boolean ssl() {
-        return getBoolValue("ssl", true);
+        return !isDebug; // getBoolValue("ssl", true) ||
     }
 
     public static boolean stories() {
diff --git a/smali/res/xml/network_security_config_debug.xml b/smali/res/xml/network_security_config_debug.xml
new file mode 100644
index 000000000..49a224dff
--- /dev/null
+++ b/smali/res/xml/network_security_config_debug.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <debug-overrides>
+        <trust-anchors>
+            <!-- Trust user added CAs while debuggable only -->
+            <certificates src="user" />
+            <certificates src="system" />
+        </trust-anchors>
+    </debug-overrides>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+    <domain-config>
+        <!-- Make sure your URL Server here -->
+        <domain includeSubdomains="true">vk.com</domain>
+        <trust-anchors>
+            <certificates src="user"/>
+            <certificates src="system"/>
+        </trust-anchors>
+    </domain-config>
+    <domain-config>
+        <!-- Make sure your URL Server here -->
+        <domain includeSubdomains="true">api.vk.com</domain>
+        <trust-anchors>
+            <certificates src="user"/>
+            <certificates src="system"/>
+        </trust-anchors>
+    </domain-config>
+</network-security-config>
\ No newline at end of file
diff --git a/smali/smali_classes2/com/vk/core/network/proxy/j.smali b/smali/smali_classes2/com/vk/core/network/proxy/j.smali
index 510914bbe..9da842cef 100644
--- a/smali/smali_classes2/com/vk/core/network/proxy/j.smali
+++ b/smali/smali_classes2/com/vk/core/network/proxy/j.smali
@@ -696,7 +696,9 @@
     return v0
 
     :cond_1
-    const/4 v0, 0x1
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z
+
+    move-result v0
 
     return v0
 .end method
diff --git a/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali b/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali
index 86978b839..f16a98c95 100644
--- a/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali
+++ b/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali
@@ -82,6 +82,15 @@
 .method private final a(Landroid/content/Context;)V
     .locals 7
 
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z
+
+    move-result v0
+
+    if-nez v0, :cond_7
+
+    return-void
+
+    :cond_7
     const/4 v0, 0x1
 
     const/4 v1, 0x2
@@ -284,6 +293,8 @@
     .line 1
     iget-boolean v0, p0, Lcom/vk/core/network/security/NetworkKeyStore;->c:Z
 
+    const v0, 0x0
+
     return v0
 .end method
 
diff --git a/smali/smali_classes2/com/vk/core/network/security/a.smali b/smali/smali_classes2/com/vk/core/network/security/a.smali
index 2dbde8e07..eda6b7d52 100644
--- a/smali/smali_classes2/com/vk/core/network/security/a.smali
+++ b/smali/smali_classes2/com/vk/core/network/security/a.smali
@@ -358,6 +358,15 @@
         }
     .end annotation
 
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z
+
+    move-result v0
+
+    if-nez v0, :cond_7
+
+    return-void
+
+    :cond_7
     .line 1
     iget-object v0, p0, Lcom/vk/core/network/security/a;->a:Ljavax/net/ssl/X509TrustManager;
 
@@ -377,7 +386,15 @@
         }
     .end annotation
 
-    .line 1
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z
+
+    move-result v0
+
+    if-nez v0, :cond_7
+
+    return-void
+
+    :cond_7
     iget-object v0, p0, Lcom/vk/core/network/security/a;->a:Ljavax/net/ssl/X509TrustManager;
 
     if-eqz v0, :cond_0
@@ -391,7 +408,17 @@
 .method public getAcceptedIssuers()[Ljava/security/cert/X509Certificate;
     .locals 1
 
-    .line 1
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z
+
+    move-result v0
+
+    if-nez v0, :cond_7
+
+    const/4 v0, 0x0
+
+    return-object v0
+
+    :cond_7
     iget-object v0, p0, Lcom/vk/core/network/security/a;->a:Ljavax/net/ssl/X509TrustManager;
 
     if-eqz v0, :cond_0