diff --git a/api/poetry.lock b/api/poetry.lock index 65aa4cb61..3c45d7ac1 100644 --- a/api/poetry.lock +++ b/api/poetry.lock @@ -2673,13 +2673,13 @@ files = [ [[package]] name = "weasyprint" -version = "60.2" +version = "61.0" description = "The Awesome Document Factory" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "weasyprint-60.2-py3-none-any.whl", hash = "sha256:3e98eedcc1c5a14cb310c293c6d59a479f59a13f0d705ff07106482827fa5705"}, - {file = "weasyprint-60.2.tar.gz", hash = "sha256:0c0cdd617a78699262b80026e67fa1692e3802cfa966395436eeaf6f787dd126"}, + {file = "weasyprint-61.0-py3-none-any.whl", hash = "sha256:1dd5e929389b7ebcbff3088da7af13ae7ab201dce3a2faca7832b1dd5cec60ea"}, + {file = "weasyprint-61.0.tar.gz", hash = "sha256:d91b11a05426fef1d63de826f30a80521d48c6a356455d338c2c429989fa586d"}, ] [package.dependencies] @@ -2890,4 +2890,4 @@ test = ["pytest"] [metadata] lock-version = "2.0" python-versions = "~3.12" -content-hash = "fca9e61f5e8f4a42d380b6cc2327550a7ec4b547baa898b494dc034780f4d35b" +content-hash = "37db88c83d86f07b867e68a2f2980d4d0b1508f321a52f34b08f0ccd89029a79" diff --git a/api/pyproject.toml b/api/pyproject.toml index 66473e7c4..6684a53f3 100644 --- a/api/pyproject.toml +++ b/api/pyproject.toml @@ -10,7 +10,7 @@ python = "~3.12" django = { extras = ["argon2"], version = "~5.0" } djangorestframework = "~3.14.0" adrf = "==0.1.2" # bug in 0.1.3 causes authentication errors: see https://github.com/em1208/adrf/issues/28 -weasyprint = "~60.2" +weasyprint = "~61.0" django-phonenumber-field = { version = "^7.0.0", extras = ["phonenumberslite"] } django-csp = "^3.7" diff --git a/api/requirements.txt b/api/requirements.txt index 2f0e8b16c..3a3eb9670 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1326,9 +1326,9 @@ watchdog==4.0.0 ; python_version >= "3.12" and python_version < "3.13" \ wcwidth==0.2.13 ; python_version >= "3.12" and python_version < "3.13" \ --hash=sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859 \ --hash=sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5 -weasyprint==60.2 ; python_version >= "3.12" and python_version < "3.13" \ - --hash=sha256:0c0cdd617a78699262b80026e67fa1692e3802cfa966395436eeaf6f787dd126 \ - --hash=sha256:3e98eedcc1c5a14cb310c293c6d59a479f59a13f0d705ff07106482827fa5705 +weasyprint==61.0 ; python_version >= "3.12" and python_version < "3.13" \ + --hash=sha256:1dd5e929389b7ebcbff3088da7af13ae7ab201dce3a2faca7832b1dd5cec60ea \ + --hash=sha256:d91b11a05426fef1d63de826f30a80521d48c6a356455d338c2c429989fa586d webencodings==0.5.1 ; python_version >= "3.12" and python_version < "3.13" \ --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \ --hash=sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 diff --git a/api/src/reportcreator_api/pentests/customfields/predefined_fields.py b/api/src/reportcreator_api/pentests/customfields/predefined_fields.py index 7a84817ca..373ed9cc4 100644 --- a/api/src/reportcreator_api/pentests/customfields/predefined_fields.py +++ b/api/src/reportcreator_api/pentests/customfields/predefined_fields.py @@ -20,7 +20,6 @@ items=StringField(origin=FieldOrigin.PREDEFINED, label='Reference', default=None)), 'affected_components': ListField(origin=FieldOrigin.PREDEFINED, label='Affected Components', required=True, items=StringField(origin=FieldOrigin.PREDEFINED, label='Component', default='TODO: affected component')), - 'cwe': CweField(origin=FieldOrigin.PREDEFINED, label='CWE', default=None, required=False), 'owasp_top10_2021': EnumField(origin=FieldOrigin.PREDEFINED, label='OWASP Top 10 - 2021', required=True, default=None, choices=[ EnumChoice(value='A01_2021', label='A01:2021 - Broken Access Control'), EnumChoice(value='A02_2021', label='A02:2021 - Cryptographic Failures'), diff --git a/api/src/reportcreator_api/tasks/rendering/global_assets/base-text.scss b/api/src/reportcreator_api/tasks/rendering/global_assets/base-text.scss index 1bdf280ec..a7637398f 100644 --- a/api/src/reportcreator_api/tasks/rendering/global_assets/base-text.scss +++ b/api/src/reportcreator_api/tasks/rendering/global_assets/base-text.scss @@ -11,7 +11,6 @@ The reason why the file extension is .scss is that the SCSS-preprocessor inlines table { width: 100%; caption-side: bottom; - overflow-wrap: anywhere; } table, th, td { border: 1px solid black; @@ -20,6 +19,9 @@ table, th, td { th { font-weight: bold; } +td { + overflow-wrap: anywhere; +} th, td { padding: 0.3em; }