mirror of https://github.com/MISP/PyMISP
parent
cb4f4d2443
commit
c862800df2
|
@ -17,7 +17,7 @@ import zipfile
|
||||||
from . import __version__, deprecated
|
from . import __version__, deprecated
|
||||||
from .exceptions import PyMISPError, SearchError, NoURL, NoKey
|
from .exceptions import PyMISPError, SearchError, NoURL, NoKey
|
||||||
from .mispevent import MISPEvent, MISPAttribute, MISPUser, MISPOrganisation, MISPSighting
|
from .mispevent import MISPEvent, MISPAttribute, MISPUser, MISPOrganisation, MISPSighting
|
||||||
from .abstract import MISPEncode
|
from .abstract import AbstractMISP, MISPEncode
|
||||||
|
|
||||||
logger = logging.getLogger('pymisp')
|
logger = logging.getLogger('pymisp')
|
||||||
|
|
||||||
|
@ -478,15 +478,18 @@ class PyMISP(object):
|
||||||
else:
|
else:
|
||||||
url = urljoin(self.root_url, 'attributes/add/{}'.format(event_id))
|
url = urljoin(self.root_url, 'attributes/add/{}'.format(event_id))
|
||||||
if isinstance(attributes, list):
|
if isinstance(attributes, list):
|
||||||
values = []
|
if all(isinstance(a, AbstractMISP) for a in attributes):
|
||||||
for a in attributes:
|
data = attributes
|
||||||
values.append(a['value'])
|
else:
|
||||||
attributes[0]['value'] = values
|
values = []
|
||||||
data = attributes[0].to_json()
|
for a in attributes:
|
||||||
|
values.append(a['value'])
|
||||||
|
attributes[0]['value'] = values
|
||||||
|
data = attributes[0].to_json()
|
||||||
else:
|
else:
|
||||||
data = attributes.to_json()
|
data = attributes.to_json()
|
||||||
# __prepare_request(...) returns a requests.Response Object
|
# __prepare_request(...) returns a requests.Response Object
|
||||||
responses.append(self.__prepare_request('POST', url, data).json())
|
responses.append(self.__prepare_request('POST', url, json.dumps(data, cls=MISPEncode)).json())
|
||||||
return responses
|
return responses
|
||||||
|
|
||||||
def _extract_event_id(self, event):
|
def _extract_event_id(self, event):
|
||||||
|
|
Loading…
Reference in New Issue