Skip to content

Commit

Permalink
Add proxy host into allow list (go-gitea#20798)
Browse files Browse the repository at this point in the history
Co-authored-by: techknowlogick <[email protected]>
  • Loading branch information
2 people authored and Sysoev, Vladimir committed Aug 28, 2022
1 parent 9f26437 commit 0073d60
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions modules/hostmatcher/hostmatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions services/migrations/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -479,5 +479,10 @@ func Init() error {
}
// TODO: at the moment, if ALLOW_LOCALNETWORKS=false, ALLOWED_DOMAINS=domain.com, and domain.com has IP 127.0.0.1, then it's still allowed.
// if we want to block such case, the private&loopback should be added to the blockList when ALLOW_LOCALNETWORKS=false

if setting.Proxy.Enabled && setting.Proxy.ProxyURLFixed != nil {
allowList.AppendPattern(setting.Proxy.ProxyURLFixed.Host)
}

return nil
}

0 comments on commit 0073d60

Please sign in to comment.