移除qiniu/x依赖， authorization -> credentials

Author: tonycai653

Makefile

@@ -4,8 +4,10 @@ test:
 	go test -v ./cdn/...
 	go test -v ./storage/...
 	go test -v ./rtc/...
+	go test -v ./internal/...
 
 
 unittest:
 	go test -v ./auth/...
 	go test -v ./conf/...
+	go test -v ./internal/...

auth/context.go

@@ -0,0 +1,23 @@
+package auth
+
+import (
+	"context"
+)
+
+// MacContextKey 是用户的密钥信息
+// context.Context中的键值不应该使用普通的字符串， 有可能导致命名冲突
+type macContextKey struct{}
+
+// WithCredentials 返回一个包含密钥信息的context
+func WithCredentials(ctx context.Context, cred *Credentials) context.Context {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	return context.WithValue(ctx, macContextKey{}, cred)
+}
+
+// CredentialsFromContext 从context获取密钥信息
+func CredentialsFromContext(ctx context.Context) (cred *Credentials, ok bool) {
+	cred, ok = ctx.Value(macContextKey{}).(*Credentials)
+	return
+}

auth/authorization.go renamed to auth/credentials.go

@@ -1,14 +1,16 @@
 package auth
 
 import (
+	"bytes"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/base64"
 	"fmt"
+	"io/ioutil"
 	"net/http"
 
+	"github.com/qiniu/api.v7"
 	"github.com/qiniu/api.v7/conf"
-	"github.com/qiniu/x/bytes.v7/seekable"
 )
 
 //  七牛鉴权类，用于生成Qbox, Qiniu, Upload签名
