@bedrock/kms-http 22.0.0 → 23.0.0

package/lib/helpers.js

@@ -1,14 +1,13 @@
 /*!
- * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2019-2025 Digital Bazaar, Inc. All rights reserved.
  */
+import * as bedrock from '@bedrock/core';
 import forwarded from 'forwarded';
 import ipaddr from 'ipaddr.js';
 
-export function getKeystoreId({host, req, localId, routes}) {
-  if(!host) {
-    host = req.get('host');
-  }
-  return `https://${host}${routes.keystores}/${localId}`;
+export function getKeystoreId({localId, routes}) {
+  const {baseUri} = bedrock.config.server;
+  return `${baseUri}${routes.keystores}/${localId}`;
 }
 
 export function verifyRequestIp({keystoreConfig, req}) {

package/lib/http.js

@@ -110,7 +110,7 @@ bedrock.events.on('bedrock-express.configure.routes', app => {
 
       // create a keystore for the controller
       const random = await generateRandom();
-      const id = helpers.getKeystoreId({req, localId: random, routes});
+      const id = helpers.getKeystoreId({localId: random, routes});
       const config = {id, meterId, ...req.body};
       const record = await keystores.insert({config});
       res.status(201).location(id).json(record.config);

package/lib/middleware.js

@@ -1,5 +1,5 @@
 /*!
- * Copyright (c) 2019-2024 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2019-2025 Digital Bazaar, Inc. All rights reserved.
  */
 import * as bedrock from '@bedrock/core';
 import * as brZCapStorage from '@bedrock/zcap-storage';
@@ -20,6 +20,7 @@ import {defaultModuleManager as moduleManager} from '@bedrock/kms';
 import {reportOperationUsage} from './metering.js';
 
 const {config, util: {BedrockError}} = bedrock;
+const {helpers: {inspectCapabilityChain}} = brZCapStorage;
 
 const FIVE_MINUTES = 1000 * 60 * 5;
 
@@ -31,7 +32,7 @@ export function createGetKeystoreConfig({routes}) {
   return asyncHandler(async function _getKeystoreConfig(req, res, next) {
     if(!req.webkms) {
       const keystoreId = helpers.getKeystoreId(
-        {req, localId: req.params.keystoreId, routes});
+        {localId: req.params.keystoreId, routes});
       const configRecord = await storage.get({
         id: keystoreId, req, returnRecord: true
       });
@@ -200,44 +201,6 @@ async function getVerifier({keyId, documentLoader}) {
   return {verifier, verificationMethod};
 }
 
-async function inspectCapabilityChain({
-  capabilityChain, capabilityChainMeta
-}) {
-  // if capability chain has only root, there's nothing to check as root
-  // zcaps cannot be revoked
-  if(capabilityChain.length === 1) {
-    return {valid: true};
-  }
-
-  // collect capability IDs and delegators for all delegated capabilities in
-  // chain (skip root) so they can be checked for revocation
-  const capabilities = [];
-  for(const [i, capability] of capabilityChain.entries()) {
-    // skip root zcap, it cannot be revoked
-    if(i === 0) {
-      continue;
-    }
-    const [{purposeResult}] = capabilityChainMeta[i].verifyResult.results;
-    if(purposeResult && purposeResult.delegator) {
-      capabilities.push({
-        capabilityId: capability.id,
-        delegator: purposeResult.delegator.id,
-      });
-    }
-  }
-
-  const revoked = await brZCapStorage.revocations.isRevoked({capabilities});
-  if(revoked) {
-    return {
-      valid: false,
-      error: new Error(
-        'One or more capabilities in the chain have been revoked.')
-    };
-  }
-
-  return {valid: true};
-}
-
 function onError({error}) {
   if(!(error instanceof BedrockError)) {
     // always expose cause message and name; expose cause details as

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/kms-http",
-  "version": "22.0.0",
+  "version": "23.0.0",
   "type": "module",
   "description": "Bedrock KMS HTTP API",
   "main": "./lib/index.js",
@@ -49,7 +49,7 @@
     "@bedrock/security-context": "^9.0.0",
     "@bedrock/validation": "^7.1.1",
     "@bedrock/veres-one-context": "^16.0.0",
-    "@bedrock/zcap-storage": "^9.0.0"
+    "@bedrock/zcap-storage": "^9.3.0"
   },
   "directories": {
     "lib": "./lib"