添加强制注册http接口功能

Author: c-wind

Makefile

@@ -22,6 +22,6 @@ fmt:
 	@for path in $(SOURCE_PATH); do echo "gofmt -s -l -w $$path";  gofmt -s -l -w $$path;  done;
 
 crab: lint
-	@for path in $(SOURCE_PATH); do echo "go test ./$$path"; go test "./"$$path; done;
+	@for path in $(SOURCE_PATH); do echo "go test ./$$path"; go test "./"$$path/...; done;
 
 

http/server/handler.go

@@ -17,10 +17,6 @@ import (
 	"github.com/dearcode/crab/log"
 )
 
-var (
-	server = newHTTPServer()
-)
-
 type handlerRegexp struct {
 	keys []string
 	exp  *regexp.Regexp
@@ -46,6 +42,19 @@ type httpServer struct {
 	mu       sync.RWMutex
 }
 
+var (
+	server  = newHTTPServer()
+	keysExp *regexp.Regexp
+)
+
+func init() {
+	exp, err := regexp.Compile(`{(\w+)?}`)
+	if err != nil {
+		panic(err.Error())
+	}
+	keysExp = exp
+}
+
 func newHTTPServer() *httpServer {
 	return &httpServer{
 		path:   make(map[string]handler),
@@ -83,11 +92,26 @@ func Register(obj interface{}) error {
 	return register(obj, "", false)
 }
 
+//RegisterMust 只要struct实现了Get(),Post(),Delete(),Put()接口就可以自动注册, 如果添加失败panic.
+func RegisterMust(obj interface{}) {
+	if err := register(obj, "", false); err != nil {
+		panic(err.Error())
+	}
+
+}
+
 //RegisterPath 注册url完全匹配.
 func RegisterPath(obj interface{}, path string) error {
 	return register(obj, path, false)
 }
 
+//RegisterPathMust 注册url完全匹配，如果遇到错误panic.
+func RegisterPathMust(obj interface{}, path string) {
+	if err := register(obj, path, false); err != nil {
+		panic(err.Error())
+	}
+}
+
 //RegisterHandler 注册自定义url完全匹配.
 func RegisterHandler(call func(http.ResponseWriter, *http.Request), method, path string) error {
 	h := handler{
@@ -114,16 +138,11 @@ func RegisterPrefix(obj interface{}, path string) error {
 	return register(obj, path, true)
 }
 
-var (
-	keysExp *regexp.Regexp
-)
-
-func init() {
-	exp, err := regexp.Compile(`{(\w+)?}`)
-	if err != nil {
+//RegisterPrefixMust 注册url前缀并保证成功.
+func RegisterPrefixMust(obj interface{}, path string) {
+	if err := RegisterPrefix(obj, path); err != nil {
 		panic(err.Error())
 	}
-	keysExp = exp
 }
 
 func newHandlerRegexp(h handler) handlerRegexp {

orm/orm.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/dearcode/crab/log"
 	"github.com/dearcode/crab/meta"
-	"github.com/dearcode/crab/util"
+	"github.com/dearcode/crab/util/str"
 )
 
 //Stmt db stmt.
@@ -169,9 +169,9 @@ func (s *Stmt) SQLColumn(rt reflect.Type, table string) string {
 		case reflect.Struct:
 			if f.Tag.Get("db_table") == "one" {
 				s.table += ","
-				s.table += util.FieldEscape(f.Name)
-				bs.WriteString(s.SQLColumn(f.Type, util.FieldEscape(f.Name)))
-				field := util.FieldEscape(f.Name)
+				s.table += str.FieldEscape(f.Name)
+				bs.WriteString(s.SQLColumn(f.Type, str.FieldEscape(f.Name)))
+				field := str.FieldEscape(f.Name)
 				s.addWhere(fmt.Sprintf("%s.%s_id = %s.id", table, field, field))
 				continue
 			}
@@ -180,7 +180,7 @@ func (s *Stmt) SQLColumn(rt reflect.Type, table string) string {
 		}
 		name := f.Tag.Get("db")
 		if name == "" {
-			name = util.FieldEscape(f.Name)
+			name = str.FieldEscape(f.Name)
 		}
 		if !strings.Contains(name, ".") {
 			fmt.Fprintf(bs, "%s.", table)
@@ -216,16 +216,16 @@ func (s *Stmt) firstTable() string {
 
 // addRelation 添加多表关联条件
 func (s *Stmt) addRelation(t1, t2 string, id interface{}) *Stmt {
-	t1 = util.FieldEscape(t1)
-	t2 = util.FieldEscape(t2)
+	t1 = str.FieldEscape(t1)
+	t2 = str.FieldEscape(t2)
 	s.addWhere(fmt.Sprintf("id in (select %s_id from %s_%s_relation where %s_id=%d)", t1, t2, t1, t2, id))
 	return s
 }
 
 // addOne2More 添加一对多关联条件
 func (s *Stmt) addOne2More(t1, t2 string, id interface{}) *Stmt {
-	t1 = util.FieldEscape(t1)
-	t2 = util.FieldEscape(t2)
+	t1 = str.FieldEscape(t1)
+	t2 = str.FieldEscape(t2)
 	s.addWhere(fmt.Sprintf("%s.%s_id=%d", t1, t2, id))
 	return s
 }
@@ -325,14 +325,14 @@ func (s *Stmt) Query(result interface{}) error {
 			switch f.Tag.Get("db_table") {
 			case "more":
 				//填充一对多结果，每次去查询
-				if err = NewStmt(s.db, util.FieldEscape(f.Name)).addRelation(f.Name, s.firstTable(), id).Query(lr); err != nil {
+				if err = NewStmt(s.db, str.FieldEscape(f.Name)).addRelation(f.Name, s.firstTable(), id).Query(lr); err != nil {
 					if errors.Cause(err) != meta.ErrNotFound {
 						return errors.Trace(err)
 					}
 				}
 			case "one2more":
 				//填充一对多结果，每次去查询
-				if err = NewStmt(s.db, util.FieldEscape(f.Name)).addOne2More(f.Name, s.firstTable(), id).Query(lr); err != nil {
+				if err = NewStmt(s.db, str.FieldEscape(f.Name)).addOne2More(f.Name, s.firstTable(), id).Query(lr); err != nil {
 					if errors.Cause(err) != meta.ErrNotFound {
 						return errors.Trace(err)
 					}
@@ -398,7 +398,7 @@ func (s *Stmt) SQLInsert(rt reflect.Type, rv reflect.Value) (sql string, refs []
 		}
 		name := rt.Field(i).Tag.Get("db")
 		if name == "" {
-			name = util.FieldEscape(rt.Field(i).Name)
+			name = str.FieldEscape(rt.Field(i).Name)
 		}
 
 		bs.WriteString(name)
@@ -444,7 +444,7 @@ func (s *Stmt) SQLUpdate(rt reflect.Type, rv reflect.Value) (sql string, refs []
 
 		name := rt.Field(i).Tag.Get("db")
 		if name == "" {
-			name = util.FieldEscape(rt.Field(i).Name)
+			name = str.FieldEscape(rt.Field(i).Name)
 		}
 
 		fmt.Fprintf(bs, "`%s`=?, ", name)

project.ini

@@ -0,0 +1,14 @@
+#按F9对应Make
+Make=make
+#按F8对应Test
+Test=make test
+#按,f对应格式化
+Format=go fmt 
+#生成tags时跳过以下目录
+ExcludePath=docs,bin,Godeps,_vendor,vendor,logs
+#生成tags时跳过以下类型文件
+CtagsExcludeFile=*.cc,*.c,*.h,*.go
+#查找文件时跳过以下类型文件
+FindExcludeFile=*.cc,*.c,*.h,*_test.go
+#扩展tags目录
+#CtagsExtendFile=/usr/local/go/src

util/aes/ecb.go

@@ -0,0 +1,112 @@
+package aes
+
+import (
+	"bytes"
+	"crypto/aes"
+	"crypto/cipher"
+	"encoding/base64"
+
+	"github.com/juju/errors"
+)
+
+//Decrypt 解密.
+func Decrypt(crypted string, key []byte) ([]byte, error) {
+	raw, err := base64.StdEncoding.DecodeString(crypted)
+	if err != nil {
+		return nil, errors.Trace(err)
+	}
+
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, errors.Trace(err)
+	}
+
+	blockMode := NewECBDecrypter(block)
+	data := make([]byte, len(raw))
+	blockMode.CryptBlocks(data, raw)
+	data = pkcs5UnPadding(data)
+
+	return data, nil
+}
+
+//Encrypt 加密.
+func Encrypt(src string, key []byte) (string, error) {
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return "", err
+	}
+
+	ecb := NewECBEncrypter(block)
+	content := pkcs5Padding([]byte(src), block.BlockSize())
+	buf := make([]byte, len(content))
+	ecb.CryptBlocks(buf, content)
+
+	return base64.StdEncoding.EncodeToString(buf), nil
+}
+
+func pkcs5Padding(ciphertext []byte, blockSize int) []byte {
+	padding := blockSize - len(ciphertext)%blockSize
+	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
+	return append(ciphertext, padtext...)
+}
+
+func pkcs5UnPadding(origData []byte) []byte {
+	length := len(origData)
+	// 去掉最后一个字节 unpadding 次
+	unpadding := int(origData[length-1])
+	return origData[:(length - unpadding)]
+}
+
+type ecb struct {
+	b         cipher.Block
+	blockSize int
+}
+
+func newECB(b cipher.Block) *ecb {
+	return &ecb{
+		b:         b,
+		blockSize: b.BlockSize(),
+	}
+}
+
+type ecbEncrypter ecb
+
+// NewECBEncrypter returns a BlockMode which encrypts in electronic code book mode, using the given Block.
+func NewECBEncrypter(b cipher.Block) cipher.BlockMode {
+	return (*ecbEncrypter)(newECB(b))
+}
+func (x *ecbEncrypter) BlockSize() int { return x.blockSize }
+func (x *ecbEncrypter) CryptBlocks(dst, src []byte) {
+	if len(src)%x.blockSize != 0 {
+		panic("crypto/cipher: input not full blocks")
+	}
+	if len(dst) < len(src) {
+		panic("crypto/cipher: output smaller than input")
+	}
+	for len(src) > 0 {
+		x.b.Encrypt(dst, src[:x.blockSize])
+		src = src[x.blockSize:]
+		dst = dst[x.blockSize:]
+	}
+}
+
+type ecbDecrypter ecb
+
+// NewECBDecrypter returns a BlockMode which decrypts in electronic code book mode, using the given Block.
+func NewECBDecrypter(b cipher.Block) cipher.BlockMode {
+	return (*ecbDecrypter)(newECB(b))
+}
+func (x *ecbDecrypter) BlockSize() int { return x.blockSize }
+func (x *ecbDecrypter) CryptBlocks(dst, src []byte) {
+	if len(src)%x.blockSize != 0 {
+		panic("crypto/cipher: input not full blocks")
+	}
+	if len(dst) < len(src) {
+		panic("crypto/cipher: output smaller than input")
+	}
+	for len(src) > 0 {
+		x.b.Decrypt(dst, src[:x.blockSize])
+		src = src[x.blockSize:]
+		dst = dst[x.blockSize:]
+	}
+}

util/aes/ecb_test.go

@@ -0,0 +1,32 @@
+package aes
+
+import (
+	"testing"
+)
+
+func TestAes(t *testing.T) {
+	src := "test"
+	key := []byte("dbsjdcom\x00\x00\x00\x00\x00\x00\x00\x00")
+
+	crypted, err := Encrypt(src, key)
+	if err != nil {
+		t.Fatalf("AesEncrypt error:%s", err.Error())
+	}
+	deSrc, err := Decrypt(crypted, []byte(key))
+	if err != nil {
+		t.Fatalf("AesDecrypt error:%s", err.Error())
+	}
+	t.Logf("desc:%v", deSrc)
+}
+
+func TestDesPanic(t *testing.T) {
+	key := []byte("dbsjdcom\x00\x00\x00\x00\x00\x00\x00\x00")
+	crypted := "fDmxIdK9p3oEyQoL1Bwz4Fakia3Y4Qn1SF8podapMFU="
+	deSrc, err := Decrypt(crypted, []byte(key))
+	if err != nil {
+		t.Logf("err:%v", err)
+	}
+
+	t.Logf("%s", deSrc)
+
+}