Skip to content

Commit c5d391b

Browse files
committed
[client] Implement user / team helpers
1 parent b2bbf22 commit c5d391b

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

pyobas/_apis/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@
66
from .kill_chain_phase import * # noqa: F401,F403
77
from .me import * # noqa: F401,F403
88
from .organization import * # noqa: F401,F403
9+
from .team import * # noqa: F401,F403
10+
from .user import * # noqa: F401,F403
911

1012
__all__ = [name for name in dir() if not name.startswith("_")]

pyobas/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
__email__ = "[email protected]"
44
__license__ = "Apache 2.0"
55
__title__ = "python-openbas"
6-
__version__ = "1.0.0"
6+
__version__ = "4.0.0"

pyobas/client.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ def __init__(
6060
self.document = _apis.DocumentManager(self)
6161
self.kill_chain_phase = _apis.KillChainPhaseManager(self)
6262
self.attack_pattern = _apis.AttackPatternManager(self)
63+
self.team = _apis.TeamManager(self)
64+
self.user = _apis.UserManager(self)
6365

6466
@staticmethod
6567
def _check_redirects(result: requests.Response) -> None:
@@ -172,6 +174,7 @@ def http_request(
172174
opts["headers"]["Content-type"] = send_data.content_type
173175

174176
# cur_retries = 0
177+
print(send_data)
175178
while True:
176179
# noinspection PyTypeChecker
177180
result = self._backend.http_request(

pyobas/helpers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@ def ping(self) -> None:
258258
while not self.exit_event.is_set():
259259
try:
260260
if self.ping_type == "injector":
261-
self.api.injector.create(self.config)
261+
self.api.injector.create(self.config, False)
262262
else:
263-
self.api.collector.create(self.config)
263+
self.api.collector.create(self.config, False)
264264
except Exception as e: # pylint: disable=broad-except
265265
print(str(e))
266266
self.exit_event.wait(40)

pyobas/mixins.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,12 @@ def create(
202202
self._create_attrs.validate_attrs(data=data)
203203
# Handle specific URL for creation
204204
path = kwargs.pop("path", self.path)
205-
files = {} if icon is None else {"icon": icon}
205+
if icon:
206+
files = {"icon": icon}
207+
elif icon is False:
208+
files = {}
209+
else:
210+
files = None
206211
server_data = self.openbas.http_post(
207212
path, post_data=data, files=files, **kwargs
208213
)

0 commit comments

Comments
 (0)