@@ -50,12 +52,13 @@ func collectData(req *http.Request) (data []byte, err error) {
 
 	data = []byte(s)
 	if incBody(req) {
-		s2, err2 := seekable.New(req)
-		if err2 != nil {
-			err = err2
+		s2, rErr := api.BytesFromRequest(req)
+		if rErr != nil {
+			err = rErr
 			return
 		}
-		data = append(data, s2.Bytes()...)
+		req.Body = ioutil.NopCloser(bytes.NewReader(s2))
+		data = append(data, s2...)
 	}
 	return
 }
@@ -85,12 +88,13 @@ func collectDataV2(req *http.Request) (data []byte, err error) {
 	data = []byte(s)
 	//write body
 	if incBodyV2(req) {
-		s2, err2 := seekable.New(req)
-		if err2 != nil {
-			err = err2
+		s2, rErr := api.BytesFromRequest(req)
+		if rErr != nil {
+			err = rErr
 			return
 		}
-		data = append(data, s2.Bytes()...)
+		req.Body = ioutil.NopCloser(bytes.NewReader(s2))
+		data = append(data, s2...)
 	}
 	return
 }

auth/authorization_test.go renamed to auth/credentials_test.go

@@ -1,23 +1,20 @@
 package client
 
-// The original library rpc.v7 logic in github.com/qiniu/x has its own bugs
-// under the concurrent http calls, we make a fork of the library and fix
-// the bug
 import (
-	//	"bufio"
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/qiniu/api.v7/auth"
-	"github.com/qiniu/api.v7/conf"
-	"github.com/qiniu/x/reqid.v7"
-	. "golang.org/x/net/context"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"runtime"
 	"strings"
+
+	"github.com/qiniu/api.v7/auth"
+	"github.com/qiniu/api.v7/conf"
+	"github.com/qiniu/api.v7/reqid"
 )
 
 var UserAgent = "Golang qiniu/client package"
@@ -38,7 +35,7 @@ func SetAppName(userApp string) error {
 
 // --------------------------------------------------------------------
 
-func newRequest(ctx Context, method, reqUrl string, headers http.Header, body io.Reader) (req *http.Request, err error) {
+func newRequest(ctx context.Context, method, reqUrl string, headers http.Header, body io.Reader) (req *http.Request, err error) {
 	req, err = http.NewRequest(method, reqUrl, body)
 	if err != nil {
 		return
@@ -51,7 +48,7 @@ func newRequest(ctx Context, method, reqUrl string, headers http.Header, body io
 	req.Header = headers
 
 	//check access token
-	mac, ok := ctx.Value("mac").(*auth.Credentials)
+	mac, ok := auth.CredentialsFromContext(ctx)
 	if ok {
 		token, signErr := mac.SignRequest(req)
 		if signErr != nil {
@@ -64,15 +61,15 @@ func newRequest(ctx Context, method, reqUrl string, headers http.Header, body io
 	return
 }
 
-func (r Client) DoRequest(ctx Context, method, reqUrl string, headers http.Header) (resp *http.Response, err error) {
+func (r Client) DoRequest(ctx context.Context, method, reqUrl string, headers http.Header) (resp *http.Response, err error) {
 	req, err := newRequest(ctx, method, reqUrl, headers, nil)
 	if err != nil {
 		return
 	}
 	return r.Do(ctx, req)
 }
 
-func (r Client) DoRequestWith(ctx Context, method, reqUrl string, headers http.Header, body io.Reader,
+func (r Client) DoRequestWith(ctx context.Context, method, reqUrl string, headers http.Header, body io.Reader,
 	bodyLength int) (resp *http.Response, err error) {
 
 	req, err := newRequest(ctx, method, reqUrl, headers, body)
@@ -83,7 +80,7 @@ func (r Client) DoRequestWith(ctx Context, method, reqUrl string, headers http.H
 	return r.Do(ctx, req)
 }
 
-func (r Client) DoRequestWith64(ctx Context, method, reqUrl string, headers http.Header, body io.Reader,
+func (r Client) DoRequestWith64(ctx context.Context, method, reqUrl string, headers http.Header, body io.Reader,
 	bodyLength int64) (resp *http.Response, err error) {
 
 	req, err := newRequest(ctx, method, reqUrl, headers, body)
@@ -94,7 +91,7 @@ func (r Client) DoRequestWith64(ctx Context, method, reqUrl string, headers http
 	return r.Do(ctx, req)
 }
 
-func (r Client) DoRequestWithForm(ctx Context, method, reqUrl string, headers http.Header,
+func (r Client) DoRequestWithForm(ctx context.Context, method, reqUrl string, headers http.Header,
 	data map[string][]string) (resp *http.Response, err error) {
 
 	if headers == nil {
@@ -115,7 +112,7 @@ func (r Client) DoRequestWithForm(ctx Context, method, reqUrl string, headers ht
 	return r.DoRequestWith(ctx, method, reqUrl, headers, strings.NewReader(requestData), len(requestData))
 }
 
-func (r Client) DoRequestWithJson(ctx Context, method, reqUrl string, headers http.Header,
+func (r Client) DoRequestWithJson(ctx context.Context, method, reqUrl string, headers http.Header,
 	data interface{}) (resp *http.Response, err error) {
 
 	reqBody, err := json.Marshal(data)
@@ -130,13 +127,13 @@ func (r Client) DoRequestWithJson(ctx Context, method, reqUrl string, headers ht
 	return r.DoRequestWith(ctx, method, reqUrl, headers, bytes.NewReader(reqBody), len(reqBody))
 }
 
-func (r Client) Do(ctx Context, req *http.Request) (resp *http.Response, err error) {
+func (r Client) Do(ctx context.Context, req *http.Request) (resp *http.Response, err error) {
 
 	if ctx == nil {
-		ctx = Background()
+		ctx = context.Background()
 	}
 
-	if reqId, ok := reqid.FromContext(ctx); ok {
+	if reqId, ok := reqid.ReqidFromContext(ctx); ok {
 		req.Header.Set("X-Reqid", reqId)
 	}
 
@@ -248,7 +245,7 @@ func ResponseError(resp *http.Response) (err error) {
 	return e
 }
 
-func CallRet(ctx Context, ret interface{}, resp *http.Response) (err error) {
+func CallRet(ctx context.Context, ret interface{}, resp *http.Response) (err error) {
 
 	defer func() {
 		io.Copy(ioutil.Discard, resp.Body)
@@ -269,7 +266,7 @@ func CallRet(ctx Context, ret interface{}, resp *http.Response) (err error) {
 	return ResponseError(resp)
 }
 
-func (r Client) CallWithForm(ctx Context, ret interface{}, method, reqUrl string, headers http.Header,
+func (r Client) CallWithForm(ctx context.Context, ret interface{}, method, reqUrl string, headers http.Header,
 	param map[string][]string) (err error) {
 
 	resp, err := r.DoRequestWithForm(ctx, method, reqUrl, headers, param)
@@ -279,7 +276,7 @@ func (r Client) CallWithForm(ctx Context, ret interface{}, method, reqUrl string
 	return CallRet(ctx, ret, resp)
 }
 
-func (r Client) CallWithJson(ctx Context, ret interface{}, method, reqUrl string, headers http.Header,
+func (r Client) CallWithJson(ctx context.Context, ret interface{}, method, reqUrl string, headers http.Header,
 	param interface{}) (err error) {
 
 	resp, err := r.DoRequestWithJson(ctx, method, reqUrl, headers, param)
@@ -289,7 +286,7 @@ func (r Client) CallWithJson(ctx Context, ret interface{}, method, reqUrl string
 	return CallRet(ctx, ret, resp)
 }
 
-func (r Client) CallWith(ctx Context, ret interface{}, method, reqUrl string, headers http.Header, body io.Reader,
+func (r Client) CallWith(ctx context.Context, ret interface{}, method, reqUrl string, headers http.Header, body io.Reader,
 	bodyLength int) (err error) {
 
 	resp, err := r.DoRequestWith(ctx, method, reqUrl, headers, body, bodyLength)
@@ -299,7 +296,7 @@ func (r Client) CallWith(ctx Context, ret interface{}, method, reqUrl string, he
 	return CallRet(ctx, ret, resp)
 }
 
-func (r Client) CallWith64(ctx Context, ret interface{}, method, reqUrl string, headers http.Header, body io.Reader,
+func (r Client) CallWith64(ctx context.Context, ret interface{}, method, reqUrl string, headers http.Header, body io.Reader,
 	bodyLength int64) (err error) {
 
 	resp, err := r.DoRequestWith64(ctx, method, reqUrl, headers, body, bodyLength)
@@ -309,7 +306,7 @@ func (r Client) CallWith64(ctx Context, ret interface{}, method, reqUrl string,
 	return CallRet(ctx, ret, resp)
 }
 
-func (r Client) Call(ctx Context, ret interface{}, method, reqUrl string, headers http.Header) (err error) {
+func (r Client) Call(ctx context.Context, ret interface{}, method, reqUrl string, headers http.Header) (err error) {
 
 	resp, err := r.DoRequestWith(ctx, method, reqUrl, headers, nil, 0)
 	if err != nil {

client/client.go

@@ -0,0 +1,8 @@
+module github.com/qiniu/api.v7
+
+require (
+	github.com/qiniu/x v7.0.8+incompatible
+	github.com/stretchr/testify v1.3.0 // indirect
+	golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95 // indirect
+	qiniupkg.com/x v7.0.8+incompatible // indirect
+)

go.mod

@@ -0,0 +1,13 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/qiniu/x v7.0.8+incompatible h1:P4LASsfwJY7SoZ13dwqBwGhZh7HKU8cdFVCUkmz0gZ8=
+github.com/qiniu/x v7.0.8+incompatible/go.mod h1:KpRKWYG/GaidPQVpoQ2Cvuvtts3gYnoo2PftgdmAiU4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95 h1:fY7Dsw114eJN4boqzVSbpVHO6rTdhq6/GnXeu+PKnzU=
+golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+qiniupkg.com/x v7.0.8+incompatible h1:Ek0ZVi5IyaWUAFkJbPRiqlh34xDM4uoKw7KqdpankvU=
+qiniupkg.com/x v7.0.8+incompatible/go.mod h1:6sLxR5IZ03vMaRAQAY/5MvzofeoBIjO4XE0Njv6V1ms=

go.sum

@@ -0,0 +1,72 @@
+// Package log只是SDK本身自己使用，用来调试代码使用，比如输出HTTP请求和响应信息
+package log
+
+import (
+	"io"
+	"log"
+	"os"
+)
+
+type Logger struct {
+	*log.Logger
+	level LogLevel
+}
+
+// New 返回一个Logger 指针
+func New(out io.Writer, prefix string, flag int, level LogLevel) *Logger {
+	return &Logger{
+		Logger: log.New(out, prefix, flag),
+		level:  level,
+	}
+}
+
+var std = New(os.Stdout, InfoPrefix, log.LstdFlags, LogInfo)
+
+type LogLevel int
+
+const (
+	// LogDebug 调试模式
+	LogDebug LogLevel = iota
+
+	// Info
+	LogInfo
+
+	// Warn
+	LogWarn
+)
+
+const (
+	InfoPrefix  = "[I] "
+	DebugPrefix = "[D] "
+	WarnPrefix  = "[W] "
+)
+
+func (l *Logger) Info(v ...interface{}) {
+	l.output(LogInfo, v...)
+}
+
+func (l *Logger) output(level LogLevel, v ...interface{}) {
+	if l.level <= level {
+		l.Logger.Println(v...)
+	}
+}
+
+func (l *Logger) Debug(v ...interface{}) {
+	l.output(LogDebug, v...)
+}
+
+func (l *Logger) Warn(v ...interface{}) {
+	l.output(LogWarn, v...)
+}
+
+func Info(v ...interface{}) {
+	std.Info(v...)
+}
+
+func Debug(v ...interface{}) {
+	std.Debug(v...)
+}
+
+func Warn(v ...interface{}) {
+	std.Warn(v...)
+}

internal/log/logger.go

@@ -0,0 +1,20 @@
+package log
+
+import (
+	"bytes"
+	"log"
+	"strings"
+	"testing"
+)
+
+func TestLogger(t *testing.T) {
+	b := bytes.Buffer{}
+	logger := New(&b, InfoPrefix, log.LstdFlags, LogInfo)
+
+	logger.Info("hello world")
+
+	splits := strings.Split(b.String(), " ")
+	if splits[0] != strings.Trim(InfoPrefix, " ") {
+		t.Errorf("got prefix: %q, want: %q\n", splits[0], InfoPrefix)
+	}
+}

internal/log/logger_test.go

@@ -0,0 +1,20 @@
+package reqid
+
+import (
+	"context"
+)
+
+type reqidKey struct{}
+
+// WithReqid 把reqid加入context中
+func WithReqid(ctx context.Context, reqid string) context.Context {
+	return context.WithValue(ctx, reqidKey{}, reqid)
+}
+
+// ReqidFromContext 从context中获取reqid
+func ReqidFromContext(ctx context.Context) (reqid string, ok bool) {
+	reqid, ok = ctx.Value(reqidKey{}).(string)
+	return
+}
+
+// --------------------------------------------------------------------