Skip to content

Commit 1236fcd

Browse files
SamuelHassineSamuelHassine
committed
[client] Migrate cvss vector to short fields with keywords mapping (#926)
1 parent b190117 commit 1236fcd

File tree

4 files changed

+43
-39
lines changed

4 files changed

+43
-39
lines changed

‎pycti/entities/opencti_stix_core_object.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def __init__(self, opencti, file):
355355
name
356356
description
357357
x_opencti_aliases
358-
x_opencti_cvss_vector
358+
x_opencti_cvss_vector_string
359359
x_opencti_cvss_base_score
360360
x_opencti_cvss_base_severity
361361
x_opencti_cvss_attack_vector
@@ -370,7 +370,7 @@ def __init__(self, opencti, file):
370370
x_opencti_cvss_remediation_level
371371
x_opencti_cvss_report_confidence
372372
x_opencti_cvss_temporal_score
373-
x_opencti_cvss_v2_vector
373+
x_opencti_cvss_v2_vector_string
374374
x_opencti_cvss_v2_base_score
375375
x_opencti_cvss_v2_access_vector
376376
x_opencti_cvss_v2_access_complexity
@@ -382,7 +382,7 @@ def __init__(self, opencti, file):
382382
x_opencti_cvss_v2_remediation_level
383383
x_opencti_cvss_v2_report_confidence
384384
x_opencti_cvss_v2_temporal_score
385-
x_opencti_cvss_v4_vector
385+
x_opencti_cvss_v4_vector_string
386386
x_opencti_cvss_v4_base_score
387387
x_opencti_cvss_v4_base_severity
388388
x_opencti_cvss_v4_attack_vector
@@ -1066,7 +1066,7 @@ def __init__(self, opencti, file):
10661066
name
10671067
description
10681068
x_opencti_aliases
1069-
x_opencti_cvss_vector
1069+
x_opencti_cvss_vector_string
10701070
x_opencti_cvss_base_score
10711071
x_opencti_cvss_base_severity
10721072
x_opencti_cvss_attack_vector
@@ -1081,7 +1081,7 @@ def __init__(self, opencti, file):
10811081
x_opencti_cvss_remediation_level
10821082
x_opencti_cvss_report_confidence
10831083
x_opencti_cvss_temporal_score
1084-
x_opencti_cvss_v2_vector
1084+
x_opencti_cvss_v2_vector_string
10851085
x_opencti_cvss_v2_base_score
10861086
x_opencti_cvss_v2_access_vector
10871087
x_opencti_cvss_v2_access_complexity
@@ -1093,7 +1093,7 @@ def __init__(self, opencti, file):
10931093
x_opencti_cvss_v2_remediation_level
10941094
x_opencti_cvss_v2_report_confidence
10951095
x_opencti_cvss_v2_temporal_score
1096-
x_opencti_cvss_v4_vector
1096+
x_opencti_cvss_v4_vector_string
10971097
x_opencti_cvss_v4_base_score
10981098
x_opencti_cvss_v4_base_severity
10991099
x_opencti_cvss_v4_attack_vector

‎pycti/entities/opencti_stix_domain_object.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ def __init__(self, opencti, file):
478478
name
479479
description
480480
x_opencti_aliases
481-
x_opencti_cvss_vector
481+
x_opencti_cvss_vector_string
482482
x_opencti_cvss_base_score
483483
x_opencti_cvss_base_severity
484484
x_opencti_cvss_attack_vector
@@ -493,7 +493,7 @@ def __init__(self, opencti, file):
493493
x_opencti_cvss_remediation_level
494494
x_opencti_cvss_report_confidence
495495
x_opencti_cvss_temporal_score
496-
x_opencti_cvss_v2_vector
496+
x_opencti_cvss_v2_vector_string
497497
x_opencti_cvss_v2_base_score
498498
x_opencti_cvss_v2_access_vector
499499
x_opencti_cvss_v2_access_complexity
@@ -505,7 +505,7 @@ def __init__(self, opencti, file):
505505
x_opencti_cvss_v2_remediation_level
506506
x_opencti_cvss_v2_report_confidence
507507
x_opencti_cvss_v2_temporal_score
508-
x_opencti_cvss_v4_vector
508+
x_opencti_cvss_v4_vector_string
509509
x_opencti_cvss_v4_base_score
510510
x_opencti_cvss_v4_base_severity
511511
x_opencti_cvss_v4_attack_vector
@@ -1016,7 +1016,7 @@ def __init__(self, opencti, file):
10161016
name
10171017
description
10181018
x_opencti_aliases
1019-
x_opencti_cvss_vector
1019+
x_opencti_cvss_vector_string
10201020
x_opencti_cvss_base_score
10211021
x_opencti_cvss_base_severity
10221022
x_opencti_cvss_attack_vector
@@ -1031,7 +1031,7 @@ def __init__(self, opencti, file):
10311031
x_opencti_cvss_remediation_level
10321032
x_opencti_cvss_report_confidence
10331033
x_opencti_cvss_temporal_score
1034-
x_opencti_cvss_v2_vector
1034+
x_opencti_cvss_v2_vector_string
10351035
x_opencti_cvss_v2_base_score
10361036
x_opencti_cvss_v2_access_vector
10371037
x_opencti_cvss_v2_access_complexity
@@ -1043,7 +1043,7 @@ def __init__(self, opencti, file):
10431043
x_opencti_cvss_v2_remediation_level
10441044
x_opencti_cvss_v2_report_confidence
10451045
x_opencti_cvss_v2_temporal_score
1046-
x_opencti_cvss_v4_vector
1046+
x_opencti_cvss_v4_vector_string
10471047
x_opencti_cvss_v4_base_score
10481048
x_opencti_cvss_v4_base_severity
10491049
x_opencti_cvss_v4_attack_vector

‎pycti/entities/opencti_stix_object_or_stix_relationship.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ def __init__(self, opencti):
294294
name
295295
description
296296
x_opencti_aliases
297-
x_opencti_cvss_vector
297+
x_opencti_cvss_vector_string
298298
x_opencti_cvss_base_score
299299
x_opencti_cvss_base_severity
300300
x_opencti_cvss_attack_vector
@@ -309,7 +309,7 @@ def __init__(self, opencti):
309309
x_opencti_cvss_remediation_level
310310
x_opencti_cvss_report_confidence
311311
x_opencti_cvss_temporal_score
312-
x_opencti_cvss_v2_vector
312+
x_opencti_cvss_v2_vector_string
313313
x_opencti_cvss_v2_base_score
314314
x_opencti_cvss_v2_access_vector
315315
x_opencti_cvss_v2_access_complexity
@@ -321,7 +321,7 @@ def __init__(self, opencti):
321321
x_opencti_cvss_v2_remediation_level
322322
x_opencti_cvss_v2_report_confidence
323323
x_opencti_cvss_v2_temporal_score
324-
x_opencti_cvss_v4_vector
324+
x_opencti_cvss_v4_vector_string
325325
x_opencti_cvss_v4_base_score
326326
x_opencti_cvss_v4_base_severity
327327
x_opencti_cvss_v4_attack_vector

‎pycti/entities/opencti_vulnerability.py‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def __init__(self, opencti):
107107
name
108108
description
109109
x_opencti_aliases
110-
x_opencti_cvss_vector
110+
x_opencti_cvss_vector_string
111111
x_opencti_cvss_base_score
112112
x_opencti_cvss_base_severity
113113
x_opencti_cvss_attack_vector
@@ -122,7 +122,7 @@ def __init__(self, opencti):
122122
x_opencti_cvss_remediation_level
123123
x_opencti_cvss_report_confidence
124124
x_opencti_cvss_temporal_score
125-
x_opencti_cvss_v2_vector
125+
x_opencti_cvss_v2_vector_string
126126
x_opencti_cvss_v2_base_score
127127
x_opencti_cvss_v2_access_vector
128128
x_opencti_cvss_v2_access_complexity
@@ -134,7 +134,7 @@ def __init__(self, opencti):
134134
x_opencti_cvss_v2_remediation_level
135135
x_opencti_cvss_v2_report_confidence
136136
x_opencti_cvss_v2_temporal_score
137-
x_opencti_cvss_v4_vector
137+
x_opencti_cvss_v4_vector_string
138138
x_opencti_cvss_v4_base_score
139139
x_opencti_cvss_v4_base_severity
140140
x_opencti_cvss_v4_attack_vector
@@ -332,7 +332,7 @@ def create(self, **kwargs):
332332
description = kwargs.get("description", None)
333333
x_opencti_aliases = kwargs.get("x_opencti_aliases", None)
334334
# CVSS3
335-
x_opencti_cvss_vector = kwargs.get("x_opencti_cvss_vector", None)
335+
x_opencti_cvss_vector_string = kwargs.get("x_opencti_cvss_vector_string", None)
336336
x_opencti_cvss_base_score = kwargs.get("x_opencti_cvss_base_score", None)
337337
x_opencti_cvss_base_severity = kwargs.get("x_opencti_cvss_base_severity", None)
338338
x_opencti_cvss_attack_vector = kwargs.get("x_opencti_cvss_attack_vector", None)
@@ -368,7 +368,9 @@ def create(self, **kwargs):
368368
"x_opencti_cvss_temporal_score", None
369369
)
370370
# CVSS2
371-
x_opencti_cvss_v2_vector = kwargs.get("x_opencti_cvss_v2_vector", None)
371+
x_opencti_cvss_v2_vector_string = kwargs.get(
372+
"x_opencti_cvss_v2_vector_string", None
373+
)
372374
x_opencti_cvss_v2_base_score = kwargs.get("x_opencti_cvss_v2_base_score", None)
373375
x_opencti_cvss_v2_access_vector = kwargs.get(
374376
"x_opencti_cvss_v2_access_vector", None
@@ -401,7 +403,9 @@ def create(self, **kwargs):
401403
"x_opencti_cvss_v2_temporal_score", None
402404
)
403405
# CVSS4
404-
x_opencti_cvss_v4_vector = kwargs.get("x_opencti_cvss_v4_vector", None)
406+
x_opencti_cvss_v4_vector_string = kwargs.get(
407+
"x_opencti_cvss_v4_vector_string", None
408+
)
405409
x_opencti_cvss_v4_base_score = kwargs.get("x_opencti_cvss_v4_base_score", None)
406410
x_opencti_cvss_v4_base_severity = kwargs.get(
407411
"x_opencti_cvss_v4_base_severity", None
@@ -484,7 +488,7 @@ def create(self, **kwargs):
484488
"description": description,
485489
"x_opencti_aliases": x_opencti_aliases,
486490
# CVSS3
487-
"x_opencti_cvss_vector": x_opencti_cvss_vector,
491+
"x_opencti_cvss_vector_string": x_opencti_cvss_vector_string,
488492
"x_opencti_cvss_base_score": x_opencti_cvss_base_score,
489493
"x_opencti_cvss_base_severity": x_opencti_cvss_base_severity,
490494
"x_opencti_cvss_attack_vector": x_opencti_cvss_attack_vector,
@@ -500,7 +504,7 @@ def create(self, **kwargs):
500504
"x_opencti_cvss_report_confidence": x_opencti_cvss_report_confidence,
501505
"x_opencti_cvss_temporal_score": x_opencti_cvss_temporal_score,
502506
# CVSS2
503-
"x_opencti_cvss_v2_vector": x_opencti_cvss_v2_vector,
507+
"x_opencti_cvss_v2_vector_string": x_opencti_cvss_v2_vector_string,
504508
"x_opencti_cvss_v2_base_score": x_opencti_cvss_v2_base_score,
505509
"x_opencti_cvss_v2_access_vector": x_opencti_cvss_v2_access_vector,
506510
"x_opencti_cvss_v2_access_complexity": x_opencti_cvss_v2_access_complexity,
@@ -513,7 +517,7 @@ def create(self, **kwargs):
513517
"x_opencti_cvss_v2_report_confidence": x_opencti_cvss_v2_report_confidence,
514518
"x_opencti_cvss_v2_temporal_score": x_opencti_cvss_v2_temporal_score,
515519
# CVSS 4
516-
"x_opencti_cvss_v4_vector": x_opencti_cvss_v4_vector,
520+
"x_opencti_cvss_v4_vector_string": x_opencti_cvss_v4_vector_string,
517521
"x_opencti_cvss_v4_base_score": x_opencti_cvss_v4_base_score,
518522
"x_opencti_cvss_v4_base_severity": x_opencti_cvss_v4_base_severity,
519523
"x_opencti_cvss_v4_attack_vector": x_opencti_cvss_v4_attack_vector,
@@ -593,8 +597,8 @@ def import_from_stix2(self, **kwargs):
593597
self.opencti.get_attribute_in_extension("aliases", stix_object)
594598
)
595599
# CVSS3
596-
if "x_opencti_cvss_vector" not in stix_object:
597-
stix_object["x_opencti_cvss_vector"] = (
600+
if "x_opencti_cvss_vector_string" not in stix_object:
601+
stix_object["x_opencti_cvss_vector_string"] = (
598602
self.opencti.get_attribute_in_extension("cvss_vector", stix_object)
599603
)
600604
if "x_opencti_cvss_base_score" not in stix_object:
@@ -681,8 +685,8 @@ def import_from_stix2(self, **kwargs):
681685
)
682686

