Make UnhandledFileCloseWritableHandle use new API

owen-mc · owen-mc · commit 0e1383ddd79d · 2023-08-10T15:49:01.000+01:00
diff --git a/go/ql/src/InconsistentCode/UnhandledCloseWritableHandle.ql b/go/ql/src/InconsistentCode/UnhandledCloseWritableHandle.ql
@@ -14,7 +14,6 @@
  */
 
 import go
-import DataFlow::PathGraph
 
 /**
  * Holds if a `flag` for use with `os.OpenFile` implies that the resulting
@@ -124,25 +123,23 @@ predicate isHandledSync(DataFlow::Node sink, DataFlow::CallNode syncCall) {
   not unhandledCall(syncCall)
 }
 
-/**
- * A data flow configuration which traces writable file handles resulting from calls to
- * `os.OpenFile` to `os.File.Close` calls on them.
- */
-class UnhandledFileCloseDataFlowConfiguration extends DataFlow::Configuration {
-  UnhandledFileCloseDataFlowConfiguration() { this = "UnhandledCloseWritableHandle" }
-
-  override predicate isSource(DataFlow::Node source) { isWritableFileHandle(source, _) }
+module UnhandledFileCloseConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { isWritableFileHandle(source, _) }
 
-  override predicate isSink(DataFlow::Node sink) { isCloseSink(sink, _) }
+  predicate isSink(DataFlow::Node sink) { isCloseSink(sink, _) }
 }
 
+module UnhandledFileCloseFlow = DataFlow::Global<UnhandledFileCloseConfig>;
+
+import UnhandledFileCloseFlow::PathGraph
+
 from
-  UnhandledFileCloseDataFlowConfiguration cfg, DataFlow::PathNode source,
-  DataFlow::CallNode openCall, DataFlow::PathNode sink, DataFlow::CallNode closeCall
+  UnhandledFileCloseFlow::PathNode source, DataFlow::CallNode openCall,
+  UnhandledFileCloseFlow::PathNode sink, DataFlow::CallNode closeCall
 where
   // find data flow from an `os.OpenFile` call to an `os.File.Close` call
   // where the handle is writable
-  cfg.hasFlowPath(source, sink) and
+  UnhandledFileCloseFlow::flowPath(source, sink) and
   isWritableFileHandle(source.getNode(), openCall) and
   // get the `CallNode` corresponding to the sink
   isCloseSink(sink.getNode(), closeCall)
