Merge branch 'main' of github.com:MISP/misp-objects

Author: chrisr3d

README.md

@@ -396,6 +396,7 @@ for a specific attribute. An optional **to_ids** boolean field to disable the ID
 - [objects/sigmf-recording](https://github.com/MISP/misp-objects/blob/main/objects/sigmf-recording/definition.json) - An object representing a single IQ/RF sample in the Signal Metadata Format Specification (SigMF).
 - [objects/social-media-group](https://github.com/MISP/misp-objects/blob/main/objects/social-media-group/definition.json) - Social media group object template describing a public or private group or channel.
 - [objects/software](https://github.com/MISP/misp-objects/blob/main/objects/software/definition.json) - The Software object represents high-level properties associated with software, including software products. STIX 2.1 - 6.14.
+- [objects/spambee-report](https://github.com/MISP/misp-objects/main/objects/spambee-report/definition.json) - A Spambee analysis report.
 - [objects/spearphishing-attachment](https://github.com/MISP/misp-objects/blob/main/objects/spearphishing-attachment/definition.json) - Spearphishing Attachment.
 - [objects/spearphishing-link](https://github.com/MISP/misp-objects/blob/main/objects/spearphishing-link/definition.json) - Spearphishing Link.
 - [objects/splunk](https://github.com/MISP/misp-objects/blob/main/objects/splunk/definition.json) - Splunk / Splunk ES object.

objects/android-app/definition.json

@@ -7,11 +7,17 @@
       "ui-priority": 1
     },
     "certificate": {
-      "description": "Android certificate",
+      "description": "Android certificate (SHA1)",
       "misp-attribute": "sha1",
       "multiple": true,
       "ui-priority": 1
     },
+    "certificate-sha256": {
+      "description": "Android certificate (SHA256)",
+      "misp-attribute": "sha256",
+      "multiple": true,
+      "ui-priority": 1
+    },
     "domain": {
       "description": "Domain used by the app",
       "misp-attribute": "domain",
@@ -39,5 +45,5 @@
     "sha256"
   ],
   "uuid": "92836f23-4730-4eae-82ac-9f00d5299735",
-  "version": 1
+  "version": 2
 }

objects/spambee-report/definition.json

@@ -0,0 +1,54 @@
+{
+  "attributes": {
+    "feedback-requested": {
+      "description": "User has requested feedback",
+      "disable_correlation": true,
+      "misp-attribute": "boolean",
+      "ui-priority": 0
+    },
+    "feedback-sent": {
+      "description": "Feedback has been sent to user",
+      "disable_correlation": true,
+      "misp-attribute": "boolean",
+      "ui-priority": 0
+    },
+    "feedback-time": {
+      "description": "Timestamp of the feedback",
+      "disable_correlation": true,
+      "misp-attribute": "datetime",
+      "ui-priority": 0
+    },
+    "privacy": {
+      "description": "User has requested privacy",
+      "disable_correlation": true,
+      "misp-attribute": "boolean",
+      "ui-priority": 0
+    },
+    "report-status": {
+      "categories": [
+        "External analysis"
+      ],
+      "description": "Result of the Spambee analysis for the submitted email",
+      "disable_correlation": true,
+      "misp-attribute": "text",
+      "ui-priority": 0
+    },
+    "report-uid": {
+      "categories": [
+        "Internal reference"
+      ],
+      "description": "Internal reference to the Spambee report",
+      "disable_correlation": true,
+      "misp-attribute": "text",
+      "ui-priority": 0
+    }
+  },
+  "description": "A Spambee analysis report",
+  "meta-category": "network",
+  "name": "spambee-report",
+  "requiredOneOf": [
+    "report-uid"
+  ],
+  "uuid": "305d6e6c-bb4d-4b9a-abf5-9f34d1322352",
+  "version": 3
+}