Merge pull request #14692 from geoffw0/webview3

geoffw0 · web-flow · commit ff8b79673121 · 2023-12-06T09:11:33.000Z
Swift: Simplify AdoptsWkNavigationDelegate in WebView.qll.
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/WebView.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/WebView.qll
@@ -43,12 +43,7 @@ private class WKScriptMessageBodyInheritsTaint extends TaintInheritingContent,
  */
 private class AdoptsWkNavigationDelegate extends Decl {
   AdoptsWkNavigationDelegate() {
-    exists(ProtocolDecl delegate |
-      this.(ExtensionDecl).getAProtocol().getABaseTypeDecl*() = delegate or
-      this.(NominalTypeDecl).getABaseTypeDecl*() = delegate
-    |
-      delegate.getName() = "WKNavigationDelegate"
-    )
+    this.asNominalTypeDecl().getABaseTypeDecl*().(ProtocolDecl).getName() = "WKNavigationDelegate"
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,7 @@ private class WKScriptMessageBodyInheritsTaint extends TaintInheritingContent,`
`43`	`43`	`*/`
`44`	`44`	`private class AdoptsWkNavigationDelegate extends Decl {`
`45`	`45`	`AdoptsWkNavigationDelegate() {`
`46`		`- exists(ProtocolDecl delegate \|`
`47`		`- this.(ExtensionDecl).getAProtocol().getABaseTypeDecl*() = delegate or`
`48`		`- this.(NominalTypeDecl).getABaseTypeDecl*() = delegate`
`49`		`- \|`
`50`		`- delegate.getName() = "WKNavigationDelegate"`
`51`		`- )`
	`46`	`+ this.asNominalTypeDecl().getABaseTypeDecl*().(ProtocolDecl).getName() = "WKNavigationDelegate"`
`52`	`47`	`}`
`53`	`48`	`}`
`54`	`49`