Skip to content

Commit 82c0250

Browse files
committed
Merge remote-tracking branch 'origin/main' into maikypedia/ruby-ssti
2 parents a571bc6 + 2e5a048 commit 82c0250

File tree

1,125 files changed

+66944
-36501
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,125 files changed

+66944
-36501
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.0
1+
6.1.2

.github/workflows/go-tests-other-os.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go 1.20
1616
uses: actions/setup-go@v4
1717
with:
18-
go-version: 1.20.0
18+
go-version: '1.20'
1919
id: go
2020

2121
- name: Check out code
@@ -50,7 +50,7 @@ jobs:
5050
- name: Set up Go 1.20
5151
uses: actions/setup-go@v4
5252
with:
53-
go-version: 1.20.0
53+
go-version: '1.20'
5454
id: go
5555

5656
- name: Check out code

.github/workflows/go-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Go 1.20
2424
uses: actions/setup-go@v4
2525
with:
26-
go-version: 1.20.0
26+
go-version: '1.20'
2727
id: go
2828

2929
- name: Check out code

.github/workflows/ruby-build.yml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ jobs:
5858
id: cache-extractor
5959
with:
6060
path: |
61-
ruby/extractor/target/release/autobuilder
62-
ruby/extractor/target/release/autobuilder.exe
63-
ruby/extractor/target/release/extractor
64-
ruby/extractor/target/release/extractor.exe
61+
ruby/extractor/target/release/codeql-extractor-ruby
62+
ruby/extractor/target/release/codeql-extractor-ruby.exe
6563
ruby/extractor/ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
6664
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-ruby-extractor-${{ hashFiles('ruby/extractor/rust-toolchain.toml', 'ruby/extractor/Cargo.lock') }}--${{ hashFiles('ruby/extractor/**/*.rs') }}
6765
- uses: actions/cache@v3
@@ -88,15 +86,13 @@ jobs:
8886
run: |
8987
cd extractor
9088
cross build --release
91-
mv target/x86_64-unknown-linux-gnu/release/extractor target/release/
92-
mv target/x86_64-unknown-linux-gnu/release/autobuilder target/release/
93-
mv target/x86_64-unknown-linux-gnu/release/generator target/release/
89+
mv target/x86_64-unknown-linux-gnu/release/codeql-extractor-ruby target/release/
9490
- name: Release build (windows and macos)
9591
if: steps.cache-extractor.outputs.cache-hit != 'true' && runner.os != 'Linux'
9692
run: cd extractor && cargo build --release
9793
- name: Generate dbscheme
9894
if: ${{ matrix.os == 'ubuntu-latest' && steps.cache-extractor.outputs.cache-hit != 'true'}}
99-
run: extractor/target/release/generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
95+
run: extractor/target/release/codeql-extractor-ruby generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
10096
- uses: actions/upload-artifact@v3
10197
if: ${{ matrix.os == 'ubuntu-latest' }}
10298
with:
@@ -111,10 +107,8 @@ jobs:
111107
with:
112108
name: extractor-${{ matrix.os }}
113109
path: |
114-
ruby/extractor/target/release/autobuilder
115-
ruby/extractor/target/release/autobuilder.exe
116-
ruby/extractor/target/release/extractor
117-
ruby/extractor/target/release/extractor.exe
110+
ruby/extractor/target/release/codeql-extractor-ruby
111+
ruby/extractor/target/release/codeql-extractor-ruby.exe
118112
retention-days: 1
119113
compile-queries:
120114
runs-on: ubuntu-latest-xl
@@ -172,13 +166,10 @@ jobs:
172166
mkdir -p ruby
173167
cp -r codeql-extractor.yml tools ql/lib/ruby.dbscheme.stats ruby/
174168
mkdir -p ruby/tools/{linux64,osx64,win64}
175-
cp linux64/autobuilder ruby/tools/linux64/autobuilder
176-
cp osx64/autobuilder ruby/tools/osx64/autobuilder
177-
cp win64/autobuilder.exe ruby/tools/win64/autobuilder.exe
178-
cp linux64/extractor ruby/tools/linux64/extractor
179-
cp osx64/extractor ruby/tools/osx64/extractor
180-
cp win64/extractor.exe ruby/tools/win64/extractor.exe
181-
chmod +x ruby/tools/{linux64,osx64}/{autobuilder,extractor}
169+
cp linux64/codeql-extractor-ruby ruby/tools/linux64/extractor
170+
cp osx64/codeql-extractor-ruby ruby/tools/osx64/extractor
171+
cp win64/codeql-extractor-ruby.exe ruby/tools/win64/extractor.exe
172+
chmod +x ruby/tools/{linux64,osx64}/extractor
182173
zip -rq codeql-ruby.zip ruby
183174
- uses: actions/upload-artifact@v3
184175
with:

