From 798f3151ad728fded6af77e31a15396ad82cc95e Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Wed, 11 Nov 2026 12:52:37 +0700 Subject: [PATCH] M4: fail-closed typed native FX envelopes shared by Harmonice and existing editors --- src/NativeFxControlRequest.h | 19 ++++++++++--- tests/native_fx_registry_extension_test.cpp | 31 +++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/NativeFxControlRequest.h b/src/NativeFxControlRequest.h index 257a7a0eb..52d02ebab 100644 --- a/src/NativeFxControlRequest.h +++ b/src/NativeFxControlRequest.h @@ -21,10 +21,21 @@ struct NativeFxControlRequest final { result.rawEpoch=args.getProperty("deviceEpoch",{}); result.rawRevision=args.getProperty("graphRevision",{}); result.rawInstance=args.getProperty("instanceId",{}); - result.request=args.getProperty("requestId",{}).toString(); - result.slot=static_cast(args.getProperty("slot",-1)); - result.unbound=args.getProperty("workspaceToken","").toString().isNotEmpty(); - result.valid=armix::console::approvedNativeId(result.rawChannel,result.channel) && + const auto rawRequest=args.getProperty("requestId",{}); + const auto rawSlot=args.getProperty("slot",{}); + const auto rawWorkspace=args.getProperty("workspaceToken",{}); + // Every built-in editor receives the same typed CONTROL envelope. + // Never turn JSON 3.9, "3" or true into slot 3/1; nor coerce an + // integer requestId into a string or a numeric workspace token into + // LOGICAL_ONLY authority. Existing native callers send integer slots + // and string request IDs, including Harmonice user preset actions. + result.request=rawRequest.isString()?rawRequest.toString():juce::String{}; + result.slot=rawSlot.isInt()?static_cast(rawSlot):-1; + result.unbound=rawWorkspace.isString()&&rawWorkspace.toString().isNotEmpty(); + const bool workspaceTyped=rawWorkspace.isVoid()||rawWorkspace.isString(); + result.valid=args.isObject() && rawRequest.isString() && rawSlot.isInt() && + workspaceTyped && maximumSlots>0 && + armix::console::approvedNativeId(result.rawChannel,result.channel) && armix::console::approvedNativeId(result.rawEpoch,result.epoch) && armix::console::approvedNativeId(result.rawRevision,result.revision) && result.rawInstance.isString() && diff --git a/tests/native_fx_registry_extension_test.cpp b/tests/native_fx_registry_extension_test.cpp index 144e58057..21ac5e291 100644 --- a/tests/native_fx_registry_extension_test.cpp +++ b/tests/native_fx_registry_extension_test.cpp @@ -104,6 +104,37 @@ static void verifySharedNativeFxControlRequest() { assert(!Target::parse(alter(source,"instanceId",juce::var(1)),8).valid); assert(!Target::parse(alter(source,"slot",juce::var(8)),8).valid); assert(!Target::parse(alter(source,"slot",juce::var(-1)),8).valid); + // A native editor slot is an integer JSON value, not a coercible string, + // floating-point value, bool or 64-bit guest pointer/index. + for(const auto& invalid: {juce::var("3"),juce::var(3.5),juce::var(3.0), + juce::var(true),juce::var(static_cast(3))}) { + const auto bad=Target::parse(alter(source,"slot",invalid),8); + assert(!bad.valid && bad.slot==-1); + } + assert(!Target::parse(source,0).valid); + assert(!Target::parse(source,-1).valid); + assert(!Target::parse(alter(source,"requestId",juce::var(12345)),8).valid); + assert(!Target::parse(alter(source,"requestId",juce::var(true)),8).valid); + // A foreign/non-string workspace token must never select a logical + // authority path or silently fall into an installed processor lease. + for(const auto& invalid: {juce::var(1),juce::var(true), + juce::var(2.5),juce::var(juce::Array{})}) { + const auto bad=Target::parse(alter(source,"workspaceToken",invalid),8); + assert(!bad.valid && !bad.unbound); + } + // Device epoch "0" is intentional when the *separate* saved logical + // workspace owns the FX. It is NOT a valid LIVE device identity; its + // mailbox sequence still serves offline EQ/COMP/Harmony/Throw edits. + auto logicalArgs=alter(source,"deviceEpoch",juce::var("0")); + logicalArgs.getDynamicObject()->setProperty("workspaceToken","saved-mixer"); + const auto unbound=Target::parse(logicalArgs,8); + assert(!unbound.valid && unbound.unbound); + assert(unbound.sequence("comp-")==good.sequence("comp-")); + // Harmonice's new user-preset command reuses the SAME host target + // envelope, but must never be interpreted as a realtime DSP mailbox. + const auto preset=Target::parse(alter(source,"requestId", + juce::var("hpres-1844674407370955161-7")),8); + assert(preset.valid && !preset.unbound && preset.sequence("harm-")==0); assert(!Target::parse(alter(source,"requestId",juce::var("")),8).valid); assert(!Target::parse(alter(source,"requestId",juce::var(juce::String::repeatedString("a",73))),8).valid); const auto logical=Target::parse(alter(source,"workspaceToken",juce::var("persisted-mixer")),8);