Skip to content

Commit 778cf70

Browse files
Maffoochclaude
andcommitted
merge dev: multi-CWE stack alongside code-location emission
Four both-sides-append unions: parsers keep the new LocationData.code(...) emission (V3-gated) and gain dev's unsaved_cwes persistence; xygeni's import follows dev's parse_cwes rename. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2 parents 4b082b4 + 55ca4f8 commit 778cf70

310 files changed

Lines changed: 13112 additions & 766 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
1-
# Any kind of package updates only need 2 approvals,
2-
# So let's add three folks here
3-
requirements.txt @cneill @mtesauro @Maffooch
4-
# Any dockerfile or compose changes will need to be viewed by
5-
# these people
6-
Dockerfile.* @mtesauro @Maffooch
7-
docker-compose.* @mtesauro @Maffooch
8-
/docker/ @mtesauro @Maffooch
91
# Documentation changes
10-
/docs/content/ @paulOsinski @valentijnscholten @Maffooch
11-
# Kubernetes should be reviewed by reviewed first by those that know it
12-
/helm/ @cneill @kiblik @Maffooch
13-
# Anything UI related needs to be checked out by those with the eye for it
14-
/dojo/static/ @blakeaowens @Maffooch
15-
/dojo/templates/ @blakeaowens @Maffooch
16-
# Any model changes should be closely looked at
17-
/dojo/models.py @Maffooch
2+
/docs/content/ @paulOsinski @Maffooch
183
# All other code changes should be reviewed by someone
19-
* @Maffooch @mtesauro
4+
* @Maffooch @blakeaowens

.github/workflows/build-docker-images-for-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: echo "IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
5050

5151
- name: Set up Docker Buildx
52-
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
52+
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
5353

5454
- name: Build
5555
id: docker_build

.github/workflows/release-x-manual-docker-containers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
run: echo "DOCKER_ORG=$(echo ${GITHUB_REPOSITORY%%/*} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
5353

5454
- name: Login to DockerHub
55-
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
55+
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
5656
with:
5757
username: ${{ secrets.DOCKERHUB_USERNAME }}
5858
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -64,7 +64,7 @@ jobs:
6464

6565
- name: Set up Docker Buildx
6666
id: buildx
67-
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
67+
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
6868

6969
# we cannot set any tags here, those are set on the merged digest in release-x-manual-merge-container-digests.yml
7070
- name: Build and push images

.github/workflows/release-x-manual-merge-container-digests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ jobs:
4848
merge-multiple: true
4949

5050
- name: Login to DockerHub
51-
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
51+
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
5252
with:
5353
username: ${{ secrets.DOCKERHUB_USERNAME }}
5454
password: ${{ secrets.DOCKERHUB_TOKEN }}
5555

5656
- name: Set up Docker Buildx
57-
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
57+
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
5858

5959
# the alpine and debian images are tagged with the os name
6060
- name: Create OS specific manifest list and push

.github/workflows/release-x-manual-tag-as-latest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737
run: echo "DOCKER_ORG=$(echo ${GITHUB_REPOSITORY%%/*} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
3838

3939
- name: Login to DockerHub
40-
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
40+
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
4141
with:
4242
username: ${{ secrets.DOCKERHUB_USERNAME }}
4343
password: ${{ secrets.DOCKERHUB_TOKEN }}
4444

4545
- name: Set up Docker Buildx
46-
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
46+
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
4747

4848
- name: Tag with latest tags
4949
run: |

.github/workflows/renovate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
uses: suzuki-shunsuke/github-action-renovate-config-validator@ee9f69e1f683ed0d08225086482b34fc9abe9300 # v2.1.0
2222
with:
2323
strict: "true"
24-
validator_version: 43.248.0 # renovate: datasource=github-releases depName=renovatebot/renovate
24+
validator_version: 43.263.3 # renovate: datasource=github-releases depName=renovatebot/renovate

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,3 +153,5 @@ docs/.hugo_build.lock
153153
# claude etc
154154
MEMORY.md
155155
.claude/
156+
CLAUDE.md
157+
CLAUDE.local.md

components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defectdojo",
3-
"version": "3.1.0-dev",
3+
"version": "3.2.0-dev",
44
"license": "BSD-3-Clause",
55
"private": true,
66
"dependencies": {

components/tailwind.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,6 +1177,9 @@
11771177
box-shadow: 0 4px 16px rgba(0,0,0,.12), 0 1px 3px rgba(0,0,0,.06);
11781178
}
11791179
.open > .dropdown-menu { display: block; }
1180+
/* Right-align the menu to its toggle (e.g. dropdowns pinned to the right
1181+
edge of a header) so it opens leftward instead of overflowing the page. */
1182+
.dropdown-menu-right { right: 0; left: auto; }
11801183
.dropdown-menu > li > a,
11811184
.dropdown-menu > a {
11821185
display: block;

docker-compose.override.integration_tests.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ services:
4646
environment:
4747
DD_DATABASE_URL: ${DD_TEST_DATABASE_URL:-postgresql://defectdojo:defectdojo@postgres:5432/test_defectdojo}
4848
DD_V3_FEATURE_LOCATIONS: ${DD_V3_FEATURE_LOCATIONS:-False}
49+
# Delay deduplication batches so the async_wait integration test can
50+
# deterministically distinguish a blocking join (async_wait) from a
51+
# non-blocking one (async). Scoped by _FILTER to that test's findings so
52+
# other dedupe tests are unaffected. Integration-test stack only; never prod.
53+
DD_DEDUPLICATION_BATCH_PROCESS_TEST_DELAY: 10
54+
DD_DEDUPLICATION_BATCH_PROCESS_TEST_DELAY_FILTER: "async_wait finding"
4955
initializer:
5056
environment:
5157
PYTHONWARNINGS: error # We are strict about Warnings during testing

0 commit comments

Comments
 (0)