Skip to content

C#: ExternalFlow.qll cleanup. #11395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 24, 2022
Merged

C#: ExternalFlow.qll cleanup. #11395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
311614c
C#: Remove imports of ExternalFlow.qll.
michaelnebel Nov 23, 2022
582cfb9
C#: Remove the frameworks module in ExternalFlow as MaD models are no…
michaelnebel Nov 23, 2022
2684b3f
C#: Make bi-directional import of Servicestack remote flow source def…
michaelnebel Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlow.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,43 +90,6 @@ private import internal.FlowSummaryImpl::Public
private import internal.FlowSummaryImpl::Private::External
private import internal.FlowSummaryImplSpecific

/**
* A module importing the frameworks that provide external flow data,
* ensuring that they are visible to the taint tracking / data flow library.
*/
private module Frameworks {
private import semmle.code.csharp.frameworks.EntityFramework
private import semmle.code.csharp.frameworks.JsonNET
private import semmle.code.csharp.frameworks.ServiceStack
private import semmle.code.csharp.frameworks.Sql
private import semmle.code.csharp.frameworks.System
private import semmle.code.csharp.frameworks.system.CodeDom
private import semmle.code.csharp.frameworks.system.Collections
private import semmle.code.csharp.frameworks.system.collections.Generic
private import semmle.code.csharp.frameworks.system.collections.Specialized
private import semmle.code.csharp.frameworks.system.Data
private import semmle.code.csharp.frameworks.system.data.Common
private import semmle.code.csharp.frameworks.system.Diagnostics
private import semmle.code.csharp.frameworks.system.Linq
private import semmle.code.csharp.frameworks.system.Net
private import semmle.code.csharp.frameworks.system.net.Mail
private import semmle.code.csharp.frameworks.system.IO
private import semmle.code.csharp.frameworks.system.io.Compression
private import semmle.code.csharp.frameworks.system.runtime.CompilerServices
private import semmle.code.csharp.frameworks.system.Security
private import semmle.code.csharp.frameworks.system.security.Cryptography
private import semmle.code.csharp.frameworks.system.security.cryptography.X509Certificates
private import semmle.code.csharp.frameworks.system.Text
private import semmle.code.csharp.frameworks.system.text.RegularExpressions
private import semmle.code.csharp.frameworks.system.threading.Tasks
private import semmle.code.csharp.frameworks.system.Web
private import semmle.code.csharp.frameworks.system.web.ui.WebControls
private import semmle.code.csharp.frameworks.system.Xml
private import semmle.code.csharp.security.dataflow.flowsinks.Html
private import semmle.code.csharp.security.dataflow.flowsources.Local
private import semmle.code.csharp.security.dataflow.XSSSinks
}

