From 19f7c90d1a560233b335494a1aa97f680ca0ff86 Mon Sep 17 00:00:00 2001
From: Corsin Camichel <cocaman@gmail.com>
Date: Tue, 5 Jun 2018 11:04:15 +0200
Subject: [PATCH 1/3] Shortened link and its redirect target

---
 objects/shortened-link/definition.json | 67 ++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 objects/shortened-link/definition.json

diff --git a/objects/shortened-link/definition.json b/objects/shortened-link/definition.json
new file mode 100644
index 0000000..18ef819
--- /dev/null
+++ b/objects/shortened-link/definition.json
@@ -0,0 +1,67 @@
+{
+  "required": [
+    "url",
+    "shortened-url"
+  ],
+  "attributes": {
+    "port": {
+      "description": "Port number",
+      "ui-priority": 0,
+      "misp-attribute": "port",
+      "disable_correlation": true
+    },
+    "scheme": {
+      "description": "Scheme",
+      "sane_default": [
+        "http",
+        "https",
+        "ftp"
+      ],
+      "ui-priority": 0,
+      "misp-attribute": "text",
+      "disable_correlation": true
+    },
+    "first-seen": {
+      "description": "First time this URL has been seen",
+      "disable_correlation": true,
+      "ui-priority": 0,
+      "misp-attribute": "datetime"
+    },
+    "query_string": {
+      "description": "Query (after path, preceded by '?')",
+      "ui-priority": 0,
+      "misp-attribute": "text",
+      "multiple": true
+    },
+    "url": {
+      "description": "Redirected to URL",
+      "ui-priority": 1,
+      "misp-attribute": "url"
+    },
+    "shortened-url": {
+      "description": "Shortened URL",
+      "ui-priority": 1,
+      "misp-attribute": "url"
+    },
+    "domain": {
+      "description": "Full domain",
+      "ui-priority": 0,
+      "misp-attribute": "domain"
+    },
+    "credential": {
+      "description": "Credential (username, password)",
+      "ui-priority": 0,
+      "misp-attribute": "text"
+    },
+    "text": {
+      "description": "Description and context of the shortened URL ",
+      "ui-priority": 0,
+      "misp-attribute": "text"
+    }
+  },
+  "version": 1,
+  "description": "Shortened link and its redirect target",
+  "meta-category": "network",
+  "uuid": "3ac2857c-689f-11e8-adc0-fa7ae01bbebc",
+  "name": "shortened-link"
+}

From 69ed89cef07de061b356f8a5f3e0de50600c3e82 Mon Sep 17 00:00:00 2001
From: Corsin Camichel <cocaman@gmail.com>
Date: Tue, 5 Jun 2018 14:35:42 +0200
Subject: [PATCH 2/3] updated definition, removed some attributes

---
 objects/shortened-link/definition.json | 27 ++------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/objects/shortened-link/definition.json b/objects/shortened-link/definition.json
index 18ef819..9423750 100644
--- a/objects/shortened-link/definition.json
+++ b/objects/shortened-link/definition.json
@@ -4,35 +4,12 @@
     "shortened-url"
   ],
   "attributes": {
-    "port": {
-      "description": "Port number",
-      "ui-priority": 0,
-      "misp-attribute": "port",
-      "disable_correlation": true
-    },
-    "scheme": {
-      "description": "Scheme",
-      "sane_default": [
-        "http",
-        "https",
-        "ftp"
-      ],
-      "ui-priority": 0,
-      "misp-attribute": "text",
-      "disable_correlation": true
-    },
     "first-seen": {
-      "description": "First time this URL has been seen",
+      "description": "First time this shortened URL has been seen",
       "disable_correlation": true,
       "ui-priority": 0,
       "misp-attribute": "datetime"
     },
-    "query_string": {
-      "description": "Query (after path, preceded by '?')",
-      "ui-priority": 0,
-      "misp-attribute": "text",
-      "multiple": true
-    },
     "url": {
       "description": "Redirected to URL",
       "ui-priority": 1,
@@ -62,6 +39,6 @@
   "version": 1,
   "description": "Shortened link and its redirect target",
   "meta-category": "network",
-  "uuid": "3ac2857c-689f-11e8-adc0-fa7ae01bbebc",
+  "uuid": "99c2857c-689f-11e8-adc0-fa7ae01bbebc",
   "name": "shortened-link"
 }

From 85901f995a3b573017d38facb576b167d68cd4b1 Mon Sep 17 00:00:00 2001
From: Corsin Camichel <cocaman@gmail.com>
Date: Tue, 5 Jun 2018 14:39:12 +0200
Subject: [PATCH 3/3] renamed url attributed, versioning date based

---
 objects/shortened-link/definition.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/objects/shortened-link/definition.json b/objects/shortened-link/definition.json
index 9423750..a2a2ff6 100644
--- a/objects/shortened-link/definition.json
+++ b/objects/shortened-link/definition.json
@@ -1,6 +1,6 @@
 {
   "required": [
-    "url",
+    "redirect-url",
     "shortened-url"
   ],
   "attributes": {
@@ -10,7 +10,7 @@
       "ui-priority": 0,
       "misp-attribute": "datetime"
     },
-    "url": {
+    "redirect-url": {
       "description": "Redirected to URL",
       "ui-priority": 1,
       "misp-attribute": "url"
@@ -36,9 +36,9 @@
       "misp-attribute": "text"
     }
   },
-  "version": 1,
+  "version": 2018060501,
   "description": "Shortened link and its redirect target",
   "meta-category": "network",
-  "uuid": "99c2857c-689f-11e8-adc0-fa7ae01bbebc",
+  "uuid": "361c0ae8-68bd-11e8-adc0-fa7ae01bbebc",
   "name": "shortened-link"
 }