From 51f4b731c28691ee0befc7badfabc5baf84a39ce Mon Sep 17 00:00:00 2001 From: Tsimafei Labanovich Date: Fri, 13 Nov 2026 10:52:19 +0100 Subject: [PATCH 1/2] dbeaver/pro#11700 Share scoped MCP paths and account context --- .../datadam/mcp/api/model/DDMcpDamPath.java | 58 +++++++++++++++++++ .../api/model/DDSsoAccessContextResponse.java | 11 +++- .../sso/api/client/DDSsoServiceTest.java | 28 +++++++++ 3 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpDamPath.java diff --git a/apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpDamPath.java b/apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpDamPath.java new file mode 100644 index 0000000..6d2fbba --- /dev/null +++ b/apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpDamPath.java @@ -0,0 +1,58 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2026 DBeaver Corp + * + * All Rights Reserved. + * + * NOTICE: All information contained herein is, and remains + * the property of DBeaver Corp and its suppliers, if any. + * The intellectual and technical concepts contained + * herein are proprietary to DBeaver Corp and its suppliers + * and may be covered by U.S. and Foreign Patents, + * patents in process, and are protected by trade secret or copyright law. + * Dissemination of this information or reproduction of this material + * is strictly forbidden unless prior written permission is obtained + * from DBeaver Corp. + */ +package com.dbeaver.datadam.mcp.api.model; + +import org.jkiss.code.NotNull; +import org.jkiss.code.Nullable; + +import java.nio.charset.StandardCharsets; +import java.util.Base64; + +public final class DDMcpDamPath { + private DDMcpDamPath() { + } + + public static boolean isDamId(@Nullable String value) { + return value != null && value.matches("[a-zA-Z0-9._~+/-]{1,256}") && !".".equals(value) && !"..".equals(value); + } + + @NotNull + public static String path(@NotNull String damId) { + if (!isDamId(damId)) { + throw new IllegalArgumentException("Invalid dam ID"); + } + // deployment IDs can contain slashes; keep the endpoint in one URL segment + String segment = damId.matches("[a-zA-Z0-9._-]+") ? damId + : "~" + Base64.getUrlEncoder().withoutPadding().encodeToString(damId.getBytes(StandardCharsets.UTF_8)); + return "/mcp/" + segment; + } + + @Nullable + public static String damId(@NotNull String path) { + if (!path.startsWith("/mcp/")) { + return null; + } + String segment = path.substring(5); + try { + String damId = segment.startsWith("~") + ? new String(Base64.getUrlDecoder().decode(segment.substring(1)), StandardCharsets.UTF_8) : segment; + return isDamId(damId) && path(damId).equals(path) ? damId : null; + } catch (IllegalArgumentException exception) { + return null; + } + } +} diff --git a/apis/com.dbeaver.datadam.sso.api/src/main/java/com/dbeaver/datadam/sso/api/model/DDSsoAccessContextResponse.java b/apis/com.dbeaver.datadam.sso.api/src/main/java/com/dbeaver/datadam/sso/api/model/DDSsoAccessContextResponse.java index 8af048b..627ddca 100644 --- a/apis/com.dbeaver.datadam.sso.api/src/main/java/com/dbeaver/datadam/sso/api/model/DDSsoAccessContextResponse.java +++ b/apis/com.dbeaver.datadam.sso.api/src/main/java/com/dbeaver/datadam/sso/api/model/DDSsoAccessContextResponse.java @@ -30,6 +30,15 @@ public record DDSsoAccessContextResponse( @NotNull String subscriptionPlanType, @Nullable String subscriptionStatus, @Nullable Long subscriptionExpiresAt, - @NotNull Set permissions + @NotNull Set permissions, + @Nullable String accountName ) { + public DDSsoAccessContextResponse( + @NotNull String userId, @NotNull String accountId, @NotNull String accountType, + @Nullable String subscriptionPlanId, @NotNull String subscriptionPlanType, + @Nullable String subscriptionStatus, @Nullable Long subscriptionExpiresAt, @NotNull Set permissions + ) { + this(userId, accountId, accountType, subscriptionPlanId, subscriptionPlanType, + subscriptionStatus, subscriptionExpiresAt, permissions, null); + } } diff --git a/apis/com.dbeaver.datadam.sso.api/src/test/java/com/dbeaver/datadam/sso/api/client/DDSsoServiceTest.java b/apis/com.dbeaver.datadam.sso.api/src/test/java/com/dbeaver/datadam/sso/api/client/DDSsoServiceTest.java index 9042861..12a3bf5 100644 --- a/apis/com.dbeaver.datadam.sso.api/src/test/java/com/dbeaver/datadam/sso/api/client/DDSsoServiceTest.java +++ b/apis/com.dbeaver.datadam.sso.api/src/test/java/com/dbeaver/datadam/sso/api/client/DDSsoServiceTest.java @@ -442,6 +442,34 @@ void credentialBearingClientsDoNotFollowRedirects() throws Exception { } } + @ParameterizedTest + @MethodSource("accessContextAccountNames") + void accountBackchannelDeserializesCurrentAndLegacyAccountNames( + @Nullable String nameJson, @Nullable String expectedName + ) throws Exception { + var response = JsonParser.parseString(""" + {"userId":"22222222-2222-2222-2222-222222222222","accountId":"33333333-3333-3333-3333-333333333333", + "accountType":"CORPORATE","subscriptionPlanType":"FREE","permissions":["MCP_INVOKE"]} + """).getAsJsonObject(); + if (nameJson != null) { + response.add("accountName", JsonParser.parseString(nameJson)); + } + responseJson.set(response.toString()); + var account = new DDSsoAccountClient("http://127.0.0.1:" + server.getAddress().getPort(), "s".repeat(32)); + var context = account.exchange("test-access-token"); + Assertions.assertThat(context.accountName()).isEqualTo(expectedName); + Assertions.assertThat(context.userId()).isEqualTo("22222222-2222-2222-2222-222222222222"); + Assertions.assertThat(context.accountId()).isEqualTo("33333333-3333-3333-3333-333333333333"); + Assertions.assertThat(context.permissions()).containsExactly("MCP_INVOKE"); + Assertions.assertThat(requestMethod).hasValue("POST"); + Assertions.assertThat(requestPath).hasValue(DDSsoConstants.ACCESS_CONTEXT_PATH); + } + + @NotNull + private static Stream accessContextAccountNames() { + return Stream.of(Arguments.of("\"Local account\"", "Local account"), Arguments.of("null", null), Arguments.of(null, null)); + } + @Test void accountBackchannelRejectsForbiddenResponses() { responseJson.set("{\"error\":\"forbidden\"}"); From 3f5766375e0581d4f407830c305f00b6a1aa97cf Mon Sep 17 00:00:00 2001 From: Tsimafei Labanovich Date: Fri, 13 Nov 2026 11:57:36 +0100 Subject: [PATCH 2/2] dbeaver/pro#11700 Remove internal MCP path helper from public API --- .../datadam/mcp/api/model/DDMcpDamPath.java | 58 ------------------- 1 file changed, 58 deletions(-) delete mode 100644 apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpDamPath.java diff --git a/apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpDamPath.java b/apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpDamPath.java deleted file mode 100644 index 6d2fbba..0000000 --- a/apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpDamPath.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * DBeaver - Universal Database Manager - * Copyright (C) 2010-2026 DBeaver Corp - * - * All Rights Reserved. - * - * NOTICE: All information contained herein is, and remains - * the property of DBeaver Corp and its suppliers, if any. - * The intellectual and technical concepts contained - * herein are proprietary to DBeaver Corp and its suppliers - * and may be covered by U.S. and Foreign Patents, - * patents in process, and are protected by trade secret or copyright law. - * Dissemination of this information or reproduction of this material - * is strictly forbidden unless prior written permission is obtained - * from DBeaver Corp. - */ -package com.dbeaver.datadam.mcp.api.model; - -import org.jkiss.code.NotNull; -import org.jkiss.code.Nullable; - -import java.nio.charset.StandardCharsets; -import java.util.Base64; - -public final class DDMcpDamPath { - private DDMcpDamPath() { - } - - public static boolean isDamId(@Nullable String value) { - return value != null && value.matches("[a-zA-Z0-9._~+/-]{1,256}") && !".".equals(value) && !"..".equals(value); - } - - @NotNull - public static String path(@NotNull String damId) { - if (!isDamId(damId)) { - throw new IllegalArgumentException("Invalid dam ID"); - } - // deployment IDs can contain slashes; keep the endpoint in one URL segment - String segment = damId.matches("[a-zA-Z0-9._-]+") ? damId - : "~" + Base64.getUrlEncoder().withoutPadding().encodeToString(damId.getBytes(StandardCharsets.UTF_8)); - return "/mcp/" + segment; - } - - @Nullable - public static String damId(@NotNull String path) { - if (!path.startsWith("/mcp/")) { - return null; - } - String segment = path.substring(5); - try { - String damId = segment.startsWith("~") - ? new String(Base64.getUrlDecoder().decode(segment.substring(1)), StandardCharsets.UTF_8) : segment; - return isDamId(damId) && path(damId).equals(path) ? damId : null; - } catch (IllegalArgumentException exception) { - return null; - } - } -}