fix: moved nodeIdFromMeta to agent domain

[ci skip]

Author: tegefaulkes

src/agent/handlers/nodesCrossSignClaim.ts

@@ -2,10 +2,10 @@ import type { AgentClaimMessage } from './types';
 import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
 import type ACL from '../../acl/ACL';
 import type NodeManager from '../../nodes/NodeManager';
-import * as networkUtils from '../../network/utils';
 import * as nodesErrors from '../../nodes/errors';
 import { DuplexHandler } from '../../rpc/handlers';
 import * as agentErrors from '../errors';
+import * as agentUtils from '../utils';
 
 class NodesCrossSignClaimHandler extends DuplexHandler<
   {
@@ -21,7 +21,7 @@ class NodesCrossSignClaimHandler extends DuplexHandler<
     meta,
   ): AsyncGenerator<AgentRPCResponseResult<AgentClaimMessage>> {
     const { acl, nodeManager } = this.container;
-    const requestingNodeId = networkUtils.nodeIdFromMeta(meta);
+    const requestingNodeId = agentUtils.nodeIdFromMeta(meta);
     if (requestingNodeId == null) {
       throw new agentErrors.ErrorAgentNodeIdMissing();
     }

src/agent/handlers/nodesHolePunchMessageSend.ts

@@ -8,11 +8,11 @@ import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
 import type { NodeId } from '../../ids';
 import type { HolePunchRelayMessage } from './types';
 import * as agentErrors from '../errors';
-import * as networkUtils from '../../network/utils';
 import { validateSync } from '../../validation';
 import { matchSync } from '../../utils';
 import * as validationUtils from '../../validation/utils';
 import * as nodesUtils from '../../nodes/utils';
+import * as agentUtils from '../utils';
 import { UnaryHandler } from '../../rpc/handlers';
 
 class NodesHolePunchMessageSendHandler extends UnaryHandler<
@@ -56,7 +56,7 @@ class NodesHolePunchMessageSendHandler extends UnaryHandler<
       },
     );
     // Connections should always be validated
-    const requestingNodeId = networkUtils.nodeIdFromMeta(meta);
+    const requestingNodeId = agentUtils.nodeIdFromMeta(meta);
     if (requestingNodeId == null) {
       throw new agentErrors.ErrorAgentNodeIdMissing();
     }

src/agent/handlers/vaultsGitInfoGet.ts

@@ -7,14 +7,14 @@ import type Logger from '@matrixai/logger';
 import type { VaultsGitInfoGetMessage } from './types';
 import type { VaultAction } from '../../vaults/types';
 import * as agentErrors from '../errors';
