feat: dial-unified-config — MCP server (admin tools for read/write/upload/publish)

config/src/main/java/com/epam/aidial/core/config/IpAddressRange.java

@@ -3,6 +3,9 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 @AllArgsConstructor
 @Data
 public class IpAddressRange {
@@ -21,4 +24,48 @@ public boolean isAddressInRange(byte[] clientIpAddress) {
         }
         return true;
     }
+
+    /**
+     * Parses a CIDR string like {@code 10.0.0.0/8} or {@code fe80::/10} into an
+     * {@link IpAddressRange}. Used by both the JSON deserializer for client-IP allow-lists
+     * and by the MCP SSRF guard's CIDR blocklist.
+     */
+    public static IpAddressRange parseCidr(String cidr) {
+        String[] parts = cidr.trim().split("/");
+        if (parts.length != 2) {
+            throw new IllegalArgumentException("Invalid CIDR: " + cidr);
+        }
+        String base = parts[0].trim();
+        int prefixLen;
+        try {
+            prefixLen = Integer.parseInt(parts[1].trim());
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("Invalid CIDR prefix in '" + cidr + "': " + e.getMessage());
+        }
+        InetAddress baseAddr;
+        try {
+            baseAddr = InetAddress.getByName(base);
+        } catch (UnknownHostException e) {
+            throw new IllegalArgumentException("Invalid CIDR base address in '" + cidr + "': " + e.getMessage());
+        }
+        byte[] baseBytes = baseAddr.getAddress();
+
+        int maxPrefix = baseBytes.length * 8;
+        if (prefixLen < 0 || prefixLen > maxPrefix) {
+            throw new IllegalArgumentException("Invalid prefix length " + prefixLen
+                    + " for " + maxPrefix + "-bit address in '" + cidr + "'");
+        }
+        byte[] mask = new byte[baseBytes.length];
+        int remaining = prefixLen;
+        for (int i = 0; i < mask.length; i++) {
+            int bits = Math.min(Math.max(remaining, 0), 8);
+            mask[i] = (byte) (bits == 0 ? 0 : (0xFF << (8 - bits)) & 0xFF);
+            remaining -= 8;
+        }
+        byte[] maskedBaseIp = new byte[baseBytes.length];
+        for (int i = 0; i < baseBytes.length; i++) {
+            maskedBaseIp[i] = (byte) (baseBytes[i] & mask[i] & 0xFF);
+        }
+        return new IpAddressRange(mask, maskedBaseIp);
+    }
 }

config/src/main/java/com/epam/aidial/core/config/databind/IpAddressRangeDeserializer.java

@@ -8,10 +8,8 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
-import lombok.SneakyThrows;
 
 import java.io.IOException;
-import java.net.InetAddress;
 import java.util.List;
 
 public class IpAddressRangeDeserializer extends JsonDeserializer<IpAddressRanges> {
@@ -28,45 +26,8 @@ public IpAddressRanges deserialize(JsonParser jsonParser, DeserializationContext
             if (!node.isTextual()) {
                 throw InvalidFormatException.from(jsonParser, "Expected a JSON string of client IP range", node.toString(), String.class);
             }
-            String cidr = node.textValue();
-            IpAddressRange range = toIpAddressRange(cidr);
-            ranges.getRanges().add(range);
+            ranges.getRanges().add(IpAddressRange.parseCidr(node.textValue()));
         }
         return ranges;
     }
-
-    @SneakyThrows
-    private static IpAddressRange toIpAddressRange(String cidr) {
-        String[] parts = cidr.trim().split("/");
-        if (parts.length != 2) {
-            throw new IllegalArgumentException("Invalid CIDR: " + cidr);
-        }
-
-        String base = parts[0].trim();
-        int prefixLen = Integer.parseInt(parts[1].trim());
-        InetAddress baseAddr = InetAddress.getByName(base);
-        byte[] baseBytes = baseAddr.getAddress();
-
-        int maxPrefix = baseBytes.length * 8; // 32 for IPv4, 128 for IPv6
-        if (prefixLen < 0 || prefixLen > maxPrefix) {
-            throw new IllegalArgumentException("Invalid prefix length " + prefixLen
-                    + " for " + maxPrefix + "-bit address");
-        }
-
-        byte[] mask = new byte[baseBytes.length];
-        int remaining = prefixLen;
-        for (int i = 0; i < mask.length; i++) {
-            int bits = Math.min(Math.max(remaining, 0), 8);
-            int maskByte = bits == 0 ? 0 : (0xFF << (8 - bits)) & 0xFF;
-            mask[i] = (byte) maskByte;
-            remaining -= 8;
-        }
-
-        byte[] maskedBaseIp = new byte[baseBytes.length];
-        for (int i = 0; i < baseBytes.length; i++) {
-            int baseMasked = baseBytes[i] & mask[i] & 0xFF;
-            maskedBaseIp[i] = (byte) baseMasked;
-        }
-        return new IpAddressRange(mask, maskedBaseIp);
-    }
 }

docs/sandbox/dial-unified-config/03-api-reference.md

