From 183ed0667e307662a824ff118311b365024172cd Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 15 Nov 2023 09:24:24 +0100 Subject: [PATCH] cmd/ursrv: Anchor distribution expressions to avoid mismatches --- cmd/ursrv/serve/serve.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/cmd/ursrv/serve/serve.go b/cmd/ursrv/serve/serve.go index f4a4ff5da70..f1ed7a11ce0 100644 --- a/cmd/ursrv/serve/serve.go +++ b/cmd/ursrv/serve/serve.go @@ -53,22 +53,22 @@ var ( // Maps well known builders to the official distribution method that // they represent - {regexp.MustCompile(`teamcity@build\.syncthing\.net`), "GitHub"}, - {regexp.MustCompile(`jenkins@build\.syncthing\.net`), "GitHub"}, - {regexp.MustCompile(`builder@github\.syncthing\.net`), "GitHub"}, - - {regexp.MustCompile(`deb@build\.syncthing\.net`), "APT"}, - {regexp.MustCompile(`debian@github\.syncthing\.net`), "APT"}, - - {regexp.MustCompile(`docker@syncthing\.net`), "Docker Hub"}, - {regexp.MustCompile(`docker@build.syncthing\.net`), "Docker Hub"}, - {regexp.MustCompile(`docker@github.syncthing\.net`), "Docker Hub"}, - - {regexp.MustCompile(`android-builder@github\.syncthing\.net`), "Google Play"}, - {regexp.MustCompile(`android-.*teamcity@build\.syncthing\.net`), "Google Play"}, - {regexp.MustCompile(`android-.*vagrant@basebox-stretch64`), "F-Droid"}, - {regexp.MustCompile(`vagrant@bullseye`), "F-Droid"}, - {regexp.MustCompile(`builduser@(archlinux|svetlemodry)`), "Arch (3rd party)"}, + {regexp.MustCompile(`^teamcity@build\.syncthing\.net`), "GitHub"}, + {regexp.MustCompile(`^jenkins@build\.syncthing\.net`), "GitHub"}, + {regexp.MustCompile(`^builder@github\.syncthing\.net`), "GitHub"}, + + {regexp.MustCompile(`^deb@build\.syncthing\.net`), "APT"}, + {regexp.MustCompile(`^debian@github\.syncthing\.net`), "APT"}, + + {regexp.MustCompile(`^docker@syncthing\.net`), "Docker Hub"}, + {regexp.MustCompile(`^docker@build.syncthing\.net`), "Docker Hub"}, + {regexp.MustCompile(`^docker@github.syncthing\.net`), "Docker Hub"}, + + {regexp.MustCompile(`^android-builder@github\.syncthing\.net`), "Google Play"}, + {regexp.MustCompile(`^android-.*teamcity@build\.syncthing\.net`), "Google Play"}, + {regexp.MustCompile(`^android-.*vagrant@basebox-stretch64`), "F-Droid"}, + {regexp.MustCompile(`^vagrant@bullseye`), "F-Droid"}, + {regexp.MustCompile(`^builduser@(archlinux|svetlemodry)`), "Arch (3rd party)"}, {regexp.MustCompile(`@debian`), "Debian (3rd party)"}, {regexp.MustCompile(`@fedora`), "Fedora (3rd party)"}, {regexp.MustCompile(`\bbrew@`), "Homebrew (3rd party)"},