From c87c5f4ab9592ad54539b2817ce2f9e665b1ffc9 Mon Sep 17 00:00:00 2001 From: iisky1121 Date: Fri, 29 Apr 2022 14:15:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=BC=BAacl=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/github/quickmsg/core/acl/JCasBinAclManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java b/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java index b66d9c0b..de59ad02 100644 --- a/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java +++ b/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java @@ -30,7 +30,7 @@ public class JCasBinAclManager implements AclManager { model.addDef("r", "r", "sub, obj, act"); model.addDef("p", "p", "sub, obj, act"); model.addDef("e", "e", "some(where (p.eft == allow))"); - model.addDef("m", "m", "r.sub == p.sub && r.obj == p.obj && r.act == p.act"); + model.addDef("m", "m", "keyMatch(r.sub, p.sub) && keyMatch(r.obj, p.obj) && r.act == p.act\""); if (aclConfig.getAclPolicy() == AclPolicy.JDBC) { AclConfig.JdbcAclConfig jdbcAclConfig = aclConfig.getJdbcAclConfig(); Objects.requireNonNull(jdbcAclConfig); -- Gitee From 80a6c581a2d231daf860bebe909da91c6faf441c Mon Sep 17 00:00:00 2001 From: iisky1121 Date: Fri, 29 Apr 2022 06:27:39 +0000 Subject: [PATCH 2/2] update smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java. --- .../java/io/github/quickmsg/core/acl/JCasBinAclManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java b/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java index de59ad02..bc613224 100644 --- a/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java +++ b/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java @@ -30,7 +30,7 @@ public class JCasBinAclManager implements AclManager { model.addDef("r", "r", "sub, obj, act"); model.addDef("p", "p", "sub, obj, act"); model.addDef("e", "e", "some(where (p.eft == allow))"); - model.addDef("m", "m", "keyMatch(r.sub, p.sub) && keyMatch(r.obj, p.obj) && r.act == p.act\""); + model.addDef("m", "m", "keyMatch(r.sub, p.sub) && keyMatch(r.obj, p.obj) && r.act == p.act"); if (aclConfig.getAclPolicy() == AclPolicy.JDBC) { AclConfig.JdbcAclConfig jdbcAclConfig = aclConfig.getJdbcAclConfig(); Objects.requireNonNull(jdbcAclConfig); -- Gitee