Skip to content

Commit ab276fc

Browse files
authored
Merge pull request github#11481 from owen-mc/dataflow/sync-go-libraries-2
Sync go libraries
2 parents 22eb619 + 083a3ba commit ab276fc

File tree

12 files changed

+2519
-3899
lines changed

12 files changed

+2519
-3899
lines changed

config/identical-files.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"DataFlow Java/C++/C#/Python": [
2+
"DataFlow Java/C++/C#/Go/Python/Ruby/Swift": [
33
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll",
44
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll",
55
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll",
@@ -27,6 +27,8 @@
2727
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll",
2828
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll",
2929
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplForContentDataFlow.qll",
30+
"go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl.qll",
31+
"go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll",
3032
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll",
3133
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll",
3234
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll",
@@ -38,17 +40,18 @@
3840
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForPathname.qll",
3941
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll"
4042
],
41-
"DataFlow Java/C++/C#/Python Common": [
43+
"DataFlow Java/C++/C#/Go/Python/Ruby/Swift Common": [
4244
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll",
4345
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll",
4446
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll",
4547
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll",
4648
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll",
49+
"go/ql/lib/semmle/go/dataflow/internal/DataFlowImplCommon.qll",
4750
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll",
4851
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll",
4952
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImplCommon.qll"
5053
],
51-
"TaintTracking::Configuration Java/C++/C#/Python": [
54+
"TaintTracking::Configuration Java/C++/C#/Go/Python/Ruby/Swift": [
5255
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
5356
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
5457
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
@@ -62,6 +65,8 @@
6265
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
6366
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingImpl.qll",
6467
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll",
68+
"go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
69+
"go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
6570
"java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
6671
"java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
6772
"java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
@@ -72,7 +77,7 @@
7277
"ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
7378
"swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingImpl.qll"
7479
],
75-
"DataFlow Java/C++/C#/Python Consistency checks": [
80+
"DataFlow Java/C++/C#/Python/Ruby/Swift Consistency checks": [
7681
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll",
7782
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplConsistency.qll",
7883
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll",
@@ -82,9 +87,10 @@
8287
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplConsistency.qll",
8388
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImplConsistency.qll"
8489
],
85-
"DataFlow Java/C#/Ruby/Python/Swift Flow Summaries": [
90+
"DataFlow Java/C#/Go/Ruby/Python/Swift Flow Summaries": [
8691
"java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll",
8792
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll",
93+
"go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll",
8894
"ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll",
8995
"python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll",
9096
"swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll"
@@ -505,6 +511,7 @@
505511
],
506512
"AccessPathSyntax": [
507513
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/AccessPathSyntax.qll",
514+
"go/ql/lib/semmle/go/dataflow/internal/AccessPathSyntax.qll",
508515
"java/ql/lib/semmle/code/java/dataflow/internal/AccessPathSyntax.qll",
509516
"javascript/ql/lib/semmle/javascript/frameworks/data/internal/AccessPathSyntax.qll",
510517
"ruby/ql/lib/codeql/ruby/dataflow/internal/AccessPathSyntax.qll",

go/Makefile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,3 @@ build/testdb/go.dbscheme: ql/lib/upgrades/initial/go.dbscheme
132132
rm -rf build/testdb
133133
echo >build/empty.trap
134134
codeql dataset import -S ql/lib/upgrades/initial/go.dbscheme build/testdb build/empty.trap
135-
136-
.PHONY: sync-dataflow-libraries
137-
sync-dataflow-libraries:
138-
for f in DataFlowImpl.qll DataFlowImpl2.qll DataFlowImplCommon.qll DataFlowImplConsistency.qll tainttracking1/TaintTrackingImpl.qll tainttracking2/TaintTrackingImpl.qll FlowSummaryImpl.qll AccessPathSyntax.qll;\
139-
do\
140-
curl -s -o ./ql/lib/semmle/go/dataflow/internal/$$f https://raw.githubusercontent.com/github/codeql/$(DATAFLOW_BRANCH)/java/ql/lib/semmle/code/java/dataflow/internal/$$f;\
141-
done
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: fix
3+
---
4+
* Fixed an issue in the taint tracking analysis where implicit reads were not allowed by default in sinks or additional taint steps that used flow states.

go/ql/lib/semmle/go/dataflow/internal/AccessPathSyntax.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Module for parsing access paths from CSV models, both the identifying access path used
2+
* Module for parsing access paths from MaD models, both the identifying access path used
33
* by dynamic languages, and the input/output specifications for summary steps.
44
*
55
* This file is used by the shared data flow library and by the JavaScript libraries

0 commit comments

Comments
 (0)