revert changing imports in java/

erik-krogh · erik-krogh · commit 9e7c0c6ab936 · 2022-08-18T10:19:12.000+02:00
diff --git a/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll
@@ -6,28 +6,28 @@ import java
 import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.dataflow.DefUse
-private import semmle.code.java.frameworks.Jdbc
-private import semmle.code.java.frameworks.Networking
-private import semmle.code.java.frameworks.Properties
-private import semmle.code.java.frameworks.Rmi
-private import semmle.code.java.frameworks.Servlets
-private import semmle.code.java.frameworks.ApacheHttp
-private import semmle.code.java.frameworks.android.XmlParsing
-private import semmle.code.java.frameworks.android.WebView
-private import semmle.code.java.frameworks.JaxWS
-private import semmle.code.java.frameworks.javase.WebSocket
-private import semmle.code.java.frameworks.android.Android
-private import semmle.code.java.frameworks.android.ExternalStorage
-private import semmle.code.java.frameworks.android.OnActivityResultSource
-private import semmle.code.java.frameworks.android.Intent
-private import semmle.code.java.frameworks.play.Play
-private import semmle.code.java.frameworks.spring.SpringWeb
-private import semmle.code.java.frameworks.spring.SpringController
-private import semmle.code.java.frameworks.spring.SpringWebClient
-private import semmle.code.java.frameworks.Guice
-private import semmle.code.java.frameworks.struts.StrutsActions
-private import semmle.code.java.frameworks.Thrift
-private import semmle.code.java.frameworks.javaee.jsf.JSFRenderer
+import semmle.code.java.frameworks.Jdbc
+import semmle.code.java.frameworks.Networking
+import semmle.code.java.frameworks.Properties
+import semmle.code.java.frameworks.Rmi
+import semmle.code.java.frameworks.Servlets
+import semmle.code.java.frameworks.ApacheHttp
+import semmle.code.java.frameworks.android.XmlParsing
+import semmle.code.java.frameworks.android.WebView
+import semmle.code.java.frameworks.JaxWS
+import semmle.code.java.frameworks.javase.WebSocket
+import semmle.code.java.frameworks.android.Android
+import semmle.code.java.frameworks.android.ExternalStorage
+import semmle.code.java.frameworks.android.OnActivityResultSource
+import semmle.code.java.frameworks.android.Intent
+import semmle.code.java.frameworks.play.Play
+import semmle.code.java.frameworks.spring.SpringWeb
+import semmle.code.java.frameworks.spring.SpringController
+import semmle.code.java.frameworks.spring.SpringWebClient
+import semmle.code.java.frameworks.Guice
+import semmle.code.java.frameworks.struts.StrutsActions
+import semmle.code.java.frameworks.Thrift
+import semmle.code.java.frameworks.javaee.jsf.JSFRenderer
 private import semmle.code.java.dataflow.ExternalFlow
 
 /** A data flow source of remote user input. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/android/Widget.qll b/java/ql/lib/semmle/code/java/frameworks/android/Widget.qll
@@ -3,7 +3,6 @@
 import java
 private import semmle.code.java.dataflow.ExternalFlow
 private import semmle.code.java.dataflow.FlowSources
-private import semmle.code.java.dataflow.FlowSteps
 
 private class AndroidWidgetSourceModels extends SourceModelCsv {
   override predicate row(string row) {
diff --git a/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll b/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll
@@ -6,7 +6,6 @@ import semmle.code.java.dataflow.DataFlow2
 import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.dataflow.TaintTracking3
 import semmle.code.java.security.AndroidIntentRedirection
-private import semmle.code.java.frameworks.android.Intent
 
 /**
  * A taint tracking configuration for tainted Intents being used to start Android components.
diff --git a/java/ql/lib/semmle/code/java/security/ResponseSplitting.qll b/java/ql/lib/semmle/code/java/security/ResponseSplitting.qll
@@ -3,8 +3,9 @@
 import java
 import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.FlowSources
+import semmle.code.java.frameworks.Servlets
+import semmle.code.java.frameworks.JaxWS
 private import semmle.code.java.dataflow.ExternalFlow
-private import semmle.code.java.frameworks.Servlets
 
 /** A sink that is vulnerable to an HTTP header splitting attack. */
 abstract class HeaderSplittingSink extends DataFlow::Node { }
diff --git a/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql b/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
@@ -15,7 +15,6 @@ import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.ExternalFlow
 import DataFlow::PathGraph