@@ -210,7 +210,7 @@ Listing is per-bucket — `GET /v1/{type}/{bucket}/`. Admin enumerates the relev
 }
 ```
 
-`hasMore` is **always present** (`true` or `false`) on every listing response; `nextCursor` is present **iff** `hasMore: true` and is omitted on the last page. The two fields are kept consistent — the two-field shape is convenient for clients that prefer either explicit `hasMore` checks or `nextCursor`-presence checks. The cursor is opaque and clients must not parse it. The Admin MCP's `dial_admin_list_entities` paginates the underlying listing endpoint (issuing `?limit=500` per page) until `hasMore: false` (for bounded entity types) or until its per-invocation ceiling of 2,500 items (5 pages) for potentially unbounded types (`files`, `prompts`, `conversations`) — see [`09-admin-mcp-spec.md`](09-admin-mcp-spec.md) §6.1 for the full draining and truncation semantics.
+`hasMore` is **always present** (`true` or `false`) on every listing response; `nextCursor` is present **iff** `hasMore: true` and is omitted on the last page. The two fields are kept consistent — the two-field shape is convenient for clients that prefer either explicit `hasMore` checks or `nextCursor`-presence checks. The cursor is opaque and clients must not parse it. The Admin MCP's `dial_list_resources` paginates the underlying listing endpoint (issuing `?limit=500` per page) until `hasMore: false` (for bounded entity types) or until its per-invocation ceiling of 2,500 items (5 pages) for potentially unbounded types (`files`, `prompts`, `conversations`) — see [`09-admin-mcp-spec.md`](09-admin-mcp-spec.md) §6.1 for the full draining and truncation semantics.
 
 **`name` field synthesis.** The `name` value on each list item (and on `GET` of a single entity) is **always synthesized** by the controller — for API-managed entities the **full canonical ID** (the `Config` map key, e.g. `models/public/gpt-4`); for file-sourced entities the simple-name `Config` map key (e.g. `gpt-4`). It is never deserialized from the persisted JSON body. **Amendment 2026-05-08 (Polish.1):** prior to this round API-managed entries projected `simpleName(mapKey)` in the listing/GET; canonical IDs were exposed only on the legacy `/openai/...` listings. Operators copy-pasting an API entry's listing row into a per-entity URL needed to reconstruct the canonical prefix manually, and a file-vs-API simple-name collision silently lost one row in the listing. Polish.1 projects the full canonical ID for API entries so the row is copy-paste-friendly and the dedup keying on the full map key (see *Listing dedup* below) preserves both rows on collision. File-sourced entries are unchanged. Implementers wiring the listing controller must populate `name` from the canonical map key for API entries and from the simple map key for file entries — not expect it on the persisted body.
 

docs/sandbox/dial-unified-config/04-security-and-audit.md

@@ -352,7 +352,7 @@ See `dial_secrets_storage_analysis.md` for the full evaluation of alternative ap
 
 ## 3. Audit
 
-> **STATUS: WIP / DEFERRED.** The audit subsystem is **deferred to Phase 7** (Audit & Compliance) — after full entity-management API support, CLI surface, and Admin MCP land. §3 below remains as the working design draft for that future phase. **Phase 1–6 make no commitment to R-Audit-1 or R-Audit-2** and ship without an audit trail. Cross-references from other documents to specific §3 subsections (storage layout, event schema, CLI commands, `/v1/admin/audit`, `dial_admin_query_audit` MCP tool) all carry the same WIP status. See [`07-migration-and-rollout.md`](07-migration-and-rollout.md) Phase 7 for the rollout placement and rationale.
+> **STATUS: WIP / DEFERRED.** The audit subsystem is **deferred to Phase 7** (Audit & Compliance) — after full entity-management API support, CLI surface, and Admin MCP land. §3 below remains as the working design draft for that future phase. **Phase 1–6 make no commitment to R-Audit-1 or R-Audit-2** and ship without an audit trail. Cross-references from other documents to specific §3 subsections (storage layout, event schema, CLI commands, `/v1/admin/audit`, `dial_query_audit` MCP tool) all carry the same WIP status. See [`07-migration-and-rollout.md`](07-migration-and-rollout.md) Phase 7 for the rollout placement and rationale.
 
 ### 3.1 Requirements
 

docs/sandbox/dial-unified-config/07-migration-and-rollout.md

@@ -265,7 +265,7 @@ Phase 5 is a **major Admin Backend refactor**, not a thin adapter swap. The dire
 - Storage: Redis Streams (hot) + blob archival (cold) per [`04-security-and-audit.md`](04-security-and-audit.md) §3.4.
 - `GET /v1/admin/audit` query API + filters per [`04-security-and-audit.md`](04-security-and-audit.md) §3.5.
 - `dial-cli audit` command group (history, log, snapshot, rollback, reconcile) per [`06-cli-user-guide.md`](06-cli-user-guide.md).
-- `dial_admin_query_audit` MCP tool per [`09-admin-mcp-spec.md`](09-admin-mcp-spec.md).
+- `dial_query_audit` MCP tool per [`09-admin-mcp-spec.md`](09-admin-mcp-spec.md).
 - Admin Backend audit-table retirement + Admin UI history-view rewrite (moved here from Phase 5).
 - Snapshot / point-in-time reconstruction + boundary-snapshot preservation.
 - `PublicationService` audit — to be triaged at Phase-7 planning, may slip to Phase 7.5+.