Use OriginalURL insead of CloneAddr in migration logging (#9418)

CloneAddr will contain username and password credentials and they will
get stored in system notices about failed migrations (and logs if trace
is set). Replace with OriginalURL that doesn't have those.

diff --git a/modules/migrations/migrate.go b/modules/migrations/migrate.go
index ece871a8574d3c90a433b029c6ebe6c7bc962564..fb143f7e29e94356e033215f53320c8e2a3ffe20 100644 (file)
--- a/modules/migrations/migrate.go
+++ b/modules/migrations/migrate.go
@@ -59,7 +59,7 @@ func MigrateRepository(ctx context.Context, doer *models.User, ownerName string,
                opts.PullRequests = false
                opts.GitServiceType = structs.PlainGitService
                downloader = NewPlainGitDownloader(ownerName, opts.RepoName, opts.CloneAddr)
-               log.Trace("Will migrate from git: %s", opts.CloneAddr)
+               log.Trace("Will migrate from git: %s", opts.OriginalURL)
        } else if opts.GitServiceType == structs.NotMigrated {
                opts.GitServiceType = theFactory.GitServiceType()
        }
@@ -77,7 +77,7 @@ func MigrateRepository(ctx context.Context, doer *models.User, ownerName string,
                        log.Error("rollback failed: %v", err1)
                }
 
-               if err2 := models.CreateRepositoryNotice(fmt.Sprintf("Migrate repository from %s failed: %v", opts.CloneAddr, err)); err2 != nil {
+               if err2 := models.CreateRepositoryNotice(fmt.Sprintf("Migrate repository from %s failed: %v", opts.OriginalURL, err)); err2 != nil {
                        log.Error("create respotiry notice failed: ", err2)
                }
                return nil, err