resolved merge conflict in AndroidManifest lib

Jami Cogswell · Jami Cogswell · commit eacce0307350 · 2022-08-22T12:41:22.000-04:00
diff --git a/java/ql/lib/semmle/code/java/security/ImplicitlyExportedAndroidComponent.qll b/java/ql/lib/semmle/code/java/security/ImplicitlyExportedAndroidComponent.qll
@@ -11,19 +11,8 @@ class ImplicitlyExportedAndroidComponent extends AndroidComponentXmlElement {
       "android.intent.category.LAUNCHER" and
     not this.requiresPermissions() and
     not this.getParent().(AndroidApplicationXmlElement).requiresPermissions() and
-    //not this.getAnIntentFilterElement().hasLauncherCategoryElement() and
-    not this.getFile().(AndroidManifestXmlFile).isInBuildDirectory()
-    //this.getFile() instanceof SourceAndroidManifestXmlFile
+    not this.getFile().(AndroidManifestXmlFile).isInBuildDirectory() //and
+    //not this.getAnIntentFilterElement().getAnActionElement().getActionName() =
+    //  "android.intent.action.MAIN"
   }
-  //   predicate isImplicitlyExported() {
-  //     not this.hasExportedAttribute() and
-  //     this.hasAnIntentFilterElement() and
-  //     not this.requiresPermissions() and
-  //     not this.getParent().(AndroidApplicationXmlElement).hasAttribute("permission") and
-  //     not this.getAnIntentFilterElement().hasLauncherCategoryElement() and
-  //     not this.getFile().(AndroidManifestXmlFile).isInBuildDirectory() //and
-  //     not this.getAnIntentFilterElement().getAnActionElement().getActionName().matches("%MEDIA%") and // try MEDIA exclusion -- MRVA returns 251 results, so only removed 13
-  //     not this.getAnIntentFilterElement().getAnActionElement().getActionName() =
-  //       "android.intent.action.MAIN" // try MAIN exclusion -- MRVA returns 193 results, so removed 251-193 = 58 results
-  //   }
 }
diff --git a/java/ql/lib/semmle/code/xml/AndroidManifest.qll b/java/ql/lib/semmle/code/xml/AndroidManifest.qll
@@ -25,9 +25,6 @@ class AndroidManifestXmlFile extends XmlFile {
   predicate isInBuildDirectory() { this.getFile().getRelativePath().matches("%build%") }
 }
 
-// class SourceAndroidManifestXmlFile extends AndroidManifestXmlFile {
-//   SourceAndroidManifestXmlFile() { not this.getFile().getRelativePath().matches("%build%") }
-// }
 /**
  * A `<manifest>` element in an Android manifest file.
  */
@@ -238,7 +235,6 @@ class AndroidComponentXmlElement extends XmlElement {
   /**
    * Holds if this component element has an `android:exported` attribute.
    */
-  //predicate hasExportedAttribute() { this.hasAttribute("exported") }
   predicate hasExportedAttribute() { exists(this.getExportedAttributeValue()) }
 
   /**
@@ -264,13 +260,6 @@ class AndroidIntentFilterXmlElement extends XmlElement {
    * Gets a `<category>` child element of this `<intent-filter>` element.
    */
   AndroidCategoryXmlElement getACategoryElement() { result = this.getAChild() }
-  // /**
-  //  * Holds if this `<intent-filter>` element has a `<category>` child element
-  //  * named `android.intent.category.LAUNCHER`.
-  //  */
-  // predicate hasLauncherCategoryElement() {
-  //   this.getACategoryElement().getCategoryName() = "android.intent.category.LAUNCHER"
-  // }
 }
 
 /**
diff --git a/java/ql/src/Security/CWE/CWE-926/ImplicitlyExportedAndroidComponent.ql b/java/ql/src/Security/CWE/CWE-926/ImplicitlyExportedAndroidComponent.ql
@@ -13,9 +13,5 @@
 import java
 import semmle.code.java.security.ImplicitlyExportedAndroidComponent
 
-// from ImplicitlyExportedAndroidComponent impExpAndroidComp
-// where impExpAndroidComp.isImplicitlyExported()
-// select impExpAndroidComp, "This component is implicitly exported."
 from ImplicitlyExportedAndroidComponent impExpAndroidComp
-//where exists(impExpAndroidComp)
 select impExpAndroidComp, "This component is implicitly exported."
