summaryrefslogtreecommitdiffstats
path: root/services/migrations
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2022-07-13 09:07:16 +0800
committerGitHub <noreply@github.com>2022-07-13 09:07:16 +0800
commitf67a1030b308a24cca13ff788f7b7119f0404580 (patch)
tree2f5d8777096f84bf4443070fa379ec4fd3034332 /services/migrations
parentd94f517643480369665eb37db31c9ddd700e07b3 (diff)
downloadgitea-f67a1030b308a24cca13ff788f7b7119f0404580.tar.gz
gitea-f67a1030b308a24cca13ff788f7b7119f0404580.zip
Add tests for the host checking logic, clarify the behaviors (#20328)
Before, the combination of AllowedDomains/BlockedDomains/AllowLocalNetworks is confusing. This PR adds tests for the logic, clarify the behaviors.
Diffstat (limited to 'services/migrations')
-rw-r--r--services/migrations/migrate.go11
-rw-r--r--services/migrations/migrate_test.go40
2 files changed, 48 insertions, 3 deletions
diff --git a/services/migrations/migrate.go b/services/migrations/migrate.go
index ce76733bd5..f2542173a0 100644
--- a/services/migrations/migrate.go
+++ b/services/migrations/migrate.go
@@ -84,7 +84,10 @@ func IsMigrateURLAllowed(remoteURL string, doer *user_model.User) error {
// some users only use proxy, there is no DNS resolver. it's safe to ignore the LookupIP error
addrList, _ := net.LookupIP(hostName)
+ return checkByAllowBlockList(hostName, addrList)
+}
+func checkByAllowBlockList(hostName string, addrList []net.IP) error {
var ipAllowed bool
var ipBlocked bool
for _, addr := range addrList {
@@ -93,12 +96,12 @@ func IsMigrateURLAllowed(remoteURL string, doer *user_model.User) error {
}
var blockedError error
if blockList.MatchHostName(hostName) || ipBlocked {
- blockedError = &models.ErrInvalidCloneAddr{Host: u.Host, IsPermissionDenied: true}
+ blockedError = &models.ErrInvalidCloneAddr{Host: hostName, IsPermissionDenied: true}
}
- // if we have an allow-list, check the allow-list first
+ // if we have an allow-list, check the allow-list before return to get the more accurate error
if !allowList.IsEmpty() {
if !allowList.MatchHostName(hostName) && !ipAllowed {
- return &models.ErrInvalidCloneAddr{Host: u.Host, IsPermissionDenied: true}
+ return &models.ErrInvalidCloneAddr{Host: hostName, IsPermissionDenied: true}
}
}
// otherwise, we always follow the blocked list
@@ -474,5 +477,7 @@ func Init() error {
allowList.AppendBuiltin(hostmatcher.MatchBuiltinPrivate)
allowList.AppendBuiltin(hostmatcher.MatchBuiltinLoopback)
}
+ // 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
return nil
}
diff --git a/services/migrations/migrate_test.go b/services/migrations/migrate_test.go
index d09c184d91..53cfe6d3eb 100644
--- a/services/migrations/migrate_test.go
+++ b/services/migrations/migrate_test.go
@@ -5,6 +5,7 @@
package migrations
import (
+ "net"
"path/filepath"
"testing"
@@ -74,3 +75,42 @@ func TestMigrateWhiteBlocklist(t *testing.T) {
setting.ImportLocalPaths = old
}
+
+func TestAllowBlockList(t *testing.T) {
+ init := func(allow, block string, local bool) {
+ setting.Migrations.AllowedDomains = allow
+ setting.Migrations.BlockedDomains = block
+ setting.Migrations.AllowLocalNetworks = local
+ assert.NoError(t, Init())
+ }
+
+ // default, allow all external, block none, no local networks
+ init("", "", false)
+ assert.NoError(t, checkByAllowBlockList("domain.com", []net.IP{net.ParseIP("1.2.3.4")}))
+ assert.Error(t, checkByAllowBlockList("domain.com", []net.IP{net.ParseIP("127.0.0.1")}))
+
+ // allow all including local networks (it could lead to SSRF in production)
+ init("", "", true)
+ assert.NoError(t, checkByAllowBlockList("domain.com", []net.IP{net.ParseIP("1.2.3.4")}))
+ assert.NoError(t, checkByAllowBlockList("domain.com", []net.IP{net.ParseIP("127.0.0.1")}))
+
+ // allow wildcard, block some subdomains. if the domain name is allowed, then the local network check is skipped
+ init("*.domain.com", "blocked.domain.com", false)
+ assert.NoError(t, checkByAllowBlockList("sub.domain.com", []net.IP{net.ParseIP("1.2.3.4")}))
+ assert.NoError(t, checkByAllowBlockList("sub.domain.com", []net.IP{net.ParseIP("127.0.0.1")}))
+ assert.Error(t, checkByAllowBlockList("blocked.domain.com", []net.IP{net.ParseIP("1.2.3.4")}))
+ assert.Error(t, checkByAllowBlockList("sub.other.com", []net.IP{net.ParseIP("1.2.3.4")}))
+
+ // allow wildcard (it could lead to SSRF in production)
+ init("*", "", false)
+ assert.NoError(t, checkByAllowBlockList("domain.com", []net.IP{net.ParseIP("1.2.3.4")}))
+ assert.NoError(t, checkByAllowBlockList("domain.com", []net.IP{net.ParseIP("127.0.0.1")}))
+
+ // local network can still be blocked
+ init("*", "127.0.0.*", false)
+ assert.NoError(t, checkByAllowBlockList("domain.com", []net.IP{net.ParseIP("1.2.3.4")}))
+ assert.Error(t, checkByAllowBlockList("domain.com", []net.IP{net.ParseIP("127.0.0.1")}))
+
+ // reset
+ init("", "", false)
+}