From 7fc9b3f254d1c69debffc984548b504562ea75fe Mon Sep 17 00:00:00 2001
From: Nicolas Bareil <nicolas.bareil@airbus.com>
Date: Mon, 4 Jun 2018 14:30:40 +0200
Subject: [PATCH] Updating JSON Schema

---
 misp-core-format/raw.md | 217 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 216 insertions(+), 1 deletion(-)

diff --git a/misp-core-format/raw.md b/misp-core-format/raw.md
index 7eddc03..f0dc66d 100755
--- a/misp-core-format/raw.md
+++ b/misp-core-format/raw.md
@@ -1215,6 +1215,161 @@ or parsing.
         }
       }
     },
+    "object": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "uuid": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "event_id": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "template_uuid": {
+          "type": "string"
+        },
+        "template_version": {
+          "type": "string"
+        },
+        "id": {
+          "type": "string"
+        },
+        "meta-category": {
+          "type": "string"
+        },
+        "deleted": {
+          "type": "boolean"
+        },
+        "timestamp": {
+          "type": "string"
+        },
+        "distribution": {
+          "type": "string"
+        },
+        "sharing_group_id": {
+          "type": "string"
+        },
+        "comment": {
+          "type": "string"
+        },
+        "ObjectReference": {
+            "type": "array",
+            "uniqueItems": true,
+            "items": {
+              "$ref": "#/defs/objectreference"
+            }
+        },
+        "Attribute": {
+          "type": "array",
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/defs/attribute"
+          }
+        }
+      }
+    },
+    "sighthing": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "attribute_id": {
+          "type": "string"
+        },
+        "event_id": {
+          "type": "string"
+        },
+        "source": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        },
+        "org_id": {
+          "type": "string"
+        },
+        "date_sighting": {
+          "type": "string"
+        },
+        "uuid": {
+          "type": "string"
+        },
+        "Organisation": {
+            "$ref": "#/defs/organisation"
+        }
+      }
+    },
+    "organisation": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "uuid": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        }
+      }
+    },
+    "objectreference": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "deleted": {
+          "type": "boolean"
+        },
+        "object_id": {
+          "type": "string"
+        },
+        "event_id": {
+          "type": "string"
+        },
+        "timestamp": {
+          "type": "string"
+        },
+        "id": {
+          "type": "string"
+        },
+        "uuid": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        },
+        "referenced_id": {
+          "type": "string"
+        },
+        "referenced_uuid": {
+          "type": "string"
+        },
+        "referenced_type": {
+          "type": "string"
+        },
+        "relationship_type": {
+          "type": "string"
+        },
+        "object_uuid": {
+          "type": "string"
+        },
+        "comment": {
+          "type": "string"
+        },
+        "Object": {
+          "$ref": "#/defs/object"
+        }
+      }
+    },
     "attribute": {
       "type": "object",
       "additionalProperties": false,
@@ -1222,6 +1377,9 @@ or parsing.
         "id": {
           "type": "string"
         },
+        "old_id": {
+          "type": "string"
+        },
         "type": {
           "type": "string"
         },
@@ -1237,6 +1395,21 @@ or parsing.
         "event_id": {
           "type": "string"
         },
+        "event_uuid": {
+          "type": "string"
+        },
+        "proposal_to_delete": {
+          "type": "boolean"
+        },
+        "validationIssue": {
+          "type": "boolean"
+        },
+        "Org": {
+          "$ref": "#/defs/organisation"
+        },
+        "org_id": {
+          "type": "string"
+        },
         "distribution": {
           "type": "string"
         },
@@ -1261,6 +1434,12 @@ or parsing.
         "data": {
           "type": "string"
         },
+        "object_relation": {
+          "type": ["string", "null"]
+        },
+        "object_id": {
+          "type": "string"
+        },
         "SharingGroup": {
           "$ref": "#/defs/sharing_group"
         },
@@ -1271,9 +1450,23 @@ or parsing.
             "$ref": "#/defs/attribute"
           }
         },
-        "Tag": {
+        "Sighting": {
+            "type": "array",
+            "uniqueItems": true,
+            "items": {
+              "$ref": "#/defs/sighthing"
+            }
+        },
+        "Galaxy": {
           "type": "array",
           "uniqueItems": true,
+          "items": {
+            "$ref": "#/defs/galaxy"
+          }
+        },
+        "Tag": {
+          "uniqueItems": true,
+          "type": "array",
           "items": {
             "$ref": "#/defs/tag"
           }
@@ -1296,6 +1489,9 @@ or parsing.
         "date": {
           "type": "string"
         },
+        "extends_uuid": {
+            "type": "string"
+        },
         "threat_level_id": {
           "type": "string"
         },
@@ -1381,6 +1577,13 @@ or parsing.
             "$ref": "#/defs/galaxy"
           }
         },
+        "Object": {
+            "type": "array",
+            "uniqueItems": true,
+            "items": {
+                "$ref": "#/defs/object"
+            }
+        },
         "Tag": {
           "type": "array",
           "uniqueItems": true,
@@ -1408,6 +1611,9 @@ or parsing.
         },
         "hide_tag": {
           "type": "boolean"
+        },
+        "user_id": {
+          "type": "string"
         }
       }
     },
@@ -1433,6 +1639,12 @@ or parsing.
         "version": {
           "type": "string"
         },
+        "icon": {
+          "type": "string"
+        },
+        "namespace": {
+          "type": "string"
+        },
         "GalaxyCluster": {
           "type": "array",
           "uniqueItems": true,
@@ -1467,6 +1679,9 @@ or parsing.
         "galaxy_id": {
           "type": "string"
         },
+        "version": {
+          "type": "string"
+        },
         "source": {
           "type": "string"
         },