update

Author: chenjie199234

cgrpc/context.go

@@ -7,7 +7,7 @@ import (
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
-func (s *CGrpcServer) getcontext(c context.Context, path string, peername string, peeraddr string, metadata map[string]string, handlers []OutsideHandler, d func(interface{}) error) *Context {
+func (s *CGrpcServer) getcontext(c context.Context, path string, peername string, remoteaddr string, metadata map[string]string, handlers []OutsideHandler, d func(interface{}) error) *Context {
 	ctx, ok := s.ctxpool.Get().(*Context)
 	if !ok {
 		ctx = &Context{
@@ -16,7 +16,7 @@ func (s *CGrpcServer) getcontext(c context.Context, path string, peername string
 			handlers:   handlers,
 			path:       path,
 			peername:   peername,
-			peeraddr:   peeraddr,
+			remoteaddr: remoteaddr,
 			metadata:   metadata,
 			resp:       nil,
 			e:          nil,
@@ -32,7 +32,7 @@ func (s *CGrpcServer) getcontext(c context.Context, path string, peername string
 	ctx.handlers = handlers
 	ctx.path = path
 	ctx.peername = peername
-	ctx.peeraddr = peeraddr
+	ctx.remoteaddr = remoteaddr
 	if metadata != nil {
 		ctx.metadata = metadata
 	}
@@ -54,7 +54,7 @@ type Context struct {
 	handlers   []OutsideHandler
 	path       string
 	peername   string
-	peeraddr   string
+	remoteaddr string
 	metadata   map[string]string
 	resp       interface{}
 	e          *cerror.Error
@@ -96,8 +96,17 @@ func (c *Context) GetPath() string {
 func (c *Context) GetPeerName() string {
 	return c.peername
 }
-func (c *Context) GetPeerAddr() string {
-	return c.peeraddr
+
+//get the direct peer's addr(maybe a proxy)
+func (c *Context) GetRemoteAddr() string {
+	return c.remoteaddr
+}
+
+//this function try to return the first caller's ip(mostly time it will be the user's ip)
+//if can't get the first caller's ip,try to return the real peer's ip which will not be confused by proxy
+//if failed,the direct peer's ip will be returned(maybe a proxy)
+func (c *Context) GetClientIp() string {
+	return c.metadata["Client-IP"]
 }
 func (c *Context) GetMetadata() map[string]string {
 	return c.metadata

cgrpc/server.go

@@ -202,6 +202,7 @@ func (s *CGrpcServer) insidehandler(sname, mname string, handlers ...OutsideHand
 		atomic.AddInt32(&s.totalreqnum, 1)
 		defer atomic.AddInt32(&s.totalreqnum, -1)
 		conninfo := ctx.Value(serverconnkey{}).(*stats.ConnTagInfo)
+		remoteaddr := conninfo.RemoteAddr.String()
 		localaddr := conninfo.LocalAddr.String()
 		traceid := ""
 		sourceip := ""
@@ -213,7 +214,6 @@ func (s *CGrpcServer) insidehandler(sname, mname string, handlers ...OutsideHand
 			}
 		}
 		if sourceip == "" {
-			remoteaddr := conninfo.RemoteAddr.String()
 			sourceip = remoteaddr[:strings.LastIndex(remoteaddr, ":")]
 		}
 		sourceapp := "unknown"
@@ -263,7 +263,10 @@ func (s *CGrpcServer) insidehandler(sname, mname string, handlers ...OutsideHand
 			monitor.GrpcServerMonitor(sourceapp, "GRPC", path, e, uint64(end.UnixNano()-start.UnixNano()))
 			return
 		}
-		workctx := s.getcontext(ctx, path, sourceapp, sourceip, mdata, totalhandlers, decode)
+		workctx := s.getcontext(ctx, path, sourceapp, remoteaddr, mdata, totalhandlers, decode)
+		if _, ok := workctx.metadata["Client-IP"]; !ok {
+			workctx.metadata["Client-IP"] = sourceip
+		}
 		defer func() {
 			if e := recover(); e != nil {
 				stack := make([]byte, 1024)

codegen/main.go

@@ -31,6 +31,7 @@ import (
 	"github.com/chenjie199234/Corelib/codegen/tml/service"
 	servicestatus "github.com/chenjie199234/Corelib/codegen/tml/service/status"
 	subservice "github.com/chenjie199234/Corelib/codegen/tml/service/sub"
+	"github.com/chenjie199234/Corelib/codegen/tml/util"
 	cname "github.com/chenjie199234/Corelib/util/name"
 )
 
@@ -217,6 +218,9 @@ func createBaseProject() {
 	model.CreatePathAndFile()
 	model.Execute()
 
+	util.CreatePathAndFile()
+	util.Execute()
+
 	xcrpc.CreatePathAndFile()
 	xcrpc.Execute(*packagename)
 

codegen/tml/util/util.go

@@ -0,0 +1,38 @@
+package util
+
+import (
+	"fmt"
+	"os"
+	"text/template"
+)
+
+const text = `package util`
+
+const path = "./util/"
+const name = "util.go"
+
+var tml *template.Template
+var file *os.File
+
+func init() {
+	var e error
+	tml, e = template.New("util").Parse(text)
+	if e != nil {
+		panic(fmt.Sprintf("create template error:%s", e))
+	}
+}
+func CreatePathAndFile() {
+	var e error
+	if e = os.MkdirAll(path, 0755); e != nil {
+		panic(fmt.Sprintf("make dir:%s error:%s", path, e))
+	}
+	file, e = os.OpenFile(path+name, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
+	if e != nil {
+		panic(fmt.Sprintf("make file:%s error:%s", path+name, e))
+	}
+}
+func Execute() {
+	if e := tml.Execute(file, nil); e != nil {
+		panic(fmt.Sprintf("write content into file:%s error:%s", path+name, e))
+	}
+}

crpc/context.go

@@ -98,15 +98,17 @@ func (c *Context) GetPath() string {
 func (c *Context) GetBody() []byte {
 	return c.msg.Body
 }
+
+//get the direct peer's addr(maybe a proxy)
 func (c *Context) GetRemoteAddr() string {
 	return c.peer.GetRemoteAddr()
 }
 
-//this is only useful for crpc server
-//when the client connection is based on websocket and there is a load balancer before it like nginx
-//then the realPeerIP may different from the remoteaddr
-func (c *Context) GetRealPeerIP() string {
-	return c.peer.GetRealPeerIp()
+//this function try to return the first caller's ip(mostly time it will be the user's ip)
+//if can't get the first caller's ip,try to return the real peer's ip which will not be confused by proxy
+//if failed,the direct peer's ip will be returned(maybe a proxy)
+func (c *Context) GetClientIp() string {
+	return c.metadata["Client-IP"]
 }
 func (c *Context) GetPeerMaxMsgLen() uint32 {
 	return c.peer.GetPeerMaxMsgLen()

crpc/server.go

@@ -257,6 +257,9 @@ func (s *CrpcServer) insidehandler(path string, handlers ...OutsideHandler) func
 		}
 		//logic
 		workctx := s.getContext(ctx, p, msg, totalhandlers)
+		if _, ok := workctx.metadata["Client-IP"]; !ok {
+			workctx.metadata["Client-IP"] = sourceip
+		}
 		defer func() {
 			if e := recover(); e != nil {
 				stack := make([]byte, 1024)

web/context.go

@@ -137,12 +137,19 @@ func (c *Context) GetHeader(key string) string {
 func (c *Context) GetPeerName() string {
 	return c.peername
 }
-func (c *Context) GetPeerAddr() string {
+
+//get the direct peer's addr(maybe a proxy)
+func (c *Context) GetRemoteAddr() string {
 	return c.r.RemoteAddr
 }
+
+//this function try to return the first caller's ip(mostly time it will be the user's ip)
+//if can't get the first caller's ip,try to return the real peer's ip which will not be confused by proxy
+//if failed,the direct peer's ip will be returned(maybe a proxy)
 func (c *Context) GetClientIp() string {
-	return getclientip(c.r)
+	return c.metadata["Client-IP"]
 }
+
 func getclientip(r *http.Request) string {
 	ip := strings.TrimSpace(r.Header.Get("X-Forwarded-For"))
 	if ip != "" {

web/protoc-gen-go-web/README.md

@@ -1,7 +1,7 @@
 # protoc-gen-go-web
 
 ## Description
-	protoc-gen-go-web是一个基于proto文件生成http框架的桩代码的工具
+	protoc-gen-go-web是一个基于proto文件生成web框架的桩代码的工具
 	所有的接口定义都使用一套proto文件,清晰明了,规范化接口管理
 
 ## Installation

web/server.go

@@ -615,6 +615,9 @@ func (s *WebServer) insideHandler(method, path string, handlers []OutsideHandler
 		}
 		//logic
 		workctx := s.getContext(w, r, ctx, sourceapp, mdata, totalhandlers)
+		if _, ok := workctx.metadata["Client-IP"]; !ok {
+			workctx.metadata["Client-IP"] = sourceip
+		}
 		defer func() {
 			if e := recover(); e != nil {
 				stack := make([]byte, 1024)