Merge pull request #4104 from vincentgoat/rbac

Verify token when list/watch and add autonomy switch

3 files changed, 16 insertions, 5 deletions

diff --git a/edge/test/integration/metaserver/metaserver_suite_test.go b/edge/test/integration/metaserver/metaserver_suite_test.go
index f1adc8a51..f006cc3f9 100644
--- a/edge/test/integration/metaserver/metaserver_suite_test.go
+++ b/edge/test/integration/metaserver/metaserver_suite_test.go
@@ -25,6 +25,10 @@ func TestEdgecoreMetaServer(t *testing.T) {
 		c.Modules.Edged.HostnameOverride = cfg.NodeID
 		c.Modules.MetaManager.Enable = true
 		c.Modules.MetaManager.MetaServer.Enable = true
+		c.Modules.MetaManager.MetaServer.AutonomyWithoutAuthorization = true
+		c.Modules.MetaManager.MetaServer.TLSCaFile = "/tmp/edgecore/rootCA.crt"
+		c.Modules.MetaManager.MetaServer.TLSCertFile = "/tmp/edgecore/kubeedge.crt"
+		c.Modules.MetaManager.MetaServer.TLSPrivateKeyFile = "/tmp/edgecore/kubeedge.key"
 
 		Expect(utils.CfgToFile(c)).Should(BeNil())
 		Expect(utils.StartEdgeCore()).Should(BeNil())
diff --git a/edge/test/integration/metaserver/metaserver_test.go b/edge/test/integration/metaserver/metaserver_test.go
index 09fb2eb07..120a9a7a9 100644
--- a/edge/test/integration/metaserver/metaserver_test.go
+++ b/edge/test/integration/metaserver/metaserver_test.go
@@ -1,6 +1,7 @@
 package metaserver
 
 import (
+	"crypto/tls"
 	"net/http"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -42,11 +43,17 @@ var _ = Describe("Test MetaServer", func() {
 				//"Watch with bad method":                         {"POST", "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version + "/watch/namespaces/ns/simples/", http.StatusMethodNotAllowed},
 				//"Watch param with bad method": {"POST", "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version + "/namespaces/ns-foo/simples?watch=true", http.StatusMethodNotAllowed},
 			}
-			client := http.Client{}
-			url := "http://127.0.0.1:10550"
+			client := http.Client{
+				Transport: &http.Transport{
+					TLSClientConfig: &tls.Config{
+						InsecureSkipVerify: true},
+				},
+			}
+			url := "https://127.0.0.1:10550"
 			for _, v := range cases {
 				request, err := http.NewRequest(v.Method, url+v.Path, nil)
 				Expect(err).Should(BeNil())
+				request.Header.Set("Authorization", "xxxxx")
 				response, err := client.Do(request)
 				Expect(err).Should(BeNil())
 				isEqual := v.Status == response.StatusCode
diff --git a/edge/test/test.go b/edge/test/test.go
index fedf82251..82d4919cd 100644
--- a/edge/test/test.go
+++ b/edge/test/test.go
@@ -122,7 +122,7 @@ func (tm *testManager) podHandler(w http.ResponseWriter, req *http.Request) {
 			ns = p.Namespace
 		}
 		msgReq := message.BuildMsg("resource", string(p.UID), "edgecontroller", ns+"/pod/"+p.Name, operation, p)
-		beehiveContext.Send("metaManager", *msgReq)
+		beehiveContext.Send(modules.MetaManagerModuleName, *msgReq)
 		klog.Infof("send message to metaManager is %+v\n", msgReq)
 	}
 }
@@ -183,7 +183,7 @@ func (tm *testManager) secretHandler(w http.ResponseWriter, req *http.Request) {
 		}
 
 		msgReq := message.BuildMsg("edgehub", string(p.UID), "test", "fakeNamespace/secret/"+string(p.UID), operation, p)
-		beehiveContext.Send("metaManager", *msgReq)
+		beehiveContext.Send(modules.MetaManagerModuleName, *msgReq)
 		klog.Infof("send message to metaManager is %+v\n", msgReq)
 	}
 }
@@ -213,7 +213,7 @@ func (tm *testManager) configmapHandler(w http.ResponseWriter, req *http.Request
 		}
 
 		msgReq := message.BuildMsg("edgehub", string(p.UID), "test", "fakeNamespace/configmap/"+string(p.UID), operation, p)
-		beehiveContext.Send("metaManager", *msgReq)
+		beehiveContext.Send(modules.MetaManagerModuleName, *msgReq)
 		klog.Infof("send message to metaManager is %+v\n", msgReq)
 	}
 }