fix merge (#20819)

diff --git a/modules/hostmatcher/hostmatcher.go b/modules/hostmatcher/hostmatcher.go
index 00bbc6cb0a83f6bc1a61a97de370d73553acb29b..ac939c3c86822ab28e50560242d8eaacef72c1a9 100644 (file)
--- a/modules/hostmatcher/hostmatcher.go
+++ b/modules/hostmatcher/hostmatcher.go
@@ -78,6 +78,11 @@ func (hl *HostMatchList) AppendBuiltin(builtin string) {
        hl.builtins = append(hl.builtins, builtin)
 }
 
+// AppendPattern appends more pattern to match
+func (hl *HostMatchList) AppendPattern(pattern string) {
+       hl.patterns = append(hl.patterns, pattern)
+}
+
 // IsEmpty checks if the checklist is empty
 func (hl *HostMatchList) IsEmpty() bool {
        return hl == nil || (len(hl.builtins) == 0 && len(hl.patterns) == 0 && len(hl.ipNets) == 0)

diff --git a/services/migrations/migrate.go b/services/migrations/migrate.go
index ce76733bd51a85e8cbe0044fff710a82edd7b790..d36c4efedc922475d0715da9ba114f050d8879a0 100644 (file)
--- a/services/migrations/migrate.go
+++ b/services/migrations/migrate.go
@@ -474,5 +474,10 @@ func Init() error {
                allowList.AppendBuiltin(hostmatcher.MatchBuiltinPrivate)
                allowList.AppendBuiltin(hostmatcher.MatchBuiltinLoopback)
        }
+
+       if setting.Proxy.Enabled && setting.Proxy.ProxyURLFixed != nil {
+               allowList.AppendPattern(setting.Proxy.ProxyURLFixed.Host)
+       }
+
        return nil
 }