aboutsummaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2022-03-31 10:25:40 +0800
committerGitHub <noreply@github.com>2022-03-31 10:25:40 +0800
commitc83168104b8bcb09e3e6e1490bd586a9e1a55bc3 (patch)
tree6732a64a1f40d9c27f3a3215bc847e701367e777 /models
parent84038f33f42b03dbf455e41f5036f67ba7b61a66 (diff)
downloadgitea-c83168104b8bcb09e3e6e1490bd586a9e1a55bc3.tar.gz
gitea-c83168104b8bcb09e3e6e1490bd586a9e1a55bc3.zip
Use a more general (and faster) method to sanitize URLs with credentials (#19239)
Use a more general method to sanitize URLs with credentials: Simple and intuitive / Faster / Remove all credentials in all URLs
Diffstat (limited to 'models')
-rw-r--r--models/migrations/v180.go2
-rw-r--r--models/task.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/models/migrations/v180.go b/models/migrations/v180.go
index 1b735c2035..492c91f1b9 100644
--- a/models/migrations/v180.go
+++ b/models/migrations/v180.go
@@ -112,7 +112,7 @@ func removeCredentials(payload string) (string, error) {
opts.AuthPassword = ""
opts.AuthToken = ""
- opts.CloneAddr = util.NewStringURLSanitizer(opts.CloneAddr, true).Replace(opts.CloneAddr)
+ opts.CloneAddr = util.SanitizeCredentialURLs(opts.CloneAddr)
confBytes, err := json.Marshal(opts)
if err != nil {
diff --git a/models/task.go b/models/task.go
index 64c858921c..bade1a639d 100644
--- a/models/task.go
+++ b/models/task.go
@@ -245,7 +245,7 @@ func FinishMigrateTask(task *Task) error {
}
conf.AuthPassword = ""
conf.AuthToken = ""
- conf.CloneAddr = util.NewStringURLSanitizer(conf.CloneAddr, true).Replace(conf.CloneAddr)
+ conf.CloneAddr = util.SanitizeCredentialURLs(conf.CloneAddr)
conf.AuthPasswordEncrypted = ""
conf.AuthTokenEncrypted = ""
conf.CloneAddrEncrypted = ""