From 35a7db49b49b748496993bd7dc142c63cf573d10 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 2 May 2022 13:11:45 +0800 Subject: [PATCH] ignore DNS error when doing migration allow/block check (#19567) Co-authored-by: Lauris BH --- models/error.go | 4 ---- services/migrations/migrate.go | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/models/error.go b/models/error.go index f0e8751d75fdc..1d0f658eb8ba1 100644 --- a/models/error.go +++ b/models/error.go @@ -332,7 +332,6 @@ type ErrInvalidCloneAddr struct { IsProtocolInvalid bool IsPermissionDenied bool LocalPath bool - NotResolvedIP bool } // IsErrInvalidCloneAddr checks if an error is a ErrInvalidCloneAddr. @@ -342,9 +341,6 @@ func IsErrInvalidCloneAddr(err error) bool { } func (err *ErrInvalidCloneAddr) Error() string { - if err.NotResolvedIP { - return fmt.Sprintf("migration/cloning from '%s' is not allowed: unknown hostname", err.Host) - } if err.IsInvalidPath { return fmt.Sprintf("migration/cloning from '%s' is not allowed: the provided path is invalid", err.Host) } diff --git a/services/migrations/migrate.go b/services/migrations/migrate.go index 65ecceddbeab3..c07edfb8c0554 100644 --- a/services/migrations/migrate.go +++ b/services/migrations/migrate.go @@ -81,10 +81,9 @@ func IsMigrateURLAllowed(remoteURL string, doer *user_model.User) error { err = nil //nolint hostName = u.Host } - addrList, err := net.LookupIP(hostName) - if err != nil { - return &models.ErrInvalidCloneAddr{Host: u.Host, NotResolvedIP: true} - } + + // some users only use proxy, there is no DNS resolver. it's safe to ignore the LookupIP error + addrList, _ := net.LookupIP(hostName) var ipAllowed bool var ipBlocked bool