fix: Do not try OIDF resolution on http:// urls

Sphereon-Opensource · Jan 29, 2025 · fe88114 · fe88114
1 parent cf8f502
commit fe88114
Show file tree

Hide file tree

Showing 14 changed files with 131 additions and 124 deletions.
diff --git a/packages/ebsi-support/package.json b/packages/ebsi-support/package.json
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@ethersproject/random": "^5.7.0",
-    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.352",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
     "@sphereon/ssi-sdk-ext.did-resolver-ebsi": "0.27.1-next.14",
@@ -44,8 +44,8 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.352",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.key-manager": "0.27.1-next.14",
     "@sphereon/ssi-sdk-ext.kms-local": "0.27.1-next.14",

diff --git a/packages/mdl-mdoc/package.json b/packages/mdl-mdoc/package.json
@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.352",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
@@ -35,8 +35,8 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.352",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.key-manager": "0.27.1-next.14",
     "@sphereon/ssi-sdk-ext.kms-local": "0.27.1-next.14",

diff --git a/packages/oid4vci-holder/package.json b/packages/oid4vci-holder/package.json
@@ -15,9 +15,9 @@
   },
   "dependencies": {
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
-    "@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.352",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.1-next.14",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.1-next.14",
     "@sphereon/ssi-sdk-ext.jwt-service": "0.27.1-next.14",
@@ -46,7 +46,7 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.352",
     "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.27.1-next.14",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",

diff --git a/packages/oid4vci-holder/src/agent/OID4VCIHolder.ts b/packages/oid4vci-holder/src/agent/OID4VCIHolder.ts
@@ -1087,6 +1087,12 @@ export class OID4VCIHolder implements IAgentPlugin {
     const params = new URLSearchParams(url.search)
     const openidFederation = params.get('openid_federation')
     const entityIdentifier = openidFederation ?? serverMetadata.issuer
+    if (entityIdentifier.startsWith('http://')) {
+      console.warn(`OpenID federation does not support http://, only https:// allowed; got: (${url.toString()})`)
+      // OIDF always needs to be https
+      return []
+    }
+
 
     const result = await context.agent.identifierExternalResolveByOIDFEntityId({
       method: 'entity_id',

diff --git a/packages/oid4vci-issuer-rest-api/package.json b/packages/oid4vci-issuer-rest-api/package.json
@@ -11,9 +11,9 @@
     "start:dev": "ts-node __tests__/RestAPI.ts"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/oid4vci-issuer": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/oid4vci-issuer-server": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/oid4vci-issuer": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/oid4vci-issuer-server": "0.16.1-feature.MWALL.715.352",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.1-next.14",
     "@sphereon/ssi-sdk.kv-store-temp": "workspace:*",

diff --git a/packages/oid4vci-issuer-rest-client/package.json b/packages/oid4vci-issuer-rest-client/package.json
@@ -16,7 +16,7 @@
     "generate-plugin-schema": "ts-node ../../packages/dev/bin/sphereon.js dev generate-plugin-schema"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.352",
     "@sphereon/ssi-types": "workspace:*",
     "@veramo/core": "4.2.0",
     "cross-fetch": "^3.1.8"

diff --git a/packages/oid4vci-issuer-store/package.json b/packages/oid4vci-issuer-store/package.json
@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.352",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.1-next.14",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.1-next.14",
     "@sphereon/ssi-sdk.kv-store-temp": "workspace:*",

diff --git a/packages/oid4vci-issuer/package.json b/packages/oid4vci-issuer/package.json
@@ -14,9 +14,9 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/oid4vci-issuer": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/oid4vci-issuer": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.352",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.1-next.14",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.1-next.14",
     "@sphereon/ssi-sdk.agent-config": "workspace:*",
@@ -36,7 +36,7 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.352",
     "@sphereon/did-uni-client": "^0.6.3",
     "@veramo/did-provider-key": "4.2.0",
     "@veramo/did-resolver": "4.2.0",

diff --git a/packages/siopv2-oid4vp-common/package.json b/packages/siopv2-oid4vp-common/package.json
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.352",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-types": "workspace:*",
     "uint8arrays": "3.1.1"

diff --git a/packages/siopv2-oid4vp-op-auth/package.json b/packages/siopv2-oid4vp-op-auth/package.json
@@ -14,9 +14,9 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.352",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.1-next.14",

diff --git a/packages/siopv2-oid4vp-rp-auth/package.json b/packages/siopv2-oid4vp-rp-auth/package.json
@@ -14,9 +14,9 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.349",
-    "@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.352",
+    "@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.352",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.1-next.14",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.1-next.14",

diff --git a/packages/siopv2-oid4vp-rp-rest-api/package.json b/packages/siopv2-oid4vp-rp-rest-api/package.json
@@ -11,7 +11,7 @@
     "start:dev": "ts-node __tests__/RestAPI.ts"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.352",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-sdk.credential-validation": "workspace:*",

diff --git a/packages/w3c-vc-api/package.json b/packages/w3c-vc-api/package.json
@@ -11,7 +11,7 @@
     "start:dev": "ts-node __tests__/agent.ts"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.349",
+    "@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.352",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk.agent-config": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",