diff options
| author | Ethan Koenig <ethantkoenig@gmail.com> | 2017-12-08 07:12:47 -0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2017-12-08 17:12:47 +0200 |
| commit | ec6718ef403e0b89f8b649aef225b94b2369725e (patch) | |
| tree | d0eab9810c5f5bd85252351f1cf8e0166adf1f4b /routers/repo | |
| parent | 8f7054a8645e56575435d66ffa8d82d40620165b (diff) | |
| download | gitea-ec6718ef403e0b89f8b649aef225b94b2369725e.tar.gz gitea-ec6718ef403e0b89f8b649aef225b94b2369725e.zip | |
Sanitize logs for mirror sync (#3057, #3082) (#3078)
* Sanitize logs for mirror sync
* Fix error message sanitiziation (#3082)
Diffstat (limited to 'routers/repo')
| -rw-r--r-- | routers/repo/repo.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/routers/repo/repo.go b/routers/repo/repo.go index dbe78f6d1e..36105bfe17 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -20,6 +20,7 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" ) const ( @@ -232,6 +233,9 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) { return } + // remoteAddr may contain credentials, so we sanitize it + err = util.URLSanitizedError(err, remoteAddr) + if repo != nil { if errDelete := models.DeleteRepository(ctx.User, ctxUser.ID, repo.ID); errDelete != nil { log.Error(4, "DeleteRepository: %v", errDelete) @@ -241,11 +245,11 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) { if strings.Contains(err.Error(), "Authentication failed") || strings.Contains(err.Error(), "could not read Username") { ctx.Data["Err_Auth"] = true - ctx.RenderWithErr(ctx.Tr("form.auth_failed", models.HandleCloneUserCredentials(err.Error(), true)), tplMigrate, &form) + ctx.RenderWithErr(ctx.Tr("form.auth_failed", err.Error()), tplMigrate, &form) return } else if strings.Contains(err.Error(), "fatal:") { ctx.Data["Err_CloneAddr"] = true - ctx.RenderWithErr(ctx.Tr("repo.migrate.failed", models.HandleCloneUserCredentials(err.Error(), true)), tplMigrate, &form) + ctx.RenderWithErr(ctx.Tr("repo.migrate.failed", err.Error()), tplMigrate, &form) return } |