config/identical-files.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll",
4141
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll",
4242
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll",
43-
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplForContentDataFlow.qll",
4443
"go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll",
4544
"go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll",
4645
"go/ql/lib/semmle/go/dataflow/internal/DataFlowImplForStringsNewReplacer.qll",

cpp/ql/examples/queries.xml

Lines changed: 0 additions & 1 deletion
This file was deleted.

cpp/ql/lib/CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
## 0.7.0
2+
3+
### Breaking Changes
4+
5+
* The internal `SsaConsistency` module has been moved from `SSAConstruction` to `SSAConsitency`, and the deprecated `SSAConsistency` module has been removed.
6+
7+
### Deprecated APIs
8+
9+
* The single-parameter predicates `ArrayOrVectorAggregateLiteral.getElementExpr` and `ClassAggregateLiteral.getFieldExpr` have been deprecated in favor of `ArrayOrVectorAggregateLiteral.getAnElementExpr` and `ClassAggregateLiteral.getAFieldExpr`.
10+
* The recently introduced new data flow and taint tracking APIs have had a
11+
number of module and predicate renamings. The old APIs remain in place for
12+
now.
13+
* The `SslContextCallAbstractConfig`, `SslContextCallConfig`, `SslContextCallBannedProtocolConfig`, `SslContextCallTls12ProtocolConfig`, `SslContextCallTls13ProtocolConfig`, `SslContextCallTlsProtocolConfig`, `SslContextFlowsToSetOptionConfig`, `SslOptionConfig` dataflow configurations from `BoostorgAsio` have been deprecated. Please use `SslContextCallConfigSig`, `SslContextCallGlobal`, `SslContextCallFlow`, `SslContextCallBannedProtocolFlow`, `SslContextCallTls12ProtocolFlow`, `SslContextCallTls13ProtocolFlow`, `SslContextCallTlsProtocolFlow`, `SslContextFlowsToSetOptionFlow`.
14+
15+
### New Features
16+
17+
* Added overridable predicates `getSizeExpr` and `getSizeMult` to the `BufferAccess` class (`semmle.code.cpp.security.BufferAccess.qll`). This makes it possible to model a larger class of buffer reads and writes using the library.
18+
19+
### Minor Analysis Improvements
20+
21+
* The `BufferAccess` library (`semmle.code.cpp.security.BufferAccess`) no longer matches buffer accesses inside unevaluated contexts (such as inside `sizeof` or `decltype` expressions). As a result, queries using this library may see fewer false positives.
22+
23+
### Bug Fixes
24+
25+
* Fixed some accidental predicate visibility in the backwards-compatible wrapper for data flow configurations. In particular `DataFlow::hasFlowPath`, `DataFlow::hasFlow`, `DataFlow::hasFlowTo`, and `DataFlow::hasFlowToExpr` were accidentally exposed in a single version.
26+
127
## 0.6.1
228

329
No user-facing changes.

cpp/ql/lib/change-notes/2013-03-20-ssa-consistency.md

Lines changed: 0 additions & 4 deletions
This file was deleted.

cpp/ql/lib/change-notes/2023-03-20-boost-deprecated-dataflow-configurations.md

Lines changed: 0 additions & 4 deletions
This file was deleted.

cpp/ql/lib/change-notes/2023-03-21-buffer-access.md

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)