Skip to content

Commit a8a34ad

Browse files
committed
Merge branch 'main' into redsun82/swift-weak-hashing-phase-1
2 parents 6223103 + 9893650 commit a8a34ad

File tree

365 files changed

+27627
-6845
lines changed

Some content is hidden

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

365 files changed

+27627
-6845
lines changed

.github/workflows/check-qldoc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ jobs:
2727
run: |
2828
EXIT_CODE=0
2929
# TODO: remove the swift exception from the regex when we fix generated QLdoc
30-
changed_lib_packs="$(git diff --name-only --diff-filter=ACMRT HEAD^ HEAD | { grep -Po '^(?!swift)[a-z]*/ql/lib' || true; } | sort -u)"
30+
# TODO: remove the shared exception from the regex when coverage of qlpacks without dbschemes is supported
31+
changed_lib_packs="$(git diff --name-only --diff-filter=ACMRT HEAD^ HEAD | { grep -Po '^(?!(swift|shared))[a-z]*/ql/lib' || true; } | sort -u)"
3132
for pack_dir in ${changed_lib_packs}; do
3233
lang="${pack_dir%/ql/lib}"
3334
codeql generate library-doc-coverage --output="${RUNNER_TEMP}/${lang}-current.txt" --dir="${pack_dir}"

.github/workflows/ruby-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ jobs:
9595
uses: ./.github/actions/fetch-codeql
9696
- name: Build Query Pack
9797
run: |
98+
codeql pack create ../shared/ssa --output target/packs
9899
codeql pack create ql/lib --output target/packs
99100
codeql pack install ql/src
100101
codeql pack create ql/src --output target/packs

codeql-workspace.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ provide:
44
- "*/ql/test/qlpack.yml"
55
- "*/ql/examples/qlpack.yml"
66
- "*/ql/consistency-queries/qlpack.yml"
7+
- "shared/*/qlpack.yml"
78
- "cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml"
89
- "go/ql/config/legacy-support/qlpack.yml"
910
- "go/build/codeql-extractor-go/codeql-extractor.yml"

config/identical-files.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll",
3131
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll",
3232
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForLibraries.qll",
33+
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForHttpClientLibraries.qll",
3334
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll"
3435
],
3536
"DataFlow Java/C++/C#/Python Common": [
@@ -460,12 +461,6 @@
460461
"javascript/ql/lib/IDEContextual.qll",
461462
"python/ql/lib/analysis/IDEContextual.qll"
462463
],
463-
"SSA C#": [
464-
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll",
465-
"ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplCommon.qll",
466-
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll",
467-
"swift/ql/lib/codeql/swift/dataflow/internal/SsaImplCommon.qll"
468-
],
469464
"CryptoAlgorithms Python/JS/Ruby": [
470465
"javascript/ql/lib/semmle/javascript/security/CryptoAlgorithms.qll",
471466
"python/ql/lib/semmle/python/concepts/CryptoAlgorithms.qll",
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
class Expr extends @expr {
2+
string toString() { none() }
3+
}
4+
5+
class Location extends @location_expr {
6+
string toString() { none() }
7+
}
8+
9+
predicate isExprWithNewBuiltin(Expr expr) {
10+
exists(int kind | exprs(expr, kind, _) | 336 <= kind and kind <= 362)
11+
}
12+
13+
from Expr expr, int kind, int kind_new, Location location
14+
where
15+
exprs(expr, kind, location) and
16+
if isExprWithNewBuiltin(expr) then kind_new = 1 else kind_new = kind
17+
select expr, kind_new, location

0 commit comments

Comments
 (0)