TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-18 02:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

tsweb: normalize passkey identities in bucketed stats

Browse Source 
Signed-off-by: Tom DNetto <tom@tailscale.com>
Updates: corp#17075
This commit is contained in:
Tom DNetto 2024-02-07 15:37:23 -08:00 committed by Tom
parent 8d6d9d28ba
commit 653721541c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tsweb/tsweb.go
View File

@ -196,8 +196,8 @@ type BucketedStatsOptions struct {
// normalizePathRegex matches components in a HTTP request path // normalizePathRegex matches components in a HTTP request path
// that should be replaced. // that should be replaced.
// //
// See: https://regex101.com/r/WIfpaR/1 for the explainer and test cases. // See: https://regex101.com/r/WIfpaR/3 for the explainer and test cases.
var normalizePathRegex = regexp.MustCompile("([a-fA-F0-9]{9,}|([^\\/])+\\.([^\\/]){2,}|((n|k|u|L|t|S)[a-zA-Z0-9]{5,}(CNTRL|Djz1H|LV5CY|mxgaY|jNy1b)))") var normalizePathRegex = regexp.MustCompile("([a-fA-F0-9]{9,}|([^\\/])+\\.([^\\/]){2,}|((n|k|u|L|t|S)[a-zA-Z0-9]{5,}(CNTRL|Djz1H|LV5CY|mxgaY|jNy1b))|(([^\\/])+\\@passkey))")
// NormalizedPath returns the given path with the following modifications: // NormalizedPath returns the given path with the following modifications:
// //
@ -206,7 +206,8 @@ var normalizePathRegex = regexp.MustCompile("([a-fA-F0-9]{9,}|([^\\/])+\\.([^\\/
// replaced by an ellipsis // replaced by an ellipsis
// - any path component containing a period with at least two characters // - any path component containing a period with at least two characters
// after the period (i.e. an email or domain) // after the period (i.e. an email or domain)
// - any path component consisting of a common Tailscale Stable ID. // - any path component consisting of a common Tailscale Stable ID
// - any path segment *@passkey.
func NormalizedPath(p string) string { func NormalizedPath(p string) string {
// Fastpath: No hex sequences in there we might have to trim. // Fastpath: No hex sequences in there we might have to trim.
// Avoids allocating. // Avoids allocating.

1
tsweb/tsweb_test.go
View File

@ -686,6 +686,7 @@ func TestBucket(t *testing.T) {
{"/a/831a4bf39856?refreshed=true", "/a/…"}, {"/a/831a4bf39856?refreshed=true", "/a/…"},
{"/c2n/nxaaa1CNTRL", "/c2n/…"}, {"/c2n/nxaaa1CNTRL", "/c2n/…"},
{"/api/v2/tailnet/blueberries.com/keys/kxaDK21CNTRL", "/api/v2/tailnet/…/keys/…"}, {"/api/v2/tailnet/blueberries.com/keys/kxaDK21CNTRL", "/api/v2/tailnet/…/keys/…"},
{"/api/v2/tailnet/bloop@passkey/devices", "/api/v2/tailnet/…/devices"},
} }
for _, tc := range tcs { for _, tc := range tcs {