Merge pull request #61 from jobot0/fix_bad_behavior_raw_cert

🐛 Fix bug with resource Id for raw file
datatheorem · Dec 6, 2019 · 8efb743 · 8efb743
2 parents c3363cf + e26e637
commit 8efb743
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/...it/src/main/java/com/datatheorem/android/trustkit/config/TrustKitConfigurationParser.java b/...it/src/main/java/com/datatheorem/android/trustkit/config/TrustKitConfigurationParser.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import androidx.annotation.NonNull;
 import android.text.TextUtils;
+
 import com.datatheorem.android.trustkit.utils.TrustKitLog;
 import java.io.IOException;
 import java.io.InputStream;
@@ -45,6 +46,7 @@ public static TrustKitConfiguration fromXmlPolicy(
                     builderList.addAll(readDomainConfig(parser, null));
                 } else if ("debug-overrides".equals(parser.getName())) {
                     // The debug-overrides option is global and not tied to a specific domain
+
                     debugOverridesTag = readDebugOverrides(context, parser);
                 }
             }
@@ -262,6 +264,8 @@ private static DebugOverridesTag readDebugOverrides(@NonNull Context context,
                 // Parse the supplied certificate file
                 String caPathFromUser = parser.getAttributeValue(null, "src").trim();
 
+                caPathFromUser = formatCertPathResourceWhenId(context, caPathFromUser);
+
                 // Parse the path to the certificate bundle for src=@raw - we ignore system or user
                 // as the src
                 if (!TextUtils.isEmpty(caPathFromUser) && !caPathFromUser.equals("user")
@@ -293,4 +297,14 @@ private static DebugOverridesTag readDebugOverrides(@NonNull Context context,
         }
         return result;
     }
+
+    private static String formatCertPathResourceWhenId(@NonNull Context context, String caPathFromUser) {
+        if(TextUtils.isDigitsOnly(caPathFromUser.replace("@", ""))){
+            caPathFromUser = "@" + context.getResources()
+                .getResourceName(Integer.parseInt(caPathFromUser.replace("@", "")))
+                .replace(context.getPackageName()+":", "");
+        }
+
+        return caPathFromUser;
+    }
 }