Skip to content

Commit b02eddc

Browse files
fix: Replace xml.etree.ElementTree with defusedxml.ElementTree (#1430)
* Fixes #1398
1 parent 0210dd5 commit b02eddc

File tree

6 files changed

+9
-4
lines changed

6 files changed

+9
-4
lines changed

cve_bin_tool/sbom_manager/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
# SPDX-License-Identifier: GPL-3.0-or-later
33

44
import sqlite3
5-
import xml.etree.ElementTree as ET
65
from collections import defaultdict
76
from logging import Logger
87
from typing import DefaultDict, Dict, List, Optional
98

9+
import defusedxml.ElementTree as ET
10+
1011
from cve_bin_tool.cvedb import CVEDB
1112
from cve_bin_tool.input_engine import TriageData
1213
from cve_bin_tool.log import LOGGER

cve_bin_tool/sbom_manager/cyclonedx_parser.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
# SPDX-License-Identifier: GPL-3.0-or-later
33

44
import json
5-
import xml.etree.ElementTree as ET
65
from typing import List
76

7+
import defusedxml.ElementTree as ET
8+
89

910
class CycloneParser:
1011
def __init__(self):

cve_bin_tool/sbom_manager/spdx_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
import json
55
import re
6-
import xml.etree.ElementTree as ET
76
from typing import List
87

8+
import defusedxml.ElementTree as ET
99
import yaml
1010

1111
from cve_bin_tool.log import LOGGER

cve_bin_tool/sbom_manager/swid_parser.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# Copyright (C) 2021 Anthony Harrison
22
# SPDX-License-Identifier: GPL-3.0-or-later
33

4-
import xml.etree.ElementTree as ET
54
from typing import List
65

6+
import defusedxml.ElementTree as ET
7+
78

89
class SWIDParser:
910
def __init__(self):

requirements.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ pytest,py
1616
srossross_not_in_db,rpmfile
1717
indygreg_not_in_db,zstandard
1818
nir0s_not_in_db,distro
19+
tiran_not_in_db,defusedxml

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ rpmfile>=1.0.6
1515
zstandard; python_version >= "3.4"
1616
reportlab
1717
distro
18+
defusedxml

0 commit comments

Comments
 (0)