Merge https://github.com/MISP/misp-objects

objects/flowintel-cm-case/definition.json

@@ -42,6 +42,12 @@
       "misp-attribute": "datetime",
       "ui-priority": 0
     },
+    "notes": {
+      "description": "Notes of the case",
+      "disable_correlation": true,
+      "misp-attribute": "text",
+      "ui-priority": 0
+    },
     "origin-url": {
       "description": "Origin of the case",
       "disable_correlation": true,
@@ -86,5 +92,5 @@
   "meta-category": "misc",
   "name": "flowintel-cm-case",
   "uuid": "19df57c7-b315-4fd2-84e5-d81ab221425e",
-  "version": 2
+  "version": 3
 }

objects/flowintel-cm-task-note/definition.json

@@ -0,0 +1,35 @@
+{
+  "attributes": {
+    "note": {
+      "description": "Notes of the task",
+      "disable_correlation": true,
+      "misp-attribute": "text",
+      "multiple": true,
+      "ui-priority": 0
+    },
+    "note-uuid": {
+      "description": "UUID of the note",
+      "disable_correlation": true,
+      "misp-attribute": "text",
+      "ui-priority": 2
+    },
+    "origin-url": {
+      "description": "Origin of the task",
+      "disable_correlation": true,
+      "misp-attribute": "url",
+      "to_ids": false,
+      "ui-priority": 1
+    },
+    "task-uuid": {
+      "description": "UUID of the parent task",
+      "disable_correlation": true,
+      "misp-attribute": "text",
+      "ui-priority": 2
+    }
+  },
+  "description": "A task's note as defined by flowintel-cm.",
+  "meta-category": "misc",
+  "name": "flowintel-cm-task-note",
+  "uuid": "2c6f6aba-48b6-482f-a810-81934d29be9a",
+  "version": 1
+}

objects/flowintel-cm-task/definition.json

@@ -37,12 +37,6 @@
       "misp-attribute": "datetime",
       "ui-priority": 0
     },
-    "notes": {
-      "description": "Notes of the task",
-      "disable_correlation": true,
-      "misp-attribute": "text",
-      "ui-priority": 0
-    },
     "origin-url": {
       "description": "Origin of the task",
       "disable_correlation": true,
@@ -88,5 +82,5 @@
   "meta-category": "misc",
   "name": "flowintel-cm-task",
   "uuid": "2f525f6e-d3f2-4cb9-9ca0-f1160d99397d",
-  "version": 3
+  "version": 4
 }

objects/instant-message/definition.json

@@ -22,7 +22,8 @@
         "Discord",
         "Mumble",
         "Jabber",
-        "Twitter"
+        "Twitter",
+        "Mattermost"
       ],
       "ui-priority": 1
     },

relationships/definition.json

@@ -36,6 +36,22 @@
       "name": "shared-by",
       "opposite": "shares"
     },
+    {
+      "description": "This relationship describes an object which publishes another object.",
+      "format": [
+        "misp"
+      ],
+      "name": "publishes",
+      "opposite": "published-by"
+    },
+    {
+      "description": "This relationship describes an object which was published by another object.",
+      "format": [
+        "misp"
+      ],
+      "name": "published-by",
+      "opposite": "publishes"
+    },
     {
       "description": "The referenced source and target objects are semantically duplicates of each other.",
       "format": [