C#/Java/Ruby: Remove superfluous module members.

aschackmull · aschackmull · commit 91de43f9181a · 2023-07-13T11:38:35.000+02:00
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ContentDataFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ContentDataFlow.qll
@@ -107,8 +107,6 @@ module Global<ConfigSig ContentConfig> {
 
     predicate isBarrier = ContentConfig::isBarrier/1;
 
-    predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
-
     DataFlow::FlowFeature getAFeature() { result = ContentConfig::getAFeature() }
 
     // needed to record reads/stores inside summarized callables
diff --git a/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -160,8 +160,6 @@ module ThroughFlowConfig implements DataFlow::StateConfigSig {
     exists(Type t | t = n.getType() and not isRelevantType(t))
   }
 
-  predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
-
   DataFlow::FlowFeature getAFeature() {
     result instanceof DataFlow::FeatureEqualSourceSinkCallContext
   }
diff --git a/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallationQuery.qll b/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallationQuery.qll
@@ -68,8 +68,6 @@ private module InstallPackageActionConfig implements DataFlow::StateConfigSig {
   predicate isSink(DataFlow::Node node, FlowState state) {
     state instanceof HasInstallPackageAction and node.asExpr().getType() instanceof TypeIntent
   }
-
-  predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
 }
 
 private module InstallPackageActionFlow =
@@ -113,8 +111,6 @@ private module PackageArchiveMimeTypeConfig implements DataFlow::StateConfigSig
     state instanceof HasPackageArchiveMimeType and
     node instanceof SetDataSink
   }
-
-  predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
 }
 
 private module PackageArchiveMimeTypeFlow =
diff --git a/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll b/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll
@@ -72,8 +72,6 @@ module ImplicitPendingIntentStartConfig implements DataFlow::StateConfigSig {
 
   predicate isBarrier(DataFlow::Node sanitizer) { sanitizer instanceof ExplicitIntentSanitizer }
 
-  predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
-
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(ImplicitPendingIntentAdditionalTaintStep c).step(node1, node2)
   }
diff --git a/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsAllowsContentAccess.ql b/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsAllowsContentAccess.ql
@@ -97,8 +97,6 @@ module WebViewDisallowContentAccessConfig implements DataFlow::StateConfigSig {
     state instanceof IsSettings and
     node instanceof WebSettingsDisallowContentAccessSink
   }
-
-  predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
 }
 
 module WebViewDisallowContentAccessFlow =
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -160,8 +160,6 @@ module ThroughFlowConfig implements DataFlow::StateConfigSig {
     exists(Type t | t = n.getType() and not isRelevantType(t))
   }
 
-  predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
-
   DataFlow::FlowFeature getAFeature() {
     result instanceof DataFlow::FeatureEqualSourceSinkCallContext
   }
diff --git a/ruby/ql/lib/codeql/ruby/security/InsecureDownloadQuery.qll b/ruby/ql/lib/codeql/ruby/security/InsecureDownloadQuery.qll
@@ -45,14 +45,6 @@ module Config implements DataFlow::StateConfigSig {
   }
 
   predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
-
-  predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(
-    DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2
-  ) {
-    none()
-  }
 }
 
 module Flow = DataFlow::GlobalWithState<Config>;

Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,6 @@ module ThroughFlowConfig implements DataFlow::StateConfigSig {`
`160`	`160`	`exists(Type t \| t = n.getType() and not isRelevantType(t))`
`161`	`161`	`}`
`162`	`162`
`163`		`- predicate isBarrier(DataFlow::Node node, FlowState state) { none() }`
`164`		`-`
`165`	`163`	`DataFlow::FlowFeature getAFeature() {`
`166`	`164`	`result instanceof DataFlow::FeatureEqualSourceSinkCallContext`
`167`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,6 @@ private module InstallPackageActionConfig implements DataFlow::StateConfigSig {`
`68`	`68`	`predicate isSink(DataFlow::Node node, FlowState state) {`
`69`	`69`	`state instanceof HasInstallPackageAction and node.asExpr().getType() instanceof TypeIntent`
`70`	`70`	`}`
`71`		`-`
`72`		`- predicate isBarrier(DataFlow::Node node, FlowState state) { none() }`
`73`	`71`	`}`
`74`	`72`
`75`	`73`	`private module InstallPackageActionFlow =`
`@@ -113,8 +111,6 @@ private module PackageArchiveMimeTypeConfig implements DataFlow::StateConfigSig`
`113`	`111`	`state instanceof HasPackageArchiveMimeType and`
`114`	`112`	`node instanceof SetDataSink`
`115`	`113`	`}`
`116`		`-`
`117`		`- predicate isBarrier(DataFlow::Node node, FlowState state) { none() }`
`118`	`114`	`}`
`119`	`115`
`120`	`116`	`private module PackageArchiveMimeTypeFlow =`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,6 @@ module ImplicitPendingIntentStartConfig implements DataFlow::StateConfigSig {`
`72`	`72`
`73`	`73`	`predicate isBarrier(DataFlow::Node sanitizer) { sanitizer instanceof ExplicitIntentSanitizer }`
`74`	`74`
`75`		`- predicate isBarrier(DataFlow::Node node, FlowState state) { none() }`
`76`		`-`
`77`	`75`	`predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {`
`78`	`76`	`any(ImplicitPendingIntentAdditionalTaintStep c).step(node1, node2)`
`79`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,6 @@ module WebViewDisallowContentAccessConfig implements DataFlow::StateConfigSig {`
`97`	`97`	`state instanceof IsSettings and`
`98`	`98`	`node instanceof WebSettingsDisallowContentAccessSink`
`99`	`99`	`}`
`100`		`-`
`101`		`- predicate isBarrier(DataFlow::Node node, FlowState state) { none() }`
`102`	`100`	`}`
`103`	`101`
`104`	`102`	`module WebViewDisallowContentAccessFlow =`
Original file line number	Diff line number	Diff line change
`@@ -45,14 +45,6 @@ module Config implements DataFlow::StateConfigSig {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }`
`48`		`-`
`49`		`- predicate isBarrier(DataFlow::Node node, FlowState state) { none() }`
`50`		`-`
`51`		`- predicate isAdditionalFlowStep(`
`52`		`- DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2`
`53`		`- ) {`
`54`		`- none()`
`55`		`- }`
`56`	`48`	`}`
`57`	`49`
`58`	`50`	`module Flow = DataFlow::GlobalWithState<Config>;`