- added : attachment attribute to annotation

- added : new object type device

objects/annotation/definition.json

@@ -61,7 +61,13 @@
       "description": "Last update of the annotation",
       "ui-priority": 0,
       "misp-attribute": "datetime"
-    }
+    },
+    "attachment" : {
+      "description" : "An attachment to support the annotation",
+      "ui-priority" : 0,
+      "misp-attribute": "attachment",
+      "multiple" : true
+    },
   },
   "version": 2,
   "description": "An annotation object allowing analysts to add annotations, comments, executive summary to a MISP event, objects or attributes.",

objects/device/definition.json

@@ -0,0 +1,61 @@
+{
+  "requiredOneOf": [
+    "name"
+  ],
+  "attributes": {
+    "description": {
+      "description": "Description of the Device",
+      "ui-priority": 0,
+      "misp-attribute": "text",
+      "disable_correlation" : true
+    },
+    "name" : {
+      "description" : "Name of the Device",
+      "ui-priority" : 101,
+      "misp-attribute" : "text",
+    },
+    "alias" : {
+      "description" : "Alias of the Device",
+      "ui-priority" : 100,
+      "misp-attribute" : "text",
+      "multiple" : true
+    },
+    "device-type": {
+      "description": "Type of the device",
+      "ui-priority": 99,
+      "misp-attribute": "text",
+      "disable_correlation": true,
+      "categories": [
+        "PC",
+        "Mobile",
+        "Laptop",
+        "HID",
+        "TV",
+        "IoT",
+        "Hardware",
+        "Other"
+      ]
+    },
+    "ip-address": {
+      "description": "Device IP address",
+      "ui-priority": 0,
+      "misp-attribute": "ip-src"
+    },
+    "analysis-date": {
+      "description": "Date of device analysis",
+      "ui-priority": 0,
+      "misp-attribute": "datetime"
+    },
+    "attachment" : {
+      "description" : "An attachment",
+      "ui-priority" : 0,
+      "misp-attribute": "attachment",
+      "multiple" : true
+    },
+  },
+  "version": 3,
+  "description": "An object to define a device",
+  "meta-category": "device",
+  "uuid": "0c64b41a-e583-4f4d-ac92-d484163b9e52",
+  "name": "Device"
+}

objects/organization/definition.json

@@ -55,7 +55,7 @@
     },
 
     "role": {
-      "description": "The role of a person.",
+      "description": "The role of the organization.",
       "ui-priority": 0,
       "misp-attribute": "text",
       "multiple": true,
@@ -71,9 +71,9 @@
       "disable_correlation": true
     }
   },
-  "version": 10,
-  "description": "An object which describes a person or an identity.",
+  "version": 1,
+  "description": "An object which describes an organization.",
   "meta-category": "organization",
-  "uuid": "ec8f8ca1-7f82-4d79-a9d0-2254303de686",
+  "uuid": "f750e12b-127a-432c-b022-b3f9153c4e2a",
   "name": "organization"
 }