feat(user): make username case insensitive by default

- username is now case insensitive by default
- use option `--user-match-case` to make username case sensitive

Author: marjune163

README.md

@@ -85,7 +85,7 @@ ghfs --listen-plain 80 --listen-tls 443 -c /cert/server1.pem -k /cert/server1.ke
 
 ## Usage
 ```
-server [options]
+ghfs [options]
 
 -l|--listen <ip|port|:port|ip:port|socket> ...
     IP and port the server listens on, e.g. ":80" or "127.0.0.1:80".
@@ -209,6 +209,8 @@ server [options]
 --user-sha256 [<username>]:<sha256-password> ...
 --user-sha512 [<username>]:<sha512-password> ...
     Specify users for Basic Auth, with encoded password.
+--user-match-case
+    Username is case sensitive.
 
 -c|--cert <file>
     Specify TLS certificate file.

README.zh-CN.md

@@ -84,7 +84,7 @@ ghfs --listen-plain 80 --listen-tls 443 -c /cert/server1.pem -k /cert/server1.ke
 
 ## 使用方法
 ```
-server [选项]
+ghfs [选项]
 
 -l|--listen <IP|端口|:端口|IP:端口|socket> ...
     指定服务器要侦听的IP和端口，例如“:80”或“127.0.0.1:80”。
@@ -207,6 +207,8 @@ server [选项]
 --user-sha256 [<用户名>]:<sha256密码> ...
 --user-sha512 [<用户名>]:<sha512密码> ...
     指定http基本验证的用户，对密码使用特定的编码。
+--user-match-case
+    用户名区分大小写。
 
 -c|--cert <证书文件>
     指定TLS证书文件。

src/param/cli.go

@@ -116,6 +116,9 @@ func init() {
 	err = options.AddFlagValues("userssha512", "--user-sha512", "", nil, "user info: <username>:<sha512-password>")
 	serverErrHandler.CheckFatal(err)
 
+	err = options.AddFlag("usermatchcase", "--user-match-case", "GHFS_USER_MATCH_CASE", "username should be case sensitive")
+	serverErrHandler.CheckFatal(err)
+
 	err = options.AddFlagsValue("key", []string{"-k", "--key"}, "GHFS_KEY", "", "TLS certificate key path")
 	serverErrHandler.CheckFatal(err)
 
@@ -252,6 +255,7 @@ func doParseCli() []*Param {
 		param.GlobalArchive = result.HasKey("globalarchive")
 		param.GlobalCors = result.HasKey("globalcors")
 		param.GlobalAuth = result.HasKey("globalauth")
+		param.UserMatchCase = result.HasKey("usermatchcase")
 		param.HostNames, _ = result.GetStrings("hostnames")
 		param.Theme, _ = result.GetString("theme")
 		param.ThemeDir, _ = result.GetString("themedir")

src/param/main.go

@@ -41,15 +41,16 @@ type Param struct {
 	CorsUrls   []string
 	CorsDirs   []string
 
-	GlobalAuth  bool
-	AuthUrls    []string
-	AuthDirs    []string
-	UsersPlain  []*user
-	UsersBase64 []*user
-	UsersMd5    []*user
-	UsersSha1   []*user
-	UsersSha256 []*user
-	UsersSha512 []*user
+	GlobalAuth    bool
+	AuthUrls      []string
+	AuthDirs      []string
+	UsersPlain    []*user
+	UsersBase64   []*user
+	UsersMd5      []*user
+	UsersSha1     []*user
+	UsersSha256   []*user
+	UsersSha512   []*user
+	UserMatchCase bool
 
 	Certificate  *tls.Certificate
 	Listens      []string

src/user/list.go

@@ -1,97 +1,82 @@
 package user
 
 import (
-	"errors"
+	"../util"
 )
 
 type List struct {
-	users []user
+	users          []user
+	namesEqualFunc util.StrEqualFunc
 }
 
-var errUserExists = errors.New("username already exist")
-
 func (list *List) findIndex(username string) int {
 	for i := range list.users {
-		if list.users[i].getName() == username {
+		if list.namesEqualFunc(list.users[i].getName(), username) {
 			return i
 		}
 	}
 	return -1
 }
 
-func (list *List) AddPlain(username, password string) error {
-	if list.findIndex(username) >= 0 {
-		return errUserExists
+func (list *List) addUser(user user) {
+	username := user.getName()
+	index := list.findIndex(username)
+	if index < 0 {
+		list.users = append(list.users, user)
+	} else {
+		list.users[index] = user
 	}
+}
 
+func (list *List) AddPlain(username, password string) error {
 	user := newPlainUser(username, password)
-	list.users = append(list.users, user)
+	list.addUser(user)
 	return nil
 }
 
 func (list *List) AddBase64(username, password string) error {
-	if list.findIndex(username) >= 0 {
-		return errUserExists
-	}
-
 	user := newBase64User(username, password)
-	list.users = append(list.users, user)
+	list.addUser(user)
 	return nil
 }
 
 func (list *List) AddMd5(username, password string) error {
-	if list.findIndex(username) >= 0 {
-		return errUserExists
-	}
-
 	user, err := newMd5User(username, password)
 	if err != nil {
 		return err
 	}
 
-	list.users = append(list.users, user)
+	list.addUser(user)
 	return nil
 }
 
 func (list *List) AddSha1(username, password string) error {
-	if list.findIndex(username) >= 0 {
-		return errUserExists
-	}
-
 	user, err := newSha1User(username, password)
 	if err != nil {
 		return err
 	}
 
-	list.users = append(list.users, user)
+	list.addUser(user)
 	return nil
 }
 
 func (list *List) AddSha256(username, password string) error {
-	if list.findIndex(username) >= 0 {
-		return errUserExists
-	}
-
 	user, err := newSha256User(username, password)
 	if err != nil {
 		return err
 	}
 
-	list.users = append(list.users, user)
+	list.addUser(user)
 	return nil
 }
 
 func (list *List) AddSha512(username, password string) error {
-	if list.findIndex(username) >= 0 {
-		return errUserExists
-	}
-
 	user, err := newSha512User(username, password)
 	if err != nil {
 		return err
 	}
 
-	list.users = append(list.users, user)
+	list.addUser(user)
 	return nil
 }
 
@@ -104,6 +89,12 @@ func (list *List) Auth(username, password string) bool {
 	return list.users[index].auth(password)
 }
 
-func NewList() *List {
-	return &List{}
+func NewList(nameCaseSensitive bool) *List {
+	var namesEqualFunc util.StrEqualFunc
+	if nameCaseSensitive {
+		namesEqualFunc = util.IsStrEqualAccurate
+	} else {
+		namesEqualFunc = util.IsStrEqualNoCase
+	}
+	return &List{namesEqualFunc: namesEqualFunc}
 }