Merge pull request apache#30 from sjzar/master

PILIVDN-763 pili-statd 支持无uid参数查询(admin权限)

Author: wangtuanjie

go/src/pili.qiniu.com/statd.v4/http/http.go

@@ -126,7 +126,9 @@ func queryOf(req *http.Request) (query statd.Query, err error) {
 		return
 	}
 
-	query.Where["uid"] = uid
+	if uid != 0 {
+		query.Where["uid"] = uid
+	}
 
 	if query.From.IsZero() {
 		err = fmt.Errorf("need begin arg")
@@ -148,9 +150,10 @@ func queryOf(req *http.Request) (query statd.Query, err error) {
 	return
 }
 
-// uid参数支持两张形式
+// uid参数支持三种形式
 // a. http://host/path?$uid=123456, 需要admin权限
 // b. 通用的七牛鉴权
+// c. 不带uid参数, 需要admin权限
 func extractUid(req *http.Request) (uint32, error) {
 
 	auth := req.Header.Get("Authorization")
@@ -161,14 +164,17 @@ func extractUid(req *http.Request) (uint32, error) {
 
 	uid := user.Uid
 
-	if ustr := req.FormValue("$uid"); ustr != "" && user.Utype&proto.USER_TYPE_ADMIN != 0 {
-		var n uint64
-		n, err = strconv.ParseUint(ustr, 10, 31)
-		if err != nil {
-			err = fmt.Errorf("parse uid(%v) failed", ustr)
-			return 0, err
+	if user.Utype&proto.USER_TYPE_ADMIN != 0 {
+		uid = uint32(0)
+		if ustr := req.FormValue("$uid"); ustr != "" {
+			var n uint64
+			n, err = strconv.ParseUint(ustr, 10, 31)
+			if err != nil {
+				err = fmt.Errorf("parse uid(%v) failed", ustr)
+				return 0, err
+			}
+			uid = uint32(n)
 		}
-		uid = uint32(n)
 	}
 
 	return uid, err

go/src/pili.qiniu.com/statd.v4/http/http_test.go

@@ -123,6 +123,28 @@ foo:
 		ast.Equal(2, result2[0].Vals["foo"]["hit"])
 	}
 
+	{
+		cli := client.New(srv.URL, stubTransport{123, true})
+		arg := client.Args{
+			From:         start,
+			To:           start.Add(time.Minute * 5),
+			Granule:      client.G5min,
+			SelectFields: []string{"hit", "flow"},
+		}
+
+		result, err := cli.Query(xl, table, arg)
+		ast.NoError(err)
+		ast.Equal(1, len(result))
+		ast.Equal(6, result[0].Vals["hit"])
+		ast.Equal(60, result[0].Vals["flow"])
+
+		result2, err := cli.Group(xl, table, arg, "bucket")
+		ast.NoError(err)
+		ast.Equal(1, len(result2))
+		ast.Equal(3, result2[0].Vals["bar"]["hit"])
+		ast.Equal(3, result2[0].Vals["foo"]["hit"])
+	}
+
 	{
 		cli := client.New(srv.URL, stubTransport{123, false})
 		arg := client.Args{