#2903 use different reversed words and patterns for repository and user

diff --git a/README.md b/README.md
index 527a9f73206ef86fd77682f9c9049c57845288d4..e63b25c954f0380c8de4969d5c19db28b3acd83f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current tip version: 0.9.51 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
+##### Current tip version: 0.9.52 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|

diff --git a/gogs.go b/gogs.go
index d8da7069ea74bd55b626379a9bff062c8966eaf6..64bb1980e920e175d74fb043f3a1675aa597b3bc 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
        "github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.9.51.0723"
+const APP_VER = "0.9.52.0723"
 
 func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/models/org.go b/models/org.go
index d2cb188935fff80f32f8e6961faf8cd0eb6a61ee..9cb862dec9c620f743e4be0f5f6a79f270d1b6fe 100644 (file)
--- a/models/org.go
+++ b/models/org.go
@@ -94,7 +94,7 @@ func (org *User) RemoveOrgRepo(repoID int64) error {
 
 // CreateOrganization creates record of a new organization.
 func CreateOrganization(org, owner *User) (err error) {
-       if err = IsUsableName(org.Name); err != nil {
+       if err = IsUsableUsername(org.Name); err != nil {
                return err
        }
 

diff --git a/models/repo.go b/models/repo.go
index e1073419a3da0a9cb8de65418b36e96055e847ed..d5ca030d9fef2001a7f26df3b8c7ccb422e0372e 100644 (file)
--- a/models/repo.go
+++ b/models/repo.go
@@ -19,7 +19,6 @@ import (
        "strings"
        "sync"
        "time"
-       "unicode/utf8"
 
        "github.com/Unknwon/cae/zip"
        "github.com/Unknwon/com"
@@ -517,34 +516,6 @@ func (repo *Repository) CloneLink() (cl *CloneLink) {
        return repo.cloneLink(false)
 }
 
-var (
-       reservedNames    = []string{"debug", "raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new", ".", ".."}
-       reservedPatterns = []string{"*.git", "*.keys", "*.wiki"}
-)
-
-// IsUsableName checks if name is reserved or pattern of name is not allowed.
-func IsUsableName(name string) error {
-       name = strings.TrimSpace(strings.ToLower(name))
-       if utf8.RuneCountInString(name) == 0 {
-               return ErrNameEmpty
-       }
-
-       for i := range reservedNames {
-               if name == reservedNames[i] {
-                       return ErrNameReserved{name}
-               }
-       }
-
-       for _, pat := range reservedPatterns {
-               if pat[0] == '*' && strings.HasSuffix(name, pat[1:]) ||
-                       (pat[len(pat)-1] == '*' && strings.HasPrefix(name, pat[:len(pat)-1])) {
-                       return ErrNamePatternNotAllowed{pat}
-               }
-       }
-
-       return nil
-}
-
 // Mirror represents a mirror information of repository.
 type Mirror struct {
        ID          int64 `xorm:"pk autoincr"`
@@ -940,8 +911,17 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, opts C
        return nil
 }
 
+var (
+       reservedRepoNames    = []string{".", ".."}
+       reservedRepoPatterns = []string{"*.git", "*.wiki"}
+)
+
+func IsUsableRepoName(name string) error {
+       return isUsableName(reservedRepoNames, reservedRepoPatterns, name)
+}
+
 func createRepository(e *xorm.Session, u *User, repo *Repository) (err error) {
-       if err = IsUsableName(repo.Name); err != nil {
+       if err = IsUsableRepoName(repo.Name); err != nil {
                return err
        }
 
@@ -1209,7 +1189,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error {
 func ChangeRepositoryName(u *User, oldRepoName, newRepoName string) (err error) {
        oldRepoName = strings.ToLower(oldRepoName)
        newRepoName = strings.ToLower(newRepoName)
-       if err = IsUsableName(newRepoName); err != nil {
+       if err = IsUsableRepoName(newRepoName); err != nil {
                return err
        }
 

diff --git a/models/user.go b/models/user.go
index e8e79f247c4a62c450939326b732c77c55acd5a1..a7c877140cdcb20a4d0973bed324fbcc2b2244da 100644 (file)
--- a/models/user.go
+++ b/models/user.go
@@ -18,6 +18,7 @@ import (
        "path/filepath"
        "strings"
        "time"
+       "unicode/utf8"
 
        "github.com/Unknwon/com"
        "github.com/go-xorm/xorm"
@@ -468,9 +469,43 @@ func NewFakeUser() *User {
        }
 }
 
+var (
+       reversedUsernames    = []string{"debug", "raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new", ".", ".."}
+       reversedUserPatterns = []string{"*.keys"}
+)
+
+// isUsableName checks if name is reserved or pattern of name is not allowed
+// based on given reversed 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))
+       if utf8.RuneCountInString(name) == 0 {
+               return ErrNameEmpty
+       }
+
+       for i := range names {
+               if name == names[i] {
+                       return ErrNameReserved{name}
+               }
+       }
+
+       for _, pat := range patterns {
+               if pat[0] == '*' && strings.HasSuffix(name, pat[1:]) ||
+                       (pat[len(pat)-1] == '*' && strings.HasPrefix(name, pat[:len(pat)-1])) {
+                       return ErrNamePatternNotAllowed{pat}
+               }
+       }
+
+       return nil
+}
+
+func IsUsableUsername(name string) error {
+       return isUsableName(reversedUsernames, reversedUserPatterns, name)
+}
+
 // CreateUser creates record of a new user.
 func CreateUser(u *User) (err error) {
-       if err = IsUsableName(u.Name); err != nil {
+       if err = IsUsableUsername(u.Name); err != nil {
                return err
        }
 
@@ -583,7 +618,7 @@ func VerifyActiveEmailCode(code, email string) *EmailAddress {
 
 // ChangeUserName changes all corresponding setting from old user name to new one.
 func ChangeUserName(u *User, newUserName string) (err error) {
-       if err = IsUsableName(newUserName); err != nil {
+       if err = IsUsableUsername(newUserName); err != nil {
                return err
        }
 

diff --git a/templates/.VERSION b/templates/.VERSION
index 33af4b850cfddcafb004c35d10b29a99fb1d36f1..82c3ae6aff1adfe30db0253d07b0486806a127c8 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.9.51.0723
\ No newline at end of file
+0.9.52.0723
\ No newline at end of file