@matter/node 0.16.0-alpha.0-20250906-463912bd0 → 0.16.0-alpha.0-20250912-0d12bf718
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/behavior/Behavior.d.ts +0 -18
- package/dist/cjs/behavior/Behavior.d.ts.map +1 -1
- package/dist/cjs/behavior/Behavior.js +0 -34
- package/dist/cjs/behavior/Behavior.js.map +1 -1
- package/dist/cjs/behavior/Transitions.js +2 -2
- package/dist/cjs/behavior/Transitions.js.map +1 -1
- package/dist/cjs/behavior/context/ActionContext.d.ts +4 -29
- package/dist/cjs/behavior/context/ActionContext.d.ts.map +1 -1
- package/dist/cjs/behavior/context/server/{OfflineContext.d.ts → LocalActorContext.d.ts} +16 -12
- package/dist/cjs/behavior/context/server/LocalActorContext.d.ts.map +1 -0
- package/dist/cjs/behavior/context/server/{OfflineContext.js → LocalActorContext.js} +10 -9
- package/dist/cjs/behavior/context/server/LocalActorContext.js.map +6 -0
- package/dist/cjs/behavior/context/server/RemoteActorContext.d.ts +80 -0
- package/dist/cjs/behavior/context/server/RemoteActorContext.d.ts.map +1 -0
- package/dist/cjs/behavior/context/server/{OnlineContext.js → RemoteActorContext.js} +15 -27
- package/dist/cjs/behavior/context/server/RemoteActorContext.js.map +6 -0
- package/dist/cjs/behavior/context/server/index.d.ts +2 -2
- package/dist/cjs/behavior/context/server/index.d.ts.map +1 -1
- package/dist/cjs/behavior/context/server/index.js +2 -2
- package/dist/cjs/behavior/context/server/index.js.map +1 -1
- package/dist/cjs/behavior/internal/Reactors.d.ts.map +1 -1
- package/dist/cjs/behavior/internal/Reactors.js +4 -3
- package/dist/cjs/behavior/internal/Reactors.js.map +1 -1
- package/dist/cjs/behavior/state/managed/Datasource.d.ts.map +1 -1
- package/dist/cjs/behavior/state/managed/Datasource.js +1 -6
- package/dist/cjs/behavior/state/managed/Datasource.js.map +1 -1
- package/dist/cjs/behavior/state/managed/values/ListManager.d.ts.map +1 -1
- package/dist/cjs/behavior/state/managed/values/ListManager.js +4 -4
- package/dist/cjs/behavior/state/managed/values/ListManager.js.map +1 -1
- package/dist/cjs/behavior/supervision/ValueSupervisor.d.ts +16 -9
- package/dist/cjs/behavior/supervision/ValueSupervisor.d.ts.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.d.ts +12 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.d.ts.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.js +1 -0
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.js.map +1 -1
- package/dist/cjs/behavior/system/network/ClientNetworkRuntime.d.ts.map +1 -1
- package/dist/cjs/behavior/system/network/ClientNetworkRuntime.js +3 -1
- package/dist/cjs/behavior/system/network/ClientNetworkRuntime.js.map +1 -1
- package/dist/cjs/behavior/system/network/NetworkClient.d.ts +9 -0
- package/dist/cjs/behavior/system/network/NetworkClient.d.ts.map +1 -1
- package/dist/cjs/behavior/system/network/NetworkClient.js +20 -0
- package/dist/cjs/behavior/system/network/NetworkClient.js.map +1 -1
- package/dist/cjs/behaviors/access-control/AccessControlServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/access-control/AccessControlServer.js +19 -15
- package/dist/cjs/behaviors/access-control/AccessControlServer.js.map +1 -1
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.js +5 -5
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.js.map +1 -1
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.js +6 -6
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.js.map +1 -1
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.js +2 -4
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.js.map +1 -1
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.js +9 -6
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.js.map +1 -1
- package/dist/cjs/behaviors/groups/GroupsServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/groups/GroupsServer.js +12 -9
- package/dist/cjs/behaviors/groups/GroupsServer.js.map +2 -2
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.js +16 -9
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.js.map +1 -1
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.js +1 -1
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.js.map +1 -1
- package/dist/cjs/endpoint/Agent.d.ts +14 -0
- package/dist/cjs/endpoint/Agent.d.ts.map +1 -1
- package/dist/cjs/endpoint/Agent.js +32 -0
- package/dist/cjs/endpoint/Agent.js.map +1 -1
- package/dist/cjs/endpoint/Endpoint.js +2 -2
- package/dist/cjs/endpoint/Endpoint.js.map +1 -1
- package/dist/cjs/endpoint/properties/Behaviors.js +4 -4
- package/dist/cjs/endpoint/properties/Behaviors.js.map +1 -1
- package/dist/cjs/endpoint/properties/Commands.js +2 -2
- package/dist/cjs/endpoint/properties/Commands.js.map +1 -1
- package/dist/cjs/node/server/IdentityService.js +2 -2
- package/dist/cjs/node/server/IdentityService.js.map +1 -1
- package/dist/cjs/node/server/InteractionServer.js.map +1 -1
- package/dist/cjs/node/server/OnlineServerInteraction.d.ts +6 -6
- package/dist/cjs/node/server/OnlineServerInteraction.d.ts.map +1 -1
- package/dist/cjs/node/server/OnlineServerInteraction.js +4 -4
- package/dist/cjs/node/server/OnlineServerInteraction.js.map +1 -1
- package/dist/cjs/node/server/ProtocolService.js +1 -1
- package/dist/cjs/node/server/ProtocolService.js.map +1 -1
- package/dist/cjs/node/server/ServerSubscription.d.ts +2 -2
- package/dist/cjs/node/server/ServerSubscription.d.ts.map +1 -1
- package/dist/cjs/node/server/ServerSubscription.js +3 -3
- package/dist/cjs/node/server/ServerSubscription.js.map +1 -1
- package/dist/esm/behavior/Behavior.d.ts +0 -18
- package/dist/esm/behavior/Behavior.d.ts.map +1 -1
- package/dist/esm/behavior/Behavior.js +0 -35
- package/dist/esm/behavior/Behavior.js.map +1 -1
- package/dist/esm/behavior/Transitions.js +2 -2
- package/dist/esm/behavior/Transitions.js.map +1 -1
- package/dist/esm/behavior/context/ActionContext.d.ts +4 -29
- package/dist/esm/behavior/context/ActionContext.d.ts.map +1 -1
- package/dist/esm/behavior/context/server/{OfflineContext.d.ts → LocalActorContext.d.ts} +16 -12
- package/dist/esm/behavior/context/server/LocalActorContext.d.ts.map +1 -0
- package/dist/esm/behavior/context/server/{OfflineContext.js → LocalActorContext.js} +7 -6
- package/dist/esm/behavior/context/server/LocalActorContext.js.map +6 -0
- package/dist/esm/behavior/context/server/RemoteActorContext.d.ts +80 -0
- package/dist/esm/behavior/context/server/RemoteActorContext.d.ts.map +1 -0
- package/dist/esm/behavior/context/server/{OnlineContext.js → RemoteActorContext.js} +14 -31
- package/dist/esm/behavior/context/server/RemoteActorContext.js.map +6 -0
- package/dist/esm/behavior/context/server/index.d.ts +2 -2
- package/dist/esm/behavior/context/server/index.d.ts.map +1 -1
- package/dist/esm/behavior/context/server/index.js +2 -2
- package/dist/esm/behavior/internal/Reactors.d.ts.map +1 -1
- package/dist/esm/behavior/internal/Reactors.js +4 -3
- package/dist/esm/behavior/internal/Reactors.js.map +1 -1
- package/dist/esm/behavior/state/managed/Datasource.d.ts.map +1 -1
- package/dist/esm/behavior/state/managed/Datasource.js +2 -7
- package/dist/esm/behavior/state/managed/Datasource.js.map +1 -1
- package/dist/esm/behavior/state/managed/values/ListManager.d.ts.map +1 -1
- package/dist/esm/behavior/state/managed/values/ListManager.js +13 -5
- package/dist/esm/behavior/state/managed/values/ListManager.js.map +1 -1
- package/dist/esm/behavior/supervision/ValueSupervisor.d.ts +16 -9
- package/dist/esm/behavior/supervision/ValueSupervisor.d.ts.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningClient.d.ts +12 -1
- package/dist/esm/behavior/system/commissioning/CommissioningClient.d.ts.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningClient.js +1 -0
- package/dist/esm/behavior/system/commissioning/CommissioningClient.js.map +1 -1
- package/dist/esm/behavior/system/network/ClientNetworkRuntime.d.ts.map +1 -1
- package/dist/esm/behavior/system/network/ClientNetworkRuntime.js +3 -1
- package/dist/esm/behavior/system/network/ClientNetworkRuntime.js.map +1 -1
- package/dist/esm/behavior/system/network/NetworkClient.d.ts +9 -0
- package/dist/esm/behavior/system/network/NetworkClient.d.ts.map +1 -1
- package/dist/esm/behavior/system/network/NetworkClient.js +20 -0
- package/dist/esm/behavior/system/network/NetworkClient.js.map +1 -1
- package/dist/esm/behaviors/access-control/AccessControlServer.d.ts.map +1 -1
- package/dist/esm/behaviors/access-control/AccessControlServer.js +21 -15
- package/dist/esm/behaviors/access-control/AccessControlServer.js.map +1 -1
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts.map +1 -1
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.js +13 -6
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.js.map +1 -1
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.d.ts.map +1 -1
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.js +15 -7
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.js.map +1 -1
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.d.ts.map +1 -1
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.js +3 -5
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.js.map +1 -1
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.d.ts.map +1 -1
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.js +10 -7
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.js.map +1 -1
- package/dist/esm/behaviors/groups/GroupsServer.d.ts.map +1 -1
- package/dist/esm/behaviors/groups/GroupsServer.js +12 -9
- package/dist/esm/behaviors/groups/GroupsServer.js.map +2 -2
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.d.ts.map +1 -1
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.js +17 -9
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.js.map +1 -1
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.js +1 -1
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.js.map +1 -1
- package/dist/esm/endpoint/Agent.d.ts +14 -0
- package/dist/esm/endpoint/Agent.d.ts.map +1 -1
- package/dist/esm/endpoint/Agent.js +32 -0
- package/dist/esm/endpoint/Agent.js.map +1 -1
- package/dist/esm/endpoint/Endpoint.js +2 -2
- package/dist/esm/endpoint/Endpoint.js.map +1 -1
- package/dist/esm/endpoint/properties/Behaviors.js +4 -4
- package/dist/esm/endpoint/properties/Behaviors.js.map +1 -1
- package/dist/esm/endpoint/properties/Commands.js +2 -2
- package/dist/esm/endpoint/properties/Commands.js.map +1 -1
- package/dist/esm/node/server/IdentityService.js +2 -2
- package/dist/esm/node/server/IdentityService.js.map +1 -1
- package/dist/esm/node/server/InteractionServer.js.map +1 -1
- package/dist/esm/node/server/OnlineServerInteraction.d.ts +6 -6
- package/dist/esm/node/server/OnlineServerInteraction.d.ts.map +1 -1
- package/dist/esm/node/server/OnlineServerInteraction.js +4 -4
- package/dist/esm/node/server/OnlineServerInteraction.js.map +1 -1
- package/dist/esm/node/server/ProtocolService.js +2 -2
- package/dist/esm/node/server/ProtocolService.js.map +1 -1
- package/dist/esm/node/server/ServerSubscription.d.ts +2 -2
- package/dist/esm/node/server/ServerSubscription.d.ts.map +1 -1
- package/dist/esm/node/server/ServerSubscription.js +3 -3
- package/dist/esm/node/server/ServerSubscription.js.map +1 -1
- package/package.json +7 -7
- package/src/behavior/Behavior.ts +0 -41
- package/src/behavior/Transitions.ts +2 -2
- package/src/behavior/context/ActionContext.ts +4 -35
- package/src/behavior/context/server/{OfflineContext.ts → LocalActorContext.ts} +17 -14
- package/src/behavior/context/server/{OnlineContext.ts → RemoteActorContext.ts} +65 -52
- package/src/behavior/context/server/index.ts +2 -2
- package/src/behavior/internal/Reactors.ts +5 -4
- package/src/behavior/state/managed/Datasource.ts +3 -9
- package/src/behavior/state/managed/values/ListManager.ts +14 -11
- package/src/behavior/supervision/ValueSupervisor.ts +18 -10
- package/src/behavior/system/commissioning/CommissioningClient.ts +15 -0
- package/src/behavior/system/network/ClientNetworkRuntime.ts +5 -1
- package/src/behavior/system/network/NetworkClient.ts +23 -0
- package/src/behaviors/access-control/AccessControlServer.ts +25 -20
- package/src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts +14 -6
- package/src/behaviors/general-commissioning/GeneralCommissioningServer.ts +15 -8
- package/src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts +3 -5
- package/src/behaviors/group-key-management/GroupKeyManagementServer.ts +13 -7
- package/src/behaviors/groups/GroupsServer.ts +16 -11
- package/src/behaviors/operational-credentials/OperationalCredentialsServer.ts +21 -9
- package/src/behaviors/window-covering/WindowCoveringServer.ts +1 -1
- package/src/endpoint/Agent.ts +34 -0
- package/src/endpoint/Endpoint.ts +2 -2
- package/src/endpoint/properties/Behaviors.ts +4 -4
- package/src/endpoint/properties/Commands.ts +2 -2
- package/src/node/ClientNode.ts +1 -1
- package/src/node/server/IdentityService.ts +2 -2
- package/src/node/server/InteractionServer.ts +2 -2
- package/src/node/server/OnlineServerInteraction.ts +9 -9
- package/src/node/server/ProtocolService.ts +2 -2
- package/src/node/server/ServerSubscription.ts +5 -5
- package/dist/cjs/behavior/context/server/OfflineContext.d.ts.map +0 -1
- package/dist/cjs/behavior/context/server/OfflineContext.js.map +0 -6
- package/dist/cjs/behavior/context/server/OnlineContext.d.ts +0 -61
- package/dist/cjs/behavior/context/server/OnlineContext.d.ts.map +0 -1
- package/dist/cjs/behavior/context/server/OnlineContext.js.map +0 -6
- package/dist/esm/behavior/context/server/OfflineContext.d.ts.map +0 -1
- package/dist/esm/behavior/context/server/OfflineContext.js.map +0 -6
- package/dist/esm/behavior/context/server/OnlineContext.d.ts +0 -61
- package/dist/esm/behavior/context/server/OnlineContext.d.ts.map +0 -1
- package/dist/esm/behavior/context/server/OnlineContext.js.map +0 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupKeyManagementServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/group-key-management/GroupKeyManagementServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAyC,YAAY,EAAE,MAAM,UAAU,CAAC;AAG/E,OAAO,
|
|
1
|
+
{"version":3,"file":"GroupKeyManagementServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/group-key-management/GroupKeyManagementServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAyC,YAAY,EAAE,MAAM,UAAU,CAAC;AAG/E,OAAO,EAAqB,MAAM,EAAiC,MAAM,WAAW,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,OAAO,EAAmC,MAAM,QAAQ,CAAC;AAC/F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAmB7E;;GAEG;AACH,qBAAa,wBAAyB,SAAQ,0BAA0B;;IAC5D,KAAK,EAAE,wBAAwB,CAAC,KAAK,CAAC;IAC9C,MAAM,0BAAU;IAEP,UAAU,IAAI,YAAY;IAsNpB,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,kBAAkB,CAAC,kBAAkB;IAsGxE,UAAU,CAAC,EAChB,aAAa,GAChB,EAAE,kBAAkB,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,kBAAkB;IAqBhE,YAAY,CAAC,EAAE,aAAa,EAAE,EAAE,kBAAkB,CAAC,mBAAmB;IA6B5E,oBAAoB,IAAI,kBAAkB,CAAC,4BAA4B;IAgBhF,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAsC1G;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO;CA4BzF;AAED,yBAAiB,wBAAwB,CAAC;IACtC,MAAa,KAAM,SAAQ,0BAA0B,CAAC,KAAK;QACvD;;;WAGG;QACH,YAAY,EAAE,CAAC,kBAAkB,CAAC,WAAW,GAAG;YAAE,WAAW,EAAE,WAAW,CAAA;SAAE,CAAC,EAAE,CAAM;QAG5E,qBAAqB,SAAM;QAC3B,kBAAkB,SAAM;KACpC;CACJ"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { GroupKeyManagement } from "#clusters/group-key-management";
|
|
7
7
|
import { deepCopy, ImplementationError, Logger } from "#general";
|
|
8
8
|
import { DatatypeModel, FieldElement } from "#model";
|
|
9
|
-
import { FabricManager,
|
|
9
|
+
import { assertRemoteActor, FabricManager, hasRemoteActor } from "#protocol";
|
|
10
10
|
import { GroupId, StatusCode, StatusResponseError } from "#types";
|
|
11
11
|
import { GroupKeyManagementBehavior } from "./GroupKeyManagementBehavior.js";
|
|
12
12
|
const logger = Logger.get("GroupKeyManagementServer");
|
|
@@ -161,7 +161,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
163
|
#updateGroupKeyMap(groupKeyMap, _oldMap, context) {
|
|
164
|
-
if (context !== void 0 &&
|
|
164
|
+
if (context !== void 0 && hasRemoteActor(context)) {
|
|
165
165
|
const fabric = context.session?.associatedFabric;
|
|
166
166
|
const fabricIndex = fabric?.fabricIndex;
|
|
167
167
|
if (fabric !== void 0 && fabricIndex !== void 0) {
|
|
@@ -189,7 +189,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
191
|
async keySetWrite({ groupKeySet }) {
|
|
192
|
-
|
|
192
|
+
assertRemoteActor(this.context);
|
|
193
193
|
const {
|
|
194
194
|
groupKeySetId,
|
|
195
195
|
epochKey0,
|
|
@@ -246,7 +246,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
246
246
|
if (groupKeyMulticastPolicy !== GroupKeyManagement.GroupKeyMulticastPolicy.PerGroupId) {
|
|
247
247
|
throw new StatusResponseError("GroupKeyMulticastPolicy must be PerGroupId", StatusCode.InvalidCommand);
|
|
248
248
|
}
|
|
249
|
-
const fabric = this.session.associatedFabric;
|
|
249
|
+
const fabric = this.context.session.associatedFabric;
|
|
250
250
|
const fabricIndex = fabric.fabricIndex;
|
|
251
251
|
const existingIndex = this.state.groupKeySets.findIndex(
|
|
252
252
|
({ groupKeySetId: entryId, fabricIndex: entryIndex }) => entryIndex === fabricIndex && entryId === groupKeySetId
|
|
@@ -270,7 +270,8 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
270
270
|
keySetRead({
|
|
271
271
|
groupKeySetId
|
|
272
272
|
}) {
|
|
273
|
-
|
|
273
|
+
assertRemoteActor(this.context);
|
|
274
|
+
const fabric = this.context.session.associatedFabric;
|
|
274
275
|
const groupKeySet = fabric.groups.keySets.asGroupKeySet(groupKeySetId);
|
|
275
276
|
if (groupKeySet === void 0) {
|
|
276
277
|
throw new StatusResponseError(`GroupKeySet ${groupKeySetId} not found`, StatusCode.NotFound);
|
|
@@ -288,7 +289,8 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
288
289
|
if (groupKeySetId === 0) {
|
|
289
290
|
throw new StatusResponseError(`GroupKeySet ${groupKeySetId} cannot be removed`, StatusCode.InvalidCommand);
|
|
290
291
|
}
|
|
291
|
-
|
|
292
|
+
assertRemoteActor(this.context);
|
|
293
|
+
const fabric = this.context.session.associatedFabric;
|
|
292
294
|
const fabricIndex = fabric.fabricIndex;
|
|
293
295
|
const existingIndex = this.state.groupKeySets.findIndex(
|
|
294
296
|
({ groupKeySetId: entryId, fabricIndex: entryIndex }) => entryIndex === fabricIndex && entryId === groupKeySetId
|
|
@@ -302,7 +304,8 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
302
304
|
await fabric.groups.removeGroupKeySet(groupKeySetId);
|
|
303
305
|
}
|
|
304
306
|
keySetReadAllIndices() {
|
|
305
|
-
|
|
307
|
+
assertRemoteActor(this.context);
|
|
308
|
+
const fabric = this.context.session.associatedFabric;
|
|
306
309
|
const fabricIndex = fabric.fabricIndex;
|
|
307
310
|
const groupKeySetIDs = this.state.groupKeySets.filter(({ fabricIndex: entryIndex }) => entryIndex === fabricIndex).map(({ groupKeySetId }) => groupKeySetId);
|
|
308
311
|
groupKeySetIDs.unshift(0);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/group-key-management/GroupKeyManagementServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,0BAA0B;AACnC,SAAS,UAAU,qBAAqB,cAA4B;AACpE,SAAS,eAAe,oBAAoB;AAE5C,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,0BAA0B;AACnC,SAAS,UAAU,qBAAqB,cAA4B;AACpE,SAAS,eAAe,oBAAoB;AAE5C,SAAS,mBAA2B,eAAe,sBAAsB;AACzE,SAAsC,SAAS,YAAY,2BAA2B;AACtF,SAAS,kCAAkC;AAE3C,MAAM,SAAS,OAAO,IAAI,0BAA0B;AAEpD,MAAM,iBAAiB,OAAO,oBAAoB;AAGlD,MAAM,oBAAoB,2BAA2B,OAAQ,IAAI,eAAe,mBAAmB;AACnG,MAAM,sBAAsB,kBAAkB,OAAO;AAAA,EACjD,MAAM;AAAA,EACN,UAAU,CAAC,aAAa,EAAE,MAAM,eAAe,IAAI,KAAM,MAAM,cAAc,CAAC,CAAC;AACnF,CAAC;AACD,MAAM,SAAS,2BAA2B,OAAQ,OAAO;AAAA,EACrD,UAAU;AAAA,IACN;AAAA,IACA,aAAa,EAAE,MAAM,gBAAgB,MAAM,uBAAuB,SAAS,KAAK,QAAQ,UAAU,CAAC;AAAA,EACvG;AACJ,CAAC;AAKM,MAAM,iCAAiC,2BAA2B;AAAA,EAErE,SAAS;AAAA,EAEA,aAA2B;AAChC,QAAI,KAAK,SAAS,cAAc;AAC5B,YAAM,IAAI,oBAAoB,yDAAyD;AAAA,IAC3F;AAGA,QAAI,KAAK,MAAM,iBAAiB,QAAW;AACvC,WAAK,MAAM,eAAe,CAAC;AAAA,IAC/B;AAGA,SAAK,QAAQ,KAAK,OAAO,sBAAsB,KAAK,oBAAoB;AACxE,SAAK,QAAQ,KAAK,OAAO,qBAAqB,KAAK,mBAAmB;AAGtE,SAAK,QAAQ,KAAK,OAAO,qBAAqB,KAAK,kBAAkB;AAErE,UAAM,YAAY,KAAK,SAAS;AAChC,SAAK,QAAQ,UAAU,QAAQ,KAAK,OAAO;AAAA,EAC/C;AAAA,EAEA,MAAM,UAAU;AAEZ,QAAI,KAAK,MAAM,0BAA0B,KAAK,KAAK,MAAM,uBAAuB,GAAG;AAE/E,UAAI,cAAc;AAClB,WAAK,SAAS,MAAM,cAAY;AAC5B,YAAI,CAAC,eAAe,YAAY,SAAS,UAAU,WAAW;AAC1D,wBAAc;AAAA,QAClB;AAAA,MACJ,CAAC;AACD,UAAI,aAAa;AACb,cAAM,IAAI;AAAA,UACN;AAAA,QACJ;AAAA,MACJ;AAAA,IACJ;AAEA,UAAM,UAAU,KAAK,IAAI,IAAI,aAAa;AAM1C,SAAK,QAAQ,QAAQ,OAAO,SAAS,KAAK,mBAAmB;AAG7D,QAAI,KAAK,MAAM,aAAa,QAAQ;AAChC,YAAM,qBAAqB,oBAAI,IAAmD;AAClF,iBAAW,eAAe,KAAK,MAAM,cAAc;AAC/C,cAAM,cAAc,YAAY;AAChC,cAAM,OAAO,mBAAmB,IAAI,WAAW,KAAK,CAAC;AACrD,aAAK,KAAK,WAAW;AACrB,2BAAmB,IAAI,aAAa,IAAI;AAAA,MAC5C;AAEA,iBAAW,CAAC,aAAa,IAAI,KAAK,mBAAmB,QAAQ,GAAG;AAC5D,cAAM,SAAS,QAAQ,IAAI,WAAW;AACtC,mBAAW,eAAe,MAAM;AAC5B,gBAAM,OAAO,OAAO,mBAAmB,WAAW;AAAA,QACtD;AAAA,MACJ;AAAA,IACJ;AACA,QAAI,KAAK,MAAM,YAAY,QAAQ;AAC/B,WAAK,mBAAmB,KAAK,MAAM,WAAW;AAAA,IAClD;AAAA,EACJ;AAAA;AAAA,EAGA,MAAM,oBAAoB,QAAgB;AACtC,QAAI,KAAK,MAAM,aAAa,WAAW,GAAG;AACtC;AAAA,IACJ;AACA,UAAM,cAAc,OAAO;AAC3B,UAAM,qBAAqB,KAAK,MAAM,aAAa;AAAA,MAC/C,CAAC,EAAE,aAAa,WAAW,MAAM,eAAe;AAAA,IACpD;AACA,eAAW,eAAe,oBAAoB;AAC1C,YAAM,OAAO,OAAO,mBAAmB,WAAW;AAAA,IACtD;AACA,QAAI,KAAK,MAAM,YAAY,QAAQ;AAC/B,aAAO,OAAO,gBAAgB,IAAI;AAAA,QAC9B,KAAK,MAAM,YACN,OAAO,CAAC,EAAE,aAAa,WAAW,MAAM,eAAe,WAAW,EAClE,IAAI,CAAC,EAAE,SAAS,cAAc,MAAM,CAAC,SAAS,aAAa,CAAC;AAAA,MACrE;AAAA,IACJ;AACA,QAAI,KAAK,MAAM,WAAW,QAAQ;AAE9B,YAAM,aAAa,KAAK,MAAM,WAAW;AAAA,QACrC,CAAC,EAAE,aAAa,WAAW,MAAM,eAAe;AAAA,MACpD;AACA,aAAO,OAAO,UAAU,MAAM;AAC9B,iBAAW,SAAS,YAAY;AAC5B,eAAO,OAAO,UAAU,IAAI,MAAM,SAAS,MAAM,SAAS;AAAA,MAC9D;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,qBAAqB,aAA+C;AAChE,UAAM,iBAAiB,oBAAI,IAAY;AACvC,eAAW,YAAY,KAAK,MAAM,cAAc;AAC5C,YAAM,EAAE,eAAe,YAAY,IAAI;AACvC,YAAM,KAAK,GAAG,WAAW,IAAI,aAAa;AAC1C,qBAAe,IAAI,EAAE;AAAA,IACzB;AAEA,UAAM,gBAAgB,oBAAI,IAAY;AACtC,UAAM,oBAAoB,IAAI,MAAc;AAC5C,eAAW,SAAS,aAAa;AAC7B,YAAM,EAAE,SAAS,YAAY,IAAI;AACjC,UAAI,CAAC,QAAQ,qBAAqB,OAAO,GAAG;AACxC,cAAM,IAAI;AAAA,UACN;AAAA,UACA,WAAW;AAAA,QACf;AAAA,MACJ;AAEA,wBAAkB,WAAW,KAAK,kBAAkB,WAAW,KAAK,KAAK;AACzE,YAAM,KAAK,GAAG,WAAW,IAAI,OAAO;AACpC,UAAI,cAAc,IAAI,EAAE,GAAG;AACvB,cAAM,IAAI;AAAA,UACN,qBAAqB,OAAO,oBAAoB,WAAW;AAAA,UAC3D,WAAW;AAAA,QACf;AAAA,MACJ;AACA,oBAAc,IAAI,EAAE;AAAA,IAUxB;AACA,QAAI,kBAAkB,KAAK,WAAS,QAAQ,KAAK,MAAM,kBAAkB,GAAG;AACxE,YAAM,IAAI;AAAA,QACN,0CAA0C,KAAK,MAAM,kBAAkB;AAAA,QACvE,WAAW;AAAA,MACf;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,oBAAoB,YAA+C;AAC/D,UAAM,gBAAgB,oBAAI,IAAY;AACtC,eAAW,SAAS,YAAY;AAC5B,YAAM,EAAE,SAAS,aAAa,UAAU,IAAI;AAC5C,UAAI,YAAY,GAAG;AACf,cAAM,IAAI;AAAA,UACN;AAAA,UACA,WAAW;AAAA,QACf;AAAA,MACJ;AAEA,YAAM,KAAK,GAAG,WAAW,IAAI,OAAO;AACpC,UAAI,cAAc,IAAI,EAAE,GAAG;AACvB,cAAM,IAAI;AAAA,UACN,qBAAqB,OAAO,oBAAoB,WAAW;AAAA,UAC3D,WAAW;AAAA,QACf;AAAA,MACJ;AACA,oBAAc,IAAI,EAAE;AAEpB,YAAM,cAAc,IAAI,IAAY,SAAS;AAC7C,UAAI,YAAY,SAAS,UAAU,QAAQ;AACvC,cAAM,IAAI;AAAA,UACN,qCAAqC,OAAO,oBAAoB,WAAW;AAAA,UAC3E,WAAW;AAAA,QACf;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,mBACI,aACA,SACA,SACF;AACE,QAAI,YAAY,UAAa,eAAe,OAAO,GAAG;AAClD,YAAM,SAAS,QAAQ,SAAS;AAChC,YAAM,cAAc,QAAQ;AAG5B,UAAI,WAAW,UAAa,gBAAgB,QAAW;AACnD,eAAO,OAAO,gBAAgB,IAAI;AAAA,UAC9B,YACK,OAAO,CAAC,EAAE,aAAa,WAAW,MAAM,eAAe,WAAW,EAClE,IAAI,CAAC,EAAE,SAAS,cAAc,MAAM,CAAC,SAAS,aAAa,CAAC;AAAA,QACrE;AACA;AAAA,MACJ;AAAA,IACJ;AAEA,UAAM,UAAU,KAAK,IAAI,IAAI,aAAa;AAC1C,UAAM,aAAa,oBAAI,IAAuC;AAC9D,eAAW,SAAS,aAAa;AAC7B,YAAM,EAAE,aAAa,SAAS,cAAc,IAAI;AAEhD,YAAM,YAAY,WAAW,IAAI,WAAW,KAAK,oBAAI,IAAqB;AAC1E,gBAAU,IAAI,SAAS,aAAa;AACpC,iBAAW,IAAI,aAAa,SAAS;AAAA,IACzC;AACA,eAAW,UAAU,SAAS;AAC1B,YAAM,cAAc,OAAO;AAC3B,YAAM,MAAM,WAAW,IAAI,WAAW;AACtC,UAAI,QAAQ,QAAW;AACnB;AAAA,MACJ;AACA,aAAO,OAAO,gBAAgB;AAAA,IAClC;AAAA,EACJ;AAAA,EAEA,MAAe,YAAY,EAAE,YAAY,GAA0C;AAC/E,sBAAkB,KAAK,OAAO;AAE9B,UAAM;AAAA,MACF;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,0BAA0B,mBAAmB,wBAAwB;AAAA,IACzE,IAAI;AAKJ,QAAI,YAAY,oBAAoB,gBAAgB;AAChD,kBAAY,kBAAkB;AAC9B,kBAAY,YAAY;AAAA,IAC5B;AACA,QAAI,YAAY,oBAAoB,gBAAgB;AAChD,kBAAY,kBAAkB;AAC9B,kBAAY,YAAY;AAAA,IAC5B;AACA,QAAI,YAAY,oBAAoB,gBAAgB;AAChD,kBAAY,kBAAkB;AAC9B,kBAAY,YAAY;AAAA,IAC5B;AAEA,QAAI,cAAc,QAAQ,oBAAoB,MAAM;AAChD,YAAM,IAAI,oBAAoB,6CAA6C,WAAW,cAAc;AAAA,IACxG;AACA,QAAI,oBAAoB,GAAG;AACvB,YAAM,IAAI,oBAAoB,iCAAiC,WAAW,cAAc;AAAA,IAC5F;AAEA,QAAI,cAAc,SAAS,oBAAoB,QAAQ,mBAAmB,kBAAkB;AACxF,YAAM,IAAI;AAAA,QACN;AAAA,QACA,WAAW;AAAA,MACf;AAAA,IACJ;AACA,QAAI,cAAc,QAAQ,oBAAoB,MAAM;AAChD,YAAM,IAAI,oBAAoB,mDAAmD,WAAW,cAAc;AAAA,IAC9G;AAEA,QAAI,cAAc,QAAQ,cAAc,MAAM;AAC1C,YAAM,IAAI,oBAAoB,6CAA6C,WAAW,cAAc;AAAA,IACxG;AACA,QACI,cAAc,SACb,oBAAoB,QAAQ,oBAAoB,QAAQ,mBAAmB,kBAC9E;AACE,YAAM,IAAI;AAAA,QACN;AAAA,QACA,WAAW;AAAA,MACf;AAAA,IACJ;AACA,QAAI,cAAc,QAAQ,oBAAoB,MAAM;AAChD,YAAM,IAAI,oBAAoB,mDAAmD,WAAW,cAAc;AAAA,IAC9G;AAEA,QAAI,2BAA2B,mBAAmB,uBAAuB,YAAY;AACjF,YAAM,IAAI,oBAAoB,6CAA6C,WAAW,cAAc;AAAA,IACxG;AAGA,QAAI,4BAA4B,mBAAmB,wBAAwB,YAAY;AACnF,YAAM,IAAI,oBAAoB,8CAA8C,WAAW,cAAc;AAAA,IACzG;AAEA,UAAM,SAAS,KAAK,QAAQ,QAAQ;AACpC,UAAM,cAAc,OAAO;AAG3B,UAAM,gBAAgB,KAAK,MAAM,aAAa;AAAA,MAC1C,CAAC,EAAE,eAAe,SAAS,aAAa,WAAW,MAC/C,eAAe,eAAe,YAAY;AAAA,IAClD;AACA,QAAI,kBAAkB,IAAI;AAEtB,WAAK,MAAM,aAAa,aAAa,IAAI,EAAE,GAAG,aAAa,YAAY;AAAA,IAC3E,OAAO;AAEH,YAAM,kBAAkB,KAAK,MAAM,aAAa;AAAA,QAC5C,CAAC,EAAE,aAAa,WAAW,MAAM,eAAe;AAAA,MACpD,EAAE;AACF,UAAI,mBAAmB,KAAK,MAAM,uBAAuB;AACrD,cAAM,IAAI;AAAA,UACN,sCAAsC,WAAW,gBAAgB,KAAK,MAAM,qBAAqB;AAAA,UACjG,WAAW;AAAA,QACf;AAAA,MACJ;AACA,WAAK,MAAM,aAAa,KAAK,EAAE,GAAG,aAAa,YAAY,CAAC;AAAA,IAChE;AAGA,UAAM,OAAO,OAAO,mBAAmB,WAAW;AAAA,EACtD;AAAA,EAES,WAAW;AAAA,IAChB;AAAA,EACJ,GAAgF;AAC5E,sBAAkB,KAAK,OAAO;AAE9B,UAAM,SAAS,KAAK,QAAQ,QAAQ;AAGpC,UAAM,cAAc,OAAO,OAAO,QAAQ,cAAc,aAAa;AACrE,QAAI,gBAAgB,QAAW;AAC3B,YAAM,IAAI,oBAAoB,eAAe,aAAa,cAAc,WAAW,QAAQ;AAAA,IAC/F;AAEA,WAAO;AAAA,MACH,aAAa;AAAA,QACT,GAAG;AAAA,QACH,WAAW;AAAA,QACX,WAAW;AAAA,QACX,WAAW;AAAA,MACf;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,MAAe,aAAa,EAAE,cAAc,GAA2C;AACnF,QAAI,kBAAkB,GAAG;AACrB,YAAM,IAAI,oBAAoB,eAAe,aAAa,sBAAsB,WAAW,cAAc;AAAA,IAC7G;AAEA,sBAAkB,KAAK,OAAO;AAE9B,UAAM,SAAS,KAAK,QAAQ,QAAQ;AACpC,UAAM,cAAc,OAAO;AAG3B,UAAM,gBAAgB,KAAK,MAAM,aAAa;AAAA,MAC1C,CAAC,EAAE,eAAe,SAAS,aAAa,WAAW,MAC/C,eAAe,eAAe,YAAY;AAAA,IAClD;AACA,QAAI,kBAAkB,IAAI;AACtB,YAAM,IAAI,oBAAoB,eAAe,aAAa,cAAc,WAAW,QAAQ;AAAA,IAC/F;AACA,SAAK,MAAM,aAAa,OAAO,eAAe,CAAC;AAI/C,UAAM,cAAc,SAAS,KAAK,MAAM,WAAW;AACnD,SAAK,MAAM,cAAc,YAAY,OAAO,CAAC,EAAE,eAAe,QAAQ,MAAM,kBAAkB,OAAO;AAGrG,UAAM,OAAO,OAAO,kBAAkB,aAAa;AAAA,EACvD;AAAA,EAES,uBAAwE;AAC7E,sBAAkB,KAAK,OAAO;AAE9B,UAAM,SAAS,KAAK,QAAQ,QAAQ;AACpC,UAAM,cAAc,OAAO;AAE3B,UAAM,iBAAiB,KAAK,MAAM,aAC7B,OAAO,CAAC,EAAE,aAAa,WAAW,MAAM,eAAe,WAAW,EAClE,IAAI,CAAC,EAAE,cAAc,MAAM,aAAa;AAC7C,mBAAe,QAAQ,CAAC;AAExB,WAAO;AAAA,MACH;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,oBAAoB,QAAgB,SAAkB,YAA4B,WAAyB;AACvG,UAAM,cAAc,OAAO;AAE3B,UAAM,qBAAqB,KAAK,MAAM,WAAW;AAAA,MAC7C,WAAS,MAAM,YAAY,WAAW,MAAM,gBAAgB;AAAA,IAChE;AACA,QAAI,uBAAuB,IAAI;AAE3B,UAAI,CAAC,KAAK,MAAM,WAAW,kBAAkB,EAAE,UAAU,SAAS,UAAU,GAAG;AAC3E,aAAK,MAAM,WAAW,kBAAkB,EAAE,UAAU,KAAK,UAAU;AACnE,eAAO,OAAO,UAAU,IAAI,SAAS,KAAK,MAAM,WAAW,kBAAkB,EAAE,SAAS;AAAA,MAC5F;AACA,WAAK,MAAM,WAAW,kBAAkB,EAAE,YAAY;AAAA,IAC1D,OAAO;AACH,UACI,KAAK,MAAM,WAAW,OAAO,CAAC,EAAE,aAAa,iBAAiB,MAAM,qBAAqB,WAAW,EAC/F,UAAU,KAAK,MAAM,oBAC5B;AACE,cAAM,IAAI;AAAA,UACN,8BAA8B,WAAW,gBAAgB,KAAK,MAAM,kBAAkB;AAAA,UACtF,WAAW;AAAA,QACf;AAAA,MACJ;AAGA,WAAK,MAAM,WAAW,KAAK;AAAA,QACvB;AAAA,QACA,WAAW,CAAC,UAAU;AAAA,QACtB;AAAA,QACA;AAAA,MACJ,CAAC;AACD,aAAO,OAAO,UAAU,IAAI,SAAS,CAAC,UAAU,CAAC;AAAA,IACrD;AACA,WAAO;AAAA,MACH,kBAAkB,UAAU,aAAa,OAAO,cAAc,WAAW,eAAe,SAAS;AAAA,IACrG;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA,EAKA,eAAe,QAAgB,YAA4B,SAA4B;AACnF,QAAI,WAAW;AAEf,UAAM,aAAa,KAAK,MAAM;AAC9B,UAAM,cAAc,OAAO;AAG3B,aAAS,IAAI,WAAW,SAAS,GAAG,KAAK,GAAG,KAAK;AAC7C,YAAM,QAAQ,WAAW,CAAC;AAC1B,UAAI,MAAM,gBAAgB,eAAgB,YAAY,UAAa,MAAM,YAAY,SAAU;AAC3F;AAAA,MACJ;AACA,YAAM,iBAAiB,MAAM,UAAU,SAAS,UAAU;AAC1D,UAAI,gBAAgB;AAChB,YAAI,MAAM,UAAU,WAAW,KAAK,MAAM,UAAU,CAAC,MAAM,YAAY;AACnE,gBAAMA,WAAU,MAAM;AAEtB,qBAAW,OAAO,GAAG,CAAC;AACtB,iBAAO,OAAO,UAAU,OAAOA,QAAO;AAAA,QAC1C,OAAO;AACH,gBAAM,YAAY,MAAM,UAAU,OAAO,QAAM,OAAO,UAAU;AAChE,iBAAO,OAAO,UAAU,IAAI,MAAM,SAAS,MAAM,SAAS;AAAA,QAC9D;AACA,mBAAW;AAAA,MACf;AAAA,IACJ;AACA,WAAO;AAAA,EACX;AACJ;AAAA,CAEO,CAAUC,8BAAV;AAAA,EACI,MAAM,cAAc,2BAA2B,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA,IAKxD,eAAkF,CAAC;AAAA;AAAA,IAG1E,wBAAwB;AAAA;AAAA,IACxB,qBAAqB;AAAA;AAAA,EAClC;AAVO,EAAAA,0BAAM;AAAA,GADA;",
|
|
5
5
|
"names": ["groupId", "GroupKeyManagementServer"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/groups/GroupsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"GroupsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/groups/GroupsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAkD1C,QAAA,MAAM,UAAU,kPAAiD,CAAC;AAElE;;GAEG;AACH,qBAAa,YAAa,SAAQ,UAAU;;IAC/B,UAAU;IAyBJ,QAAQ,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,CAAC,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC;IA8BhG,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,iBAAiB;IAmBnE,kBAAkB,CAAC,EAC9B,SAAS,GACZ,EAAE,MAAM,CAAC,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAC;IAoBjE,WAAW,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC;IAqBxF,eAAe;IASf,qBAAqB,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,CAAC,4BAA4B;CASnG"}
|
|
@@ -9,6 +9,7 @@ import { Groups } from "#clusters/groups";
|
|
|
9
9
|
import { RootEndpoint } from "#endpoints/root";
|
|
10
10
|
import { InternalError, Logger } from "#general";
|
|
11
11
|
import { AccessLevel } from "#model";
|
|
12
|
+
import { assertRemoteActor } from "#protocol";
|
|
12
13
|
import {
|
|
13
14
|
Command,
|
|
14
15
|
StatusCode,
|
|
@@ -59,14 +60,16 @@ class GroupsServer extends GroupsBase {
|
|
|
59
60
|
return rootEndpoint;
|
|
60
61
|
}
|
|
61
62
|
async #actOnGroupKeyManagement(act) {
|
|
63
|
+
assertRemoteActor(this.context);
|
|
62
64
|
const agent = this.#rootEndpoint.agentFor(this.context);
|
|
63
65
|
const gkm = agent.get(GroupKeyManagementServer);
|
|
64
66
|
await agent.context.transaction.addResources(gkm);
|
|
65
67
|
await agent.context.transaction.begin();
|
|
66
|
-
return act(gkm);
|
|
68
|
+
return act(this.context.session.associatedFabric, gkm);
|
|
67
69
|
}
|
|
68
70
|
async addGroup({ groupId, groupName }) {
|
|
69
|
-
|
|
71
|
+
assertRemoteActor(this.context);
|
|
72
|
+
const fabric = this.context.session.associatedFabric;
|
|
70
73
|
if (groupId < 1) {
|
|
71
74
|
return { status: StatusCode.ConstraintError, groupId };
|
|
72
75
|
}
|
|
@@ -79,7 +82,7 @@ class GroupsServer extends GroupsBase {
|
|
|
79
82
|
const endpointNumber = this.endpoint.number;
|
|
80
83
|
try {
|
|
81
84
|
await this.#actOnGroupKeyManagement(
|
|
82
|
-
(gkm) => gkm.addEndpointForGroup(
|
|
85
|
+
(fabric2, gkm) => gkm.addEndpointForGroup(fabric2, groupId, endpointNumber, groupName)
|
|
83
86
|
);
|
|
84
87
|
} catch (error) {
|
|
85
88
|
logger.error(error);
|
|
@@ -89,7 +92,8 @@ class GroupsServer extends GroupsBase {
|
|
|
89
92
|
return { status: StatusCode.Success, groupId };
|
|
90
93
|
}
|
|
91
94
|
viewGroup({ groupId }) {
|
|
92
|
-
|
|
95
|
+
assertRemoteActor(this.context);
|
|
96
|
+
const fabric = this.context.session.associatedFabric;
|
|
93
97
|
if (groupId < 1) {
|
|
94
98
|
return { status: StatusCode.ConstraintError, groupId, groupName: "" };
|
|
95
99
|
}
|
|
@@ -105,7 +109,8 @@ class GroupsServer extends GroupsBase {
|
|
|
105
109
|
async getGroupMembership({
|
|
106
110
|
groupList
|
|
107
111
|
}) {
|
|
108
|
-
|
|
112
|
+
assertRemoteActor(this.context);
|
|
113
|
+
const fabric = this.context.session.associatedFabric;
|
|
109
114
|
const fabricIndex = fabric.fabricIndex;
|
|
110
115
|
const endpointNumber = this.endpoint.number;
|
|
111
116
|
const { groupTable } = this.#rootEndpoint.stateOf(GroupKeyManagementServer);
|
|
@@ -125,7 +130,7 @@ class GroupsServer extends GroupsBase {
|
|
|
125
130
|
}
|
|
126
131
|
try {
|
|
127
132
|
if (await this.#actOnGroupKeyManagement(
|
|
128
|
-
(gkm) => gkm.removeEndpoint(
|
|
133
|
+
(fabric, gkm) => gkm.removeEndpoint(fabric, this.endpoint.number, groupId)
|
|
129
134
|
)) {
|
|
130
135
|
return { status: StatusCode.Success, groupId };
|
|
131
136
|
}
|
|
@@ -138,9 +143,7 @@ class GroupsServer extends GroupsBase {
|
|
|
138
143
|
// TODO ScenesManagement cluster is also affected by this command
|
|
139
144
|
async removeAllGroups() {
|
|
140
145
|
try {
|
|
141
|
-
await this.#actOnGroupKeyManagement(
|
|
142
|
-
(gkm) => gkm.removeEndpoint(this.session.associatedFabric, this.endpoint.number)
|
|
143
|
-
);
|
|
146
|
+
await this.#actOnGroupKeyManagement((fabric, gkm) => gkm.removeEndpoint(fabric, this.endpoint.number));
|
|
144
147
|
} catch (error) {
|
|
145
148
|
StatusResponseError.accept(error);
|
|
146
149
|
throw error;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/groups/GroupsServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,gCAAgC;AACzC,SAAS,wBAAwB;AACjC,SAAS,cAAc;AAEvB,SAAS,oBAAoB;AAC7B,SAAS,eAAe,cAAc;AACtC,SAAS,mBAAmB;AAC5B;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,sBAAsB;AAE/B,MAAM,SAAS,OAAO,IAAI,cAAc;AAOxC,OAAO,QAAQ,WAAW;AAAA,EACtB,GAAG,OAAO,QAAQ;AAAA,EAClB,UAAU;AAAA,IACN;AAAA,IACA,UAAU;AAAA,MACN,SAAS,SAAS,GAAG,UAAU;AAAA,MAC/B,WAAW,SAAS,GAAG,SAAS;AAAA,IACpC,CAAC;AAAA,IACD;AAAA,IACA,OAAO;AAAA,IACP,EAAE,WAAW,YAAY,OAAO;AAAA,EACpC;AAAA,EACA,uBAAuB;AAAA,IACnB;AAAA,IACA,UAAU;AAAA,MACN,SAAS,SAAS,GAAG,UAAU;AAAA,MAC/B,WAAW,SAAS,GAAG,SAAS;AAAA,IACpC,CAAC;AAAA,IACD;AAAA,IACA;AAAA,IACA,EAAE,WAAW,YAAY,OAAO;AAAA,EACpC;AACJ;AAGA,MAAM,aAAa,eAAe,KAAK,OAAO,QAAQ,UAAU;AAKzD,MAAM,qBAAqB,WAAW;AAAA,EAChC,aAAa;AAClB,SAAK,MAAM,YAAY,aAAa,KAAK,SAAS;AAAA,EACtD;AAAA;AAAA;AAAA,EAIA,IAAI,gBAAwC;AACxC,UAAM,eAAe,KAAK,SAAS,YAAY,YAAY;AAC3D,QAAI,iBAAiB,QAAW;AAC5B,YAAM,IAAI,cAAc,wBAAwB;AAAA,IACpD;AACA,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,
|
|
5
|
-
"names": []
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,gCAAgC;AACzC,SAAS,wBAAwB;AACjC,SAAS,cAAc;AAEvB,SAAS,oBAAoB;AAC7B,SAAS,eAAe,cAAc;AACtC,SAAS,mBAAmB;AAC5B,SAAS,yBAAiC;AAC1C;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,sBAAsB;AAE/B,MAAM,SAAS,OAAO,IAAI,cAAc;AAOxC,OAAO,QAAQ,WAAW;AAAA,EACtB,GAAG,OAAO,QAAQ;AAAA,EAClB,UAAU;AAAA,IACN;AAAA,IACA,UAAU;AAAA,MACN,SAAS,SAAS,GAAG,UAAU;AAAA,MAC/B,WAAW,SAAS,GAAG,SAAS;AAAA,IACpC,CAAC;AAAA,IACD;AAAA,IACA,OAAO;AAAA,IACP,EAAE,WAAW,YAAY,OAAO;AAAA,EACpC;AAAA,EACA,uBAAuB;AAAA,IACnB;AAAA,IACA,UAAU;AAAA,MACN,SAAS,SAAS,GAAG,UAAU;AAAA,MAC/B,WAAW,SAAS,GAAG,SAAS;AAAA,IACpC,CAAC;AAAA,IACD;AAAA,IACA;AAAA,IACA,EAAE,WAAW,YAAY,OAAO;AAAA,EACpC;AACJ;AAGA,MAAM,aAAa,eAAe,KAAK,OAAO,QAAQ,UAAU;AAKzD,MAAM,qBAAqB,WAAW;AAAA,EAChC,aAAa;AAClB,SAAK,MAAM,YAAY,aAAa,KAAK,SAAS;AAAA,EACtD;AAAA;AAAA;AAAA,EAIA,IAAI,gBAAwC;AACxC,UAAM,eAAe,KAAK,SAAS,YAAY,YAAY;AAC3D,QAAI,iBAAiB,QAAW;AAC5B,YAAM,IAAI,cAAc,wBAAwB;AAAA,IACpD;AACA,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,yBACF,KACU;AACV,sBAAkB,KAAK,OAAO;AAC9B,UAAM,QAAQ,KAAK,cAAc,SAAS,KAAK,OAAO;AACtD,UAAM,MAAM,MAAM,IAAI,wBAAwB;AAC9C,UAAM,MAAM,QAAQ,YAAY,aAAa,GAAG;AAChD,UAAM,MAAM,QAAQ,YAAY,MAAM;AACtC,WAAO,IAAI,KAAK,QAAQ,QAAQ,kBAAkB,GAAG;AAAA,EACzD;AAAA,EAEA,MAAe,SAAS,EAAE,SAAS,UAAU,GAA6D;AACtG,sBAAkB,KAAK,OAAO;AAC9B,UAAM,SAAS,KAAK,QAAQ,QAAQ;AAEpC,QAAI,UAAU,GAAG;AACb,aAAO,EAAE,QAAQ,WAAW,iBAAiB,QAAQ;AAAA,IACzD;AACA,QAAI,UAAU,SAAS,IAAI;AACvB,aAAO,EAAE,QAAQ,WAAW,iBAAiB,QAAQ;AAAA,IACzD;AAEA,QAAI,CAAC,OAAO,OAAO,cAAc,IAAI,OAAO,GAAG;AAC3C,aAAO,EAAE,QAAQ,WAAW,mBAAmB,QAAQ;AAAA,IAC3D;AAEA,UAAM,iBAAiB,KAAK,SAAS;AAErC,QAAI;AACA,YAAM,KAAK;AAAA,QAAyB,CAACA,SAAQ,QACzC,IAAI,oBAAoBA,SAAQ,SAAS,gBAAgB,SAAS;AAAA,MACtE;AAAA,IACJ,SAAS,OAAO;AACZ,aAAO,MAAM,KAAK;AAClB,0BAAoB,OAAO,KAAK;AAChC,aAAO,EAAE,QAAQ,MAAM,MAAM,QAAQ;AAAA,IACzC;AAEA,WAAO,EAAE,QAAQ,WAAW,SAAS,QAAQ;AAAA,EACjD;AAAA,EAES,UAAU,EAAE,QAAQ,GAAsD;AAC/E,sBAAkB,KAAK,OAAO;AAC9B,UAAM,SAAS,KAAK,QAAQ,QAAQ;AAEpC,QAAI,UAAU,GAAG;AACb,aAAO,EAAE,QAAQ,WAAW,iBAAiB,SAAS,WAAW,GAAG;AAAA,IACxE;AAEA,UAAM,cAAc,OAAO;AAC3B,UAAM,iBAAiB,KAAK,SAAS;AAErC,UAAM,EAAE,WAAW,IAAI,KAAK,cAAc,QAAQ,wBAAwB;AAC1E,UAAM,aAAa,WAAW,KAAK,WAAS,MAAM,YAAY,WAAW,MAAM,gBAAgB,WAAW;AAC1G,QAAI,eAAe,UAAa,CAAC,WAAW,UAAU,SAAS,cAAc,GAAG;AAC5E,aAAO,EAAE,QAAQ,WAAW,UAAU,SAAS,WAAW,GAAG;AAAA,IACjE;AACA,WAAO,EAAE,QAAQ,WAAW,SAAS,SAAS,WAAW,WAAW,aAAa,GAAG;AAAA,EACxF;AAAA,EAEA,MAAe,mBAAmB;AAAA,IAC9B;AAAA,EACJ,GAAiF;AAC7E,sBAAkB,KAAK,OAAO;AAC9B,UAAM,SAAS,KAAK,QAAQ,QAAQ;AACpC,UAAM,cAAc,OAAO;AAC3B,UAAM,iBAAiB,KAAK,SAAS;AAErC,UAAM,EAAE,WAAW,IAAI,KAAK,cAAc,QAAQ,wBAAwB;AAC1E,UAAM,iBAAiB,WAAW;AAAA,MAC9B,WAAS,MAAM,UAAU,SAAS,cAAc,KAAK,MAAM,gBAAgB;AAAA,IAC/E;AACA,UAAM,mBAAmB,eAAe,IAAI,WAAS,MAAM,OAAO;AAElE,QAAI,UAAU,WAAW,GAAG;AACxB,aAAO,EAAE,UAAU,MAAO,iBAAiB,QAAQ,WAAW,iBAAiB;AAAA,IACnF;AAEA,UAAM,qBAAqB,UAAU,OAAO,aAAW,iBAAiB,SAAS,OAAO,CAAC;AACzF,WAAO,EAAE,UAAU,MAAO,iBAAiB,QAAQ,WAAW,mBAAmB;AAAA,EACrF;AAAA,EAEA,MAAe,YAAY,EAAE,QAAQ,GAAmE;AACpG,QAAI,UAAU,GAAG;AACb,aAAO,EAAE,QAAQ,WAAW,iBAAiB,QAAQ;AAAA,IACzD;AAEA,QAAI;AACA,UACI,MAAM,KAAK;AAAA,QAAyB,CAAC,QAAQ,QACzC,IAAI,eAAe,QAAQ,KAAK,SAAS,QAAQ,OAAO;AAAA,MAC5D,GACF;AACE,eAAO,EAAE,QAAQ,WAAW,SAAS,QAAQ;AAAA,MACjD;AACA,aAAO,EAAE,QAAQ,WAAW,UAAU,QAAQ;AAAA,IAClD,SAAS,OAAO;AACZ,0BAAoB,OAAO,KAAK;AAChC,aAAO,EAAE,QAAQ,MAAM,MAAM,QAAQ;AAAA,IACzC;AAAA,EACJ;AAAA;AAAA,EAGA,MAAe,kBAAkB;AAC7B,QAAI;AACA,YAAM,KAAK,yBAAyB,CAAC,QAAQ,QAAQ,IAAI,eAAe,QAAQ,KAAK,SAAS,MAAM,CAAC;AAAA,IACzG,SAAS,OAAO;AACZ,0BAAoB,OAAO,KAAK;AAChC,YAAM;AAAA,IACV;AAAA,EACJ;AAAA,EAEA,MAAe,sBAAsB,EAAE,SAAS,UAAU,GAAwC;AAC9F,QAAI,KAAK,SAAS,QAAQ,gBAAgB,EAAE,eAAe,GAAG;AAE1D,YAAM,EAAE,OAAO,IAAI,MAAM,KAAK,SAAS,EAAE,SAAS,UAAU,CAAC;AAC7D,UAAI,WAAW,WAAW,SAAS;AAC/B,cAAM,IAAI,oBAAoB,uBAAuB,OAAO,IAAI,MAAM;AAAA,MAC1E;AAAA,IACJ;AAAA,EACJ;AACJ;",
|
|
5
|
+
"names": ["fabric"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperationalCredentialsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/operational-credentials/OperationalCredentialsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAI3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAsD,YAAY,EAAuB,MAAM,UAAU,CAAC;AAGjH,OAAO,
|
|
1
|
+
{"version":3,"file":"OperationalCredentialsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/operational-credentials/OperationalCredentialsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAI3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAsD,YAAY,EAAuB,MAAM,UAAU,CAAC;AAGjH,OAAO,EAGH,mBAAmB,EAYnB,GAAG,EACN,MAAM,WAAW,CAAC;AACnB,OAAO,EAEH,WAAW,EASd,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AA8BrF;;;;;;;GAOG;AACH,qBAAa,4BAA6B,SAAQ,8BAA8B;;IACpE,QAAQ,EAAE,4BAA4B,CAAC,QAAQ,CAAC;IAChD,KAAK,EAAE,4BAA4B,CAAC,KAAK,CAAC;IAEzC,UAAU,IAAI,YAAY;IAUpB,kBAAkB,CAAC,EAAE,gBAAgB,EAAE,EAAE,sBAAsB,CAAC,kBAAkB;;;;IAuBlF,UAAU,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,sBAAsB,CAAC,UAAU;;;;IAoC1E,uBAAuB,CAAC,EAAE,eAAe,EAAE,EAAE,sBAAsB,CAAC,uBAAuB;;;IAmD3F,MAAM,CAAC,EAClB,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,aAAa,GAChB,EAAE,sBAAsB,CAAC,aAAa;IAmGxB,SAAS,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,sBAAsB,CAAC,gBAAgB;IA8D1E,iBAAiB,CAAC,EAAE,KAAK,EAAE,EAAE,sBAAsB,CAAC,wBAAwB;;;;;;;;;IAmB5E,YAAY,CAAC,EAAE,WAAW,EAAE,EAAE,sBAAsB,CAAC,mBAAmB;;;;;;;;;IAqBxE,yBAAyB,CAAC,EACrC,iBAAiB,GACpB,EAAE,sBAAsB,CAAC,gCAAgC;IAiEpD,gBAAgB;CA6CzB;AAED,yBAAiB,4BAA4B,CAAC;IAC1C,MAAa,QAAQ;QACjB,aAAa,CAAC,EAAE,mBAAmB,CAAC;QACpC,kBAAkB,CAAC,EAAE,WAAW,CAAC;KACpC;IAED,MAAa,KAAM,SAAQ,8BAA8B,CAAC,KAAK;QAC3D;;;;;;;;WAQG;QACH,aAAa,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAa;QAE3D,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,OAAO;;;KAOzE;CACJ"}
|
|
@@ -10,6 +10,7 @@ import { OperationalCredentials } from "#clusters/operational-credentials";
|
|
|
10
10
|
import { Crypto, CryptoVerifyError, Logger, MatterFlowError, UnexpectedDataError } from "#general";
|
|
11
11
|
import { AccessLevel } from "#model";
|
|
12
12
|
import {
|
|
13
|
+
assertRemoteActor,
|
|
13
14
|
CertificateError,
|
|
14
15
|
DeviceCertification,
|
|
15
16
|
DeviceCommissioner,
|
|
@@ -67,11 +68,12 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
67
68
|
this.reactTo(this.endpoint.lifecycle.online, this.#nodeOnline);
|
|
68
69
|
}
|
|
69
70
|
async attestationRequest({ attestationNonce }) {
|
|
71
|
+
assertRemoteActor(this.context);
|
|
70
72
|
if (attestationNonce.byteLength !== 32) {
|
|
71
73
|
throw new StatusResponseError("Invalid attestation nonce length", StatusCode.InvalidCommand);
|
|
72
74
|
}
|
|
73
75
|
const certification = await this.getCertification();
|
|
74
|
-
const session = this.session;
|
|
76
|
+
const session = this.context.session;
|
|
75
77
|
NodeSession.assert(session);
|
|
76
78
|
const attestationElements = TlvAttestation.encode({
|
|
77
79
|
declaration: certification.declaration,
|
|
@@ -82,10 +84,11 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
82
84
|
return { attestationElements, attestationSignature };
|
|
83
85
|
}
|
|
84
86
|
async csrRequest({ csrNonce, isForUpdateNoc }) {
|
|
87
|
+
assertRemoteActor(this.context);
|
|
85
88
|
if (csrNonce.byteLength !== 32) {
|
|
86
89
|
throw new StatusResponseError("Invalid csr nonce length", StatusCode.InvalidCommand);
|
|
87
90
|
}
|
|
88
|
-
const session = this.session;
|
|
91
|
+
const session = this.context.session;
|
|
89
92
|
NodeSession.assert(session);
|
|
90
93
|
if (isForUpdateNoc && session.isPase) {
|
|
91
94
|
throw new StatusResponseError(
|
|
@@ -102,9 +105,10 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
102
105
|
);
|
|
103
106
|
}
|
|
104
107
|
const certification = await this.getCertification();
|
|
108
|
+
assertRemoteActor(this.context);
|
|
105
109
|
const certSigningRequest = await failsafeContext.createCertificateSigningRequest(
|
|
106
110
|
isForUpdateNoc ?? false,
|
|
107
|
-
this.session.id
|
|
111
|
+
this.context.session.id
|
|
108
112
|
);
|
|
109
113
|
const nocsrElements = TlvCertSigningRequest.encode({ certSigningRequest, csrNonce });
|
|
110
114
|
return { nocsrElements, attestationSignature: await certification.sign(session, nocsrElements) };
|
|
@@ -159,6 +163,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
159
163
|
caseAdminSubject,
|
|
160
164
|
adminVendorId
|
|
161
165
|
}) {
|
|
166
|
+
assertRemoteActor(this.context);
|
|
162
167
|
const failsafeContext = this.#failsafeContext;
|
|
163
168
|
if (failsafeContext.fabricIndex !== void 0) {
|
|
164
169
|
throw new StatusResponseError(
|
|
@@ -172,7 +177,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
172
177
|
debugText: "Root certificate not found"
|
|
173
178
|
};
|
|
174
179
|
}
|
|
175
|
-
if (failsafeContext.csrSessionId !== this.session.id) {
|
|
180
|
+
if (failsafeContext.csrSessionId !== this.context.session.id) {
|
|
176
181
|
return {
|
|
177
182
|
statusCode: OperationalCredentials.NodeOperationalCertStatus.MissingCsr,
|
|
178
183
|
debugText: "CSR not found in failsafe context"
|
|
@@ -205,7 +210,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
205
210
|
return this.#mapNocErrors(error);
|
|
206
211
|
}
|
|
207
212
|
await this.endpoint.act((agent) => agent.get(AccessControlServer).addDefaultCaseAcl(fabric, [caseAdminSubject]));
|
|
208
|
-
const session = this.session;
|
|
213
|
+
const session = this.context.session;
|
|
209
214
|
NodeSession.assert(session);
|
|
210
215
|
await failsafeContext.addFabric(fabric);
|
|
211
216
|
try {
|
|
@@ -231,7 +236,8 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
231
236
|
};
|
|
232
237
|
}
|
|
233
238
|
async updateNoc({ nocValue, icacValue }) {
|
|
234
|
-
|
|
239
|
+
assertRemoteActor(this.context);
|
|
240
|
+
NodeSession.assert(this.context.session);
|
|
235
241
|
const timedOp = this.#failsafeContext;
|
|
236
242
|
if (timedOp.fabricIndex !== void 0) {
|
|
237
243
|
throw new StatusResponseError(
|
|
@@ -255,7 +261,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
255
261
|
statusCode: OperationalCredentials.NodeOperationalCertStatus.MissingCsr
|
|
256
262
|
};
|
|
257
263
|
}
|
|
258
|
-
if (this.session.associatedFabric.fabricIndex !== timedOp.associatedFabric?.fabricIndex) {
|
|
264
|
+
if (this.context.session.associatedFabric.fabricIndex !== timedOp.associatedFabric?.fabricIndex) {
|
|
259
265
|
throw new StatusResponseError(
|
|
260
266
|
"Fabric of this session and the failsafe context do not match",
|
|
261
267
|
StatusCode.ConstraintError
|
|
@@ -274,7 +280,8 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
274
280
|
}
|
|
275
281
|
}
|
|
276
282
|
async updateFabricLabel({ label }) {
|
|
277
|
-
|
|
283
|
+
assertRemoteActor(this.context);
|
|
284
|
+
const fabric = this.context.session.associatedFabric;
|
|
278
285
|
const currentFabricIndex = fabric.fabricIndex;
|
|
279
286
|
const fabrics = this.env.get(FabricManager);
|
|
280
287
|
const conflictingLabelFabric = fabrics.find((f) => f.label === label && f.fabricIndex !== currentFabricIndex);
|
|
@@ -288,6 +295,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
288
295
|
return { statusCode: OperationalCredentials.NodeOperationalCertStatus.Ok, fabricIndex: fabric.fabricIndex };
|
|
289
296
|
}
|
|
290
297
|
async removeFabric({ fabricIndex }) {
|
|
298
|
+
assertRemoteActor(this.context);
|
|
291
299
|
const fabric = this.env.get(FabricManager).findByIndex(fabricIndex);
|
|
292
300
|
if (fabric === void 0) {
|
|
293
301
|
return {
|
|
@@ -295,7 +303,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
295
303
|
debugText: `Fabric ${fabricIndex} not found`
|
|
296
304
|
};
|
|
297
305
|
}
|
|
298
|
-
await fabric.remove(this.session.id);
|
|
306
|
+
await fabric.remove(this.context.session.id);
|
|
299
307
|
return {
|
|
300
308
|
statusCode: OperationalCredentials.NodeOperationalCertStatus.Ok,
|
|
301
309
|
fabricIndex
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/operational-credentials/OperationalCredentialsServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,2BAA2B;AACpC,SAAS,gCAAgC;AACzC,SAAS,2BAA2B;AACpC,SAAS,8BAA8B;AAEvC,SAAS,QAAQ,mBAAmB,QAAQ,iBAA+B,2BAA2B;AACtG,SAAS,mBAAmB;AAE5B;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,sCAAsC;AAE/C,MAAM,SAAS,OAAO,IAAI,wBAAwB;AAOlD,uBAAuB,QAAQ,WAAW;AAAA,EACtC,GAAG,uBAAuB,QAAQ;AAAA,EAClC,oBAAoB;AAAA,IAChB;AAAA,IACA,UAAU,EAAE,kBAAkB,SAAS,GAAG,aAAa,EAAE,CAAC;AAAA,IAC1D;AAAA,IACA,uBAAuB;AAAA,IACvB,EAAE,WAAW,YAAY,WAAW;AAAA,EACxC;AAAA,EACA,YAAY;AAAA,IACR;AAAA,IACA,UAAU;AAAA,MACN,UAAU,SAAS,GAAG,aAAa;AAAA,MACnC,gBAAgB,iBAAiB,GAAG,UAAU;AAAA,IAClD,CAAC;AAAA,IACD;AAAA,IACA,uBAAuB;AAAA,IACvB,EAAE,WAAW,YAAY,WAAW;AAAA,EACxC;AACJ;AAUO,MAAM,qCAAqC,+BAA+B;AAAA,EAIpE,aAA2B;AAEhC,QAAI,KAAK,MAAM,qBAAqB,QAAW;AAC3C,WAAK,MAAM,mBAAmB;AAAA,IAClC;AACA,SAAK,MAAM,sBAAsB,KAAK,MAAM,QAAQ;AAEpD,SAAK,QAAS,KAAK,SAAkB,UAAU,QAAQ,KAAK,WAAW;AAAA,EAC3E;AAAA,EAEA,MAAe,mBAAmB,EAAE,iBAAiB,GAA8C;AAC/F,QAAI,iBAAiB,eAAe,IAAI;AACpC,YAAM,IAAI,oBAAoB,oCAAoC,WAAW,cAAc;AAAA,IAC/F;AAEA,UAAM,gBAAgB,MAAM,KAAK,iBAAiB;AAElD,UAAM,UAAU,KAAK;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["OperationalCredentialsServer"]
|
|
6
6
|
}
|
|
@@ -94,7 +94,7 @@ class WindowCoveringBaseServer extends WindowCoveringBase {
|
|
|
94
94
|
configStatus.operational = !mode.maintenanceMode || mode.calibrationMode && !this.internal.supportsCalibration;
|
|
95
95
|
configStatus.liftMovementReversed = !!mode.motorDirectionReversed;
|
|
96
96
|
if (isDeepEqual(configStatus, this.state.configStatus)) {
|
|
97
|
-
this.
|
|
97
|
+
this.agent.asLocalActor(() => {
|
|
98
98
|
this.state.configStatus = configStatus;
|
|
99
99
|
});
|
|
100
100
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/window-covering/WindowCoveringServer.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["MovementType", "CalibrationMode", "MovementDirection", "WindowCoveringBaseServer"]
|
|
6
6
|
}
|
|
@@ -78,6 +78,20 @@ export declare class Agent {
|
|
|
78
78
|
* Create a new {@link Agent} that supports the specified behaviors.
|
|
79
79
|
*/
|
|
80
80
|
static for<T extends EndpointType>(type: EndpointType, behaviors: SupportedBehaviors): Agent.Type<T>;
|
|
81
|
+
/**
|
|
82
|
+
* Execute logic with elevated privileges.
|
|
83
|
+
*
|
|
84
|
+
* Temporarily modifies {@link context} to be a {@link LocalActorContext}. This bypasses checks associated with the
|
|
85
|
+
* remote subject.
|
|
86
|
+
*
|
|
87
|
+
* Elevated logic effectively ignores ACLs so should be used with care.
|
|
88
|
+
*
|
|
89
|
+
* Note that interactions with the agent will remain elevated until the synchronous completion of this call. You
|
|
90
|
+
* should only elevate privileges for synchronous logic.
|
|
91
|
+
*
|
|
92
|
+
* @param fn the elevated logic
|
|
93
|
+
*/
|
|
94
|
+
asLocalActor(fn: () => void): void;
|
|
81
95
|
[INSTALL_BEHAVIOR](behavior: Behavior): void;
|
|
82
96
|
}
|
|
83
97
|
export declare namespace Agent {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent.d.ts","sourceRoot":"","sources":["../../../src/endpoint/Agent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAkB,YAAY,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"Agent.d.ts","sourceRoot":"","sources":["../../../src/endpoint/Agent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAkB,YAAY,EAAE,MAAM,UAAU,CAAC;AAExD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;;;;;;;;;;;GAYG;AACH,qBAAa,KAAK;;gBAKF,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa;IAKtD;;OAEG;IACH,IAAI,QAAQ,iCAEX;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,KAAK,GAAG,SAAS,CAK7B;IAED;;OAEG;IACH,IAAI,OAAO,kBAEV;IAED;;OAEG;IACH,GAAG,CAAC,SAAS,SAAS,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI,IAAI,YAAY,CAAC,SAAS,CAAC;IAItF;;;;;;;;OAQG;IACH,GAAG,CAAC,CAAC,SAAS,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,GAKb,YAAY,CAAC,CAAC,CAAC;IAGtC;;;OAGG;IACH,IAAI,CAAC,CAAC,SAAS,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IASrE;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI;IAI5B;;OAEG;IACH,OAAO,CAAC,CAAC,SAAS,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAIvE;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI;IAI5B,IAAI,GAAG,mCAEN;IAED,QAAQ;IAIR;;OAEG;IACH,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,kBAAkB,GAgB1E,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAGvB;;;;;;;;;;;;OAYG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,IAAI;IAoB3B,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,QAAQ;CAGxC;AAED,yBAAiB,KAAK,CAAC;IACnB;;;;;OAKG;IACH,UAAiB,IAAI,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY,CAAC,KAAK;QAC7D,KAAK,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;KACjE;IAED,KAAY,QAAQ,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY,CAAC,KAAK,IAAI,KAAK,GAAG;QACxE,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,WAAW,CAAC,GAAG,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;KACjF,GAAG;QACA,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;KAC3C,CAAC;IAEF;;OAEG;IACH,UAAiB,QAAQ;QACrB,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;KAChD;CACJ"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { GeneratedClass } from "#general";
|
|
7
|
+
import { hasRemoteActor } from "#protocol";
|
|
7
8
|
const INSTALL_BEHAVIOR = Symbol("install-behavior");
|
|
8
9
|
class Agent {
|
|
9
10
|
#endpoint;
|
|
@@ -112,6 +113,37 @@ class Agent {
|
|
|
112
113
|
instanceDescriptors: props
|
|
113
114
|
});
|
|
114
115
|
}
|
|
116
|
+
/**
|
|
117
|
+
* Execute logic with elevated privileges.
|
|
118
|
+
*
|
|
119
|
+
* Temporarily modifies {@link context} to be a {@link LocalActorContext}. This bypasses checks associated with the
|
|
120
|
+
* remote subject.
|
|
121
|
+
*
|
|
122
|
+
* Elevated logic effectively ignores ACLs so should be used with care.
|
|
123
|
+
*
|
|
124
|
+
* Note that interactions with the agent will remain elevated until the synchronous completion of this call. You
|
|
125
|
+
* should only elevate privileges for synchronous logic.
|
|
126
|
+
*
|
|
127
|
+
* @param fn the elevated logic
|
|
128
|
+
*/
|
|
129
|
+
asLocalActor(fn) {
|
|
130
|
+
const { context } = this;
|
|
131
|
+
let restoreContext;
|
|
132
|
+
try {
|
|
133
|
+
if (hasRemoteActor(context)) {
|
|
134
|
+
const { fabric, subject } = context;
|
|
135
|
+
restoreContext = () => {
|
|
136
|
+
Object.assign(context, { fabric, subject });
|
|
137
|
+
};
|
|
138
|
+
delete context.fabric;
|
|
139
|
+
delete context.subject;
|
|
140
|
+
Object.assign(context, { fabric: void 0, subject: void 0 });
|
|
141
|
+
}
|
|
142
|
+
fn();
|
|
143
|
+
} finally {
|
|
144
|
+
restoreContext?.();
|
|
145
|
+
}
|
|
146
|
+
}
|
|
115
147
|
[INSTALL_BEHAVIOR](behavior) {
|
|
116
148
|
this.#behaviors[behavior.constructor.id] = behavior;
|
|
117
149
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/endpoint/Agent.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,sBAAoC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { Behavior } from "#behavior/Behavior.js";
|
|
7
7
|
import { NodeActivity } from "#behavior/context/NodeActivity.js";
|
|
8
8
|
import { ContextAgents } from "#behavior/context/server/ContextAgents.js";
|
|
9
|
-
import {
|
|
9
|
+
import { LocalActorContext } from "#behavior/context/server/LocalActorContext.js";
|
|
10
10
|
import {
|
|
11
11
|
Construction,
|
|
12
12
|
Diagnostic,
|
|
@@ -445,7 +445,7 @@ class Endpoint {
|
|
|
445
445
|
if (!this.#activity) {
|
|
446
446
|
this.#activity = this.env.get(NodeActivity);
|
|
447
447
|
}
|
|
448
|
-
return
|
|
448
|
+
return LocalActorContext.act(
|
|
449
449
|
purpose,
|
|
450
450
|
(context) => {
|
|
451
451
|
return actor(this.agentFor(context));
|