683687
# CVSS2
684-
if "x_opencti_cvss_v2_vector" not in stix_object:
685-
stix_object["x_opencti_cvss_v2_vector"] = (
688+
if "x_opencti_cvss_v2_vector_string" not in stix_object:
689+
stix_object["x_opencti_cvss_v2_vector_string"] = (
686690
self.opencti.get_attribute_in_extension(
687691
"cvss_v2_vector", stix_object
688692
)
@@ -755,8 +759,8 @@ def import_from_stix2(self, **kwargs):
755759
)
756760

757761
# CVSS4
758-
if "x_opencti_cvss_v4_vector" not in stix_object:
759-
stix_object["x_opencti_cvss_v4_vector"] = (
762+
if "x_opencti_cvss_v4_vector_string" not in stix_object:
763+
stix_object["x_opencti_cvss_v4_vector_string"] = (
760764
self.opencti.get_attribute_in_extension(
761765
"cvss_v4_vector", stix_object
762766
)
@@ -916,9 +920,9 @@ def import_from_stix2(self, **kwargs):
916920
else None
917921
),
918922
# CVSS3
919-
x_opencti_cvss_vector=(
920-
stix_object["x_opencti_cvss_vector"]
921-
if "x_opencti_cvss_vector" in stix_object
923+
x_opencti_cvss_vector_string=(
924+
stix_object["x_opencti_cvss_vector_string"]
925+
if "x_opencti_cvss_vector_string" in stix_object
922926
else None
923927
),
924928
x_opencti_cvss_base_score=(
@@ -992,9 +996,9 @@ def import_from_stix2(self, **kwargs):
992996
else None
993997
),
994998
# CVSS2
995-
x_opencti_cvss_v2_vector=(
996-
stix_object["x_opencti_cvss_v2_vector"]
997-
if "x_opencti_cvss_v2_vector" in stix_object
999+
x_opencti_cvss_v2_vector_string=(
1000+
stix_object["x_opencti_cvss_v2_vector_string"]
1001+
if "x_opencti_cvss_v2_vector_string" in stix_object
9981002
else None
9991003
),
10001004
x_opencti_cvss_v2_base_score=(
@@ -1053,9 +1057,9 @@ def import_from_stix2(self, **kwargs):
10531057
else None
10541058
),
10551059
# CVSS4
1056-
x_opencti_cvss_v4_vector=(
1057-
stix_object["x_opencti_cvss_v4_vector"]
1058-
if "x_opencti_cvss_v4_vector" in stix_object
1060+
x_opencti_cvss_v4_vector_string=(
1061+
stix_object["x_opencti_cvss_v4_vector_string"]
1062+
if "x_opencti_cvss_v4_vector_string" in stix_object
10591063
else None
10601064
),
10611065
x_opencti_cvss_v4_base_score=(

0 commit comments

Comments
 (0)