Merge pull request #117 from qiniu/develop

6.0.6 patch
qiniu · Jun 30, 2014 · 6ec0594 · 6ec0594
2 parents 10ed8d0 + 04b4d13
commit 6ec0594
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/conf/conf.go b/conf/conf.go
@@ -21,7 +21,7 @@ var SECRET_KEY string
 
 var version = "6.0.6"
 
-var userPattern = regexp.MustCompile("^[:word:]*$")
+var userPattern = regexp.MustCompile("^[a-zA-Z0-9_.-]*$")
 
 // user should be [A-Za-z0-9]*
 func SetUser(user string) error {

diff --git a/conf/conf_test.go b/conf/conf_test.go
@@ -8,17 +8,22 @@ import (
 func TestUA(t *testing.T) {
 	err := SetUser("")
 	if err != nil {
-		t.Fatal(err)
+		t.Fatal("expect no error")
 	}
 	err = SetUser("错误的UA")
 	if err == nil {
 		t.Fatal("expect an invalid ua format")
 	}
+	err = SetUser("Test0-_.")
+	if err != nil {
+		t.Fatal("expect no error")
+	}
 }
 
 func TestFormat(t *testing.T) {
-	v := formatUserAgent("test")
-	if !strings.Contains(v, "test") {
+	str := "tesT0.-_"
+	v := formatUserAgent(str)
+	if !strings.Contains(v, str) {
 		t.Fatal("should include user")
 	}
 	if !strings.HasPrefix(v, "QiniuGo/"+version) {