hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 02:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge from main to resolve conflicts

Browse Source
This commit is contained in:
Dave Bartolomeo
2024-03-19 10:41:31 -04:00
parent 769e3469a4 219cd4e415
commit 311ba8ea1b
1361 changed files with 222127 additions and 93308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
swift/ql/lib/codeql/swift/dataflow/DataFlow.qll
View File

@@ -5,6 +5,7 @@
module DataFlow {
private import internal.DataFlowImplSpecific
private import codeql.dataflow.DataFlow
import DataFlowMake<SwiftDataFlow>
private import codeql.swift.elements.Location
import DataFlowMake<Location, SwiftDataFlow>
import internal.DataFlowImpl1
}

3
swift/ql/lib/codeql/swift/dataflow/TaintTracking.qll
View File

@@ -7,6 +7,7 @@ module TaintTracking {
private import codeql.swift.dataflow.internal.DataFlowImplSpecific
private import codeql.swift.dataflow.internal.TaintTrackingImplSpecific
private import codeql.dataflow.TaintTracking
import TaintFlowMake<SwiftDataFlow, SwiftTaintTracking>
private import codeql.swift.elements.Location
import TaintFlowMake<Location, SwiftDataFlow, SwiftTaintTracking>
import codeql.swift.dataflow.internal.tainttracking1.TaintTrackingImpl
}

3
swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll
View File

@@ -1,3 +1,4 @@
private import DataFlowImplSpecific
private import codeql.dataflow.internal.DataFlowImpl
import MakeImpl<SwiftDataFlow>
private import codeql.swift.elements.Location
import MakeImpl<Location, SwiftDataFlow>

2
swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
View File

@@ -285,6 +285,8 @@ deprecated private module Config implements FullStateConfigSig {
int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
int accessPathLimit() { result = 5 }
FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
predicate sourceGrouping(Node source, string sourceGroup) {

3
swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImplCommon.qll
View File

@@ -1,3 +1,4 @@
private import DataFlowImplSpecific
private import codeql.dataflow.internal.DataFlowImplCommon
import MakeImplCommon<SwiftDataFlow>
import codeql.swift.elements.Location
import MakeImplCommon<Location, SwiftDataFlow>

4
swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImplConsistency.qll
View File

@@ -8,6 +8,6 @@ private import DataFlowImplSpecific
private import TaintTrackingImplSpecific
private import codeql.dataflow.internal.DataFlowImplConsistency
private module Input implements InputSig<SwiftDataFlow> { }
private module Input implements InputSig<Location, SwiftDataFlow> { }
module Consistency = MakeConsistency<SwiftDataFlow, SwiftTaintTracking, Input>;
module Consistency = MakeConsistency<Location, SwiftDataFlow, SwiftTaintTracking, Input>;

2
swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImplSpecific.qll
View File

@@ -15,7 +15,7 @@ module Public {
import DataFlowPublic
}
module SwiftDataFlow implements InputSig {
module SwiftDataFlow implements InputSig<Swift::Location> {
import Private
import Public

2
swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPublic.qll
View File

@@ -26,7 +26,7 @@ class Node extends TNode {
* For more information, see
* [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
*/
predicate hasLocationInfo(
deprecated predicate hasLocationInfo(
string filepath, int startline, int startcolumn, int endline, int endcolumn
) {
this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)

8
swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll
View File

@@ -11,7 +11,7 @@ private import DataFlowImplSpecific::Public
private import DataFlowImplCommon
private import codeql.swift.dataflow.ExternalFlow
module Input implements InputSig<DataFlowImplSpecific::SwiftDataFlow> {
module Input implements InputSig<Location, DataFlowImplSpecific::SwiftDataFlow> {
class SummarizedCallableBase = Function;
ArgumentPosition callbackSelfParameterPosition() { result instanceof ThisArgumentPosition }
@@ -102,14 +102,14 @@ module Input implements InputSig<DataFlowImplSpecific::SwiftDataFlow> {
}
}
private import Make<DataFlowImplSpecific::SwiftDataFlow, Input> as Impl
private import Make<Location, DataFlowImplSpecific::SwiftDataFlow, Input> as Impl
private module StepsInput implements Impl::Private::StepsInputSig {
DataFlowCall getACall(Public::SummarizedCallable sc) { result.asCall().getStaticTarget() = sc }
}
module SourceSinkInterpretationInput implements
Impl::Private::External::SourceSinkInterpretationInputSig<Location>
Impl::Private::External::SourceSinkInterpretationInputSig
{
class Element = AstNode;
@@ -222,7 +222,7 @@ module Private {
module External {
import Impl::Private::External
import Impl::Private::External::SourceSinkInterpretation<Location, SourceSinkInterpretationInput>
import Impl::Private::External::SourceSinkInterpretation<SourceSinkInterpretationInput>
}
/**

3
swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingImplSpecific.qll
View File

@@ -4,8 +4,9 @@
private import codeql.dataflow.TaintTracking
private import DataFlowImplSpecific
private import codeql.swift.elements.Location
module SwiftTaintTracking implements InputSig<SwiftDataFlow> {
module SwiftTaintTracking implements InputSig<Location, SwiftDataFlow> {
import TaintTrackingPrivate
import TaintTrackingPublic
}

1
swift/ql/test/query-tests/Security/CWE-311/CleartextStorageDatabase.expected
View File

@@ -164,7 +164,6 @@ edges
| testCoreData2.swift:98:18:98:18 | d [value] | testCoreData2.swift:98:18:98:20 | .value | provenance | |
| testCoreData2.swift:98:18:98:20 | .value | testCoreData2.swift:98:2:98:2 | [post] dbObj [myValue] | provenance | |
| testCoreData2.swift:101:10:101:10 | bankAccountNo | testCoreData2.swift:103:13:103:13 | e | provenance | |
| testCoreData2.swift:103:13:103:13 | e | testCoreData2.swift:70:9:70:9 | self | provenance | |
| testCoreData2.swift:103:13:103:13 | e | testCoreData2.swift:104:18:104:18 | e | provenance | |
| testCoreData2.swift:104:2:104:2 | [post] dbObj [myValue] | testCoreData2.swift:104:2:104:2 | [post] dbObj | provenance | |
| testCoreData2.swift:104:18:104:18 | e | testCoreData2.swift:70:9:70:9 | self | provenance | |