refactor: rename api directory

.dockerignore

@@ -1,3 +1,2 @@
 # directories
 !/.git
-!/api

Makefile

@@ -42,6 +42,14 @@ container:
 bench: container
 	make bench -C test/bench
 
+.PHONY: frontier-gen-api
+frontier-gen-api:
+	docker buildx build -t frontier-gen-api:${VERSION} -f images/Dockerfile.controlplane-api .
+
+.PHONY: api
+api:
+	docker run --rm -v ${PWD}/api/controlplane/v1:/api/controlplane/v1 frontier-gen-api:${VERSION}
+
 .PHONY: output
 output: build
 

examples/iclm/edge/edge.go

@@ -13,7 +13,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/singchia/frontier/api/v1/edge"
+	"github.com/singchia/frontier/api/dataplane/v1/edge"
 	"github.com/spf13/pflag"
 
 	armlog "github.com/jumboframes/armorigo/log"

examples/iclm/service/service.go

@@ -19,7 +19,7 @@ import (
 	"time"
 
 	armlog "github.com/jumboframes/armorigo/log"
-	"github.com/singchia/frontier/api/v1/service"
+	"github.com/singchia/frontier/api/dataplane/v1/service"
 	"github.com/singchia/geminio"
 	"github.com/spf13/pflag"
 )

go.mod

