From: mrsdizzie <info@mrsdizzie.com>
Date: Wed, 18 Dec 2019 21:49:56 +0000 (-0500)
Subject: Use OriginalURL insead of CloneAddr in migration logging (#9418)
X-Git-Tag: v1.11.0-rc1~112
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d64493495623280d324fb5908f7fb20952f18a3d;p=gitea.git

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 ece871a857..fb143f7e29 100644
--- 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