Add Spamvertised schema

.github/workflows/ci.yml

@@ -113,6 +113,6 @@ jobs:
           name: coverage
       - uses: codecov/codecov-action@v4
         with:
-          fail_ci_if_error: true # optional (default = false)
+          fail_ci_if_error: false # optional (default = false)
           verbose: true # optional (default = false)
           token: ${{ secrets.CODECOV_TOKEN }}

samples/negative/development/invalid_url_and_ip_spamvertised.json

@@ -0,0 +1,32 @@
+{
+  "Version": "development",
+  "ReporterInfo": {
+    "ReporterOrg": "ExampleOrg",
+    "ReporterOrgDomain": "example.com",
+    "ReporterOrgEmail": "[email protected]",
+    "ReporterContactEmail": "[email protected]",
+    "ReporterContactName": "Mr. Example",
+    "ReporterContactPhone": "+ 01 000 1234567"
+  },
+  "Disclosure": true,
+  "Report": {
+    "ReportClass": "Activity",
+    "ReportType": "Spamvertised",
+    "Date": "2024-08-03T14:17:10Z",
+    "SourceIp": "http://bad-spamvertised.spam",
+    "SourcePort": 54321,
+    "SourceUrl": "192.0.2.55",
+    "DestinationIp": "198.51.100.33",
+    "DestinationPort": 25,
+    "SmtpMailFromAddress": "[email protected]",
+    "SmtpRcptToAddress": "[email protected]",
+    "Samples": [
+      {
+        "ContentType": "message/rfc822",
+        "Base64Encoded": true,
+        "Description": "The spamvertised mail",
+        "Payload": "bWFpbA=="
+      }
+    ]
+  }
+}

samples/positive/development/spamvertised_sample.json

@@ -0,0 +1,32 @@
+{
+  "Version": "development",
+  "ReporterInfo": {
+    "ReporterOrg": "ExampleOrg",
+    "ReporterOrgDomain": "example.com",
+    "ReporterOrgEmail": "[email protected]",
+    "ReporterContactEmail": "[email protected]",
+    "ReporterContactName": "Mr. Example",
+    "ReporterContactPhone": "+ 01 000 1234567"
+  },
+  "Disclosure": true,
+  "Report": {
+    "ReportClass": "Activity",
+    "ReportType": "Spamvertised",
+    "Date": "2024-08-03T14:17:10Z",
+    "SourceIp": "192.0.2.55",
+    "SourcePort": 54321,
+    "SourceUrl": "http://bad-spamvertised.spam",
+    "DestinationIp": "198.51.100.33",
+    "DestinationPort": 25,
+    "SmtpMailFromAddress": "[email protected]",
+    "SmtpRcptToAddress": "[email protected]",
+    "Samples": [
+      {
+        "ContentType": "message/rfc822",
+        "Base64Encoded": true,
+        "Description": "The spamvertised mail",
+        "Payload": "bWFpbA=="
+      }
+    ]
+  }
+}

schemas/development/spamvertised.schema.json

@@ -0,0 +1,45 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://raw.githubusercontent.com/xarf/schema-discussion/master/schemas/development/spamvertised.schema.json",
+  "title": "XARF SPAMVERTISED",
+  "description": "A format to report SPAMVERTISED events.",
+  "allOf": [
+    {
+      "$ref": "xarf_shared.schema.json#/properties/XarfBase"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "Report": {
+          "allOf": [
+            {
+              "$ref": "xarf_shared.schema.json#/properties/IpAndUrlBasedReport"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "ReportClass": {
+                  "type": "string",
+                  "enum": ["Activity"]
+                },
+                "ReportType": {
+                  "type": "string",
+                  "enum": ["Spamvertised"]
+                }
+              }
+            },
+            {
+              "$ref": "xarf_shared.schema.json#/properties/WithDestination"
+            },
+            {
+              "$ref": "xarf_shared.schema.json#/properties/CommonProps"
+            },
+            {
+              "$ref": "xarf_shared.schema.json#/properties/EMail"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}

schemas/development/xarf.schema.json

@@ -51,6 +51,9 @@
     },
     {
       "$ref": "harassment.schema.json"
+    },
+    {
+      "$ref": "spamvertised.schema.json"
     }
   ]
 }