From 6effdc3cd2d8b4bfe7c02657febb0fea2555210e Mon Sep 17 00:00:00 2001
From: Vincent-CIRCL <zettacircl@protonmail.com>
Date: Fri, 14 Jun 2019 15:13:15 +0200
Subject: [PATCH 1/3] add: [core] darkweb structures and fixing previous
 motivations and topics

---
 dark-web/machinetag.json | 95 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 92 insertions(+), 3 deletions(-)

diff --git a/dark-web/machinetag.json b/dark-web/machinetag.json
index 6a9ab48..9813e0c 100644
--- a/dark-web/machinetag.json
+++ b/dark-web/machinetag.json
@@ -2,7 +2,7 @@
   "namespace": "dark-web",
   "expanded": "Dark Web",
   "description": "Criminal motivation on the dark web: A categorisation model for law enforcement. ref: Janis Dalins, Campbell Wilson, Mark Carman. Taxonomy updated by MISP Project",
-  "version": 1,
+  "version": 1.1,
   "predicates": [
     {
       "value": "topic",
@@ -13,6 +13,11 @@
       "value": "motivation",
       "description": "Motivation with the materials tagged",
       "expanded": "Motivation"
+    },
+    {
+      "value": "structure",
+      "description": "Structure of the materials tagged",
+      "expanded": "Structure"
     }
   ],
   "values": [
@@ -34,6 +39,16 @@
           "expanded": "Finance",
           "description": "Any monetary/currency/exchangeable materials. Includes carding, Bitcoin, Litecoin etc."
         },
+        {
+          "value": "cash-in",
+          "expanded": "Cash-in",
+          "description": "_"
+        },
+        {
+          "value": "cash-out",
+          "expanded": "Cash-out",
+          "description": "_"
+        },
         {
           "value": "hacking",
           "expanded": "Hacking",
@@ -84,10 +99,45 @@
           "expanded": "Weapons",
           "description": "Materials specifically associated with materials and/or items for use in violent acts against persons or property. Examples include firearms and bomb-making ingredients."
         },
+        {
+          "value": "credit-card",
+          "expanded": "Credit-Card",
+          "description": "Credit cards and payments materials"
+        },
+        {
+          "value": "counteir-feit-materials",
+          "expanded": "Counter-feit materials",
+          "description": "Fake identification papers."
+        },
+        {
+          "value": "gambling",
+          "expanded": "Gambling",
+          "description": "Games involving money"
+        },
+        {
+          "value": "library",
+          "expanded": "Library",
+          "description": "Library or list of books"
+        },
         {
           "value": "other-not-illegal",
           "expanded": "Other not illegal",
           "description": "Material not of interest to law enforcement - e.g. personal sites, Facebook mirrors."
+        },
+        {
+          "value": "legitimate",
+          "expanded": "Legitimate",
+          "description": "Legitimate websites"
+        },
+        {
+          "value": "chat",
+          "expanded": "Chats platforms",
+          "description": "Chats space or equivalent, which are not forums"
+        },
+        {
+          "value": "mixer",
+          "expanded": "_",
+          "description": "_"
         }
       ]
     },
@@ -109,6 +159,16 @@
           "expanded": "Forum",
           "description": "Sites specifically designed for multiple users to communicate as peers"
         },
+        {
+          "value": "wiki",
+          "expanded": "Wiki",
+          "description": "Wiki pages and information display"
+        },
+        {
+          "value": "hosting",
+          "expanded": "Hosting",
+          "description": "Hosting providers"
+        },
         {
           "value": "general",
           "expanded": "General",
@@ -135,6 +195,35 @@
           "description": "Automatically generated content, not designed for any identifiable purpose other than diagnostics - e.g. “It Works” message provided by default by Apache2"
         }
       ]
+    },
+    {
+      "predicate": "structure",
+      "entry": [
+        {
+          "value": "incomplete",
+          "expanded": "Imcomplete websites or information",
+          "description": "Websites and pages that are unable to load completely properly"
+        },
+        {
+          "value": "captcha",
+          "expanded": "Captcha and Solvers",
+          "description": "Captchas and solvers elements"
+        },
+        {
+          "value": "LoginForms",
+          "expanded": "Logins forms and gates",
+          "description": "Authentification pages, login page, login forms that block access to an internal part of a website."
+        },
+        {
+          "value": "police-notice",
+          "expanded": "Police Notice",
+          "description": "Closed websites, with police-equivalent banners"
+        },
+        {
+          "value": "test",
+          "expanded": "Test",
+          "description": "Test websites without any real consequences or effects"
+        }
+      ]
     }
-  ]
-}
+    }
\ No newline at end of file

From 08d0094ceaf027f0798b992d2542d376b3ce051e Mon Sep 17 00:00:00 2001
From: Vincent-CIRCL <zettacircl@protonmail.com>
Date: Fri, 14 Jun 2019 15:20:31 +0200
Subject: [PATCH 2/3] add: [core] darkweb structures and fixing previous
 motivations and topics

---
 dark-web/machinetag.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dark-web/machinetag.json b/dark-web/machinetag.json
index 9813e0c..f8826f4 100644
--- a/dark-web/machinetag.json
+++ b/dark-web/machinetag.json
@@ -226,4 +226,5 @@
         }
       ]
     }
-    }
\ No newline at end of file
+    ]
+}
\ No newline at end of file

From 0f77d07a0c50e8781d128a3b0c3a0263b68e18c9 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Fri, 14 Jun 2019 20:33:58 +0200
Subject: [PATCH 3/3] chg: [dark-web] json fixed

---
 dark-web/machinetag.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dark-web/machinetag.json b/dark-web/machinetag.json
index f8826f4..943f486 100644
--- a/dark-web/machinetag.json
+++ b/dark-web/machinetag.json
@@ -226,5 +226,5 @@
         }
       ]
     }
-    ]
-}
\ No newline at end of file
+  ]
+}