@@ -1523,45 +1523,13 @@ def get_techniques_used_by_group_software(self, stix_object, stix_format=True):
1523
1523
Filter ('relationship_type' , '=' , 'uses' ),
1524
1524
Filter ('source_ref' , 'in' , [r .target_ref for r in software_relationships ])
1525
1525
]
1526
- try :
1527
- enterprise_stix_objects = self .TC_ENTERPRISE_SOURCE .query (filter_objects )
1528
- except :
1529
- enterprise_stix_objects = []
1530
- try :
1531
- pre_stix_objects = self .TC_PRE_SOURCE .query (filter_objects )
1532
- except :
1533
- pre_stix_objects = []
1534
- try :
1535
- mobile_stix_objects = self .TC_MOBILE_SOURCE .query (filter_objects )
1536
- except :
1537
- mobile_stix_objects = []
1538
- try :
1539
- ics_stix_objects = self .TC_ICS_SOURCE .query (filter_objects )
1540
- except :
1541
- ics_stix_objects = []
1542
- software_uses = enterprise_stix_objects + pre_stix_objects + mobile_stix_objects + ics_stix_objects
1526
+ software_uses = self .COMPOSITE_DS .query .query (filter_objects )
1543
1527
# Get all techniques used by the software that is used by group
1544
1528
filter_techniques = [
1545
1529
Filter ('type' , '=' , 'attack-pattern' ),
1546
1530
Filter ('id' , 'in' , [s .target_ref for s in software_uses ])
1547
1531
]
1548
- try :
1549
- enterprise_stix_objects = self .TC_ENTERPRISE_SOURCE .query (filter_techniques )
1550
- except :
1551
- enterprise_stix_objects = []
1552
- try :
1553
- pre_stix_objects = self .TC_PRE_SOURCE .query (filter_techniques )
1554
- except :
1555
- pre_stix_objects = []
1556
- try :
1557
- mobile_stix_objects = self .TC_MOBILE_SOURCE .query (filter_techniques )
1558
- except :
1559
- mobile_stix_objects = []
1560
- try :
1561
- ics_stix_objects = self .TC_ICS_SOURCE .query (filter_techniques )
1562
- except :
1563
- ics_stix_objects = []
1564
- all_techniques_list = enterprise_stix_objects + pre_stix_objects + mobile_stix_objects + ics_stix_objects
1532
+ all_techniques_list = self .COMPOSITE_DS .query (filter_techniques )
1565
1533
if not stix_format :
1566
1534
all_techniques_list = self .translate_stix_objects (all_techniques_list )
1567
1535
return all_techniques_list
0 commit comments