From 3f32c5cb4b1d9863d371755eee14cf545ebee2d6 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 (ref #9141) --- cmd/ursrv/serve/serve.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/cmd/ursrv/serve/serve.go b/cmd/ursrv/serve/serve.go index f4a4ff5da..846dcca2c 100644 --- a/cmd/ursrv/serve/serve.go +++ b/cmd/ursrv/serve/serve.go @@ -53,26 +53,26 @@ 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(`\steamcity@build\.syncthing\.net`), "GitHub"}, + {regexp.MustCompile(`\sjenkins@build\.syncthing\.net`), "GitHub"}, + {regexp.MustCompile(`\sbuilder@github\.syncthing\.net`), "GitHub"}, - {regexp.MustCompile(`deb@build\.syncthing\.net`), "APT"}, - {regexp.MustCompile(`debian@github\.syncthing\.net`), "APT"}, + {regexp.MustCompile(`\sdeb@build\.syncthing\.net`), "APT"}, + {regexp.MustCompile(`\sdebian@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(`\sdocker@syncthing\.net`), "Docker Hub"}, + {regexp.MustCompile(`\sdocker@build.syncthing\.net`), "Docker Hub"}, + {regexp.MustCompile(`\sdocker@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(`\sandroid-builder@github\.syncthing\.net`), "Google Play"}, + {regexp.MustCompile(`\sandroid-.*teamcity@build\.syncthing\.net`), "Google Play"}, + {regexp.MustCompile(`\sandroid-.*vagrant@basebox-stretch64`), "F-Droid"}, + {regexp.MustCompile(`\svagrant@bullseye`), "F-Droid"}, + {regexp.MustCompile(`\sbuilduser@(archlinux|svetlemodry)`), "Arch (3rd party)"}, {regexp.MustCompile(`@debian`), "Debian (3rd party)"}, {regexp.MustCompile(`@fedora`), "Fedora (3rd party)"}, - {regexp.MustCompile(`\bbrew@`), "Homebrew (3rd party)"}, - {regexp.MustCompile(`root@buildkitsandbox`), "LinuxServer.io (3rd party)"}, + {regexp.MustCompile(`\sbrew@`), "Homebrew (3rd party)"}, + {regexp.MustCompile(`\sroot@buildkitsandbox`), "LinuxServer.io (3rd party)"}, {regexp.MustCompile(`.`), "Others"}, } )