Skip to content

Commit d06ff8f

Browse files
snematodaforgejo-backport-action
authored andcommitted
port(gitea): Fix password leak in log messages (go-gitea/gitea!35584) (#10550)
Link to original PR: go-gitea/gitea#35584 Original Author: https://github.com/shashank-netapp Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10550 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: Shiny Nematoda <snematoda.751k2@aleeas.com> Co-committed-by: Shiny Nematoda <snematoda.751k2@aleeas.com> (cherry picked from commit 2db3715)
1 parent e538f05 commit d06ff8f

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

modules/indexer/code/indexer.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"forgejo.org/modules/process"
2222
"forgejo.org/modules/queue"
2323
"forgejo.org/modules/setting"
24+
"forgejo.org/modules/util"
2425
)
2526

2627
var (
@@ -171,12 +172,12 @@ func Init() {
171172
log.Fatal("PID: %d Unable to initialize the bleve Repository Indexer at path: %s Error: %v", os.Getpid(), setting.Indexer.RepoPath, err)
172173
}
173174
case "elasticsearch":
174-
log.Info("PID: %d Initializing Repository Indexer at: %s", os.Getpid(), setting.Indexer.RepoConnStr)
175+
log.Info("PID: %d Initializing Repository Indexer at: %s", os.Getpid(), util.SanitizeCredentialURLs(setting.Indexer.RepoConnStr))
175176
defer func() {
176177
if err := recover(); err != nil {
177178
log.Error("PANIC whilst initializing repository indexer: %v\nStacktrace: %s", err, log.Stack(2))
178179
log.Error("The indexer files are likely corrupted and may need to be deleted")
179-
log.Error("You can completely remove the \"%s\" index to make Forgejo recreate the indexes", setting.Indexer.RepoConnStr)
180+
log.Error("You can completely remove the \"%s\" index to make Forgejo recreate the indexes", util.SanitizeCredentialURLs(setting.Indexer.RepoConnStr))
180181
}
181182
}()
182183

@@ -186,7 +187,7 @@ func Init() {
186187
cancel()
187188
(*globalIndexer.Load()).Close()
188189
close(waitChannel)
189-
log.Fatal("PID: %d Unable to initialize the elasticsearch Repository Indexer connstr: %s Error: %v", os.Getpid(), setting.Indexer.RepoConnStr, err)
190+
log.Fatal("PID: %d Unable to initialize the elasticsearch Repository Indexer connstr: %s Error: %v", os.Getpid(), util.SanitizeCredentialURLs(setting.Indexer.RepoConnStr), err)
190191
}
191192

192193
default:

modules/indexer/issues/indexer.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"forgejo.org/modules/process"
2626
"forgejo.org/modules/queue"
2727
"forgejo.org/modules/setting"
28+
"forgejo.org/modules/util"
2829
)
2930

3031
// IndexerMetadata is used to send data to the queue, so it contains only the ids.
@@ -100,15 +101,15 @@ func InitIssueIndexer(syncReindex bool) {
100101
issueIndexer = elasticsearch.NewIndexer(setting.Indexer.IssueConnStr, setting.Indexer.IssueIndexerName)
101102
existed, err = issueIndexer.Init(ctx)
102103
if err != nil {
103-
log.Fatal("Unable to issueIndexer.Init with connection %s Error: %v", setting.Indexer.IssueConnStr, err)
104+
log.Fatal("Unable to issueIndexer.Init with connection %s Error: %v", util.SanitizeCredentialURLs(setting.Indexer.IssueConnStr), err)
104105
}
105106
case "db":
106107
issueIndexer = db.NewIndexer()
107108
case "meilisearch":
108109
issueIndexer = meilisearch.NewIndexer(setting.Indexer.IssueConnStr, setting.Indexer.IssueConnAuth, setting.Indexer.IssueIndexerName)
109110
existed, err = issueIndexer.Init(ctx)
110111
if err != nil {
111-
log.Fatal("Unable to issueIndexer.Init with connection %s Error: %v", setting.Indexer.IssueConnStr, err)
112+
log.Fatal("Unable to issueIndexer.Init with connection %s Error: %v", util.SanitizeCredentialURLs(setting.Indexer.IssueConnStr), err)
112113
}
113114
default:
114115
log.Fatal("Unknown issue indexer type: %s", setting.Indexer.IssueType)

0 commit comments

Comments
 (0)