MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

new: Update MISP, test sync server

pull/434/head
Raphaël Vinot 2019-08-07 18:19:52 +02:00
parent da6d7cbeb8
commit f9c8fb815e
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pymisp/aping.py
View File

@ -151,20 +151,22 @@ class ExpandedPyMISP(PyMISP):
return {'version': '{}.{}.{}'.format(master_version['major'], master_version['minor'], master_version['hotfix'])} return {'version': '{}.{}.{}'.format(master_version['major'], master_version['minor'], master_version['hotfix'])}
return {'error': 'Impossible to retrieve the version of the master branch.'} return {'error': 'Impossible to retrieve the version of the master branch.'}
def update_misp(self):
response = self._prepare_request('POST', '/servers/update')
return self._check_response(response, lenient_response_type=True)
def set_server_setting(self, setting: str, value: Union[str, int, bool], force: bool=False):
data = {'value': value, 'force': force}
response = self._prepare_request('POST', f'/servers/serverSettingsEdit/{setting}', data=data)
return self._check_response(response, expect_json=True)
def server_settings(self):
response = self._prepare_request('GET', f'/servers/serverSettings')
return self._check_response(response, expect_json=True)
def toggle_global_pythonify(self): def toggle_global_pythonify(self):
self.global_pythonify = not self.global_pythonify self.global_pythonify = not self.global_pythonify
def _old_misp(self, minimal_version_required: tuple, removal_date: Union[str, date, datetime], method: str=None, message: str=None):
if self._misp_version >= minimal_version_required:
return False
if isinstance(removal_date, (datetime, date)):
removal_date = removal_date.isoformat()
to_print = f'The instance of MISP you are using is outdated. Unless you update your MISP instance, {method} will stop working after {removal_date}.'
if message:
to_print += f' {message}'
warnings.warn(to_print, DeprecationWarning)
return True
# ## BEGIN Event ## # ## BEGIN Event ##
def events(self, pythonify: bool=False): def events(self, pythonify: bool=False):
@ -1030,6 +1032,11 @@ class ExpandedPyMISP(PyMISP):
# FIXME: can we pythonify? # FIXME: can we pythonify?
return self._check_response(response) return self._check_response(response)
def test_server(self, server: Union[MISPServer, int, str, UUID]):
server_id = self.__get_uuid_or_id_from_abstract_misp(server)
response = self._prepare_request('POST', f'servers/testConnection/{server_id}')
return self._check_response(response, expect_json=True)
# ## END Server ### # ## END Server ###
# ## BEGIN Sharing group ### # ## BEGIN Sharing group ###
@ -1809,6 +1816,17 @@ class ExpandedPyMISP(PyMISP):
# ## Internal methods ### # ## Internal methods ###
def _old_misp(self, minimal_version_required: tuple, removal_date: Union[str, date, datetime], method: str=None, message: str=None):
if self._misp_version >= minimal_version_required:
return False
if isinstance(removal_date, (datetime, date)):
removal_date = removal_date.isoformat()
to_print = f'The instance of MISP you are using is outdated. Unless you update your MISP instance, {method} will stop working after {removal_date}.'
if message:
to_print += f' {message}'
warnings.warn(to_print, DeprecationWarning)
return True
def __get_uuid_or_id_from_abstract_misp(self, obj: Union[AbstractMISP, int, str, UUID]): def __get_uuid_or_id_from_abstract_misp(self, obj: Union[AbstractMISP, int, str, UUID]):
if isinstance(obj, UUID): if isinstance(obj, UUID):
return str(obj) return str(obj)