Skip to content

Commit 2474fc3

Browse files
authored
Bridge: Remove ACL client (#36677)
1 parent d37eae1 commit 2474fc3

File tree

2 files changed

+13
-141
lines changed

2 files changed

+13
-141
lines changed

examples/bridge-app/bridge-common/bridge-app.matter

-126
Original file line numberDiff line numberDiff line change
@@ -667,131 +667,6 @@ cluster AccessControl = 31 {
667667
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
668668
}
669669

670-
/** The Access Control Cluster exposes a data model view of a
671-
Node's Access Control List (ACL), which codifies the rules used to manage
672-
and enforce Access Control for the Node's endpoints and their associated
673-
cluster instances. */
674-
cluster AccessControl = 31 {
675-
revision 2;
676-
677-
enum AccessControlEntryAuthModeEnum : enum8 {
678-
kPASE = 1;
679-
kCASE = 2;
680-
kGroup = 3;
681-
}
682-
683-
enum AccessControlEntryPrivilegeEnum : enum8 {
684-
kView = 1;
685-
kProxyView = 2;
686-
kOperate = 3;
687-
kManage = 4;
688-
kAdminister = 5;
689-
}
690-
691-
enum AccessRestrictionTypeEnum : enum8 {
692-
kAttributeAccessForbidden = 0;
693-
kAttributeWriteForbidden = 1;
694-
kCommandForbidden = 2;
695-
kEventForbidden = 3;
696-
}
697-
698-
enum ChangeTypeEnum : enum8 {
699-
kChanged = 0;
700-
kAdded = 1;
701-
kRemoved = 2;
702-
}
703-
704-
bitmap Feature : bitmap32 {
705-
kExtension = 0x1;
706-
kManagedDevice = 0x2;
707-
}
708-
709-
struct AccessRestrictionStruct {
710-
AccessRestrictionTypeEnum type = 0;
711-
nullable int32u id = 1;
712-
}
713-
714-
struct CommissioningAccessRestrictionEntryStruct {
715-
endpoint_no endpoint = 0;
716-
cluster_id cluster = 1;
717-
AccessRestrictionStruct restrictions[] = 2;
718-
}
719-
720-
fabric_scoped struct AccessRestrictionEntryStruct {
721-
fabric_sensitive endpoint_no endpoint = 0;
722-
fabric_sensitive cluster_id cluster = 1;
723-
fabric_sensitive AccessRestrictionStruct restrictions[] = 2;
724-
fabric_idx fabricIndex = 254;
725-
}
726-
727-
struct AccessControlTargetStruct {
728-
nullable cluster_id cluster = 0;
729-
nullable endpoint_no endpoint = 1;
730-
nullable devtype_id deviceType = 2;
731-
}
732-
733-
fabric_scoped struct AccessControlEntryStruct {
734-
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
735-
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
736-
nullable fabric_sensitive int64u subjects[] = 3;
737-
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
738-
fabric_idx fabricIndex = 254;
739-
}
740-
741-
fabric_scoped struct AccessControlExtensionStruct {
742-
fabric_sensitive octet_string<128> data = 1;
743-
fabric_idx fabricIndex = 254;
744-
}
745-
746-
fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
747-
nullable node_id adminNodeID = 1;
748-
nullable int16u adminPasscodeID = 2;
749-
ChangeTypeEnum changeType = 3;
750-
nullable AccessControlEntryStruct latestValue = 4;
751-
fabric_idx fabricIndex = 254;
752-
}
753-
754-
fabric_sensitive info event access(read: administer) AccessControlExtensionChanged = 1 {
755-
nullable node_id adminNodeID = 1;
756-
nullable int16u adminPasscodeID = 2;
757-
ChangeTypeEnum changeType = 3;
758-
nullable AccessControlExtensionStruct latestValue = 4;
759-
fabric_idx fabricIndex = 254;
760-
}
761-
762-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
763-
int64u token = 0;
764-
optional long_char_string instruction = 1;
765-
optional long_char_string ARLRequestFlowUrl = 2;
766-
fabric_idx fabricIndex = 254;
767-
}
768-
769-
attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
770-
attribute access(read: administer, write: administer) optional AccessControlExtensionStruct extension[] = 1;
771-
readonly attribute int16u subjectsPerAccessControlEntry = 2;
772-
readonly attribute int16u targetsPerAccessControlEntry = 3;
773-
readonly attribute int16u accessControlEntriesPerFabric = 4;
774-
readonly attribute optional CommissioningAccessRestrictionEntryStruct commissioningARL[] = 5;
775-
readonly attribute optional AccessRestrictionEntryStruct arl[] = 6;
776-
readonly attribute command_id generatedCommandList[] = 65528;
777-
readonly attribute command_id acceptedCommandList[] = 65529;
778-
readonly attribute event_id eventList[] = 65530;
779-
readonly attribute attrib_id attributeList[] = 65531;
780-
readonly attribute bitmap32 featureMap = 65532;
781-
readonly attribute int16u clusterRevision = 65533;
782-
783-
request struct ReviewFabricRestrictionsRequest {
784-
CommissioningAccessRestrictionEntryStruct arl[] = 0;
785-
}
786-
787-
response struct ReviewFabricRestrictionsResponse = 1 {
788-
int64u token = 0;
789-
}
790-
791-
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
792-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
793-
}
794-
795670
/** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
796671
cluster Actions = 37 {
797672
revision 1; // NOTE: Default/not specifically set
@@ -2272,7 +2147,6 @@ cluster TemperatureMeasurement = 1026 {
22722147
endpoint 0 {
22732148
device type ma_rootdevice = 22, version 1;
22742149

2275-
binding cluster AccessControl;
22762150

22772151
server cluster Descriptor {
22782152
callback attribute deviceTypeList;

examples/bridge-app/bridge-common/bridge-app.zap

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 103,
3+
"featureLevel": 104,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -41,14 +41,16 @@
4141
"code": 22,
4242
"profileId": 259,
4343
"label": "MA-rootdevice",
44-
"name": "MA-rootdevice"
44+
"name": "MA-rootdevice",
45+
"deviceTypeOrder": 0
4546
},
4647
"deviceTypes": [
4748
{
4849
"code": 22,
4950
"profileId": 259,
5051
"label": "MA-rootdevice",
51-
"name": "MA-rootdevice"
52+
"name": "MA-rootdevice",
53+
"deviceTypeOrder": 0
5254
}
5355
],
5456
"deviceVersions": [
@@ -215,14 +217,6 @@
215217
}
216218
]
217219
},
218-
{
219-
"name": "Access Control",
220-
"code": 31,
221-
"mfgCode": null,
222-
"define": "ACCESS_CONTROL_CLUSTER",
223-
"side": "client",
224-
"enabled": 1
225-
},
226220
{
227221
"name": "Access Control",
228222
"code": 31,
@@ -4403,14 +4397,16 @@
44034397
"code": 14,
44044398
"profileId": 259,
44054399
"label": "MA-aggregator",
4406-
"name": "MA-aggregator"
4400+
"name": "MA-aggregator",
4401+
"deviceTypeOrder": 0
44074402
},
44084403
"deviceTypes": [
44094404
{
44104405
"code": 14,
44114406
"profileId": 259,
44124407
"label": "MA-aggregator",
4413-
"name": "MA-aggregator"
4408+
"name": "MA-aggregator",
4409+
"deviceTypeOrder": 0
44144410
}
44154411
],
44164412
"deviceVersions": [
@@ -4891,14 +4887,16 @@
48914887
"code": 257,
48924888
"profileId": 259,
48934889
"label": "MA-dimmablelight",
4894-
"name": "MA-dimmablelight"
4890+
"name": "MA-dimmablelight",
4891+
"deviceTypeOrder": 0
48954892
},
48964893
"deviceTypes": [
48974894
{
48984895
"code": 257,
48994896
"profileId": 259,
49004897
"label": "MA-dimmablelight",
4901-
"name": "MA-dimmablelight"
4898+
"name": "MA-dimmablelight",
4899+
"deviceTypeOrder": 0
49024900
}
49034901
],
49044902
"deviceVersions": [

0 commit comments

Comments
 (0)