tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-19 00:38:36 +00:00
Code Releases Activity

Support hostname:port to pass host matcher's check (#19543) (#19544)

Browse Source 
Backport #19543 
hostmatcher: split the hostname from the hostname:port string, use the correct hostname to do the match.
This commit is contained in:
wxiaoguang
2022-04-29 01:41:58 +08:00
committed by GitHub
parent 74602bb487
commit b86606fa38
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/hostmatcher/hostmatcher.go
View File

@@ -127,13 +127,18 @@ func (hl *HostMatchList) checkIP(ip net.IP) bool {
// MatchHostName checks if the host matches an allow/deny(block) list
func (hl *HostMatchList) MatchHostName(host string) bool {
hostname, _, err := net.SplitHostPort(host)
if err != nil {
hostname = host
}
if hl == nil {
return false
}
if hl.checkPattern(host) {
if hl.checkPattern(hostname) {
return true
}
if ip := net.ParseIP(host); ip != nil {
if ip := net.ParseIP(hostname); ip != nil {
return hl.checkIP(ip)
}
return false