Skip to content

perf: get_localised_vector with pre-compiled regex #1038

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

Open
saquibsaifee wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −12
Open

perf: get_localised_vector with pre-compiled regex #1038

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 17 additions & 12 deletions cyclonedx/model/vulnerability.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@
from enum import Enum
from typing import Any, Optional, Union

if sys.version_info >= (3, 13):
from warnings import deprecated
else:
from typing_extensions import deprecated

import py_serializable as serializable
from sortedcontainers import SortedSet

from .._internal.bom_ref import bom_ref_from_str as _bom_ref_from_str
from .._internal.compare import ComparableTuple as _ComparableTuple
from ..exception.model import MutuallyExclusivePropertiesException, NoPropertiesProvidedException
Expand All @@ -59,6 +51,19 @@
)
from .tool import Tool, ToolRepository, _ToolRepositoryHelper

if sys.version_info >= (3, 13):
from warnings import deprecated
else:
from typing_extensions import deprecated

import py_serializable as serializable
from sortedcontainers import SortedSet

_RE_CVSS_V4 = re.compile(r'^CVSS:4\.\d/?')
_RE_CVSS_V3 = re.compile(r'^CVSS:3\.\d/?')
_RE_CVSS_V2 = re.compile(r'^CVSS:2\.\d/?')
_RE_OWASP = re.compile(r'^OWASP/?')


@serializable.serializable_class(ignore_unknown_during_deserialization=True)
class BomTargetVersionRange:
Expand Down Expand Up @@ -643,15 +648,15 @@ def get_localised_vector(self, vector: str) -> str:
The vector without any scheme prefix as a `str`.
"""
if self is VulnerabilityScoreSource.CVSS_V4 and vector.startswith('CVSS:4.'):
return re.sub(r'^CVSS:4\.\d/?', '', vector)
return _RE_CVSS_V4.sub('', vector)
if (
self in (VulnerabilityScoreSource.CVSS_V3_1, VulnerabilityScoreSource.CVSS_V3)
) and vector.startswith('CVSS:3.'):
return re.sub(r'^CVSS:3\.\d/?', '', vector)
return _RE_CVSS_V3.sub('', vector)
if self is VulnerabilityScoreSource.CVSS_V2 and vector.startswith('CVSS:2.'):
return re.sub(r'^CVSS:2\.\d/?', '', vector)
return _RE_CVSS_V2.sub('', vector)
if self is VulnerabilityScoreSource.OWASP and vector.startswith('OWASP'):
return re.sub(r'^OWASP/?', '', vector)
return _RE_OWASP.sub('', vector)
return vector

def get_value_pre_1_4(self) -> str:
Expand Down