@@ -5,12 +5,16 @@ go 1.20
 replace github.com/singchia/geminio => ../../moresec/singchia/geminio
 
 require (
+	github.com/go-kratos/kratos/v2 v2.7.2
 	github.com/gorilla/mux v1.8.1
 	github.com/jumboframes/armorigo v0.4.0-rc.1
 	github.com/singchia/geminio v1.1.5-rc.1
 	github.com/singchia/go-timer/v2 v2.2.1
 	github.com/soheilhy/cmux v0.1.5
 	github.com/spf13/pflag v1.0.5
+	google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8
+	google.golang.org/grpc v1.62.1
+	google.golang.org/protobuf v1.33.0
 	gopkg.in/yaml.v2 v2.4.0
 	gorm.io/driver/sqlite v1.5.4
 	gorm.io/gorm v1.25.5
@@ -18,11 +22,19 @@ require (
 )
 
 require (
+	github.com/go-kratos/aegis v0.2.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-playground/form/v4 v4.2.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/singchia/yafsm v1.0.1 // indirect
-	golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb // indirect
-	golang.org/x/text v0.3.3 // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,9 +1,25 @@
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-kratos/aegis v0.2.0 h1:dObzCDWn3XVjUkgxyBp6ZeWtx/do0DPZ7LY3yNSJLUQ=
+github.com/go-kratos/aegis v0.2.0/go.mod h1:v0R2m73WgEEYB3XYu6aE2WcMwsZkJ/Rzuf5eVccm7bI=
+github.com/go-kratos/kratos/v2 v2.7.2 h1:WVPGFNLKpv+0odMnCPxM4ZHa2hy9I5FOnwpG3Vv4w5c=
+github.com/go-kratos/kratos/v2 v2.7.2/go.mod h1:rppuc8+pGL2UtXA29bgFHWKqaaF6b6GB2XIYiDvFBRk=
 github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
 github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/form/v4 v4.2.0 h1:N1wh+Goz61e6w66vo8vJkQt+uwZSoLz50kZPJWR8eic=
+github.com/go-playground/form/v4 v4.2.0/go.mod h1:q1a2BY+AQUUzhl6xA/6hBetay6dEIhMHjgvJiGo6K7U=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -13,10 +29,14 @@ github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/
 github.com/jumboframes/armorigo v0.2.3/go.mod h1:sXe0R32y6V3oJD2eXcPzMlimvZx0xIDiLedpQOy06t4=
 github.com/jumboframes/armorigo v0.4.0-rc.1 h1:+9AM5ZLM/KdF0ldLvhbaSRFLIWbcynIrCJZ2G9FJrnk=
 github.com/jumboframes/armorigo v0.4.0-rc.1/go.mod h1:H4OlF0Jj8e+8LkAqDjeLtapNNnUuUXR/h4Q32Lqgf9o=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 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/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/singchia/go-timer/v2 v2.0.3/go.mod h1:PgkEQc6io8slCUiT5rHzWKU4/P2HXHWk3WWfijZXAf4=
 github.com/singchia/go-timer/v2 v2.2.1 h1:gJucmL99fkuNzGk2AfNPFpa1X3/4+aGO21KkjFAG624=
 github.com/singchia/go-timer/v2 v2.2.1/go.mod h1:PgkEQc6io8slCUiT5rHzWKU4/P2HXHWk3WWfijZXAf4=
@@ -36,17 +56,32 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb h1:eBmm0M9fYhWpKZLjQUUKka/LtIxf46G4fxeEz5KJr9U=
 golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 h1:8eadJkXbwDEMNwcB5O0s5Y5eCfyuCLdvaiOIaGTrWmQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641 h1:DKU1r6Tj5s1vlU/moGhuGz7E3xRfwjdAfDzbsaQJtEY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs=
+google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
+google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/edgebound/edge_dataplane_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/singchia/frontier/api/v1/edge"
+	"github.com/singchia/frontier/api/dataplane/v1/edge"
 	"github.com/singchia/frontier/pkg/config"
 	"github.com/singchia/frontier/pkg/repo/dao"
 	"github.com/singchia/go-timer/v2"

pkg/edgebound/edge_manager_test.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/singchia/frontier/api/v1/edge"
+	"github.com/singchia/frontier/api/dataplane/v1/edge"
 	"github.com/singchia/frontier/pkg/config"
 	"github.com/singchia/frontier/pkg/repo/dao"
 	"github.com/singchia/go-timer/v2"

pkg/http/rest.go

@@ -1,13 +1,22 @@
 package http
 
 import (
+	"crypto/tls"
+	"crypto/x509"
 	"net"
+	"net/http"
+	"os"
+	"strings"
 
 	"github.com/gorilla/mux"
+	"github.com/singchia/frontier/pkg/apis"
 	"github.com/singchia/frontier/pkg/config"
+	"github.com/singchia/frontier/pkg/security"
+	"k8s.io/klog/v2"
 )
 
 type Rest struct {
+	conf   *config.Configuration
 	router *mux.Router
 
 	// listener for http
@@ -23,4 +32,76 @@ func NewRest(conf *config.Configuration) (*Rest, error) {
 		err     error
 	)
 
+	rest := &Rest{
+		conf: conf,
+	}
+
+	if !listen.TLS.Enable {
+		if ln, err = net.Listen(network, addr); err != nil {
+			klog.Errorf("rest net listen err: %s, network: %s, addr: %s", err, network, addr)
+			return nil, err
+		}
+	} else {
+		certs := []tls.Certificate{}
+		for _, certFile := range listen.TLS.Certs {
+			cert, err := tls.LoadX509KeyPair(certFile.Cert, certFile.Key)
+			if err != nil {
+				klog.Errorf("service manager tls load x509 cert err: %s, cert: %s, key: %s", err, certFile.Cert, certFile.Key)
+				continue
+			}
+			certs = append(certs, cert)
+		}
+
+		if !listen.TLS.MTLS {
+			// tls
+			if ln, err = tls.Listen(network, addr, &tls.Config{
+				MinVersion:   tls.VersionTLS12,
+				CipherSuites: security.CiperSuites,
+				Certificates: certs,
+			}); err != nil {
+				klog.Errorf("service manager tls listen err: %s, network: %s, addr: %s", err, network, addr)
+				return nil, err
+			}
+
+		} else {
+			// mtls, require for edge cert
+			// load all ca certs to pool
+			caPool := x509.NewCertPool()
+			for _, caFile := range listen.TLS.CACerts {
+				ca, err := os.ReadFile(caFile)
+				if err != nil {
+					klog.Errorf("service manager read ca cert err: %s, file: %s", err, caFile)
+					return nil, err
+				}
+				if !caPool.AppendCertsFromPEM(ca) {
+					klog.Warningf("service manager append ca cert to ca pool err: %s, file: %s", err, caFile)
+					continue
+				}
+			}
+			if ln, err = tls.Listen(network, addr, &tls.Config{
+				MinVersion:   tls.VersionTLS12,
+				CipherSuites: security.CiperSuites,
+				ClientCAs:    caPool,
+				ClientAuth:   tls.RequireAndVerifyClientCert,
+				Certificates: certs,
+			}); err != nil {
+				klog.Errorf("service manager tls listen err: %s, network: %s, addr: %s", err, network, addr)
+				return nil, err
+			}
+		}
+	}
+	rest.ln = ln
+
+	// router
+
+	return rest, nil
+}
+
+func (rest *Rest) Serve() {
+	err := http.Serve(rest.ln, rest.router)
+	if err != nil {
+		if !strings.Contains(err.Error(), apis.ErrStrUseOfClosedConnection) {
+			klog.V(1).Infof("rest listener serve err: %s", err)
+		}
+	}
 }

pkg/servicebound/service_manager_test.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/singchia/frontier/api/v1/service"
+	"github.com/singchia/frontier/api/dataplane/v1/service"
 	"github.com/singchia/frontier/pkg/config"
 	"github.com/singchia/frontier/pkg/repo/dao"
 	"github.com/singchia/go-timer/v2"

test/bench/call/edge/call_edge.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	armlog "github.com/jumboframes/armorigo/log"
-	"github.com/singchia/frontier/api/v1/edge"
+	"github.com/singchia/frontier/api/dataplane/v1/edge"
 	"github.com/spf13/pflag"
 )
 

test/bench/call/service/call_service.go

@@ -9,7 +9,7 @@ import (
 
 	armlog "github.com/jumboframes/armorigo/log"
 	"github.com/jumboframes/armorigo/sigaction"
-	"github.com/singchia/frontier/api/v1/service"
+	"github.com/singchia/frontier/api/dataplane/v1/service"
 	"github.com/singchia/geminio"
 	"github.com/spf13/pflag"
 )

test/bench/open/edge/open_edge.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	armlog "github.com/jumboframes/armorigo/log"
-	"github.com/singchia/frontier/api/v1/edge"
+	"github.com/singchia/frontier/api/dataplane/v1/edge"
 	"github.com/spf13/pflag"
 )
 

test/bench/open/service/open_service.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	armlog "github.com/jumboframes/armorigo/log"
-	"github.com/singchia/frontier/api/v1/service"
+	"github.com/singchia/frontier/api/dataplane/v1/service"
 	"github.com/singchia/geminio"
 	"github.com/spf13/pflag"
 )

test/bench/publish/edge/publish_edge.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	armlog "github.com/jumboframes/armorigo/log"
-	"github.com/singchia/frontier/api/v1/edge"
+	"github.com/singchia/frontier/api/dataplane/v1/edge"
 	"github.com/spf13/pflag"
 )
 

test/bench/publish/service/publish_service.go

@@ -9,7 +9,7 @@ import (
 	"os"
 
 	armlog "github.com/jumboframes/armorigo/log"
-	"github.com/singchia/frontier/api/v1/service"
+	"github.com/singchia/frontier/api/dataplane/v1/service"
 	"github.com/spf13/pflag"
 )