forks/forgejo
1
0
Fork 0
Code Releases Activity

Ensure repoNames are lowercased in serv (#12668)

Browse source 
#12624 missed lowering the provided repoPath.

(Additionally make a few fixes to the way the debug flag works.)

Fix #12659
Fix #12667

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2020-08-31 18:12:49 +01:00 committed by GitHub
parent 807a41ca9a
commit 82b71881d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/serv.go
View file

@ -51,8 +51,9 @@ var CmdServ = cli.Command{
} }
func setup(logPath string, debug bool) { func setup(logPath string, debug bool) {
if !debug { _ = log.DelLogger("console")
_ = log.DelLogger("console") if debug {
_ = log.NewLogger(1000, "console", "console", `{"level":"trace","stacktracelevel":"NONE","stderr":true}`)
} }
setting.NewContext() setting.NewContext()
if debug { if debug {
@ -117,6 +118,8 @@ func runServ(c *cli.Context) error {
} }
println("If this is unexpected, please log in with password and setup Gitea under another user.") println("If this is unexpected, please log in with password and setup Gitea under another user.")
return nil return nil
} else if c.Bool("debug") {
log.Debug("SSH_ORIGINAL_COMMAND: %s", os.Getenv("SSH_ORIGINAL_COMMAND"))
} }
words, err := shellquote.Split(cmd) words, err := shellquote.Split(cmd)
@ -145,6 +148,9 @@ func runServ(c *cli.Context) error {
} }
} }
// LowerCase and trim the repoPath as that's how they are stored.
repoPath = strings.ToLower(strings.TrimSpace(repoPath))
rr := strings.SplitN(repoPath, "/", 2) rr := strings.SplitN(repoPath, "/", 2)
if len(rr) != 2 { if len(rr) != 2 {
fail("Invalid repository path", "Invalid repository path: %v", repoPath) fail("Invalid repository path", "Invalid repository path: %v", repoPath)