Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove util.IsIPPrivate as it is no longer needed #19128

Merged
merged 1 commit into from
Mar 18, 2022
Merged

Remove util.IsIPPrivate as it is no longer needed #19128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions modules/hostmatcher/hostmatcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ 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.
Expand Down Expand Up @@ -104,11 +102,11 @@ func (hl *HostMatchList) checkIP(ip net.IP) bool {
for _, builtin := range hl.builtins {
switch builtin {
case MatchBuiltinExternal:
if ip.IsGlobalUnicast() && !util.IsIPPrivate(ip) {
if ip.IsGlobalUnicast() && !ip.IsPrivate() {
return true
}
case MatchBuiltinPrivate:
if util.IsIPPrivate(ip) {
if ip.IsPrivate() {
return true
}
case MatchBuiltinLoopback:
Expand Down
13 changes: 0 additions & 13 deletions modules/util/net.go
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions modules/util/net_test.go
View file
Open in desktop

This file was deleted.