From 024283ba01c07126189ace097686437e40d86cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Fri, 13 Jan 2023 20:49:53 +0100 Subject: [PATCH] new: Add relationship_type in Tag entries for feeds --- pymisp/abstract.py | 5 ++++- pymisp/tools/emailobject.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pymisp/abstract.py b/pymisp/abstract.py index 20dd2f6..aa30c6d 100644 --- a/pymisp/abstract.py +++ b/pymisp/abstract.py @@ -367,13 +367,14 @@ class AbstractMISP(MutableMapping, MISPFileCache, metaclass=ABCMeta): class MISPTag(AbstractMISP): - _fields_for_feed: set = {'name', 'colour'} + _fields_for_feed: set = {'name', 'colour', 'relationship_type'} def __init__(self, **kwargs: Dict): super().__init__(**kwargs) self.name: str self.exportable: bool self.local: bool + self.relationship_type: Optional[str] def from_dict(self, **kwargs): if kwargs.get('Tag'): @@ -381,6 +382,8 @@ class MISPTag(AbstractMISP): super().from_dict(**kwargs) def _set_default(self): + if not hasattr(self, 'relationship_type'): + self.relationship_type = None if not hasattr(self, 'colour'): self.colour = '#ffffff' diff --git a/pymisp/tools/emailobject.py b/pymisp/tools/emailobject.py index 4b0cc58..9223e19 100644 --- a/pymisp/tools/emailobject.py +++ b/pymisp/tools/emailobject.py @@ -11,8 +11,8 @@ from io import BytesIO from pathlib import Path from typing import Union, List, Tuple, Dict, cast, Any, Optional -from extract_msg import openMsg -from extract_msg.message import Message as MsgObj +from extract_msg import openMsg # type: ignore +from extract_msg.message import Message as MsgObj # type: ignore from RTFDE.exceptions import MalformedEncapsulatedRtf, NotEncapsulatedRtf # type: ignore from RTFDE.deencapsulate import DeEncapsulator # type: ignore from oletools.common.codepages import codepage2codec # type: ignore