Browse Source

rm acls creation for on-prem emqx

abhishek9686 1 year ago
parent
commit
0a936a1f39
4 changed files with 8 additions and 6 deletions
  1. 1 1
      mq/emqx.go
  2. 1 1
      mq/emqx_cloud.go
  3. 5 3
      mq/emqx_on_prem.go
  4. 1 1
      mq/mq.go

+ 1 - 1
mq/emqx.go

@@ -10,7 +10,7 @@ type Emqx interface {
 	CreateEmqxUserforServer() error
 	CreateEmqxDefaultAuthenticator() error
 	CreateEmqxDefaultAuthorizer() error
-	CreateDefaultDenyRule() error
+	CreateDefaultAllowRule() error
 	CreateHostACL(hostID, serverName string) error
 	AppendNodeUpdateACL(hostID, nodeNetwork, nodeID, serverName string) error
 	GetUserACL(username string) (*aclObject, error)

+ 1 - 1
mq/emqx_cloud.go

@@ -89,7 +89,7 @@ func (e *EmqxCloud) CreateEmqxDefaultAuthenticator() error { return nil } // ign
 
 func (e *EmqxCloud) CreateEmqxDefaultAuthorizer() error { return nil } // ignore
 
-func (e *EmqxCloud) CreateDefaultDenyRule() error {
+func (e *EmqxCloud) CreateDefaultAllowRule() error {
 	return nil
 }
 

+ 5 - 3
mq/emqx_on_prem.go

@@ -277,14 +277,14 @@ func (e *EmqxOnPrem) GetUserACL(username string) (*aclObject, error) {
 	return body, nil
 }
 
-// CreateDefaultDenyRule - creates a rule to deny access to all topics for all users by default
+// CreateDefaultAllowRule - creates a rule to deny access to all topics for all users by default
 // to allow user access to topics use the `mq.CreateUserAccessRule` function
-func (e *EmqxOnPrem) CreateDefaultDenyRule() error {
+func (e *EmqxOnPrem) CreateDefaultAllowRule() error {
 	token, err := getEmqxAuthToken()
 	if err != nil {
 		return err
 	}
-	payload, err := json.Marshal(&aclObject{Rules: []aclRule{{Topic: "#", Permission: "deny", Action: "all"}}})
+	payload, err := json.Marshal(&aclObject{Rules: []aclRule{{Topic: "#", Permission: "allow", Action: "all"}}})
 	if err != nil {
 		return err
 	}
@@ -311,6 +311,7 @@ func (e *EmqxOnPrem) CreateDefaultDenyRule() error {
 
 // CreateHostACL - create host ACL rules
 func (e *EmqxOnPrem) CreateHostACL(hostID, serverName string) error {
+	return nil
 	token, err := getEmqxAuthToken()
 	if err != nil {
 		return err
@@ -365,6 +366,7 @@ var nodeAclMux sync.Mutex
 
 // AppendNodeUpdateACL - adds ACL rule for subscribing to node updates for a node ID
 func (e *EmqxOnPrem) AppendNodeUpdateACL(hostID, nodeNetwork, nodeID, serverName string) error {
+	return nil
 	nodeAclMux.Lock()
 	defer nodeAclMux.Unlock()
 	token, err := getEmqxAuthToken()

+ 1 - 1
mq/mq.go

@@ -58,7 +58,7 @@ func SetupMQTT(fatal bool) {
 				logger.Log(0, err.Error())
 			}
 			// create a default deny ACL to all topics for all users
-			if err := emqx.CreateDefaultDenyRule(); err != nil {
+			if err := emqx.CreateDefaultAllowRule(); err != nil {
 				log.Fatal(err)
 			}
 		} else {