Merge branch 'main' of github.com:icco/reportd

main.go

@@ -189,7 +189,16 @@ func main() {
 			return
 		}
 
-		resp, err := json.Marshal(data)
+		data2, err := reporting.GetReportCounts(ctx, service, *project, *dataset, *rv2Table)
+		if err != nil {
+			log.Errorw("error seen during reports get", zap.Error(err), "service", service)
+			http.Error(w, "processing error", 500)
+			return
+		}
+
+		out := append(data, data2...)
+
+		resp, err := json.Marshal(out)
 		if err != nil {
 			log.Errorw("error seen during reports marshal", zap.Error(err), "service", service)
 			http.Error(w, "processing error", 500)
@@ -332,7 +341,7 @@ func main() {
 		bodyStr := buf.String()
 
 		log.Infow("reporting recieved", "content-type", contentType, "service", service, "user-agent", r.UserAgent())
-		reports, err := reporting.ParseReport(bodyStr)
+		reports, err := reporting.ParseReport(bodyStr, service)
 		if err != nil {
 			log.Errorw("error on parsing reporting data", zap.Error(err), "service", service, "content-type", contentType, "body", bodyStr)
 			http.Error(w, "uploading error", 500)

pkg/reporting/examples/csp.json

@@ -0,0 +1,17 @@
+{
+  "type": "csp-violation",
+  "url": "http://127.0.0.1:9999/",
+  "body": {
+    "sourceFile": null,
+    "lineNumber": null,
+    "columnNumber": null,
+    "documentURL": "http://127.0.0.1:9999/",
+    "referrer": "",
+    "blockedURL": "https://apis.google.com/js/platform.js",
+    "effectiveDirective": "script-src-elem",
+    "originalPolicy": "default-src 'self';",
+    "sample": "",
+    "disposition": "enforce",
+    "statusCode": 200
+  }
+}

pkg/reporting/examples/deprecation.json

@@ -0,0 +1,14 @@
+{
+  "type": "deprecation",
+  "age": 10,
+  "url": "https://example.com/",
+  "user_agent": "BarBrowser/98.0 (Mozilla/5.0 compatiblish)",
+  "body": {
+    "id": "websql",
+    "anticipatedRemoval": "1/1/2020",
+    "message": "WebSQL is deprecated and will be removed in Chrome 97 around January 2020",
+    "sourceFile": "https://example.com/index.js",
+    "lineNumber": 1234,
+    "columnNumber": 42
+  }
+}