-import * as networkUtils from '../../network/utils';
 import * as vaultsUtils from '../../vaults/utils';
 import * as vaultsErrors from '../../vaults/errors';
 import { ServerHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation';
 import { matchSync } from '../../utils';
 import * as validationUtils from '../../validation/utils';
 import * as nodesUtils from '../../nodes/utils';
+import * as agentUtils from '../utils';
 
 class VaultsGitInfoGetHandler extends ServerHandler<
   {
@@ -65,7 +65,7 @@ class VaultsGitInfoGetHandler extends ServerHandler<
         throw new vaultsErrors.ErrorVaultsVaultUndefined();
       }
       // Getting the NodeId from the connection metadata
-      const requestingNodeId = networkUtils.nodeIdFromMeta(meta);
+      const requestingNodeId = agentUtils.nodeIdFromMeta(meta);
       if (requestingNodeId == null) {
         throw new agentErrors.ErrorAgentNodeIdMissing();
       }

src/agent/handlers/vaultsGitPackGet.ts

@@ -5,14 +5,14 @@ import type { DB } from '@matrixai/db';
 import type { GitPackMessage, VaultsGitPackGetMessage } from './types';
 import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
 import * as agentErrors from '../errors';
-import * as networkUtils from '../../network/utils';
 import * as nodesUtils from '../../nodes/utils';
 import * as vaultsUtils from '../../vaults/utils';
 import * as vaultsErrors from '../../vaults/errors';
 import { validateSync } from '../../validation';
 import { matchSync } from '../../utils';
 import * as validationUtils from '../../validation/utils';
 import { ServerHandler } from '../../rpc/handlers';
+import * as agentUtils from '../utils';
 
 class VaultsGitPackGetHandler extends ServerHandler<
   {
@@ -29,7 +29,7 @@ class VaultsGitPackGetHandler extends ServerHandler<
     meta,
   ): AsyncGenerator<AgentRPCResponseResult<GitPackMessage>> {
     const { vaultManager, acl, db } = this.container;
-    const requestingNodeId = networkUtils.nodeIdFromMeta(meta);
+    const requestingNodeId = agentUtils.nodeIdFromMeta(meta);
     if (requestingNodeId == null) {
       throw new agentErrors.ErrorAgentNodeIdMissing();
     }

src/agent/handlers/vaultsScan.ts

@@ -3,9 +3,9 @@ import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
 import type VaultManager from '../../vaults/VaultManager';
 import type { DB } from '@matrixai/db';
 import * as agentErrors from '../errors';
-import * as networkUtils from '../../network/utils';
 import { ServerHandler } from '../../rpc/handlers';
 import * as vaultsUtils from '../../vaults/utils';
+import * as agentUtils from '../utils';
 
 class VaultsScanHandler extends ServerHandler<
   {
@@ -21,7 +21,7 @@ class VaultsScanHandler extends ServerHandler<
     meta,
   ): AsyncGenerator<AgentRPCResponseResult<VaultsScanMessage>> {
     const { vaultManager, db } = this.container;
-    const requestingNodeId = networkUtils.nodeIdFromMeta(meta);
+    const requestingNodeId = agentUtils.nodeIdFromMeta(meta);
     if (requestingNodeId == null) {
       throw new agentErrors.ErrorAgentNodeIdMissing();
     }

src/agent/index.ts

@@ -1,2 +1,3 @@
 export * from './handlers';
 export * as types from './types';
+export * as utils from './utils';

src/agent/utils.ts

@@ -0,0 +1,21 @@
+import type { NodeId } from '../ids/types';
+import * as keysUtils from '../keys/utils';
+
+/**
+ * Used to extract the NodeId from the connection metadata.
+ * Used by the RPC handlers when they need to know the NodeId of the requester.
+ * @param meta
+ */
+function nodeIdFromMeta(meta: any): NodeId | undefined {
+  const remoteCerts = meta.remoteCertificates;
+  if (remoteCerts == null) return;
+  const leafCertPEM = remoteCerts[0];
+  if (leafCertPEM == null) return;
+  const leafCert = keysUtils.certFromPEM(leafCertPEM);
+  if (leafCert == null) return;
+  const nodeId = keysUtils.certNodeId(leafCert);
+  if (nodeId == null) return;
+  return nodeId;
+}
+
+export { nodeIdFromMeta };

src/network/utils.ts

@@ -462,23 +462,6 @@ async function resolveHostnames(
   return final;
 }
 
-/**
- * Used to extract the NodeId from the connection metadata.
- * Used by the RPC handlers when they need to know the NodeId of the requester.
- * @param meta
- */
-function nodeIdFromMeta(meta: any): NodeId | undefined {
-  const remoteCerts = meta.remoteCertificates;
-  if (remoteCerts == null) return;
-  const leafCertPEM = remoteCerts[0];
-  if (leafCertPEM == null) return;
-  const leafCert = keysUtils.certFromPEM(leafCertPEM);
-  if (leafCert == null) return;
-  const nodeId = keysUtils.certNodeId(leafCert);
-  if (nodeId == null) return;
-  return nodeId;
-}
-
 export {
   isHost,
   isHostWildcard,
@@ -492,5 +475,4 @@ export {
   verifyServerCertificateChain,
   verifyClientCertificateChain,
   resolveHostnames,
-  nodeIdFromMeta,
 };