From 76d458eb85c8dd638d6d0eb17015ae6f167ab3f5 Mon Sep 17 00:00:00 2001 From: Reinaldy Rafli Date: Sun, 8 Sep 2024 07:47:21 +0700 Subject: [PATCH 1/3] test(filter): more tests for `scheme_domain_port` --- relay-filter/src/csp.rs | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/relay-filter/src/csp.rs b/relay-filter/src/csp.rs index 57b2712db3..c7cbe49b1f 100644 --- a/relay-filter/src/csp.rs +++ b/relay-filter/src/csp.rs @@ -232,6 +232,12 @@ mod tests { ("abc.com/something]:", None, Some("abc.com"), None), ("abc.co]m/[something:", None, Some("abc.co]m"), None), ("]abc.com:9000", None, Some("]abc.com"), Some("9000")), + ( + "https://api.example.com/foo/00000000-0000-0000-0000-000000000000?includes[]=user&includes[]=image&includes[]=author&includes[]=tag", + Some("https"), + Some("api.example.com"), + None, + ) ]; for (url, scheme, domain, port) in examples { @@ -265,6 +271,40 @@ mod tests { Some("[1fff:0:a88:85a3::ac1f]"), Some("8001"), ), + // invalid IPv6 for localhost since it's not inside brackets + ("::1", None, Some(":"), Some("1")), + ("[::1]", None, Some("[::1]"), None), + ( + "http://[fe80::862a:fdff:fe78:a2bf%13]", + Some("http"), + Some("[fe80::862a:fdff:fe78:a2bf%13]"), + None, + ), + // invalid addresses. although these results don't represent correct results, + // they are here to make sure the application won't crash. + ("192.168.1.1.1", None, Some("192.168.1.1.1"), None), + ("192.168.1.300", None, Some("192.168.1.300"), None), + ( + "[2001:0db8:85a3:::8a2e:0370:7334]", + None, + Some("[2001:0db8:85a3:::8a2e:0370:7334]"), + None, + ), + ("[fe80::1::]", None, Some("[fe80::1::]"), None), + ("fe80::1::", None, Some("fe80::1:"), Some("")), + ( + "[2001:0db8:85a3:xyz::8a2e:0370:7334]", + None, + Some("[2001:0db8:85a3:xyz::8a2e:0370:7334]"), + None, + ), + ( + "2001:0db8:85a3:xyz::8a2e:0370:7334", + None, + Some("2001:0db8:85a3:xyz::8a2e:0370"), + Some("7334"), + ), + ("192.168.0.1/24", None, Some("192.168.0.1"), None), ]; for (url, scheme, domain, port) in examples { From af0646a42dbdd608eae82f3804de16ab987087f1 Mon Sep 17 00:00:00 2001 From: Reinaldy Rafli Date: Sun, 8 Sep 2024 18:09:28 +0700 Subject: [PATCH 2/3] chore: changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd35f79d48..03ef8cdfbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Remove the OTEL spans endpoint in favor of Envelopes. ([#3973](https://github.com/getsentry/relay/pull/3973)) - Remove the `generate-schema` tool. Relay no longer exposes JSON schema for the event protocol. Consult the Rust type documentation of the `relay-event-schema` crate instead. ([#3974](https://github.com/getsentry/relay/pull/3974)) - Allow creation of `SqliteEnvelopeBuffer` from config, and load existing stacks from db on startup. ([#3967](https://github.com/getsentry/relay/pull/3967)) +- Add tests for `SchemeDomainPort`. ([#4015](https://github.com/getsentry/relay/pull/4015)) ## 24.8.0 From 2de2c2a40090abf3a1ae8bc24a27b86dc18d98ee Mon Sep 17 00:00:00 2001 From: Reinaldy Rafli Date: Mon, 9 Sep 2024 17:38:39 +0700 Subject: [PATCH 3/3] Update CHANGELOG.md Co-authored-by: Joris Bayer --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03ef8cdfbd..bd35f79d48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,6 @@ - Remove the OTEL spans endpoint in favor of Envelopes. ([#3973](https://github.com/getsentry/relay/pull/3973)) - Remove the `generate-schema` tool. Relay no longer exposes JSON schema for the event protocol. Consult the Rust type documentation of the `relay-event-schema` crate instead. ([#3974](https://github.com/getsentry/relay/pull/3974)) - Allow creation of `SqliteEnvelopeBuffer` from config, and load existing stacks from db on startup. ([#3967](https://github.com/getsentry/relay/pull/3967)) -- Add tests for `SchemeDomainPort`. ([#4015](https://github.com/getsentry/relay/pull/4015)) ## 24.8.0