Skip to content

Commit

Permalink
ignore DNS error when doing migration allow/block check (#19567)
Browse files Browse the repository at this point in the history
Co-authored-by: Lauris BH <lauris@nix.lv>
  • Loading branch information
wxiaoguang and lafriks authored May 2, 2022
1 parent f4729e2 commit 35a7db4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
4 changes: 0 additions & 4 deletions models/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ type ErrInvalidCloneAddr struct {
IsProtocolInvalid bool
IsPermissionDenied bool
LocalPath bool
NotResolvedIP bool
}

// IsErrInvalidCloneAddr checks if an error is a ErrInvalidCloneAddr.
Expand All @@ -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)
}
Expand Down
7 changes: 3 additions & 4 deletions services/migrations/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 35a7db4

Please sign in to comment.