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

Merge branch '2.4' into develop

pull/7761/head
Alexandre Dulaunoy 2021-09-15 13:30:35 +02:00
parent 3a81f0d236 ea68367592
commit 464395374c
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit 388b57e3428e1850c3195b8176827e1f53b9a4ec
Subproject commit ffa6ed7963051a5bd0f4578ade94c788c2962c09

3
tools/misp_retention.py
View File

@ -87,7 +87,8 @@ class misphelper(object):
# set expiredTag to hidden if it was accidentally enabled by "enable all"
if tag["tag"] == self.expiredTag:
if tag["existing_tag"]["Tag"]["hide_tag"] is False:
self.misp.edit_tag(tag["existing_tag"]["Tag"]["id"], hide_tag=True)
tag["existing_tag"]["Tag"]["hide_tag"] = True
self.misp.update_tag(tag["existing_tag"]["Tag"])
else:
raise Exception("Could not parse retention time/unit from tag: '{}'.".format(tag["tag"]))