Python: suggested refactor

yoff · yoff · commit 2e948da3b4a5 · 2021-03-26T13:08:45.000+01:00
diff --git a/python/ql/src/Security/CWE-327/FluentApiModel.qll b/python/ql/src/Security/CWE-327/FluentApiModel.qll
@@ -67,9 +67,8 @@ predicate unsafe_connection_creation(
 }
 
 /** A connection is created insecurely without reference to a context. */
-predicate unsafe_context_creation(DataFlow::Node node, string insecure_version, CallNode call) {
+predicate unsafe_context_creation(DataFlow::CallCfgNode call, string insecure_version) {
   exists(TlsLibrary l, ContextCreation cc | cc = l.insecure_context_creation(insecure_version) |
-    cc = node and
-    cc.getNode() = call
+    cc = call
   )
 }
diff --git a/python/ql/src/Security/CWE-327/InsecureProtocol.ql b/python/ql/src/Security/CWE-327/InsecureProtocol.ql
@@ -37,7 +37,9 @@ from
 where
   unsafe_connection_creation(creation, insecure_version, contextOrigin, specific)
   or
-  unsafe_context_creation(creation, insecure_version, contextOrigin.asCfgNode()) and specific = true
+  unsafe_context_creation(creation, insecure_version) and
+  contextOrigin = creation and
+  specific = true
 select creation,
   "Insecure SSL/TLS protocol version " + insecure_version + " " + verb(specific) + " by $@ ",
   contextOrigin, originName(contextOrigin)

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,8 @@ predicate unsafe_connection_creation(`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/** A connection is created insecurely without reference to a context. */`
`70`		`-predicate unsafe_context_creation(DataFlow::Node node, string insecure_version, CallNode call) {`
	`70`	`+predicate unsafe_context_creation(DataFlow::CallCfgNode call, string insecure_version) {`
`71`	`71`	`exists(TlsLibrary l, ContextCreation cc \| cc = l.insecure_context_creation(insecure_version) \|`
`72`		`- cc = node and`
`73`		`- cc.getNode() = call`
	`72`	`+ cc = call`
`74`	`73`	`)`
`75`	`74`	`}`