glean-parser 17.2.0__tar.gz → 17.3.0__tar.gz

{glean_parser-17.2.0 → glean_parser-17.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: glean-parser
-Version: 17.2.0
+Version: 17.3.0
 Summary: Parser tools for Mozilla's Glean telemetry
 Project-URL: Homepage, https://mozilla.github.io/glean
 Project-URL: Repository, https://github.com/mozilla/glean_parser

{glean_parser-17.2.0 → glean_parser-17.3.0}/glean_parser/lint.py

@@ -320,6 +320,36 @@ def check_empty_datareview(
         yield "List of data reviews should not contain empty strings or TODO markers."
 
 
+def check_event_extras_potential_data_sensitivity_required(
+    metric: metrics.Metric, parser_config: Dict[str, Any]
+) -> LintGenerator:
+    # Only looking at event metrics
+    if not isinstance(metric, metrics.Event):
+        return
+
+    # TODO(bug 1890648): Not all metrics have `data_sensitivity` defined.
+    has_data_sensitivity = hasattr(metric, "data_sensitivity")
+    # If already marked as "highly sensitive" no need for further checks
+    if has_data_sensitivity and any(
+        [
+            sensitivity == metrics.DataSensitivity.highly_sensitive
+            for sensitivity in metric.data_sensitivity
+        ]
+    ):
+        return
+
+    # List of potentially sensitive extra key names we want to flag.
+    potential_sensitive_names = ["url", "uri"]
+    name_list = ", ".join(potential_sensitive_names)
+
+    for extra_key in metric.extra_keys.keys():
+        if extra_key in potential_sensitive_names:
+            yield (
+                f"`{extra_key}` could potentially be used to collect sensitive data. Increase the metric's data sensitivity or disable the lint."
+                + f" (This lint applies for the following extra key names: {name_list})"
+            )
+
+
 def check_redundant_ping(
     pings: pings.Ping, parser_config: Dict[str, Any]
 ) -> LintGenerator:
@@ -432,6 +462,10 @@ METRIC_CHECKS: Dict[
     "METRIC_ON_EVENTS_LIFETIME": (check_metric_on_events_lifetime, CheckType.error),
     "UNEXPECTED_UNIT": (check_unexpected_unit, CheckType.warning),
     "EMPTY_DATAREVIEW": (check_empty_datareview, CheckType.warning),
+    "HIGHER_DATA_SENSITIVITY_REQUIRED": (
+        check_event_extras_potential_data_sensitivity_required,
+        CheckType.warning,
+    ),
 }
 
 

{glean_parser-17.2.0 → glean_parser-17.3.0}/glean_parser/metrics.py

@@ -579,7 +579,6 @@ class DualLabeledCounter(Metric):
         d["categories"] = self.ordered_categories
         del d["ordered_keys"]
         del d["ordered_categories"]
-        del d["dual_labeled"]
         return d
 
 

{glean_parser-17.2.0 → glean_parser-17.3.0}/glean_parser/schemas/metrics.2-0-0.schema.yaml

@@ -15,10 +15,6 @@ description: |
 $id: moz://mozilla.org/schemas/glean/metrics/2-0-0
 
 definitions:
-  token:
-    type: string
-    pattern: "^[A-Za-z_][A-Za-z0-9_\\.]*$"
-
   snake_case:
     type: string
     pattern: "^[a-z_][a-z0-9_]*$"
@@ -39,11 +35,6 @@ definitions:
     type: string
     pattern: "^[a-z][a-z0-9-]{0,29}$"
 
-  long_id:
-    allOf:
-      - $ref: "#/definitions/snake_case"
-      - maxLength: 40
-
   short_id:
     allOf:
       - $ref: "#/definitions/snake_case"

{glean_parser-17.2.0 → glean_parser-17.3.0}/glean_parser/schemas/pings.2-0-0.schema.yaml

@@ -15,10 +15,6 @@ description: |
 $id: moz://mozilla.org/schemas/glean/pings/2-0-0
 
 definitions:
-  dotted_snake_case:
-    type: string
-    pattern: "^[a-z_][a-z0-9_]{0,29}(\\.[a-z_][a-z0-9_]{0,29})*$"
-    maxLength: 40
   # Prior to version 2.0.0 of the schema, special ping names with underscores
   # were also supported.
   kebab_case:

glean_parser-17.3.0/tests/data/events_data_sensitivity.yaml

@@ -0,0 +1,78 @@
+# Any copyright is dedicated to the Public Domain.
+# https://creativecommons.org/publicdomain/zero/1.0/
+
+---
+$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0
+
+event:
+  low_sensitivity:
+    type: event
+    description: |
+      Just testing events
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1973017
+    data_reviews:
+      - http://example.com/reviews
+    notification_emails:
+      - CHANGE-ME@example.com
+    extra_keys:
+      url:
+        type: string
+        description: "This is key one"
+    expires: never
+    data_sensitivity:
+      - technical
+
+  no_data_sensitivity:
+    type: event
+    description: |
+      Just testing events
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1973017
+    data_reviews:
+      - http://example.com/reviews
+    notification_emails:
+      - CHANGE-ME@example.com
+    extra_keys:
+      url:
+        type: string
+        description: "This is key one"
+    expires: never
+
+  correct_sensitivity:
+    type: event
+    description: |
+      Just testing events
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1973017
+    data_reviews:
+      - http://example.com/reviews
+    notification_emails:
+      - CHANGE-ME@example.com
+    extra_keys:
+      url:
+        type: string
+        description: "This is key one"
+    expires: never
+    data_sensitivity:
+      - highly_sensitive
+
+  exempt:
+    type: event
+    description: |
+      Just testing events
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1973017
+    data_reviews:
+      - http://example.com/reviews
+    notification_emails:
+      - CHANGE-ME@example.com
+    extra_keys:
+      url:
+        type: string
+        description: "This is key one"
+    expires: never
+    data_sensitivity:
+      - technical
+    no_lint:
+      - HIGHER_DATA_SENSITIVITY_REQUIRED

{glean_parser-17.2.0 → glean_parser-17.3.0}/tests/test_lint.py

@@ -644,3 +644,112 @@ def test_unit_on_metrics(metric, num_nits):
     assert len(nits) == num_nits
     if num_nits > 0:
         assert set(["UNEXPECTED_UNIT"]) == set(v.check_name for v in nits)
+
+
+@pytest.mark.parametrize(
+    "metric, num_nits",
+    [
+        (
+            {
+                "metric": {
+                    "type": "event",
+                    "extra_keys": {
+                        "id": {"type": "string", "description": "description"}
+                    },
+                }
+            },
+            0,
+        ),
+        (
+            {
+                "metric": {
+                    "type": "event",
+                    "extra_keys": {
+                        "url": {"type": "string", "description": "description"}
+                    },
+                }
+            },
+            1,
+        ),
+        (
+            {
+                "metric": {
+                    "type": "event",
+                    "extra_keys": {
+                        "url": {"type": "string", "description": "description"}
+                    },
+                    "no_lint": ["HIGHER_DATA_SENSITIVITY_REQUIRED"],
+                }
+            },
+            0,
+        ),
+        (
+            {
+                "metric": {
+                    "type": "event",
+                    "extra_keys": {
+                        "url": {"type": "string", "description": "description"}
+                    },
+                    "data_sensitivity": ["technical"],
+                }
+            },
+            1,
+        ),
+        (
+            {
+                "metric": {
+                    "type": "event",
+                    "extra_keys": {
+                        "url": {"type": "string", "description": "description"}
+                    },
+                    "data_sensitivity": ["highly_sensitive"],
+                }
+            },
+            0,
+        ),
+        (
+            {
+                "metric": {
+                    "type": "event",
+                    "extra_keys": {
+                        "url": {"type": "string", "description": "description"}
+                    },
+                    "data_sensitivity": ["technical", "highly_sensitive"],
+                }
+            },
+            0,
+        ),
+    ],
+)
+def test_events_data_sensitivity(metric, num_nits):
+    content = {"category": metric}
+    content = util.add_required(content)
+    all_metrics = parser.parse_objects(content)
+
+    errs = list(all_metrics)
+    assert len(errs) == 0
+
+    nits = lint.lint_metrics(all_metrics.value)
+
+    assert len(nits) == num_nits
+    if num_nits > 0:
+        assert set(["HIGHER_DATA_SENSITIVITY_REQUIRED"]) == set(
+            v.check_name for v in nits
+        )
+
+
+def test_events_data_sensitivity_from_file():
+    """Test that the 'glinter' reports issues with the old event API."""
+    all_metrics = parser.parse_objects([ROOT / "data" / "events_data_sensitivity.yaml"])
+    errs = list(all_metrics)
+    assert len(errs) == 0
+
+    nits = lint.lint_metrics(all_metrics.value, parser_config={})
+    assert len(nits) == 2
+    assert nits[0].check_name == "HIGHER_DATA_SENSITIVITY_REQUIRED"
+    assert nits[0].name == "event.low_sensitivity"
+    assert "data sensitivity" in nits[0].msg
+
+    assert nits[1].check_name == "HIGHER_DATA_SENSITIVITY_REQUIRED"
+    assert nits[1].name == "event.no_data_sensitivity"
+    assert "data sensitivity" in nits[1].msg

{glean_parser-17.2.0 → glean_parser-17.3.0}/tests/test_parser.py

@@ -1153,6 +1153,13 @@ def test_no_internal_fields_exposed():
                             "extra_keys": {
                                 "key_a": {"description": "desc-a", "type": "boolean"}
                             },
+                        },
+                        "metric2": {
+                            "type": "dual_labeled_counter",
+                            "dual_labels": {
+                                "key": { "description": "desc-a" },
+                                "category": { "description": "desc-b" },
+                            }
                         }
                     },
                 }
@@ -1185,7 +1192,25 @@ def test_no_internal_fields_exposed():
             "send_in_pings": ["events"],
             "type": "event",
             "version": 0,
-        }
+        },
+        "category.metric2": {
+            "bugs": ["http://bugzilla.mozilla.org/12345678"],
+            "categories": None,
+            "data_reviews": ["https://example.com/review/"],
+            "defined_in": {"line": 17},
+            "description": "DESCRIPTION...",
+            "disabled": False,
+            "expires": "never",
+            "gecko_datapoint": "",
+            "keys": None,
+            "lifetime": "ping",
+            "metadata": {},
+            "no_lint": [],
+            "notification_emails": ["nobody@example.com"],
+            "send_in_pings": ["metrics"],
+            "type": "dual_labeled_counter",
+            "version": 0,
+        },
     }
     expected_json = json.dumps(expected, sort_keys=True, indent=2)