-private import semmle.code.java.frameworks.Networking
 
 class UrlConstructor extends ClassInstanceExpr {
   UrlConstructor() { this.getConstructor().getDeclaringType() instanceof TypeUrl }
diff --git a/java/ql/src/experimental/Security/CWE/CWE-073/JFinalController.qll b/java/ql/src/experimental/Security/CWE/CWE-073/JFinalController.qll
@@ -1,7 +1,6 @@
 import java
 private import semmle.code.java.dataflow.ExternalFlow
 private import semmle.code.java.dataflow.FlowSources
-private import semmle.code.java.dataflow.FlowSteps
 
 /** The class `com.jfinal.core.Controller`. */
 class JFinalController extends RefType {
diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll
@@ -7,7 +7,6 @@ import semmle.code.xml.MyBatisMapperXML
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.frameworks.MyBatis
 import semmle.code.java.frameworks.Properties
-private import semmle.code.java.Maps
 
 private predicate propertiesKey(DataFlow::Node prop, string key) {
   exists(MethodAccess m |
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/SpringImplicitViewManipulation.ql b/java/ql/src/experimental/Security/CWE/CWE-094/SpringImplicitViewManipulation.ql
@@ -11,7 +11,6 @@
 
 import java
 import SpringViewManipulationLib
-private import semmle.code.java.frameworks.Servlets
 
 private predicate canResultInImplicitViewConversion(Method m) {
   m.getReturnType() instanceof VoidType
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulationLib.qll b/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulationLib.qll
@@ -7,7 +7,6 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.frameworks.spring.Spring
 import SpringFrameworkLib
-private import semmle.code.xml.MavenPom
 
 /** Holds if `Thymeleaf` templating engine is used in the project. */
 predicate thymeleafIsUsed() {
diff --git a/java/ql/src/experimental/Security/CWE/CWE-200/AndroidFileIntentSource.qll b/java/ql/src/experimental/Security/CWE/CWE-200/AndroidFileIntentSource.qll
@@ -4,7 +4,6 @@ import java
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.TaintTracking2
 import semmle.code.java.frameworks.android.Android
-private import semmle.code.java.frameworks.android.Intent
 
 /** The `startActivityForResult` method of Android's `Activity` class. */
 class StartActivityForResultMethod extends Method {
diff --git a/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql b/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql
@@ -15,8 +15,6 @@ import semmle.code.java.frameworks.Servlets
 import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.dataflow.TaintTracking2
 import DataFlow::PathGraph
-private import semmle.code.java.Collections
-private import semmle.code.java.Maps
 
 /**
  *  Holds if `header` sets `Access-Control-Allow-Credentials` to `true`. This ensures fair chances of exploitability.
diff --git a/java/ql/src/experimental/Security/CWE/CWE-489/EJBMain.ql b/java/ql/src/experimental/Security/CWE/CWE-489/EJBMain.ql
@@ -10,6 +10,7 @@
  */
 
 import java
+import semmle.code.java.J2EE
 import TestLib
 
 /** The `main` method in an Enterprise Java Bean. */
diff --git a/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql b/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql
@@ -17,7 +17,6 @@ import semmle.code.java.dataflow.TaintTracking
 import experimental.semmle.code.java.frameworks.Jsf
 import experimental.semmle.code.java.PathSanitizer
 import DataFlow::PathGraph
-private import semmle.code.java.frameworks.Servlets
 
 class UnsafeUrlForwardFlowConfig extends TaintTracking::Configuration {
   UnsafeUrlForwardFlowConfig() { this = "UnsafeUrlForwardFlowConfig" }
diff --git a/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.qll b/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.qll
@@ -4,9 +4,6 @@ private import semmle.code.java.dataflow.ExternalFlow
 private import semmle.code.java.dataflow.FlowSources
 private import semmle.code.java.dataflow.StringPrefixes
 private import semmle.code.java.frameworks.javaee.ejb.EJBRestrictions
-private import semmle.code.java.frameworks.Servlets
-private import semmle.code.java.frameworks.spring.SpringWeb
-private import semmle.code.java.frameworks.spring.SpringController
 
 /** A sink for unsafe URL forward vulnerabilities. */
 abstract class UnsafeUrlForwardSink extends DataFlow::Node { }
diff --git a/java/ql/src/experimental/Security/CWE/CWE-598/SensitiveGetQuery.ql b/java/ql/src/experimental/Security/CWE/CWE-598/SensitiveGetQuery.ql
@@ -14,7 +14,6 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.security.SensitiveActions
 import DataFlow::PathGraph
-private import semmle.code.java.frameworks.Servlets
 
 /** A variable that holds sensitive information judging by its name. */
 class SensitiveInfoExpr extends Expr {
diff --git a/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.qll b/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.qll
@@ -3,7 +3,7 @@ import DataFlow
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.DataFlow2
 import semmle.code.java.dataflow.TaintTracking
-private import semmle.code.java.frameworks.spring.SpringController
+import semmle.code.java.frameworks.spring.SpringController
 
 /**
  * A concatenate expression using the string `redirect:` or `ajaxredirect:` or `forward:` on the left.
diff --git a/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql b/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql
@@ -17,7 +17,6 @@ import semmle.code.java.frameworks.android.Intent
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.NumberFormatException
 import DataFlow::PathGraph
-private import semmle.code.java.frameworks.android.Android
 
 /**
  * Taint configuration tracking flow from untrusted inputs to number conversion calls in exported Android compononents.
