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

Revert the minimal golang version requirement from 1.17 to 1.16 and add a warning in Makefile (#19319)

Browse Source 
* Revert the minimal golang version requirement from 1.17 to 1.16 and add a warning in Makefile

* Apply suggestions from code review

Co-authored-by: John Olheiser <john.olheiser@gmail.com>

* 1.16

* Update modules/util/net.go

Co-authored-by: Gusted <williamzijl7@hotmail.com>

* correct bool conditional

yay tests for catching this :)

* Update hostmatcher.go

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Gusted <williamzijl7@hotmail.com>
This commit is contained in:
Lunny Xiao
2022-04-06 01:32:24 +08:00
committed by GitHub
parent 14a6aafb50
commit 0704009dd7
6 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/hostmatcher/hostmatcher.go
View File

@@ -8,6 +8,8 @@ import (
"net"
"path/filepath"
"strings"
"code.gitea.io/gitea/modules/util"
)
// HostMatchList is used to check if a host or IP is in a list.
@@ -102,11 +104,11 @@ func (hl *HostMatchList) checkIP(ip net.IP) bool {
for _, builtin := range hl.builtins {
switch builtin {
case MatchBuiltinExternal:
if ip.IsGlobalUnicast() && !ip.IsPrivate() {
if ip.IsGlobalUnicast() && !util.IsIPPrivate(ip) {
return true
}
case MatchBuiltinPrivate:
if ip.IsPrivate() {
if util.IsIPPrivate(ip) {
return true
}
case MatchBuiltinLoopback: