添加更新http接口

Author: IoTServ

go.mod

@@ -3,10 +3,9 @@ module github.com/OpenIoTHub/server-go
 go 1.12
 
 require (
-	github.com/OpenIoTHub/server-grpc-api v1.0.4
+	github.com/OpenIoTHub/server-grpc-api v1.0.5
 	github.com/OpenIoTHub/utils v0.0.63
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
-	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/iotdevice/zeroconf v0.1.2 // indirect
 	github.com/klauspost/cpuid v1.3.0 // indirect
@@ -24,13 +23,11 @@ require (
 	github.com/xtaci/kcp-go/v5 v5.5.14 // indirect
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
 	golang.org/x/mod v0.3.0 // indirect
-	golang.org/x/net v0.0.0-20200625001655-4c5254603344
+	golang.org/x/net v0.0.0-20201027133719-8eef5233e2a1
 	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a // indirect
-	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
 	golang.org/x/text v0.3.3 // indirect
 	golang.org/x/tools v0.0.0-20200702044944-0cc1aa72b347 // indirect
-	google.golang.org/genproto v0.0.0-20200702021140-07506425bd67 // indirect
-	google.golang.org/grpc v1.30.0
+	google.golang.org/grpc v1.33.1
 	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/yaml.v2 v2.3.0
 )

go.sum

@@ -5,6 +5,8 @@ github.com/OpenIoTHub/getip v0.1.2 h1:xpKf37ble1H6N02XgpAGLxG5cVcp8vIIs5XaUYNi+g
 github.com/OpenIoTHub/getip v0.1.2/go.mod h1:yEnLPtVS4JBoEU720mO6FmxLwCICKLyOcOEKRD6w0cY=
 github.com/OpenIoTHub/server-grpc-api v1.0.4 h1:dVqKqdhV6VaQIZipOHqxJEpt7NfU8QvPTaDXVJd1Vog=
 github.com/OpenIoTHub/server-grpc-api v1.0.4/go.mod h1:4Tvt1MoMNqIBcVSweRZOXuqOj5JWw1HPNxd9vZv4oAI=
+github.com/OpenIoTHub/server-grpc-api v1.0.5 h1:IPoQG0V85iHcXVr03T5vPI6hfr6utv9IoHVdxTcPims=
+github.com/OpenIoTHub/server-grpc-api v1.0.5/go.mod h1:CxrYiU7h5mTStRs9IWYNu8NRNqCNc0ojIV0ab2i/7bY=
 github.com/OpenIoTHub/utils v0.0.61 h1:CSe8mcGq8NX8xBtTzvjkcpczrFxUrlByUE5AWnnp+zw=
 github.com/OpenIoTHub/utils v0.0.61/go.mod h1:i0gwARUWZV6mtb5uREHNGzlPOjQxU282ztsJM9dQjaA=
 github.com/OpenIoTHub/utils v0.0.62 h1:N2xh9OvUD0UcEnr3LXQY2TnC0OLVZZDGhjZ+Zs6Lp+4=
@@ -43,6 +45,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
@@ -54,6 +58,7 @@ github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grandcat/zeroconf v1.0.0 h1:uHhahLBKqwWBV6WZUDAT71044vwOTL+McW0mBJvo6kE=
 github.com/grandcat/zeroconf v1.0.0/go.mod h1:lTKmG1zh86XyCoUeIHSA4FJMBwCJiQmGfcP2PdzytEs=
 github.com/iotdevice/zeroconf v0.0.0-20190424104450-85eadb44205c/go.mod h1:38eciZlYiQcW1WL0g+Pl0FwD0Md2v39yWyT2MA4Z2ag=
@@ -168,6 +173,8 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201027133719-8eef5233e2a1 h1:IEhJ99VWSYpHIxjlbu3DQyHegGPnQYAv0IaCX9KHyG0=
+golang.org/x/net v0.0.0-20201027133719-8eef5233e2a1/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -186,6 +193,9 @@ golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201027130517-9d1ec526b7bf h1:HmHgHRpqpvB74D7bjXkue6kkHJfOrKyYJtW6Sv4jpI4=
+golang.org/x/sys v0.0.0-20201027130517-9d1ec526b7bf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -216,6 +226,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20200702021140-07506425bd67 h1:4BC1C1i30F3MZeiIO6y6IIo4DxrtOwITK87bQl3lhFA=
 google.golang.org/genproto v0.0.0-20200702021140-07506425bd67/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201026171402-d4b8fe4fd877 h1:d4k3uIU763E31Rk4UZPA47oOoBymMsDImV3U4mGhX9E=
+google.golang.org/genproto v0.0.0-20201026171402-d4b8fe4fd877/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
@@ -224,6 +236,8 @@ google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.30.0 h1:M5a8xTlYTxwMn5ZFkwhRabsygDY5G8TYLyQDBxJNAxE=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1 h1:DGeFlSan2f+WEtCERJ4J9GJWk15TxUi8QGagfI87Xyc=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

session/SessionsManager.go

@@ -3,6 +3,7 @@ package session
 import (
 	"errors"
 	"github.com/OpenIoTHub/server-go/config"
+	"github.com/OpenIoTHub/server-grpc-api/pb-go"
 	"github.com/OpenIoTHub/utils/io"
 	"github.com/OpenIoTHub/utils/models"
 	"github.com/OpenIoTHub/utils/msg"
@@ -17,6 +18,7 @@ type SessionsManager struct {
 	Session      map[string]*Session
 	HttpProxyMap map[string]*HttpProxy
 	RedisPool    *redis.Pool
+	pb.UnimplementedHttpManagerServer
 }
 
 var SessionsCtl SessionsManager

session/grpc.go

@@ -0,0 +1,105 @@
+package session
+
+import (
+	"context"
+	"github.com/OpenIoTHub/server-grpc-api/pb-go"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+//grpc
+func (sm *SessionsManager) CreateOneHTTP(ctx context.Context, in *pb.HTTPConfig) (*pb.HTTPConfig, error) {
+	err := authOpenIoTHubGrpc(ctx, in.RunId)
+	if err != nil {
+		return in, status.Errorf(codes.Unauthenticated, err.Error())
+	}
+
+	return in, sm.AddHttpProxy(&HttpProxy{
+		Domain:      in.Domain,
+		RunId:       in.RunId,
+		RemoteIP:    in.RemoteIP,
+		RemotePort:  int(in.RemotePort),
+		UserName:    in.UserName,
+		Password:    in.Password,
+		IfHttps:     in.IfHttps,
+		Description: in.Description,
+	})
+}
+
+func (sm *SessionsManager) UpdateOneHTTP(ctx context.Context, in *pb.HTTPConfig) (*pb.HTTPConfig, error) {
+	err := authOpenIoTHubGrpc(ctx, in.RunId)
+	if err != nil {
+		return in, status.Errorf(codes.Unauthenticated, err.Error())
+	}
+	h := &HttpProxy{
+		Domain:      in.Domain,
+		RunId:       in.RunId,
+		RemoteIP:    in.RemoteIP,
+		RemotePort:  int(in.RemotePort),
+		UserName:    in.UserName,
+		Password:    in.Password,
+		IfHttps:     in.IfHttps,
+		Description: in.Description,
+	}
+	sm.DelHttpProxy(h.Domain)
+	return in, sm.AddHttpProxy(h)
+}
+
+func (sm *SessionsManager) DeleteOneHTTP(ctx context.Context, in *pb.HTTPConfig) (*pb.Empty, error) {
+	err := authOpenIoTHubGrpc(ctx, in.RunId)
+	if err != nil {
+		return &pb.Empty{}, status.Errorf(codes.Unauthenticated, err.Error())
+	}
+	//TODO 验证要删除的域名的所属id是否和token的id一致
+	sm.DelHttpProxy(in.Domain)
+	return &pb.Empty{}, nil
+
+}
+
+func (sm *SessionsManager) GetOneHTTP(ctx context.Context, in *pb.HTTPConfig) (*pb.HTTPConfig, error) {
+	err := authOpenIoTHubGrpc(ctx, in.RunId)
+	if err != nil {
+		return in, status.Errorf(codes.Unauthenticated, err.Error())
+	}
+	config, err := sm.GetOneHttpProxy(in.Domain)
+	if err != nil {
+		return &pb.HTTPConfig{}, err
+	}
+	return &pb.HTTPConfig{
+		Domain:           config.Domain,
+		RunId:            config.RunId,
+		RemoteIP:         config.RemoteIP,
+		RemotePort:       int32(config.RemotePort),
+		UserName:         config.UserName,
+		Password:         config.Password,
+		IfHttps:          config.IfHttps,
+		Description:      config.Description,
+		RemotePortStatus: config.RemotePortStatus,
+	}, err
+}
+
+func (sm *SessionsManager) GetAllHTTP(ctx context.Context, in *pb.Device) (*pb.HTTPList, error) {
+	var cfgs []*pb.HTTPConfig
+	err := authOpenIoTHubGrpc(ctx, in.RunId)
+	if err != nil {
+		return &pb.HTTPList{HTTPConfigs: cfgs}, status.Errorf(codes.Unauthenticated, err.Error())
+	}
+	for _, config := range sm.GetAllHttpProxy() {
+		if config.RunId == in.RunId && config.RemoteIP == in.Addr {
+			cfgs = append(cfgs, &pb.HTTPConfig{
+				Domain:           config.Domain,
+				RunId:            config.RunId,
+				RemoteIP:         config.RemoteIP,
+				RemotePort:       int32(config.RemotePort),
+				UserName:         config.UserName,
+				Password:         config.Password,
+				IfHttps:          config.IfHttps,
+				Description:      config.Description,
+				RemotePortStatus: config.RemotePortStatus,
+			})
+		}
+	}
+	return &pb.HTTPList{HTTPConfigs: cfgs}, nil
+}
+
+//grpc end

session/httpProxy.go

@@ -1,14 +1,10 @@
 package session
 
 import (
-	"context"
 	"fmt"
-	"github.com/OpenIoTHub/server-grpc-api/pb-go"
 	"github.com/OpenIoTHub/utils/io"
 	"github.com/libp2p/go-yamux"
 	"golang.org/x/net/websocket"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 	"log"
 	"net"
 	"net/http"
@@ -41,83 +37,6 @@ func (hp *HttpProxy) UpdateRemotePortStatus() {
 	hp.RemotePortStatus = online
 }
 
-//grpc
-func (sm *SessionsManager) CreateOneHTTP(ctx context.Context, in *pb.HTTPConfig) (*pb.HTTPConfig, error) {
-	err := authOpenIoTHubGrpc(ctx, in.RunId)
-	if err != nil {
-		return in, status.Errorf(codes.Unauthenticated, err.Error())
-	}
-
-	return in, sm.AddHttpProxy(&HttpProxy{
-		Domain:      in.Domain,
-		RunId:       in.RunId,
-		RemoteIP:    in.RemoteIP,
-		RemotePort:  int(in.RemotePort),
-		UserName:    in.UserName,
-		Password:    in.Password,
-		IfHttps:     in.IfHttps,
-		Description: in.Description,
-	})
-}
-
-func (sm *SessionsManager) DeleteOneHTTP(ctx context.Context, in *pb.HTTPConfig) (*pb.Empty, error) {
-	err := authOpenIoTHubGrpc(ctx, in.RunId)
-	if err != nil {
-		return &pb.Empty{}, status.Errorf(codes.Unauthenticated, err.Error())
-	}
-	sm.DelHttpProxy(in.Domain)
-	return &pb.Empty{}, nil
-
-}
-
-func (sm *SessionsManager) GetOneHTTP(ctx context.Context, in *pb.HTTPConfig) (*pb.HTTPConfig, error) {
-	err := authOpenIoTHubGrpc(ctx, in.RunId)
-	if err != nil {
-		return in, status.Errorf(codes.Unauthenticated, err.Error())
-	}
-	config, err := sm.GetOneHttpProxy(in.Domain)
-	if err != nil {
-		return &pb.HTTPConfig{}, err
-	}
-	return &pb.HTTPConfig{
-		Domain:           config.Domain,
-		RunId:            config.RunId,
-		RemoteIP:         config.RemoteIP,
-		RemotePort:       int32(config.RemotePort),
-		UserName:         config.UserName,
-		Password:         config.Password,
-		IfHttps:          config.IfHttps,
-		Description:      config.Description,
-		RemotePortStatus: config.RemotePortStatus,
-	}, err
-}
-
-func (sm *SessionsManager) GetAllHTTP(ctx context.Context, in *pb.Device) (*pb.HTTPList, error) {
-	var cfgs []*pb.HTTPConfig
-	err := authOpenIoTHubGrpc(ctx, in.RunId)
-	if err != nil {
-		return &pb.HTTPList{HTTPConfigs: cfgs}, status.Errorf(codes.Unauthenticated, err.Error())
-	}
-	for _, config := range sm.GetAllHttpProxy() {
-		if config.RunId == in.RunId && config.RemoteIP == in.Addr {
-			cfgs = append(cfgs, &pb.HTTPConfig{
-				Domain:           config.Domain,
-				RunId:            config.RunId,
-				RemoteIP:         config.RemoteIP,
-				RemotePort:       int32(config.RemotePort),
-				UserName:         config.UserName,
-				Password:         config.Password,
-				IfHttps:          config.IfHttps,
-				Description:      config.Description,
-				RemotePortStatus: config.RemotePortStatus,
-			})
-		}
-	}
-	return &pb.HTTPList{HTTPConfigs: cfgs}, nil
-}
-
-//grpc end
-
 //监听服务
 //type Handle struct{}