/**
* DEPRECATED: Define source models as data extensions instead.
*
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowDispatch.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ private import DataFlowPublic
private import DataFlowPrivate
private import FlowSummaryImpl as FlowSummaryImpl
private import semmle.code.csharp.dataflow.FlowSummary as FlowSummary
private import semmle.code.csharp.dataflow.ExternalFlow
private import semmle.code.csharp.dispatch.Dispatch
private import semmle.code.csharp.dispatch.RuntimeCallable
private import semmle.code.csharp.frameworks.system.Collections
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/EntityFramework.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ private import semmle.code.csharp.frameworks.system.data.Entity
private import semmle.code.csharp.frameworks.system.collections.Generic
private import semmle.code.csharp.frameworks.Sql
private import semmle.code.csharp.dataflow.FlowSummary
private import semmle.code.csharp.dataflow.ExternalFlow
private import semmle.code.csharp.dataflow.internal.DataFlowPrivate as DataFlowPrivate

/**
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/JsonNET.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/

import csharp
private import semmle.code.csharp.dataflow.ExternalFlow

/** Definitions relating to the `Json.NET` package. */
module JsonNET {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/ServiceStack.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*/

import csharp
private import semmle.code.csharp.dataflow.ExternalFlow

/** A class representing a Service */
private class ServiceClass extends Class {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/Sql.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ private import semmle.code.csharp.frameworks.EntityFramework
private import semmle.code.csharp.frameworks.NHibernate
private import semmle.code.csharp.frameworks.Dapper
private import semmle.code.csharp.dataflow.DataFlow4
private import semmle.code.csharp.dataflow.ExternalFlow

/** An expression containing a SQL command. */
abstract class SqlExpr extends Expr {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/System.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import system.Reflection
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System` namespace. */
class SystemNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/CodeDom.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.System
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.CodeDome` namespace. */
class SystemCodeDomNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/Collections.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.System
private import semmle.code.csharp.dataflow.ExternalFlow
private import semmle.code.csharp.dataflow.FlowSummary

/** The `System.Collections` namespace. */
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/Data.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.System
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Data` namespace. */
class SystemDataNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/Diagnostics.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import semmle.code.csharp.Type
private import semmle.code.csharp.frameworks.System
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Diagnostics` namespace. */
class SystemDiagnosticsNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/IO.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.System
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.IO` namespace. */
class SystemIONamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/Linq.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

private import csharp as CSharp
private import semmle.code.csharp.frameworks.System as System
private import semmle.code.csharp.dataflow.ExternalFlow as ExternalFlow

/** Definitions relating to the `System.Linq` namespace. */
module SystemLinq {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/Net.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.System
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Net` namespace. */
class SystemNetNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/Security.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/** Provides classes related to the namespace `System.Security`. */

import csharp
private import semmle.code.csharp.dataflow.ExternalFlow
private import semmle.code.csharp.frameworks.System

/** The `System.Security` namespace. */
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/Text.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.System
private import semmle.code.csharp.dataflow.ExternalFlow
private import semmle.code.csharp.dataflow.FlowSummary

/** The `System.Text` namespace. */
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/Web.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import csharp
private import semmle.code.csharp.frameworks.System
private import semmle.code.csharp.frameworks.system.collections.Specialized
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Web` namespace. */
class SystemWebNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/Xml.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import csharp
private import semmle.code.csharp.frameworks.System
private import semmle.code.csharp.dataflow.DataFlow3
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Xml` namespace. */
class SystemXmlNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/collections/Generic.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.system.Collections
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Collections.Generic` namespace. */
class SystemCollectionsGenericNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/collections/Specialized.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.system.Collections
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Collections.Specialized` namespace. */
class SystemCollectionsSpecializedNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/data/Common.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

private import csharp as CSharp
private import semmle.code.csharp.frameworks.system.Data as Data
private import semmle.code.csharp.dataflow.ExternalFlow as ExternalFlow

/** Definitions relating to the `System.Data.Common` namespace. */
module SystemDataCommon {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/io/Compression.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.system.IO
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.IO.Compression` namespace. */
class SystemIOCompressionNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/net/Mail.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.system.Net
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Net.Mail` namespace. */
class SystemNetMailNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/runtime/CompilerServices.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import csharp
private import semmle.code.csharp.frameworks.system.Runtime
private import semmle.code.csharp.dataflow.internal.DataFlowPrivate
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Runtime.CompilerServices` namespace. */
class SystemRuntimeCompilerServicesNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/security/Cryptography.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.system.Security
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Security.Cryptography` namespace. */
class SystemSecurityCryptographyNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion ...rp/ql/lib/semmle/code/csharp/frameworks/system/security/cryptography/X509Certificates.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.system.security.Cryptography
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Security.Cryptography.X509Certificates` namespace. */
class SystemSecurityCryptographyX509CertificatesNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/text/RegularExpressions.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import default
import semmle.code.csharp.frameworks.system.Text
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Text.RegularExpressions` namespace. */
class SystemTextRegularExpressionsNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/threading/Tasks.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import csharp
private import semmle.code.csharp.frameworks.system.Threading
private import semmle.code.csharp.dataflow.internal.DataFlowPrivate
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Threading.Tasks` namespace. */
class SystemThreadingTasksNamespace extends Namespace {
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/frameworks/system/web/ui/WebControls.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import csharp
private import semmle.code.csharp.frameworks.system.web.UI
private import semmle.code.csharp.dataflow.ExternalFlow

/** The `System.Web.UI.WebControls` namespace. */
class SystemWebUIWebControlsNamespace extends Namespace {
Expand Down
7 changes: 7 additions & 0 deletions csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsources/Remote.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ abstract class RemoteFlowSource extends DataFlow::Node {
abstract string getSourceType();
}

/**
* A module for importing frameworks that defines remote flow sources.
*/
private module RemoteFlowSources {
private import semmle.code.csharp.frameworks.ServiceStack
}

/** A data flow source of remote user input (ASP.NET). */
abstract class AspNetRemoteFlowSource extends RemoteFlowSource { }

Expand Down
1 change: 0 additions & 1 deletion csharp/ql/src/utils/model-generator/CaptureTypeBasedSummaryModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* @tags model-generator
*/

import semmle.code.csharp.dataflow.ExternalFlow
import utils.modelgenerator.internal.CaptureTypeBasedSummaryModels

from TypeBasedFlowTargetApi api, string flow
Expand Down