Skip to content
This repository was archived by the owner on Dec 5, 2025. It is now read-only.

Commit f86050d

Browse files
richard-julienrichard-julien
committed
[client] Simple adaptation (#827)
1 parent a9a0ed1 commit f86050d

File tree

4 files changed

+30
-63
lines changed

4 files changed

+30
-63
lines changed

‎pycti/entities/opencti_capability.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ def __init__(self, opencti):
1212
self.opencti = opencti
1313
self.properties = """
1414
id
15+
standard_id
1516
entity_type
1617
parent_types
1718
name
1819
description
1920
attribute_order
20-
2121
created_at
2222
updated_at
2323
"""

‎pycti/entities/opencti_group.py‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,43 +28,35 @@ def __init__(self, opencti):
2828
standard_id
2929
name
3030
description
31-
3231
entity_type
3332
parent_types
3433
created_at
3534
updated_at
36-
3735
default_assignation
3836
no_creators
3937
restrict_delete
4038
default_hidden_types
41-
4239
auto_new_marking
43-
4440
allowed_marking {
4541
id, standard_id, definition_type, definition
4642
}
47-
4843
default_marking {
4944
entity_type
5045
values {
5146
id, standard_id, definition_type, definition
5247
}
5348
}
54-
5549
not_shareable_marking_types
5650
max_shareable_marking {
5751
id, standard_id, definition_type, definition
5852
}
59-
6053
group_confidence_level {
6154
max_confidence
6255
overrides {
6356
entity_type
6457
max_confidence
6558
}
6659
}
67-
6860
roles {
6961
edges {
7062
node {
@@ -75,7 +67,6 @@ def __init__(self, opencti):
7567
}
7668
}
7769
}
78-
7970
members {
8071
edges {
8172
node {
@@ -123,15 +114,15 @@ def list(self, **kwargs) -> List[Dict]:
123114
"""
124115
first = kwargs.get("first", 500)
125116
after = kwargs.get("after", None)
126-
orderBy = kwargs.get("orderBy", None)
127-
orderMode = kwargs.get("orderMode", None)
117+
order_by = kwargs.get("orderBy", None)
118+
order_mode = kwargs.get("orderMode", None)
128119
search = kwargs.get("search", None)
129120
filters = kwargs.get("filters", None)
130121
custom_attributes = kwargs.get("customAttributes", None)
131-
getAll = kwargs.get("getAll", False)
132-
withPagination = kwargs.get("withPagination", False)
122+
get_all = kwargs.get("getAll", False)
123+
with_pagination = kwargs.get("withPagination", False)
133124

134-
if getAll:
125+
if get_all:
135126
first = 100
136127

137128
self.opencti.admin_logger.info(
@@ -164,14 +155,14 @@ def list(self, **kwargs) -> List[Dict]:
164155
{
165156
"first": first,
166157
"after": after,
167-
"orderBy": orderBy,
168-
"orderMode": orderMode,
158+
"orderBy": order_by,
159+
"orderMode": order_mode,
169160
"search": search,
170161
"filters": filters,
171162
},
172163
)
173164

174-
if getAll:
165+
if get_all:
175166
final_data = []
176167
data = self.opencti.process_multiple(result["data"]["groups"])
177168
final_data = final_data + data
@@ -182,8 +173,8 @@ def list(self, **kwargs) -> List[Dict]:
182173
{
183174
"first": first,
184175
"after": after,
185-
"orderBy": orderBy,
186-
"orderMode": orderMode,
176+
"orderBy": order_by,
177+
"orderMode": order_mode,
187178
"search": search,
188179
"filters": filters,
189180
},
@@ -193,7 +184,7 @@ def list(self, **kwargs) -> List[Dict]:
193184
return final_data
194185
else:
195186
return self.opencti.process_multiple(
196-
result["data"]["groups"], withPagination
187+
result["data"]["groups"], with_pagination
197188
)
198189

199190
def read(self, **kwargs) -> Optional[Dict]:
@@ -414,7 +405,6 @@ def add_member(self, **kwargs) -> Optional[Dict]:
414405
from {
415406
id, entity_type
416407
}
417-
418408
to {
419409
id, entity_type
420410
}
@@ -499,7 +489,6 @@ def add_role(self, **kwargs) -> Optional[Dict]:
499489
from {
500490
id, entity_type
501491
}
502-
503492
to {
504493
id, entity_type
505494
}

‎pycti/entities/opencti_role.py‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,10 @@ def __init__(self, opencti):
1919
standard_id
2020
entity_type
2121
parent_types
22-
2322
name
2423
description
25-
2624
created_at
2725
updated_at
28-
2926
capabilities {
3027
id
3128
name
@@ -69,17 +66,17 @@ def list(self, **kwargs) -> List[Dict]:
6966
search = kwargs.get("search", None)
7067
first = kwargs.get("first", 500)
7168
after = kwargs.get("after", None)
72-
orderBy = kwargs.get("orderBy", None)
73-
orderMode = kwargs.get("orderMode", None)
69+
order_by = kwargs.get("orderBy", None)
70+
order_mode = kwargs.get("orderMode", None)
7471
custom_attributes = kwargs.get("customAttributes", None)
75-
getAll = kwargs.get("getAll", False)
72+
get_all = kwargs.get("getAll", False)
7673
with_pagination = kwargs.get("withPagination", False)
7774

7875
self.opencti.admin_logger.info(
7976
"Searching roles matching search term", {"search": search}
8077
)
8178

82-
if getAll:
79+
if get_all:
8380
first = 100
8481

8582
query = (
@@ -109,12 +106,12 @@ def list(self, **kwargs) -> List[Dict]:
109106
{
110107
"first": first,
111108
"after": after,
112-
"orderBy": orderBy,
113-
"orderMode": orderMode,
109+
"orderBy": order_by,
110+
"orderMode": order_mode,
114111
"search": search,
115112
},
116113
)
117-
if getAll:
114+
if get_all:
118115
final_data = []
119116
data = self.opencti.process_multiple(result["data"]["roles"])
120117
final_data = final_data + data
@@ -125,8 +122,8 @@ def list(self, **kwargs) -> List[Dict]:
125122
{
126123
"first": first,
127124
"after": after,
128-
"orderBy": orderBy,
129-
"orderMode": orderMode,
125+
"orderBy": order_by,
126+
"orderMode": order_mode,
130127
"search": search,
131128
},
132129
)
@@ -333,15 +330,13 @@ def add_capability(self, **kwargs) -> Optional[Dict]:
333330
parent_types
334331
created_at
335332
updated_at
336-
337333
from {
338334
... on Role {
339335
"""
340336
+ self.properties
341337
+ """
342338
}
343339
}
344-
345340
to {
346341
... on Capability {
347342
id, name, description

‎pycti/entities/opencti_user.py‎

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,54 +28,44 @@ def __init__(self, opencti):
2828
lastname
2929
name
3030
description
31-
3231
language
3332
theme
3433
unit_system
35-
3634
external
3735
restrict_delete
38-
3936
account_status
4037
account_lock_after_date
41-
4238
entity_type
4339
parent_types
4440
created_at
4541
updated_at
46-
4742
unit_system
4843
submenu_show_icons
4944
submenu_auto_collapse
5045
monochrome_labels
51-
5246
roles {
5347
id, name, description
5448
capabilities {
5549
id, name
5650
}
5751
}
58-
5952
groups {
6053
edges {
6154
node {
6255
id, name, description
6356
}
6457
}
6558
}
66-
6759
objectOrganization {
6860
edges {
6961
node {
7062
id, is_inferred, name, description
7163
}
7264
}
7365
}
74-
7566
administrated_organizations {
7667
id, name, description
7768
}
78-
7969
user_confidence_level {
8070
max_confidence
8171
overrides {
@@ -124,42 +114,35 @@ def __init__(self, opencti):
124114
lastname
125115
name
126116
description
127-
128117
theme
129118
language
130119
unit_system
131120
submenu_show_icons
132121
submenu_auto_collapse
133-
134122
entity_type
135123
parent_types
136124
created_at
137125
updated_at
138-
139126
objectOrganization {
140127
edges {
141128
node {
142129
id, name
143130
}
144131
}
145132
}
146-
147133
administrated_organizations {
148134
id, name
149135
}
150-
151136
capabilities {
152137
id, name, description
153138
}
154-
155139
groups {
156140
edges {
157141
node {
158142
id, name, description
159143
}
160144
}
161145
}
162-
163146
effective_confidence_level {
164147
max_confidence
165148
source {
@@ -227,16 +210,16 @@ def list(self, **kwargs) -> List[Dict]:
227210
"""
228211
first = kwargs.get("first", 500)
229212
after = kwargs.get("after", None)
230-
orderBy = kwargs.get("orderBy", "name")
231-
orderMode = kwargs.get("orderMode", "asc")
213+
order_by = kwargs.get("orderBy", "name")
214+
order_mode = kwargs.get("orderMode", "asc")
232215
filters = kwargs.get("filters", None)
233216
search = kwargs.get("search", None)
234217
include_sessions = kwargs.get("include_sessions", False)
235218
custom_attributes = kwargs.get("customAttributes", None)
236-
getAll = kwargs.get("getAll", False)
219+
get_all = kwargs.get("getAll", False)
237220
with_pagination = kwargs.get("withPagination", False)
238221

239-
if getAll:
222+
if get_all:
240223
first = 100
241224

242225
self.opencti.admin_logger.info(
@@ -268,14 +251,14 @@ def list(self, **kwargs) -> List[Dict]:
268251
{
269252
"first": first,
270253
"after": after,
271-
"orderBy": orderBy,
272-
"orderMode": orderMode,
254+
"orderBy": order_by,
255+
"orderMode": order_mode,
273256
"filters": filters,
274257
"search": search,
275258
},
276259
)
277260

278-
if getAll:
261+
if get_all:
279262
final_data = []
280263
data = self.opencti.process_multiple(result["data"]["users"])
281264
final_data = final_data + data
@@ -286,8 +269,8 @@ def list(self, **kwargs) -> List[Dict]:
286269
{
287270
"first": first,
288271
"after": after,
289-
"orderBy": orderBy,
290-
"orderMode": orderMode,
272+
"orderBy": order_by,
273+
"orderMode": order_mode,
291274
"filters": filters,
292275
"search": search,
293276
},

0 commit comments

Comments
 (0)