femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

remove not needed (#19128)

Browse source
This commit is contained in:
6543 2022-03-18 20:17:57 +01:00 committed by GitHub
parent fda5b9fc3e
commit 60fbaa9068
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/hostmatcher/hostmatcher.go
View file

@ -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.
@ -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:

13
modules/util/net.go
View file

@ -1,13 +0,0 @@
// Copyright 2021 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package util
import (
"net"
)
func IsIPPrivate(ip net.IP) bool {
return ip.IsPrivate()
}

56
modules/util/net_test.go
View file

@ -1,56 +0,0 @@
// Copyright 2022 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package util
import (
"net"
"testing"
"github.com/stretchr/testify/assert"
)
func TestIsIPPPrivate(t *testing.T) {
cases := []struct {
ip string
isPrivate bool
}{
// case 0
{
ip: "127.0.0.1",
isPrivate: false, // TODO: according to go, this isn't private?
},
// case 1
{
ip: "127.1.2.3",
isPrivate: false, // TODO: according to go, this isn't private?
},
// case 2
{
ip: "10.255.255.0",
isPrivate: true,
},
// case 3
{
ip: "8.8.8.8",
isPrivate: false,
},
// case 4
{
ip: "::1",
isPrivate: false, // TODO: according to go, this isn't private?
},
// case 4
{
ip: "2a12:7c40::f00d",
isPrivate: false,
},
}
for n, c := range cases {
i := net.ParseIP(c.ip)
p := IsIPPrivate(i)
assert.Equal(t, c.isPrivate, p, "case %d: should be equal", n)
}
}