From 5d6253cbf10d8fae5c3248fdee3516210cc42203 Mon Sep 17 00:00:00 2001 From: xpp Date: Wed, 28 Oct 2026 13:44:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:"=E7=BB=9F=E4=B8=80=E5=AA=92=E4=BD=93?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=A0=A1=E9=AA=8C=E5=B9=B6=E8=A1=A5=E9=BD=90?= =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=8A=B6=E6=80=81"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- .../provider/media/MediaAssetNormalizer.java | 142 ++++++++++++++++++ .../task/AsyncProviderClient.java | 18 +-- .../task/AsyncTaskResponseNormalizer.java | 76 +++++----- .../controlplane/task/AsyncTaskService.java | 25 +-- .../media/MediaAssetNormalizerTest.java | 54 +++++++ .../task/AsyncProviderClientTest.java | 26 +++- .../task/AsyncTaskPostgresTest.java | 34 +++++ .../task/AsyncTaskResponseNormalizerTest.java | 31 ++++ docs/24-security-and-cpr-task-tracker.md | 10 +- docs/31-media-result-delivery-boundary.md | 59 ++++++++ prototype/src/services/media.ts | 94 +++++++++--- prototype/src/views/UserConsole.vue | 7 +- prototype/tests/media.test.mjs | 36 ++++- 14 files changed, 510 insertions(+), 106 deletions(-) create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/provider/media/MediaAssetNormalizer.java create mode 100644 control-plane-java/src/test/java/com/moyi/controlplane/provider/media/MediaAssetNormalizerTest.java create mode 100644 docs/31-media-result-delivery-boundary.md diff --git a/README.md b/README.md index 2ecd34a..be0607f 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,14 @@ ## 当前工程状态 -2026-10-22:当前产品为 Java/Vue 自研控制面与多模型网关,已补请求模块化、账务恢复、异步幂等和审计核账,并继续加固认证与 HTTP 边界。服务端参考图下载已补 DNS 地址绑定;注册/重置已补事务原子性与加密异步验证码投递,重置请求不再查询账号存在性或等待外部发送结果。生产网络策略仍需验收。下文包含产品演进目标,不等于功能均已实现。**尚未完成完整 Codex WebSocket/续接、长请求续租、公平排队、账号全生命周期和生产安全验收。** +2026-10-28:当前产品为 Java/Vue 自研控制面与多模型网关,已补请求模块化、账务恢复、异步幂等和审计核账,并继续加固认证与 HTTP 边界。参考图下载已补 DNS 地址绑定,注册/重置已补事务原子性与加密异步投递;模型级 FIFO 与执行期间续租已有本地实现,但共享等待预算和部署侧长请求合同仍未完成。音视频结果规范化与媒体有效性检查已补本地回归,**鉴权成品下载、音视频用量计费、真实供应商生成/播放、账号全生命周期和生产安全验收仍未完成**。Codex WebSocket/续接按用户决定暂缓,不存储对话。下文演进目标不等于已实现功能。 逐项完成状态与剩余验收见 [安全与 CPR 任务追踪](docs/24-security-and-cpr-task-tracker.md),认证边界见 [认证及有界 HTTP 增量](docs/25-auth-and-bounded-transport.md),出站加固与验收阻塞见 [媒体 DNS 绑定与验收状态](docs/26-media-dns-binding-and-acceptance.md),注册/重置原子性见 [验证码与账号事务](docs/27-verified-account-transactions.md)。本地验证通过不代表已部署或全仓库安全审计完成。 最新 [验证码投递隔离](docs/28-verification-delivery-isolation.md) 需要先迁移 V50,并配置 `CREDENTIAL_ENCRYPTION_KEY` 及邮件/短信服务。2026-10-22 用户要求的每半小时本地提交检查已取消;产品内部的任务与投递 worker 不属于该聊天自动化。 +媒体后续见 [媒体结果交付边界与验收准备](docs/31-media-result-delivery-boundary.md):即时/轮询共用纯媒体结果模块,无主文件不再提示可下载;规格驱动验收已准备 draft,待人工批准,没有把单元回归当成真实生成/播放验收。 + ## 一、产品简介 模亦灵枢是由模灵科技与亦城财富等合作方共同推动的多模型智能服务平台。 diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/provider/media/MediaAssetNormalizer.java b/control-plane-java/src/main/java/com/moyi/controlplane/provider/media/MediaAssetNormalizer.java new file mode 100644 index 0000000..7520be1 --- /dev/null +++ b/control-plane-java/src/main/java/com/moyi/controlplane/provider/media/MediaAssetNormalizer.java @@ -0,0 +1,142 @@ +package com.moyi.controlplane.provider.media; + +import java.net.URI; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +/** Pure media-result boundary. Does not fetch URLs, resolve credentials or change settlement. */ +public final class MediaAssetNormalizer { + private static final Map FORMAT_MIMES = Map.ofEntries( + Map.entry("png", "image/png"), Map.entry("jpg", "image/jpeg"), Map.entry("jpeg", "image/jpeg"), + Map.entry("webp", "image/webp"), Map.entry("gif", "image/gif"), Map.entry("avif", "image/avif"), + Map.entry("mp4", "video/mp4"), Map.entry("webm", "video/webm"), Map.entry("mov", "video/quicktime"), + Map.entry("mp3", "audio/mpeg"), Map.entry("wav", "audio/wav"), Map.entry("ogg", "audio/ogg"), + Map.entry("opus", "audio/ogg"), Map.entry("aac", "audio/aac"), Map.entry("flac", "audio/flac"), + Map.entry("m4a", "audio/mp4"), Map.entry("glb", "model/gltf-binary"), Map.entry("gltf", "model/gltf+json")); + + private MediaAssetNormalizer() {} + + public static Map normalize(Object raw, String taskType) { + if (raw instanceof String) { + String url = reference(raw, taskType); + return url == null ? null : new LinkedHashMap<>(Map.of("url", url)); + } + if (!(raw instanceof Map source)) return null; + var result = new LinkedHashMap(); + String[][] aliases = {{"modelUrl","modelUrl"},{"model_url","modelUrl"}, + {"previewUrl","previewUrl"},{"rendered_image_url","previewUrl"},{"preview_url","previewUrl"},{"last_frame_url","previewUrl"}, + {"imageUrl","imageUrl"},{"image_url","imageUrl"},{"generated_image_url","imageUrl"},{"image","imageUrl"}, + {"videoUrl","videoUrl"},{"video_url","videoUrl"},{"video","videoUrl"}, + {"audioUrl","audioUrl"},{"audio_url","audioUrl"},{"audio","audioUrl"}}; + for (String[] alias : aliases) { + String kind = switch (alias[1]) { + case "modelUrl" -> "3d"; + case "videoUrl" -> "video"; + case "audioUrl" -> "audio"; + default -> "image"; + }; + String value = reference(source.get(alias[0]), kind); + if (value != null) result.putIfAbsent(alias[1], value); + } + String url = reference(source.get("url"), taskType); + String payload = payload(source.get("b64_json")); + if (payload == null) payload = payload(source.get("base64")); + String mime = mime(source); + if (mime == null && payload != null) mime = imageSignatureMime(payload); + if (url != null && (mime == null || matchesKind(mime, taskType))) result.put("url", url); + if (payload != null && mime != null && matchesKind(mime, taskType)) { + result.put("base64", payload); + result.put("mimeType", mime); + } + if (source.get("format") instanceof String format && format.length() <= 40 && (mime == null || matchesKind(mime, taskType))) result.put("format", format.toLowerCase(Locale.ROOT)); + if (mime != null && matchesKind(mime, taskType)) result.putIfAbsent("mimeType", mime); + // A thumbnail or another media lane is not proof that this task's primary file was delivered. + List primary = switch (taskType == null ? "" : taskType.toLowerCase(Locale.ROOT)) { + case "video" -> List.of("videoUrl"); + case "audio" -> List.of("audioUrl"); + case "image" -> List.of("imageUrl"); + case "3d" -> List.of("modelUrl"); + default -> List.of("modelUrl", "videoUrl", "audioUrl", "imageUrl"); + }; + if (!result.containsKey("url")) { + for (String field : primary) if (result.containsKey(field)) { result.put("url", result.get(field)); break; } + } + if (!result.containsKey("url") && !result.containsKey("base64")) return null; + for (String field : List.of("usage", "usageMetadata")) if (source.get(field) instanceof Map value) result.put(field, value); + Object credits = source.get("creditsConsumed"); + if (credits == null) credits = source.get("credits_consumed"); + if (credits instanceof Number || credits instanceof String) result.put("creditsConsumed", credits); + return result; + } + + private static String reference(Object raw, String kind) { + return reference(raw, kind, 0); + } + + private static String reference(Object raw, String kind, int depth) { + if (depth > 4) return null; + if (raw instanceof Map object) { + String url = reference(object.get("url"), kind, depth + 1); + if (url != null) return url; + String payload = payload(object.get("b64_json")); + if (payload == null) payload = payload(object.get("base64")); + String mime = mime(object); + if (mime == null && payload != null) mime = imageSignatureMime(payload); + return payload != null && mime != null && matchesKind(mime, kind) ? "data:" + mime + ";base64," + payload : null; + } + if (!(raw instanceof String text)) return null; + String value = text.trim(); + if (value.isEmpty() || value.indexOf('\\') >= 0 || value.chars().anyMatch(Character::isISOControl)) return null; + if (value.regionMatches(true, 0, "data:", 0, 5)) { + int marker = value.toLowerCase(Locale.ROOT).indexOf(";base64,"); + if (marker < 0) return null; + String mime = validMime(value.substring(5, marker)); + String payload = payload(value.substring(marker + 8)); + return mime != null && payload != null && matchesKind(mime, kind) ? "data:" + mime + ";base64," + payload : null; + } + try { + URI uri = URI.create(value); + String path = uri.getPath(); + String suffix = path == null ? "" : path.substring(path.lastIndexOf('.') + 1).toLowerCase(Locale.ROOT); + String knownMime = FORMAT_MIMES.get(suffix); + return ("https".equalsIgnoreCase(uri.getScheme()) || "http".equalsIgnoreCase(uri.getScheme())) + && uri.getHost() != null && uri.getUserInfo() == null + && (knownMime == null || matchesKind(knownMime, kind)) ? value : null; + } catch (IllegalArgumentException error) { return null; } + } + + private static String payload(Object raw) { + if (!(raw instanceof String text) || text.length() > 12 * 1024 * 1024) return null; + String value = text.replaceAll("\\s+", ""); + return !value.isEmpty() && value.length() % 4 != 1 && value.matches("[a-zA-Z0-9+/]+={0,2}") ? value : null; + } + + private static String mime(Map source) { + String value = validMime(source.get("mimeType")); + if (value == null) value = validMime(source.get("mime_type")); + if (value == null && source.get("format") instanceof String format) value = FORMAT_MIMES.get(format.toLowerCase(Locale.ROOT)); + return value; + } + + private static String validMime(Object raw) { + if (!(raw instanceof String text)) return null; + String value = text.trim().toLowerCase(Locale.ROOT); + if (List.of("image/png", "image/jpeg", "image/webp", "image/gif", "image/avif", "model/gltf-binary", "model/gltf+json").contains(value)) return value; + return value.matches("(audio|video)/[a-z0-9.+-]+") && !value.endsWith("xml") ? value : null; + } + + private static boolean matchesKind(String mime, String kind) { + if (kind == null || kind.isBlank()) return true; + return mime.startsWith(("3d".equalsIgnoreCase(kind) ? "model" : kind.toLowerCase(Locale.ROOT)) + "/"); + } + + private static String imageSignatureMime(String payload) { + // Infer only unambiguous image signatures; never guess the format of arbitrary base64 text. + if (payload.startsWith("iVBORw0KGgo")) return "image/png"; + if (payload.startsWith("/9j/")) return "image/jpeg"; + if (payload.startsWith("R0lGODdh") || payload.startsWith("R0lGODlh")) return "image/gif"; + return null; + } +} diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java index a5e4366..f7d7043 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java @@ -313,23 +313,7 @@ public class AsyncProviderClient { /** Normalize OpenAI image/audio response fields to the task result shape. */ private Map compatibleResult(Map response) { - Object data = response.get("data"); - if (data instanceof List list && !list.isEmpty()) { - Object first = list.getFirst(); - if (first instanceof Map map) { - Map result = new LinkedHashMap<>(); - map.forEach((key, value) -> result.put(String.valueOf(key), value)); - Object url = result.get("url"); - if (url == null) url = result.get("audio_url"); - if (url != null) result.put("url", url); - if (result.get("b64_json") != null) result.put("base64", result.get("b64_json")); - copyUsage(response,result); - return result; - } - } - Object url = response.get("url"); - if (url != null) { var result=new LinkedHashMap(); result.put("url",url); copyUsage(response,result); return result; } - return null; + return AsyncTaskResponseNormalizer.result(response, "image"); } private Map requestAudio(String method, String url, String key, Map body, String message) { diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizer.java b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizer.java index 2dec99b..17c966d 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizer.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizer.java @@ -5,6 +5,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import com.moyi.controlplane.provider.media.MediaAssetNormalizer; /** Bounded envelope normalization only. No upstream calls, credentials, routing or settlement. */ final class AsyncTaskResponseNormalizer { @@ -34,54 +35,47 @@ final class AsyncTaskResponseNormalizer { } static Map result(Map response) { - Map data = nested(response); - for (String field : List.of("output", "content", "result")) { - Map result = asset(response.get(field)); - if (result == null) result = asset(data.get(field)); - if (result != null) { - if (data.get("credits_consumed") != null) result.put("creditsConsumed", data.get("credits_consumed")); - return result; + return result(response, null); + } + + static Map result(Map response, String taskType) { + return findResult(response, taskType, 0); + } + + static Map completedResult(Map response, String taskType) { + Map result = result(response, taskType); + if (result != null) return result; + result = new LinkedHashMap<>(Map.of("deliveryStatus", "pending", "deliveryCode", "TASK_RESULT_UNAVAILABLE")); + copyMetadata(nested(response), result); + copyMetadata(response, result); + return result; + } + + private static Map findResult(Object raw, String taskType, int depth) { + if (depth > 4) return null; + if (raw instanceof List items) { + for (int i = 0; i < Math.min(items.size(), 16); i++) { + var result = findResult(items.get(i), taskType, depth + 1); + if (result != null) return result; } + return null; } - Map direct = asset(response); - return direct != null ? direct : asset(data); + if (!(raw instanceof Map source)) return MediaAssetNormalizer.normalize(raw, taskType); + for (String field : List.of("output", "content", "result", "data")) { + var result = findResult(source.get(field), taskType, depth + 1); + if (result != null) { copyMetadata(source, result); return result; } + } + return MediaAssetNormalizer.normalize(source, taskType); } private static Map nested(Map response) { return response.get("data") instanceof Map data ? data : Map.of(); } - private static Map asset(Object raw) { - // A bare string is only a media reference when it is a URL; provider messages are not assets. - if (raw instanceof String value) return value.matches("(?i)(https?://|data:).+") ? new LinkedHashMap<>(Map.of("url", value)) : null; - if (!(raw instanceof Map source)) return null; - // Select assets explicitly: task metadata, provider errors or arbitrary content are not media. - var result = new LinkedHashMap(); - for (String field : List.of("url", "modelUrl", "previewUrl", "imageUrl", "videoUrl", "audioUrl", "base64", "b64_json")) { - Object value = source.get(field); - if (value instanceof String text && !text.isBlank()) result.put(field, text); - } - String[][] aliases = {{"model_url","modelUrl"},{"rendered_image_url","previewUrl"}, - {"generated_image_url","imageUrl"},{"image_url","imageUrl"},{"video_url","videoUrl"}, - {"audio_url","audioUrl"},{"last_frame_url","previewUrl"},{"preview_url","previewUrl"}}; - for (String[] alias : aliases) { - Object value = source.get(alias[0]); - if (value instanceof Map map) value = map.get("url"); - if (value instanceof String text && !text.isBlank()) result.putIfAbsent(alias[1], text); - } - for (String kind : List.of("video","audio","image")) { - if (source.get(kind) instanceof Map map && map.get("url") instanceof String text && !text.isBlank()) { - result.putIfAbsent(kind + "Url", text); - } - } - if (result.isEmpty() || result.keySet().stream().allMatch("previewUrl"::equals)) return null; - for (String field : List.of("format","mimeType","mime_type","creditsConsumed","credits_consumed")) { - if (source.get(field) instanceof String || source.get(field) instanceof Number) result.put(field, source.get(field)); - } - for (String field : List.of("usage","usageMetadata")) if (source.get(field) instanceof Map value) result.put(field, value); - for (String field : List.of("modelUrl","videoUrl","audioUrl","imageUrl")) { - if (!result.containsKey("url") && result.containsKey(field)) result.put("url", result.get(field)); - } - return result; + private static void copyMetadata(Map source, Map result) { + for (String field : List.of("usage", "usageMetadata")) if (source.get(field) instanceof Map value) result.put(field, value); + Object credits = source.get("creditsConsumed"); + if (credits == null) credits = source.get("credits_consumed"); + if (credits instanceof Number || credits instanceof String) result.putIfAbsent("creditsConsumed", credits); } } diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java index 79ba5e7..14f6fb3 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java @@ -294,7 +294,8 @@ public class AsyncTaskService { if (upstream.get("_moyiInlineResult") instanceof Map inline) { Map result = new LinkedHashMap<>(); inline.forEach((key, value) -> result.put(String.valueOf(key), value)); - completion = outcomes.observeTerminal(taskId, "succeeded", result, null, null); + completion = outcomes.observeTerminal(taskId, "succeeded", + AsyncTaskResponseNormalizer.completedResult(result, String.valueOf(task.get("task_type"))), null, null); } else { OffsetDateTime submittedAt = now(); outcomes.accepted(taskId, providerTaskId(upstream), upstream.get("_moyiUpstreamKeyFingerprint"), @@ -487,18 +488,12 @@ public class AsyncTaskService { } String status = AsyncTaskResponseNormalizer.status(response); int progress = AsyncTaskResponseNormalizer.progress(response, status); - Map result = AsyncTaskResponseNormalizer.result(response); String taskType = jdbc.queryForObject("SELECT task_type FROM model_tasks WHERE id=?", String.class, taskId); - if ("succeeded".equals(status) && result == null && List.of("video", "audio").contains(taskType)) { - // Generation success is not proof that the media bytes were delivered. Preserve billing - // semantics, never resubmit/refund automatically, and expose the missing delivery explicitly. - result = new LinkedHashMap<>(Map.of("deliveryStatus", "pending", "deliveryCode", "TASK_RESULT_UNAVAILABLE")); - } - if(result!=null) { - result=new LinkedHashMap<>(result); - result.putAll(usageOnly(response)); - if(response.get("data") instanceof Map nested && result.get("usage")==null && nested.get("usage") instanceof Map u) result.put("usage",u); - } + // File delivery is independent of upstream generation/settlement. Missing or invalid files + // never cause a generation retry or an automatic refund, including image and 3D tasks. + Map result = "succeeded".equals(status) + ? AsyncTaskResponseNormalizer.completedResult(response, taskType) + : AsyncTaskResponseNormalizer.result(response, taskType); if ("succeeded".equals(status) || "failed".equals(status) || "cancelled".equals(status)) { // Persistence failures must roll back and remain pollable, rather // than being mistaken for upstream failures and refunded. @@ -533,12 +528,6 @@ public class AsyncTaskService { catch (JsonProcessingException exception) { throw new ApiException("INVALID_REQUEST", "任务请求无法编码"); } } - private Map usageOnly(Map result) { - var selected=new LinkedHashMap(); - if(result!=null) for(String field:List.of("usage","usageMetadata")) if(result.get(field) instanceof Map value) selected.put(field,value); - return selected; - } - private void reserveWallet(UUID userId, BigDecimal amount) { jdbc.update("INSERT INTO user_wallets(user_id) VALUES (?) ON CONFLICT DO NOTHING", userId); Map wallet = jdbc.queryForMap("SELECT balance,reserved_balance FROM user_wallets WHERE user_id=? FOR UPDATE", userId); diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/provider/media/MediaAssetNormalizerTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/provider/media/MediaAssetNormalizerTest.java new file mode 100644 index 0000000..6485f96 --- /dev/null +++ b/control-plane-java/src/test/java/com/moyi/controlplane/provider/media/MediaAssetNormalizerTest.java @@ -0,0 +1,54 @@ +package com.moyi.controlplane.provider.media; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.Map; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class MediaAssetNormalizerTest { + @Test void imageSignaturesSupplyMissingMimeWithoutGuessingArbitraryBase64() { + assertEquals("image/png", MediaAssetNormalizer.normalize(Map.of("b64_json", "iVBORw0KGgo="), "image").get("mimeType")); + assertEquals("image/jpeg", MediaAssetNormalizer.normalize(Map.of("base64", "/9j/4AAQSkZJRg=="), "image").get("mimeType")); + assertNull(MediaAssetNormalizer.normalize(Map.of("base64", "bm90IGFuIGltYWdl"), "image")); + assertNull(MediaAssetNormalizer.normalize(Map.of("base64", "%%%", "format", "png"), "image")); + } + + @ParameterizedTest + @ValueSource(strings={"javascript:alert(1)", "file:///etc/passwd", "https://user:password@cdn.example.test/a.mp4", + "data:image/svg+xml;base64,PHN2Zz48L3N2Zz4=", "data:text/html;base64,PGh0bWw+", "https:missing-host", + "https://cdn.example.test/\\result", "generation complete"}) + void invalidReferencesAreNotDeliveredFiles(String value) { + assertNull(MediaAssetNormalizer.normalize(Map.of("url", value), null)); + assertNull(MediaAssetNormalizer.normalize(value, null)); + } + + @Test void primaryMediaMustBelongToTheTaskRatherThanItsThumbnail() { + assertNull(MediaAssetNormalizer.normalize(Map.of("image_url", "https://cdn.example.test/frame.png"), "video")); + assertNull(MediaAssetNormalizer.normalize(Map.of("url", "data:image/png;base64,iVBORw0KGgo="), "video")); + assertNull(MediaAssetNormalizer.normalize(Map.of("url", "https://cdn.example.test/file", "mimeType", "image/png"), "video")); + assertNull(MediaAssetNormalizer.normalize(Map.of("url", "https://cdn.example.test/frame.png?sig=1"), "video")); + assertNull(MediaAssetNormalizer.normalize(Map.of("video_url", "https://cdn.example.test/frame.png"), "video")); + var video = MediaAssetNormalizer.normalize(Map.of("video", Map.of("url", "https://cdn.example.test/file?sig=ok"), + "last_frame_url", "https://cdn.example.test/frame.png"), "video"); + assertEquals("https://cdn.example.test/file?sig=ok", video.get("url")); + assertEquals("https://cdn.example.test/frame.png", video.get("previewUrl")); + } + + @Test void metadataIsWhitelistedAndNestedAudioRetainsItsMime() { + var result = MediaAssetNormalizer.normalize(Map.of("audio_url", Map.of("base64", "ZmFrZQ==", "format", "opus"), + "credentials", "secret", "error", "private detail", "usage", Map.of("output_tokens", 12), "credits_consumed", 2), "audio"); + assertEquals("data:audio/ogg;base64,ZmFrZQ==", result.get("url")); + assertEquals(Map.of("output_tokens", 12), result.get("usage")); + assertEquals(2, result.get("creditsConsumed")); + assertFalse(result.containsKey("credentials")); + assertFalse(result.containsKey("error")); + } + + @Test void nestedReferencesAreDepthBounded() { + Map nested = Map.of("url", "https://cdn.example.test/result.mp4"); + for (int i = 0; i < 20; i++) nested = Map.of("url", nested); + assertNull(MediaAssetNormalizer.normalize(nested, "video")); + } +} diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncProviderClientTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncProviderClientTest.java index 55d8ea1..9a5e706 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncProviderClientTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncProviderClientTest.java @@ -32,7 +32,7 @@ class AsyncProviderClientTest { path.set(exchange.getRequestURI().getPath()); String body=path.get().contains("generateContent") ? "{\"candidates\":[{\"content\":{\"parts\":[{\"inlineData\":{\"mimeType\":\"image/png\",\"data\":\"cG5n\"}}]}}],\"usageMetadata\":{\"promptTokenCount\":20,\"candidatesTokenCount\":100}}" - : "{\"data\":[{\"b64_json\":\"cG5n\"}],\"usage\":{\"input_tokens\":10,\"output_tokens\":50}}"; + : "{\"data\":[{\"b64_json\":\"iVBORw0KGgo=\",\"revised_prompt\":\"private prompt\",\"credentials\":\"private detail\"}],\"usage\":{\"input_tokens\":10,\"output_tokens\":50}}"; byte[] bytes=body.getBytes(StandardCharsets.UTF_8); exchange.sendResponseHeaders(200,bytes.length); try(var out=exchange.getResponseBody()){out.write(bytes);} }); @@ -43,6 +43,10 @@ class AsyncProviderClientTest { var client=new AsyncProviderClient(jdbc,cipher,new ObjectMapper(),mock(Environment.class)); var image=(Map)client.submit("relay","gpt-image-2","image",Map.of("prompt","cat")).get("_moyiInlineResult"); assertEquals("/v1/images/generations",path.get()); assertTrue(image.containsKey("usage")); + assertEquals("image/png",image.get("mimeType")); + assertEquals("iVBORw0KGgo=",image.get("base64")); + org.junit.jupiter.api.Assertions.assertFalse(image.containsKey("revised_prompt")); + org.junit.jupiter.api.Assertions.assertFalse(image.containsKey("credentials")); var gemini=(Map)client.submit("relay","gemini-3-pro-image-preview","image",Map.of("prompt","cat")).get("_moyiInlineResult"); assertEquals("/v1beta/models/gemini-3-pro-image-preview:generateContent",path.get()); assertEquals("cG5n",gemini.get("base64")); assertTrue(gemini.containsKey("usageMetadata")); @@ -380,6 +384,26 @@ class AsyncProviderClientTest { assertEquals("ASYNC_PROVIDER_NOT_IMPLEMENTED", assertThrows(ApiException.class, () -> client.submit("provider-vast", "tripo", "video", Map.of("prompt", "x"))).getCode()); } + @Test void inlineImageObjectsAndInvalidAssetsUseTheSameBoundaryAsPolling() throws Exception { + HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0); + var response = new AtomicReference<>("{\"data\":{\"image_url\":{\"url\":\"https://cdn.example.test/result.png?sig=1\"}},\"usage\":{\"output_tokens\":5}}"); + server.createContext("/images/generations", exchange -> { + exchange.getRequestBody().readAllBytes(); + byte[] bytes = response.get().getBytes(StandardCharsets.UTF_8); + exchange.sendResponseHeaders(200, bytes.length); + try (var output = exchange.getResponseBody()) { output.write(bytes); } + }); + server.start(); + try { + var client = relayClient(server); + var result = (Map) client.submit("relay", "gpt-image-2", "image", Map.of("prompt", "synthetic")).get("_moyiInlineResult"); + assertEquals("https://cdn.example.test/result.png?sig=1", result.get("url")); + assertEquals(Map.of("output_tokens", 5), result.get("usage")); + response.set("{\"data\":[{\"url\":\"javascript:alert(1)\"}]}"); + org.junit.jupiter.api.Assertions.assertFalse(client.submit("relay", "gpt-image-2", "image", Map.of("prompt", "synthetic")).containsKey("_moyiInlineResult")); + } finally { server.stop(0); } + } + private AsyncProviderClient relayClient(HttpServer server) { var jdbc = mock(JdbcTemplate.class); var cipher = new SecretCipher("test-encryption"); when(jdbc.queryForMap(any(String.class), eq("relay"))).thenReturn(Map.of("code", "relay", "protocol", "openai-compatible", diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskPostgresTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskPostgresTest.java index eaeeefb..9817aeb 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskPostgresTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskPostgresTest.java @@ -446,6 +446,40 @@ class AsyncTaskPostgresTest { assertFalse(result.containsKey("deliveryStatus")); } + @ParameterizedTest + @ValueSource(strings={"image", "video", "audio", "3d"}) + void invalidCompletedMediaIsPendingWithoutRefundOrRegeneration(String type) { + jdbc.update("UPDATE model_tasks SET task_type=? WHERE id=?", type, taskId); + when(provider.poll("provider-vast", "model-mock-3d", "v3.1-20260211", "upstream-task", null)) + .thenReturn(Map.of("status", "succeeded", "result", Map.of("url", "javascript:alert(1)", "error", "private detail"))); + poll(); poll(); + assertEquals("succeeded", status()); + assertEquals(new BigDecimal("8.56000000"), wallet("balance")); + assertEquals(0, wallet("reserved_balance").signum()); + assertEquals(1, jdbc.queryForObject("SELECT count(*) FROM wallet_entries WHERE user_id=?", Integer.class, userId)); + var result = (Map) tasks.getForKey(Map.of("id", keyId.toString()), taskId).get("result"); + assertEquals("pending", result.get("deliveryStatus")); + assertFalse(result.containsKey("url")); + assertFalse(result.containsKey("error")); + verify(provider, never()).submit(anyString(), anyString(), anyString(), anyString(), anyMap()); + verify(provider, never()).submit(anyString(), anyString(), anyString(), anyString(), anyString()); + } + + @Test void inlineSuccessWithTheWrongMediaKindIsPendingAndSettlesOnlyOnce() { + jdbc.update("UPDATE model_tasks SET task_type='image',status='queued',provider_task_id=NULL WHERE id=?", taskId); + when(provider.submit(anyString(), anyString(), anyString(), eq("image"), anyString())) + .thenReturn(Map.of("_moyiInlineResult", Map.of("video_url", "https://cdn.example.test/not-an-image.mp4", "error", "private detail"))); + tasks.completeMockTasks(); tasks.completeMockTasks(); + assertEquals("succeeded", status()); + assertEquals(new BigDecimal("8.56000000"), wallet("balance")); + assertEquals(0, wallet("reserved_balance").signum()); + assertEquals(1, jdbc.queryForObject("SELECT count(*) FROM wallet_entries WHERE user_id=?", Integer.class, userId)); + var result = (Map) tasks.getForKey(Map.of("id", keyId.toString()), taskId).get("result"); + assertEquals("pending", result.get("deliveryStatus")); + assertFalse(result.containsKey("videoUrl")); + verify(provider, times(1)).submit(anyString(), anyString(), anyString(), eq("image"), anyString()); + } + @Test void confirmedUpstreamFailureReleasesHoldImmediately() { when(provider.poll("provider-vast","model-mock-3d","v3.1-20260211","upstream-task",null)).thenReturn(Map.of("data",Map.of("status","failed"))); poll(); diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizerTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizerTest.java index a44a372..7adfdf3 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizerTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizerTest.java @@ -50,4 +50,35 @@ class AsyncTaskResponseNormalizerTest { assertEquals(100, AsyncTaskResponseNormalizer.progress(Map.of("progress", 10), "succeeded")); assertEquals("failed", AsyncTaskResponseNormalizer.status(Map.of("data", Map.of("status", " FAILED ")))); } + + @Test void boundedListsAndEnvelopesRetainUsageWithoutTaskMetadata() { + var usage = Map.of("input_tokens", 10, "output_tokens", 20); + var response = Map.of("data", Map.of("result", List.of(Map.of("type", "text"), + Map.of("audio_url", Map.of("url", "https://cdn.example.test/a.opus"), "credentials", "private")), "usage", usage)); + var result = AsyncTaskResponseNormalizer.result(response, "audio"); + assertEquals("https://cdn.example.test/a.opus", result.get("url")); + assertEquals(usage, result.get("usage")); + assertFalse(result.containsKey("credentials")); + var outerUsage = Map.of("input_tokens", 30); + var withOuter = new java.util.LinkedHashMap<>(response); + withOuter.put("usage", outerUsage); + assertEquals(outerUsage, AsyncTaskResponseNormalizer.result(withOuter, "audio").get("usage")); + } + + @Test void completedResultsWithoutPrimaryFilesAreExplicitlyPendingForAllMediaKinds() { + for (String kind : List.of("image", "video", "audio", "3d")) { + var result = AsyncTaskResponseNormalizer.completedResult(Map.of("status", "completed", "url", "not a file", + "usage", Map.of("output_tokens", 25)), kind); + assertEquals("pending", result.get("deliveryStatus")); + assertEquals("TASK_RESULT_UNAVAILABLE", result.get("deliveryCode")); + assertEquals(Map.of("output_tokens", 25), result.get("usage")); + assertFalse(result.containsKey("url")); + } + } + + @Test void excessiveResultDepthCannotBypassTheEnvelopeBoundary() { + Map response = Map.of("url", "https://cdn.example.test/a.mp4"); + for (int i = 0; i < 20; i++) response = Map.of("result", response); + assertNull(AsyncTaskResponseNormalizer.result(response, "video")); + } } diff --git a/docs/24-security-and-cpr-task-tracker.md b/docs/24-security-and-cpr-task-tracker.md index 85932a5..398cf79 100644 --- a/docs/24-security-and-cpr-task-tracker.md +++ b/docs/24-security-and-cpr-task-tracker.md @@ -1,6 +1,6 @@ # 安全与 CPR 差距任务追踪 -最新增量审查日期:2026-10-22。对照用户粘贴的 CPR 比对报告与本地代码,不将建议清单视为已完成验收。比对结论与优化方案全文见 `29-cpr-gap-analysis-and-optimization-plan.md`。 +最新增量审查日期:2026-10-28。对照用户粘贴的 CPR 比对报告与本地代码,不将建议清单视为已完成验收。比对结论与优化方案全文见 `29-cpr-gap-analysis-and-optimization-plan.md`。 ## 已交付基线 @@ -29,9 +29,9 @@ | SCH-02 | 公平排队 / 取消 / 共享等待预算 | 部分完成:模型+Key 配对准入改为模型级 FIFO(到达顺序 ZSET,过期/超时/放弃即出队;仅因自身 Key 满而等待者不占模型队位),真实 Redis 回归证明旧脚本会被插队;跨路由共享等待预算、优先级与横向压测仍缺 | 多客户端饥饿/FIFO/取消回收与横向并发验证 | | OPS-01 | request/attempt 诊断、配置版本、质量门禁 | 部分:已有最终审计/健康/部分快照;本轮加依赖方向测试、CI/Dependabot 配置,远端未运行;逐 attempt/完整配置版本仍缺 | 本地门禁不等于 GitHub CI、CVE 扫描或真实协议验收 | | OPS-02 | CPR 可选部署 / OAuth 账号池 | 未部署;属于可选方案,不默认新建生产基础设施 | 用户确认部署方式及授权来源后才接入;本地不发付费生成 | -| MED-01 | 音视频任务回执与结果规范化 | 本地已实现:独立 `AsyncTaskResponseNormalizer` 解析 `content`/`result`/嵌套 `data` 与 `{url}` 对象,仅白名单媒体字段;视频/音频完成但无文件时标记 `deliveryStatus=pending`,结算一次、不重发不退款。逐供应商实测未做 | 本地协议桩、结果回读与钱包只结算一次;逐供应商实测待授权 | +| MED-01 | 音视频任务回执与结果规范化 | 本地已实现并继续收紧:`AsyncTaskResponseNormalizer` 只解析有界信封/列表,`provider.media.MediaAssetNormalizer` 为即时/轮询结果共用的纯媒体字段边界;拒绝无效/带凭据 URL、主动 SVG data 文档、错误媒体类型;所有媒体完成但无主文件均标记 `deliveryStatus=pending`,保留原结算语义、不重发不退款。逐供应商实测未做 | 本地协议桩、结果回读、缺文件/错类型和钱包只结算一次;详见 31 号文档 | | MED-02 | 音频协议与执行能力准确标识 | 本地已实现:目录与执行共用 `AsyncMediaSupport.supportsSpeech` 白名单;非 TTS 音频、专用渠道错配任务类型、非法文本/音色/格式/语速在发送前拒绝。转写/音乐/Realtime 仍未接入 | 目录与实际执行共享判定,错误协议在发送前拒绝;TTS/非 TTS 回归 | -| MED-03 | 音视频结果展示与历史任务类型 | 本地已实现:任务响应返回持久 `taskType`/`completedAt`,前端以其优先于目录;补 opus/aac/flac MIME、签名 URL 后缀、尾帧预览与“结果未交付”提示 | 无目录历史任务、音频 base64、带签名视频 URL、错误响应前端回归 | +| MED-03 | 音视频结果展示与历史任务类型 | 本地已实现并继续修复:持久任务类型优先于目录;补无格式 Base64 的 PNG/JPEG/GIF 签名识别、data URL 音频识别和单一主媒体类型;历史成功任务也检查主文件,预览帧不算视频成品,无文件不再提示可下载。真实浏览器生成/播放未验收 | 无目录任务、音频 base64、签名 URL、缺格式图片、无效别名/尾帧前端回归 | | MED-04 | 音视频用量计费及逐路由验收 | 未完成:音视频 Token/时长计费不可用固定单任务费代替,配置就绪不等于真实生成通过 | 每条路由分别核对协议、模型、用量、费用、播放;不猜报价,不自动发付费任务 | | MED-05 | 视频鉴权内容下载与不同渠道协议 | 未完成:返回任务元数据但无公开 URL 的供应商需要鉴权内容获取;不同渠道不能共用猜测接口 | 绑定原账号、受控内容下载、用户隔离、体积期限与安全存储联合验收 | @@ -39,7 +39,7 @@ 附件追踪确认(2026-10-22):用户再次提供的 CPR 比对文本已通过 SEC-01–07、COD-01–03、SCH-01–02、OPS-01–02 映射到本表,包含保留人民币钱包/凭据加密、不直接整体替换 CPR 的边界;附件中的版本是当次锁定基线,不是当前最新版声明。此前没有单列完整音视频验收任务,本轮新增 MED-01–05 并优先排查用户反馈,不能用安全回归通过替代音视频生成实测。 -已补 SEC-01/02/03、SEC-06 的本地下载代码边界、验证码/账号事务,以及请求侧一致的验证码受理和加密异步投递。下一优先级是管理授权审查、同步 Transport 与完整 provider 配置版本,再处理 COD-01/02/03 的协议/续接/长请求合同。投递真实环境、残余时序与生产网络隔离仍属待验收。Codex WebSocket 与 OAuth 不是添加 URL 即可安全完成的能力,须连同状态归属、计量、预留续期和客户端验收逐步实施。未部署、未真实供应商验证或待设计的项必须保持未完成标记。 +已补 SEC-01/02/03、SEC-06 的本地下载代码边界、验证码/账号事务,以及请求侧一致的验证码受理和加密异步投递。后续优先推进媒体交付/计费的已知缺口、同步 Transport 与完整 provider 配置版本;COD-01/02 继续遵守用户的暂缓决定,不恢复会话存储或擅自拆分管理员权限。投递真实环境、残余时序与生产网络隔离仍属待验收。Codex WebSocket 与 OAuth 不是添加 URL 即可安全完成的能力,须连同状态归属、计量、预留续期和客户端验收逐步实施。未部署、未真实供应商验证或待设计的项必须保持未完成标记。 本轮设计与验证细节见 `25-auth-and-bounded-transport.md`。这份表按用户粘贴报告的锁定基线追踪本地实施,不把旧的 CPR 版本号冒充实时最新版,也没有重新部署 CPR。只做本地 Git commit,不 push,不修改业务数据库。 @@ -58,3 +58,5 @@ 2026-10-22 管理授权审查与公平准入增量(SEC-07 / SCH-02):只读审查全部控制器,未发现未鉴权端点、先副作用后校验或跨用户 IDOR。已修复:①修改渠道 Base URL 时必须重新填写凭据,阻止把已存密钥重定向到新主机,审计记录新旧地址;②普通用户 `/api/models` 只返回渠道 id/name/status,不再暴露 Base URL 与凭据掩码;③管理端用量 CSV 导出中和公式前缀。**用户 2026-10-22 确认不拆分**:`admin` 与 `super_admin` 在钱包加款(含给自己)、定价、渠道、成本核账、用量删除上保持相同权限,依靠审计记录追溯;以下其余项仍未改:邀请码明文对所有管理员可见;管理变更审计缺 IP/前后值;角色校验未在行锁事务内复核。后端 `mvn -B -o clean verify` **403 项,0 失败/错误/跳过**(2026-10-22 12:06)。 2026-10-22 长请求底座增量(COD-03):`OpenAiCompatibleProvider` 新增 `GATEWAY_UPSTREAM_FIRST_BYTE_TIMEOUT_SECONDS`/`GATEWAY_UPSTREAM_IDLE_TIMEOUT_SECONDS`,流式响应有字节到达即重置空闲窗口;`GatewayRequestExecutionService` 在调用期间续期 `chat_billing_requests.expires_at`(只延长不缩短,仅 pending)和全部 Redis 租约(仅续仍持有的 token)。默认值不变,部署后行为与之前一致。后端 `mvn -B -o clean verify` **409 项,0 失败/错误/跳过**(2026-10-22 15:23)。另在本机 Docker(`infra/moyi` + `docker-compose.local.override.yml`,仅监听 127.0.0.1:18088)完成启动冒烟:健康检查、超级管理员登录、目录字段收敛、Key 创建、Mock 同步与 SSE 调用和用量记录、401/403/协议拒绝;Tripo 3D 因本地无凭据按预期失败且预留归零。 + +2026-10-28 媒体交付边界增量(MED-01/03):前端先新增失败回归,复现缺格式 Base64 图片、纯 data URL 音频和带凭据 URL 问题;新增共享媒体结果模块,并将缺主文件标记覆盖到图片/3D 与即时结果。增补类型/后缀检查后的最终后端 `mvn -B -o clean verify` **430 项,0 失败/错误/跳过**(13:43:34 Asia/Shanghai),前端构建及 31 项测试通过,详见 31 号文档。验收框架现在可启动,MOYI 已登记为 draft,七项匿名只读规格 `qa validate` 通过,`qa project check moyi` 无 error、仅待核实实例版本/无需凭据/未人工批准等警告;未自行 approve 或 run,不生成验收通过报告。MED-04/05 仍未完成;没有付费调用、部署或业务数据迁移。 diff --git a/docs/31-media-result-delivery-boundary.md b/docs/31-media-result-delivery-boundary.md new file mode 100644 index 0000000..e0ceef0 --- /dev/null +++ b/docs/31-media-result-delivery-boundary.md @@ -0,0 +1,59 @@ +# 媒体结果交付边界与验收准备 + +状态:本地实现与回归;真实供应商生成/播放和规格驱动验收未完成。 +负责人:Codex。更新时间:2026-10-28(Asia/Shanghai)。 +关联任务:MED-01、MED-03;MED-04/05 保持未完成。 + +## 本轮接手基线 + +接手时工作区干净,HEAD 为 `bb3baed`;上一轮媒体实现已在 `2e53b1d` 提交。本轮不重复提交旧改动。保留后续公平排队、长请求续租,以及暂缓 COD-01/02、不存储对话、不拆分管理员权限的已记录决定。原 `moyi` 半小时自动化已取消,不重新创建。 + +## 已复现的问题 + +1. 前端读取 `b64_json` 但缺少 MIME/format 时没有可播放/展示的 data URL。新增回归使用 PNG/JPEG 文件头,原实现返回 undefined。 +2. 纯 `data:audio/...` 链接未参与媒体类型推断;无额外类型元数据时没有音频播放器地址。 +3. URL 校验允许 userinfo,且 data URL 接受 SVG。后者不是产品所需的栅格媒体结果,不应作为主动文档打开。 +4. 即时图片结果复制上游第一项的任意字段;与轮询白名单不一致。上游附加的 revised_prompt、错误细节或凭据字段可能随任务保存/回传。 +5. “有返回字段”不等于“有这个任务的主文件”:无效 URL、只有尾帧、错误媒体类型仍可能被看作已交付。原无结果标记仅覆盖轮询的音频/视频,图片、3D、即时结果和历史前端状态不一致。 + +前三项已先运行前端失败回归(8 项中 3 项失败、5 项通过),随后修复;不是用户现场故障的根因认定。当前尚缺其具体渠道、型号、任务 ID 或脱敏错误。 + +## 模块与行为 + +- `provider.media.MediaAssetNormalizer`:纯字段边界,不调用 HTTP、不读取密钥、不改路由或账务。只接收媒体 URL/Base64、格式/MIME、预览和用量/credits 白名单;拒绝带凭据、错误 scheme、控制字符、SVG data 文档,以及已知类型不匹配的主文件。嵌套引用有深度上限;Base64 有大小和字符边界。 +- `task.AsyncTaskResponseNormalizer`:只处理任务状态、进度与有界信封;信封深度最多 4,列表最多查看前 16 项,向共享媒体模块委托。不沿任意属性搜文件或向外取内容。保持原有外层用量优先级,避免无意改变已有计费选择。 +- `AsyncProviderClient`:即时兼容图片结果与轮询共用规范化,支持已知 `data` 对象/列表,不再把任意上游字段带入成品记录。Base64 缺格式只对可识别的 PNG/JPEG/GIF 签名推断,不把所有未知内容默认成 PNG。 +- `AsyncTaskService`:即时及轮询的所有媒体类型在成功但没有有效主文件时返回 `deliveryStatus=pending` / `TASK_RESULT_UNAVAILABLE`。沿用生成终态及现有结算:不再次生成、不因交付缺失自动退款,重复观测不重复扣费。任务用量仍可单独参与原有结算。 +- 前端 `services/media.ts`:类型、签名 URL、data URL、Base64 与显式媒体字段一致处理;已声明任务类型只有一个通用主媒体通道,预览不算主文件。`hasPrimaryMedia` 供详情与完成通知共用,历史成功任务也不会凭空声称文件可下载。 + +这里的有效性是结构/引用校验,不是对远端可达性、文件完整性、编解码器或浏览器实际播放的证明。没有到 CDN 抓取每份成品,也没有新增鉴权下载猜测路径、供应商参数或价格。本轮尝试按 OpenAI Docs 获取官方媒体文档,站点返回 403;不据此声称核实了当前官方协议,亦不使用未经核实的默认格式或成品接口。 + +## 验证记录 + +- Java 21 + Maven 3.9.9 的媒体定向测试:49 项,0 失败/错误/跳过。 +- 首轮 `mvn -B -o clean verify`:430 项,0 失败/错误/跳过;包含独立 PostgreSQL 15.18 和 Redis 7 的数据库/账务回归。后端基线原有 409 项,本轮增加 21 项。 +- 最终补充已知 URL 后缀/任务类型交叉检查后,再次运行 `mvn -B -o clean verify`:**430 项,0 失败/错误/跳过**,2026-10-28 13:43:34(Asia/Shanghai)结束,用时 4 分 29 秒,BUILD SUCCESS。 +- `npm --prefix prototype run build`:Vue 类型检查和 Vite 生产构建通过;`npm --prefix prototype test`:31 项,0 失败/跳过。 +- 无效媒体四类型数据库测试、即时错类型测试证明:生成成功保持终态,费用只结算一次、预留归零,无重新提交;保留历史结算失败恢复、未知受理不退款、用户隔离等回归。 + +测试容器均使用本轮 `codex.task=moyi-media-20261028` 标签;PostgreSQL 无网络、无宿主端口,使用临时内存数据目录;Redis/Maven 只共享该网络命名空间。不连接现有 MOYI 业务数据库、不重启本机已有实例。日志及构建产物在受忽略的 `.tools/`、`target/` 和 `dist/`,不提交。 + +## 规格驱动验收现状 + +本轮按 `spec-driven-acceptance-testing` 执行了准备流程: + +1. 在 `D:\PROJECT\xpp_dev_agent\dev-test` 运行 `qa project list`,已能启动;过去不存在 Python 的阻塞不再复现。 +2. MOYI 尚未登记,已用 `qa project init moyi` 新建独立档案 `D:\PROJECT\xpp_dev_agent\qa-projects\moyi`;未修改框架代码或其他项目档案。 +3. 填写已核实的源代码、认证、测试范围与 loopback 入口,新增 `specs/media-access-readonly.yaml`,始终 `status: draft`。 +4. `qa validate --spec ..\qa-projects\moyi\specs\media-access-readonly.yaml` 退出 0;`qa project check moyi` 退出 1、无 error:实例版本待核实,匿名规格不需 `.env.local`,规格待人工批准。 + +七项待审预期:健康入口 200/status=ok;`/v1/tasks`、`/v1/tasks/qa-media-absent`、`/api/tasks`、`/v1/models`、`/api/models`、`/api/admin/providers` 无身份均为 401 / UNAUTHENTICATED,不回传相应任务/目录字段。全部只读,不登录、不建号、不生成、不付费。 + +**未执行 `qa approve` 或 `qa run --project moyi`**,因此没有 report.html、summary.json、JUnit 或浏览器证据,也没有规格驱动验收通过结论。用户明确审阅批准之后才执行;执行前还要核实本机实例版本。后续带身份的两用户任务隔离、媒体回读/播放需要专用测试账号、隔离任务与新的 draft,不复用真实用户凭证。 + +## 未完成项与下一步 + +- MED-04:音视频按 Token/时长计费和逐路由协议/费用/播放验收;没有报价或可核对用量时继续限制,不用固定单任务费替代。 +- MED-05:只有任务元数据的渠道要接绑定原账号的鉴权内容下载,涉及凭据版本、下载体积/期限、用户授权和安全存储。不能把媒体结果规范化当作已实现成品下载。 +- 用户实际失败需要具体渠道、型号、任务 ID 或脱敏错误来定位;本轮没有创建付费媒体任务,不能据本地桩认定真实生成已全部正常。 +- 仅经审查验证的本地 Git 提交;不 push、不部署、不迁移业务数据。 diff --git a/prototype/src/services/media.ts b/prototype/src/services/media.ts index 8f4e34f..a4127ae 100644 --- a/prototype/src/services/media.ts +++ b/prototype/src/services/media.ts @@ -9,17 +9,44 @@ export interface MediaResult { } const DATA_MEDIA_RE = /^data:(image|video|audio|model)\/[a-z0-9.+-]+;base64,[a-z0-9+/\s]+=*$/i +const FORMAT_MIMES: Record = { png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', webp: 'image/webp', gif: 'image/gif', avif: 'image/avif', mp4: 'video/mp4', webm: 'video/webm', mov: 'video/quicktime', mp3: 'audio/mpeg', wav: 'audio/wav', ogg: 'audio/ogg', opus: 'audio/ogg', aac: 'audio/aac', flac: 'audio/flac', m4a: 'audio/mp4', glb: 'model/gltf-binary', gltf: 'model/gltf+json' } + +function mediaMime(value: unknown): string | undefined { + if (typeof value !== 'string') return undefined + const mime = value.trim().toLowerCase() + return /^(image\/(png|jpeg|webp|gif|avif)|model\/gltf-binary|model\/gltf\+json|(audio|video)\/[a-z0-9.+-]+)$/.test(mime) && !mime.endsWith('xml') ? mime : undefined +} + +function imageSignatureMime(payload: string): string | undefined { + if (payload.startsWith('iVBORw0KGgo')) return 'image/png' + if (payload.startsWith('/9j/')) return 'image/jpeg' + if (payload.startsWith('R0lGODdh') || payload.startsWith('R0lGODlh')) return 'image/gif' + return undefined +} + +function dataMime(value?: string): string | undefined { + return value?.startsWith('data:') ? value.slice(5, value.indexOf(';')) : undefined +} + +function referenceMime(value?: string): string | undefined { + if (!value) return undefined + return dataMime(value) || FORMAT_MIMES[new URL(value).pathname.toLowerCase().match(/\.([a-z0-9]+)$/)?.[1] || ''] +} export function safeMediaUrl(value: unknown): string | undefined { if (typeof value !== 'string' || !value.trim()) return undefined const candidate = value.trim() + if (/[\u0000-\u001f\u007f\\]/.test(candidate)) return undefined // Providers sometimes return base64 media instead of a hosted URL. Only // accept data URLs for media and require a base64 payload; never render // arbitrary data/javascript URLs from an upstream response. - if (DATA_MEDIA_RE.test(candidate)) return candidate.replace(/\s+/g, '') + if (DATA_MEDIA_RE.test(candidate) && mediaMime(candidate.slice(5, candidate.indexOf(';')))) { + const marker = candidate.indexOf(';') + return base64DataUrl(candidate.slice(marker + 8), candidate.slice(5, marker), '') + } try { const url = new URL(candidate) - return url.protocol === 'https:' || url.protocol === 'http:' ? url.href : undefined + return (url.protocol === 'https:' || url.protocol === 'http:') && !url.username && !url.password ? url.href : undefined } catch { return undefined } } @@ -27,39 +54,66 @@ function base64DataUrl(value: unknown, mimeType: unknown, format: string): strin if (typeof value !== 'string' || !value.trim()) return undefined const payload = value.trim().replace(/\s+/g, '') if (!/^[a-z0-9+/]+={0,2}$/i.test(payload) || payload.length % 4 === 1) return undefined - const mime = typeof mimeType === 'string' && /^(image|video|audio|model)\/[a-z0-9.+-]+$/i.test(mimeType) - ? mimeType.toLowerCase() - : ({ png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', webp: 'image/webp', gif: 'image/gif', mp4: 'video/mp4', webm: 'video/webm', mp3: 'audio/mpeg', wav: 'audio/wav', ogg: 'audio/ogg', opus: 'audio/ogg', aac: 'audio/aac', flac: 'audio/flac', m4a: 'audio/mp4', glb: 'model/gltf-binary', gltf: 'model/gltf+json' } as Record)[format] + const mime = mediaMime(mimeType) || FORMAT_MIMES[format] || imageSignatureMime(payload) return mime ? `data:${mime};base64,${payload}` : undefined } -function mediaValue(value: unknown, mimeType: unknown, format: string): string | undefined { +function mediaValue(value: unknown, mimeType: unknown, format: string, depth = 0): string | undefined { + if (depth > 4) return undefined if (typeof value === 'string') return safeMediaUrl(value) || base64DataUrl(value, mimeType, format) if (!value || typeof value !== 'object') return undefined const object = value as { url?: unknown; b64_json?: unknown; base64?: unknown; mime_type?: unknown; mimeType?: unknown; format?: unknown } const objectMime = object.mimeType || object.mime_type || mimeType const objectFormat = typeof object.format === 'string' ? object.format.toLowerCase() : format - return mediaValue(object.url, objectMime, objectFormat) || base64DataUrl(object.b64_json || object.base64, objectMime, objectFormat) + return mediaValue(object.url, objectMime, objectFormat, depth + 1) || base64DataUrl(object.b64_json || object.base64, objectMime, objectFormat) +} + +function mediaKind(type: string): string { + return ({ 图像: 'image', 视频: 'video', 音频: 'audio', '3D': 'model', '3d': 'model' } as Record)[type] || (['image', 'video', 'audio', 'model'].includes(type) ? type : '') +} + +function typedMediaValue(value: unknown, kind: string, mime: string, format: string): string | undefined { + const url = mediaValue(value, mime, format) + const actualMime = referenceMime(url) + return actualMime && !actualMime.startsWith(`${kind}/`) ? undefined : url +} + +function firstTypedMedia(kind: string, mime: string, format: string, ...values: unknown[]): string | undefined { + for (const value of values) { + const url = typedMediaValue(value, kind, mime, format) + if (url) return url + } + return undefined } /** Normalize generation assets without treating every provider's generic URL as a 3D model. */ export function mediaResult(result: Record = {}, type = ''): MediaResult { const format = typeof result.format === 'string' ? result.format.toLowerCase() : '' - const mime = typeof result.mimeType === 'string' ? result.mimeType.toLowerCase() : typeof result.mime_type === 'string' ? result.mime_type.toLowerCase() : '' - const url = mediaValue(result.url, mime, format) || base64DataUrl(result.b64_json || result.base64 || result.data, mime, format) - const suffix = url && !url.startsWith('data:') ? new URL(url).pathname.toLowerCase().match(/\.([a-z0-9]+)$/)?.[1] || '' : '' - const isImage = type === '图像' || type === 'image' || mime.startsWith('image/') || /^(png|jpe?g|webp|gif|avif)$/.test(format || suffix || '') - const isVideo = type === '视频' || type === 'video' || mime.startsWith('video/') || /^(mp4|webm|mov)$/.test(format || suffix || '') - const isAudio = type === '音频' || type === 'audio' || mime.startsWith('audio/') || /^(mp3|wav|ogg|opus|m4a|flac|aac)$/.test(format || suffix || '') - const isModel = type === '3D' || type === '3d' || /^(glb|gltf|obj|fbx|stl)$/.test(format || suffix || '') + const mime = mediaMime(result.mimeType) || mediaMime(result.mime_type) || '' + const rawUrl = mediaValue(result.url, mime, format) || base64DataUrl(result.b64_json || result.base64 || result.data, mime, format) + const suffix = rawUrl && !rawUrl.startsWith('data:') ? new URL(rawUrl).pathname.toLowerCase().match(/\.([a-z0-9]+)$/)?.[1] || '' : '' + const actualMime = dataMime(rawUrl) || mime || FORMAT_MIMES[format || suffix] || '' + const inferredKind = actualMime.split('/')[0] || (/^(obj|fbx|stl)$/.test(format || suffix) ? 'model' : '') + const kind = mediaKind(type) || inferredKind + const url = mediaKind(type) && inferredKind && mediaKind(type) !== inferredKind ? undefined : rawUrl return { - imageUrl: mediaValue(result.imageUrl, mime, format) || mediaValue(result.image_url, mime, format) || (isImage ? url : undefined), - videoUrl: mediaValue(result.videoUrl, mime, format) || mediaValue(result.video_url, mime, format) || (isVideo ? url : undefined), - audioUrl: mediaValue(result.audioUrl, mime, format) || mediaValue(result.audio_url, mime, format) || (isAudio ? url : undefined), - modelUrl: mediaValue(result.modelUrl, mime, format) || (isModel ? url : undefined), - previewUrl: mediaValue(result.previewUrl, mime, format) || mediaValue(result.preview_url, mime, format) || mediaValue(result.last_frame_url, 'image/png', ''), + imageUrl: firstTypedMedia('image', mime, format, result.imageUrl, result.image_url) || (kind === 'image' ? url : undefined), + videoUrl: firstTypedMedia('video', mime, format, result.videoUrl, result.video_url) || (kind === 'video' ? url : undefined), + audioUrl: firstTypedMedia('audio', mime, format, result.audioUrl, result.audio_url) || (kind === 'audio' ? url : undefined), + modelUrl: firstTypedMedia('model', mime, format, result.modelUrl, result.model_url) || (kind === 'model' ? url : undefined), + previewUrl: firstTypedMedia('image', '', '', result.previewUrl, result.preview_url, result.last_frame_url), resultUrl: url, - resultFormat: format || suffix, + resultFormat: format || suffix || ({ 'image/png': 'png', 'image/jpeg': 'jpeg', 'audio/mpeg': 'mp3', 'audio/ogg': 'ogg' } as Record)[actualMime], + } +} + +export function hasPrimaryMedia(result: MediaResult, type: string): boolean { + switch (mediaKind(type)) { + case 'video': return !!result.videoUrl + case 'audio': return !!result.audioUrl + case 'image': return !!result.imageUrl + case 'model': return !!result.modelUrl + default: return !!result.resultUrl } } diff --git a/prototype/src/views/UserConsole.vue b/prototype/src/views/UserConsole.vue index cfbfa81..6b58c14 100644 --- a/prototype/src/views/UserConsole.vue +++ b/prototype/src/views/UserConsole.vue @@ -51,7 +51,7 @@ import UiModal from '../components/UiModal.vue' import ModelGroupPermissions from '../components/ModelGroupPermissions.vue' import UsageHistory from '../components/UsageHistory.vue' import MediaResult from '../components/MediaResult.vue' -import { generationLabel, mediaResult, mediaTypeLabel, safeMediaUrl, taskMediaType } from '../services/media' +import { generationLabel, hasPrimaryMedia, mediaResult, mediaTypeLabel, safeMediaUrl, taskMediaType } from '../services/media' defineProps<{ view: string; displayName?: string }>() const emit = defineEmits<{ navigate: [view: string]; notify: [message: string]; balance: [value: number | undefined] }>() @@ -499,7 +499,7 @@ function mapAsyncTask(task: AsyncTaskResult, model: ModelItem, taskPrompt?: stri const modelUrl = assets.modelUrl const videoUrl = assets.videoUrl const previewUrl = assets.previewUrl - const deliveryPending = task.result?.deliveryStatus === 'pending' + const deliveryPending = task.result?.deliveryStatus === 'pending' || task.status === 'succeeded' && !hasPrimaryMedia(assets, type) const imageUrl = assets.imageUrl const audioUrl = assets.audioUrl const resultUrl = assets.resultUrl @@ -565,7 +565,8 @@ async function pollTask(taskId: string, apiKey: string) { // Refresh financial state without encouraging another generation request. await refreshOverview() historyRevision.value++ - emit('notify', latest.status === 'reconciling' ? `${previous.name}结果尚未确认,额度仍冻结,请联系管理员核账,勿重复提交` : latest.result?.deliveryStatus === 'pending' ? '上游已完成,结果文件尚未接入,请联系管理员,勿重复生成' : latest.status === 'succeeded' ? `${previous.name}完成,可以查看和保存结果` : `${previous.name}未能完成,请查看错误说明`) + const deliveryPending = latest.status === 'succeeded' && (latest.result?.deliveryStatus === 'pending' || !hasPrimaryMedia(mapped, taskMediaType(latest.taskType, model.type))) + emit('notify', latest.status === 'reconciling' ? `${previous.name}结果尚未确认,额度仍冻结,请联系管理员核账,勿重复提交` : deliveryPending ? '上游已完成,结果文件尚未接入,请联系管理员,勿重复生成' : latest.status === 'succeeded' ? `${previous.name}完成,可以查看和保存结果` : `${previous.name}未能完成,请查看错误说明`) } } catch (error) { taskPollers.delete(taskId) diff --git a/prototype/tests/media.test.mjs b/prototype/tests/media.test.mjs index 7624e1d..71de879 100644 --- a/prototype/tests/media.test.mjs +++ b/prototype/tests/media.test.mjs @@ -1,6 +1,6 @@ import { test } from 'node:test' import assert from 'node:assert/strict' -import { mediaResult, safeMediaUrl, taskMediaType } from '../src/services/media.ts' +import { hasPrimaryMedia, mediaResult, safeMediaUrl, taskMediaType } from '../src/services/media.ts' test('mediaResult keeps provider URLs in their declared media lane', () => { const result = mediaResult({ url: 'https://cdn.example.test/result.mp4', format: 'mp4' }, '视频') @@ -41,3 +41,37 @@ test('audio base64 without a file suffix plays as audio', () => { const frame = mediaResult({ video_url: 'https://cdn.example.test/a.mp4', last_frame_url: 'https://cdn.example.test/a.png' }, '视频') assert.equal(frame.previewUrl, 'https://cdn.example.test/a.png') }) + +test('base64 image results without format metadata use their file signature', () => { + const png = mediaResult({ b64_json: 'iVBORw0KGgo=' }, '图像') + assert.equal(png.imageUrl, 'data:image/png;base64,iVBORw0KGgo=') + assert.equal(mediaResult({ base64: '/9j/4AAQSkZJRg==' }, '图像').imageUrl, 'data:image/jpeg;base64,/9j/4AAQSkZJRg==') + assert.equal(mediaResult({ b64_json: 'bm90IGFuIGltYWdl' }, '图像').imageUrl, undefined) +}) + +test('data URL media type is inferred and an explicit task type has a single primary lane', () => { + const audio = mediaResult({ url: 'data:audio/ogg;base64,ZmFrZQ==' }) + assert.equal(audio.audioUrl, 'data:audio/ogg;base64,ZmFrZQ==') + const video = mediaResult({ url: 'https://cdn.example.test/result.mp4', format: 'mp4' }, '视频') + assert.equal(video.videoUrl, video.resultUrl) + assert.equal(video.imageUrl, undefined) + const mismatched = mediaResult({ url: 'data:image/png;base64,iVBORw0KGgo=' }, '视频') + assert.equal(mismatched.videoUrl, undefined) + assert.equal(mismatched.resultUrl, undefined) +}) + +test('media references cannot contain credentials or active vector documents', () => { + assert.equal(safeMediaUrl('https://user:password@cdn.example.test/result.mp4'), undefined) + assert.equal(safeMediaUrl('data:image/svg+xml;base64,PHN2Zz48L3N2Zz4='), undefined) + assert.equal(safeMediaUrl('https://cdn.example.test/result.mp4?sig=ok'), 'https://cdn.example.test/result.mp4?sig=ok') +}) + +test('an invalid preferred alias or thumbnail cannot hide the primary file state', () => { + const valid = mediaResult({ videoUrl: 'javascript:alert(1)', video_url: 'https://cdn.example.test/result.mp4' }, '视频') + assert.equal(valid.videoUrl, 'https://cdn.example.test/result.mp4') + assert.equal(hasPrimaryMedia(valid, 'video'), true) + assert.equal(hasPrimaryMedia(mediaResult({ previewUrl: 'https://cdn.example.test/frame.png' }, 'video'), 'video'), false) + const wrongKind = mediaResult({ videoUrl: 'https://cdn.example.test/frame.png' }, '视频') + assert.equal(wrongKind.videoUrl, undefined) + assert.equal(hasPrimaryMedia(wrongKind, '视频'), false) +})