From d1a84017a55d50bb54d672d22f3b47db3faf0ad6 Mon Sep 17 00:00:00 2001 From: Flare Date: Tue, 4 Oct 2016 15:25:25 +0800 Subject: [PATCH 1/3] Added public entries to reserved keywords list --- models/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index 32242e0ea6b75..04c6014e913d8 100644 --- a/models/user.go +++ b/models/user.go @@ -488,7 +488,7 @@ func NewGhostUser() *User { } var ( - reversedUsernames = []string{"debug", "raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new", ".", ".."} + reversedUsernames = []string{"assets", "css", "img", "js", "less", "plugins", "debug", "raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new", ".", ".."} reversedUserPatterns = []string{"*.keys"} ) From 682e6333202f984e729a48ec4dccf87d8d5da1a9 Mon Sep 17 00:00:00 2001 From: Flare Date: Tue, 4 Oct 2016 15:25:58 +0800 Subject: [PATCH 2/3] Rename variables Seriously @Unknwon, how did you derp so hard? --- models/user.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/user.go b/models/user.go index 04c6014e913d8..15368133bd3d1 100644 --- a/models/user.go +++ b/models/user.go @@ -488,8 +488,8 @@ func NewGhostUser() *User { } var ( - reversedUsernames = []string{"assets", "css", "img", "js", "less", "plugins", "debug", "raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new", ".", ".."} - reversedUserPatterns = []string{"*.keys"} + reservedUsernames = []string{"assets", "css", "img", "js", "less", "plugins", "debug", "raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new", ".", ".."} + reservedUserPatterns = []string{"*.keys"} ) // isUsableName checks if name is reserved or pattern of name is not allowed @@ -518,7 +518,7 @@ func isUsableName(names, patterns []string, name string) error { } func IsUsableUsername(name string) error { - return isUsableName(reversedUsernames, reversedUserPatterns, name) + return isUsableName(reservedUsernames, reservedUserPatterns, name) } // CreateUser creates record of a new user. From 427bd15be7ceb2e6c9ff094a006e6c9593b133cf Mon Sep 17 00:00:00 2001 From: Flare Date: Tue, 4 Oct 2016 16:52:04 +0800 Subject: [PATCH 3/3] Derped comment --- models/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index 15368133bd3d1..3b613d62f5fd2 100644 --- a/models/user.go +++ b/models/user.go @@ -493,7 +493,7 @@ var ( ) // isUsableName checks if name is reserved or pattern of name is not allowed -// based on given reversed names and patterns. +// based on given reserved names and patterns. // Names are exact match, patterns can be prefix or suffix match with placeholder '*'. func isUsableName(names, patterns []string, name string) error { name = strings.TrimSpace(strings.ToLower(name))