Skip to content

update dojo #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 21, 2025
Merged

update dojo #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fe25eb7
update dojo
sarahgibs Mar 18, 2025
076383a
revert
sarahgibs Mar 18, 2025
d9203fc
try 2.43.4
sarahgibs Mar 19, 2025
bfd344d
trying 2.42.3
sarahgibs Mar 19, 2025
6946d62
try 2.39.4
sarahgibs Mar 19, 2025
2855b9a
revert for testing
sarahgibs Mar 19, 2025
0b02027
try 2.36.3
sarahgibs Mar 19, 2025
aa2e4c1
back to 2.44.1
sarahgibs Mar 20, 2025
8167426
add content type for xml dojo uploads
sarahgibs Mar 20, 2025
255cbfd
fix tuple
sarahgibs Mar 20, 2025
f15b984
clean up mimetypes
sarahgibs Mar 21, 2025
b057133
change to guess_type
sarahgibs Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion defectdojo/Dockerfile.django
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM defectdojo/defectdojo-django:2.35.2 as dd
FROM defectdojo/defectdojo-django:2.44.1 as dd

FROM dd as patch

Expand Down
4 changes: 4 additions & 0 deletions zap/src/defectdojo_apiv2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import json
import mimetypes
import os

import requests
import requests.exceptions
Expand Down Expand Up @@ -687,6 +689,8 @@ def upload_scan(self, engagement_id, scan_type, file, active, verified, close_ol
print("filedata:")
print(filedata)

filedata = ('report.xml', filedata, mimetypes.guess_type(file)[0])

data = {
'file': filedata,
'engagement': ('', engagement_id),
Expand Down