From d979f8958caf36cc7b97ea838960c69f7fbb4d91 Mon Sep 17 00:00:00 2001 From: mac Date: Wed, 11 Nov 2026 19:39:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=97=A2=E6=9C=89macOS?= =?UTF-8?q?=E7=A1=AC=E4=BB=B6UUID=E7=99=BB=E5=BD=95=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E5=B9=B6=E6=A0=A1=E9=AA=8C=E4=BA=A7=E5=93=81=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=EF=BC=8C=E5=87=86=E5=A4=87131?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/tests/online_luts.php | 11 +++++ .../mu-plugins/dayu-color-online-luts.php | 31 +++++++++++-- Packaging/Release-1.22.0.md | 4 +- research/OnlineLUTIntegration-20261111.md | 4 ++ verification/OnlineLUTBackendContracts.json | 30 ++++++++++++- 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Shared/DYOnlineLUT.mm | 12 ++++- 大鱼调色/Wrapper Application/AppDelegate.m | 45 ++++++++++++++----- 大鱼调色/Wrapper Application/Info.plist | 2 +- 开发交接.md | 2 +- 10 files changed, 122 insertions(+), 21 deletions(-) diff --git a/Backend/tests/online_luts.php b/Backend/tests/online_luts.php index ca3fea2..ecc28e7 100644 --- a/Backend/tests/online_luts.php +++ b/Backend/tests/online_luts.php @@ -9,6 +9,9 @@ class Request implements ArrayAccess { function get_param($k){return $this->params[$k]??null;} function get_header($k){return $this->headers[$k]??'';} function get_body(){return json_encode($this->params);} function offsetExists($k):bool{return isset($this->params[$k]);} function offsetGet($k):mixed{return $this->get_param($k);} function offsetSet($k,$v):void{$this->params[$k]=$v;} function offsetUnset($k):void{unset($this->params[$k]);} } +class WP_REST_Request extends Request {function __construct($method){parent::__construct();} function set_param($key,$value){$this[$key]=$value;}} +class AuthBridge {function rest_check_access($request){if($request->get_param('token')!=='stub-valid-device-token')return new WP_Error('invalid','invalid',array('status'=>401));return array('success'=>true,'data'=>array('user_id'=>7));}} +$GLOBALS['dayu_macos_app_auth']=new AuthBridge; $transients=array();$options=array();$meta=array();$purchase=array();$admin=false;$member=false;$bound=7;$rows=array();$checks=array(); function add_action(...$a){} function add_filter(...$a){} function register_rest_route(...$a){} function wp_schedule_single_event(...$a){} function add_option($k,$v,...$a){global $options;if(isset($options[$k]))return false;$options[$k]=$v;return true;} @@ -41,6 +44,14 @@ $meta=array('cao_user_type'=>'vip','cao_vip_end_time'=>time()-1);check(!Dayu_Col $meta=array('cao_vip_type'=>'year','cao_vip_expire'=>time()+100);check(Dayu_Color_Online_LUTs::access(7),'legacy active membership supported');$meta=array(); check(!Dayu_Color_Online_LUTs::access(8),'deleted user denied'); $device='00000000-0000-0000-0000-000000000001';$key=str_repeat('a',40);$login='dayu_app_login_'.hash('sha256',$key); +check(denied(Dayu_Color_Online_LUTs::device_login(new Request(array('device_uuid'=>$device))),400),'UUID alone cannot mint an online session'); +check(denied(Dayu_Color_Online_LUTs::device_login(new Request(array('device_uuid'=>$device,'login_token'=>str_repeat('x',30)))),401),'forged shared login token rejected'); +check(denied(Dayu_Color_Online_LUTs::device_login(new Request(array('device_uuid'=>'random-client-id','login_token'=>'stub-valid-device-token'))),400),'non-hardware UUID format rejected'); +$restored=body(Dayu_Color_Online_LUTs::device_login(new Request(array('device_uuid'=>$device,'login_token'=>'stub-valid-device-token')))); +check(strlen($restored['token']??'')===64&&$restored['allowed']===false,'existing bound account restored without granting unpaid access'); +$bound=8;check(denied(Dayu_Color_Online_LUTs::device_login(new Request(array('device_uuid'=>$device,'login_token'=>'stub-valid-device-token'))),401),'shared login user must match current hardware binding');$bound=0; +check(denied(Dayu_Color_Online_LUTs::device_login(new Request(array('device_uuid'=>$device,'login_token'=>'stub-valid-device-token'))),401),'unbound hardware cannot resume another account');$bound=7; +check(body(Dayu_Color_Online_LUTs::logout(new Request(array(),$restored['token'])))['success']===true,'restored session can be revoked normally'); $session=array('app_name'=>'DayuColor','device_uuid'=>$device,'expires_at'=>time()+120,'status'=>'pending','user_id'=>7); $transients[$login]=$session; check(body(Dayu_Color_Online_LUTs::exchange(new Request(array('session_key'=>$key,'device_uuid'=>$device))))['status']==='pending','pending login cannot mint a credential'); diff --git a/Backend/wp-content/mu-plugins/dayu-color-online-luts.php b/Backend/wp-content/mu-plugins/dayu-color-online-luts.php index ce7f882..c53740f 100644 --- a/Backend/wp-content/mu-plugins/dayu-color-online-luts.php +++ b/Backend/wp-content/mu-plugins/dayu-color-online-luts.php @@ -29,7 +29,7 @@ final class Dayu_Color_Online_LUTs { add_action('dayu_color_lut_consumed_cleanup', 'delete_option'); } public static function routes() { - foreach (array('session'=>'exchange', 'status'=>'status', 'logout'=>'logout', 'catalog'=>'catalog', '(?P\d+)/download'=>'download', '(?P\d+)/preview'=>'preview') as $path=>$handler) { + foreach (array('session'=>'exchange', 'device'=>'device_login', 'status'=>'status', 'logout'=>'logout', 'catalog'=>'catalog', '(?P\d+)/download'=>'download', '(?P\d+)/preview'=>'preview') as $path=>$handler) { register_rest_route('dayu-color/v1', '/lut/' . $path, array('methods'=>'POST', 'callback'=>array(__CLASS__, $handler), 'permission_callback'=>'__return_true')); } } @@ -82,12 +82,37 @@ final class Dayu_Color_Online_LUTs { $once='dayu_color_lut_once_' . hash('sha256', $key); if (!add_option($once, time(), '', false)) { return self::error('used', '登录会话已使用,请重新登录。', 401); } delete_transient($transient); - $token=bin2hex(random_bytes(32)); $expires=time()+self::TTL; - set_transient('dayu_color_lut_' . hash('sha256', $token), array('user_id'=>$user_id, 'device'=>$device, 'expires'=>$expires), self::TTL); // Keep the marker past the original login lifetime, including concurrent poll requests. wp_schedule_single_event(time()+1200, 'dayu_color_lut_consumed_cleanup', array($once)); + return self::issue($user_id, $device); + } + private static function issue($user_id, $device) { + $token=bin2hex(random_bytes(32)); $expires=time()+self::TTL; + set_transient('dayu_color_lut_' . hash('sha256', $token), array('user_id'=>$user_id, 'device'=>$device, 'expires'=>$expires), self::TTL); return self::response(array('status'=>'approved', 'token'=>$token, 'expires_at'=>$expires, 'allowed'=>self::access($user_id), 'username'=>get_user_by('ID', $user_id)->display_name)); } + public static function device_login($request) { + // Reuse the existing hardware-UUID login's JWT verification. Never accept + // a submitted user ID or UUID alone as an online LUT session credential. + $device=self::device($request->get_param('device_uuid')); + $token=(string)$request->get_param('login_token'); + if (!$device || strlen($token)<20 || strlen($token)>8192) { return self::error('device_login', '设备登录凭据无效,请重新识别本机账号。', 400); } + foreach (array('device'=>array($device,30), 'ip'=>array((string)($_SERVER['REMOTE_ADDR']??''),120)) as $scope=>$limit) { + $key='dayu_color_lut_login_' . $scope . '_' . hash('sha256',$limit[0]) . '_' . intval(time()/600); + $count=intval(get_transient($key)); + if ($count >= $limit[1]) { return self::error('rate', '设备验证过于频繁,请稍后重试。', 429); } + set_transient($key,$count+1,600); + } + $auth=$GLOBALS['dayu_macos_app_auth']??null; + if (!$auth || !is_callable(array($auth,'rest_check_access'))) { return self::error('auth_unavailable','账号服务暂不可用,请稍后重试。',503); } + $proof=new WP_REST_Request('POST'); + foreach (array('token'=>$token,'device_uuid'=>$device,'app_name'=>self::APP,'article_id'=>14421,'allow_vip'=>1) as $key=>$value) { $proof->set_param($key,$value); } + $verified=$auth->rest_check_access($proof); + if (is_wp_error($verified)) { return self::error('device_login','本机账号验证已失效,请刷新或重新微信登录。',401); } + $user_id=intval($verified['data']['user_id']??0); + if (($verified['success']??false)!==true || !$user_id || self::bound_user($device)!==$user_id || !get_user_by('ID',$user_id)) { return self::error('binding','本机尚未绑定此账号,请在主 APP 重新登录。',401); } + return self::issue($user_id,$device); + } private static function authentication($request, $paid=true) { $header=trim((string)$request->get_header('authorization')); if (!preg_match('/^Bearer ([a-f0-9]{64})$/D', $header, $match)) { return self::error('login_required', '请先在大鱼调色主 APP 登录。', 401); } diff --git a/Packaging/Release-1.22.0.md b/Packaging/Release-1.22.0.md index 1ab7066..8a49a2e 100644 --- a/Packaging/Release-1.22.0.md +++ b/Packaging/Release-1.22.0.md @@ -1,6 +1,6 @@ -大鱼调色 1.22.0(130)增加在线 LUT 库。 +大鱼调色 1.22.0(131)增加在线 LUT 库。 -- 主 APP 增加微信登录、刷新权限和退出登录。购买过文章 14421、15792 中任意一个,或当前为有效会员,即可使用全部已发布在线 LUT。 +- 主 APP 启动时使用 macOS 硬件 UUID 识别已绑定的大鱼账号,支持免扫码恢复;未绑定机器支持微信登录。提供刷新权限和退出登录,退出后不会立即自动重新登录。购买过文章 14421、15792 中任意一个,或当前为有效会员,即可使用全部已发布在线 LUT。 - 插件 LUT 浏览器增加在线来源、分类、分页和搜索。点击 LUT 后下载并检查文件大小、SHA-256 和 Cube 内容,保存到本地库后应用;相同文件重复下载复用已有副本。 - 点击“预览当前帧”会将当前时间线帧的 PNG 缩略图发送到 dayu.media,在服务器应用相应 LUT 并返回效果预览。最长边不超过 640 像素;不上传原始视频、文件路径或项目名称。服务器在请求内存中处理,不保存预览帧。移动播放头不会自动上传新帧,需要再次点击更新。 - 在线预览为 8-bit 显示参考;实际调色仍使用下载后的本地 LUT 和原有浮点渲染流程。本地 LUT 导入与调色继续可离线使用。 diff --git a/research/OnlineLUTIntegration-20261111.md b/research/OnlineLUTIntegration-20261111.md index cf7541d..a9def43 100644 --- a/research/OnlineLUTIntegration-20261111.md +++ b/research/OnlineLUTIntegration-20261111.md @@ -37,3 +37,7 @@ 编译提交 `0631e8b6c3aa6ef1cbcdb919d1267d9beeea7632`,APP 公证 `f5eb451e-5e1f-492e-99f8-289442229f3d` Accepted。正式路径的 1,028 项自检、签名、票据、Gatekeeper、17 模板和 PluginKit 路径核对通过。FCP 12.4 使用新插件服务进程 98402,在独立 1080p/25p 合成项目中验证本地预览、在线来源、未登录提示、辅助功能标签及 2:01→3:24 播放;正常退出。主 APP 130 已启动。用户尚未批准微信登录,真实授权目录/下载和云端预览留待扫码后验收;没有上传用户时间线帧。详见 [宿主报告](../verification/HostOnlineLUT1.22.0.json)。已知替换备份在最终验收后清理,正在制作正式 PKG 和 Release。 保存最终安装检查点时误以 `--help` 调用无参数保护的 checkpoint.py,产生 b98d92f 并包含工程既有 Security 引用排序差异;随后以新提交将工程文件恢复到本轮基线,同时把该差异原样保留为工作区未提交状态。脚本增加必填消息/路径和帮助保护,避免空路径触发全仓暂存。没有改写历史或实际编译输入。 + +## 硬件 UUID 账号恢复(用户补充) + +用户反馈微信 OAuth 未确认,并说明现有后端按 macOS 硬件 UUID 免登录。已验证客户端 gethostuuid 与 IOPlatformUUID 一致;不生成随机设备号、不保存原始 UUID 到报告。既有 `app_device_login` 对本机识别成功。新增客户端启动恢复:通过该既有接口获取短期 JWT,仅在内存中交给 `/dayu-color/v1/lut/device`,服务端复用共享 `rest_check_access` 校验 JWT,并核对统一设备表的当前账号,兑换产品专用在线 LUT 会话。所有后续操作仍复核购买/会员权益和绑定。退出后停止自动恢复,点击刷新可重新识别。未绑定机器继续微信登录。43 项后端合约覆盖伪造 JWT、UUID 单独请求、绑定变更及退出。130 APP 和 PKG 验证完成但不发行,最终改为构建 131。 diff --git a/verification/OnlineLUTBackendContracts.json b/verification/OnlineLUTBackendContracts.json index 47ec127..8282d83 100644 --- a/verification/OnlineLUTBackendContracts.json +++ b/verification/OnlineLUTBackendContracts.json @@ -1,6 +1,6 @@ { "pass": true, - "count": 36, + "count": 43, "scope": "Isolated PHP\/GD contracts; synthetic users, purchases and frames; no production credentials or account data.", "checks": [ { @@ -35,6 +35,34 @@ "name": "deleted user denied", "pass": true }, + { + "name": "UUID alone cannot mint an online session", + "pass": true + }, + { + "name": "forged shared login token rejected", + "pass": true + }, + { + "name": "non-hardware UUID format rejected", + "pass": true + }, + { + "name": "existing bound account restored without granting unpaid access", + "pass": true + }, + { + "name": "shared login user must match current hardware binding", + "pass": true + }, + { + "name": "unbound hardware cannot resume another account", + "pass": true + }, + { + "name": "restored session can be revoked normally", + "pass": true + }, { "name": "pending login cannot mint a credential", "pass": true diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index bb461a9..22461c7 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.0 CFBundleVersion - 130 + 131 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Shared/DYOnlineLUT.mm b/大鱼调色/Shared/DYOnlineLUT.mm index d3f4ef0..b20accb 100644 --- a/大鱼调色/Shared/DYOnlineLUT.mm +++ b/大鱼调色/Shared/DYOnlineLUT.mm @@ -99,6 +99,7 @@ static NSDictionary *DYOnlineKeyQuery(void) { [NSDistributedNotificationCenter.defaultCenter postNotificationName:DYOnlineLUTIdentityChanged object:nil userInfo:nil deliverImmediately:YES];return YES; } + (NSString *)deviceUUID { + // macOS hardware host UUID (verified equal to IOPlatformUUID), never uuid_generate/NSUUID. uuid_t uuid;struct timespec timeout={2,0};if(gethostuuid(uuid,&timeout)!=0)return nil;uuid_string_t text;uuid_unparse_upper(uuid,text);return [NSString stringWithUTF8String:text]; } + (NSDictionary *)JSON:(NSData *)data error:(NSError **)error { @@ -107,16 +108,23 @@ static NSDictionary *DYOnlineKeyQuery(void) { } + (NSProgress *)request:(NSString *)path body:(NSDictionary *)body authenticated:(BOOL)authenticated completion:(DYOnlineLUTReply)completion { BOOL login=[path isEqual:@"/dayu-app/v1/login/session"]; - if(!login&&![path hasPrefix:@"/dayu-color/v1/lut/"]){if(completion)completion(nil,DYOnlineError(400,@"请求地址无效。"));return nil;} + BOOL deviceLogin=[path isEqual:@"/device-login"]; + if(!login&&!deviceLogin&&![path hasPrefix:@"/dayu-color/v1/lut/"]){if(completion)completion(nil,DYOnlineError(400,@"请求地址无效。"));return nil;} NSDictionary *credential=authenticated?[self credential]:nil; if(authenticated&&!credential){if(completion)completion(nil,DYOnlineError(401,@"请先在大鱼调色主 APP 登录。"));return nil;} - NSMutableURLRequest *request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:[@"https://dayu.media/wp-json" stringByAppendingString:path]]]; + NSMutableURLRequest *request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:deviceLogin?@"https://dayu.media/wp-admin/admin-ajax.php":[@"https://dayu.media/wp-json" stringByAppendingString:path]]]; request.HTTPMethod=@"POST";request.cachePolicy=NSURLRequestReloadIgnoringLocalCacheData; [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; [request setValue:@"application/json, image/png, application/octet-stream" forHTTPHeaderField:@"Accept"]; [request setValue:@"DayuColor-OnlineLUT/1.0" forHTTPHeaderField:@"User-Agent"]; if(credential)[request setValue:[@"Bearer " stringByAppendingString:credential[@"token"]]forHTTPHeaderField:@"Authorization"]; NSError *error=nil;request.HTTPBody=[NSJSONSerialization dataWithJSONObject:body?:@{} options:0 error:&error]; + if(deviceLogin){ + NSURLComponents *form=[[[NSURLComponents alloc]init]autorelease]; + form.queryItems=@[[NSURLQueryItem queryItemWithName:@"action" value:@"app_device_login"],[NSURLQueryItem queryItemWithName:@"device_uuid" value:body[@"device_uuid"]?:@""],[NSURLQueryItem queryItemWithName:@"app_name" value:@"DayuColor"],[NSURLQueryItem queryItemWithName:@"app_version" value:NSBundle.mainBundle.infoDictionary[@"CFBundleShortVersionString"]?:@""]]; + request.HTTPBody=[form.percentEncodedQuery dataUsingEncoding:NSUTF8StringEncoding]; + [request setValue:@"application/x-www-form-urlencoded;charset=UTF-8" forHTTPHeaderField:@"Content-Type"]; + } if(!request.HTTPBody){if(completion)completion(nil,error);return nil;} NSUInteger limit=[path hasSuffix:@"/download"]?64*1024*1024:2*1024*1024; DYOnlineLUTTransfer *transfer=[[[DYOnlineLUTTransfer alloc]init]autorelease];return [transfer start:request limit:limit completion:completion]; diff --git a/大鱼调色/Wrapper Application/AppDelegate.m b/大鱼调色/Wrapper Application/AppDelegate.m index 4f16111..f2a4949 100644 --- a/大鱼调色/Wrapper Application/AppDelegate.m +++ b/大鱼调色/Wrapper Application/AppDelegate.m @@ -286,20 +286,45 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe [self.loginTimer invalidate];self.loginTimer=nil;self.loginSessionKey=nil;self.pollingLogin=NO; self.loginButton.title=@"微信登录";self.loginButton.enabled=YES;self.accessButton.enabled=YES; } +- (void)showOnlineAccount:(NSDictionary *)value { + self.accessButton.enabled=YES;self.logoutButton.enabled=YES; + BOOL allowed=[value[@"allowed"]isKindOfClass:NSNumber.class]&&[value[@"allowed"]boolValue]; + self.accountTitle.stringValue=allowed?@"在线 LUT 已开放":@"账号已登录,尚无在线 LUT 权限"; + NSString *name=[value[@"username"]isKindOfClass:NSString.class]?value[@"username"]:@"大鱼用户"; + self.accountDetail.stringValue=[NSString stringWithFormat:@"%@\n%@",name,allowed?@"已识别本机绑定账号。在 FCP 的 LUT 浏览器切换“在线 LUT”即可使用。":@"需要有效会员,或购买文章 14421 / 15792。购买后点击刷新权限。"]; +} +- (void)restoreBoundOnlineAccount { + NSUInteger generation=++self.accountGeneration;[self.accountTask cancel]; + NSString *device=[DYOnlineLUTClient deviceUUID]; + if(!device){self.accountTitle.stringValue=@"无法识别本机";self.accountDetail.stringValue=@"无法读取 macOS 硬件 UUID,请稍后重试。";return;} + self.accountTitle.stringValue=@"正在识别本机已绑定的大鱼账号…";self.accessButton.enabled=NO; + self.accountTask=[DYOnlineLUTClient request:@"/device-login" body:@{@"device_uuid":device} authenticated:NO completion:^(NSData *data,NSError *error){ + if(generation!=self.accountGeneration)return;self.accountTask=nil;self.accessButton.enabled=YES; + NSDictionary *value=[DYOnlineLUTClient JSON:data error:&error]; + NSDictionary *identity=[value[@"data"]isKindOfClass:NSDictionary.class]?value[@"data"]:nil; + NSString *token=[identity[@"token"]isKindOfClass:NSString.class]?identity[@"token"]:nil; + if(error||![value[@"success"]boolValue]||!token.length){self.accountTitle.stringValue=@"尚未登录";self.accountDetail.stringValue=error.localizedDescription?:([identity[@"message"]isKindOfClass:NSString.class]?identity[@"message"]:@"本机尚未绑定账号,请点击微信登录。已绑定账号可点击刷新权限重试。");return;} + self.accessButton.enabled=NO; + self.accountTask=[DYOnlineLUTClient request:@"/dayu-color/v1/lut/device" body:@{@"device_uuid":device,@"login_token":token} authenticated:NO completion:^(NSData *bytes,NSError *failure){ + if(generation!=self.accountGeneration)return;self.accountTask=nil;self.accessButton.enabled=YES; + NSDictionary *account=[DYOnlineLUTClient JSON:bytes error:&failure]; + if(failure||![DYOnlineLUTClient saveCredential:account error:&failure]){self.accountTitle.stringValue=@"暂时无法识别本机账号";self.accountDetail.stringValue=failure.localizedDescription?:@"请刷新权限,或重新微信登录。";return;} + [self showOnlineAccount:account]; + }]; + }]; +} - (void)refreshOnlineAccount:(id)sender { if(self.loginSessionKey.length)return; + if(sender)[NSUserDefaults.standardUserDefaults setBool:NO forKey:@"DYOnlineLUTAutomaticLoginDisabled"]; NSUInteger generation=++self.accountGeneration;[self.accountTask cancel]; self.logoutButton.enabled=[DYOnlineLUTClient credential]!=nil; - if(!self.logoutButton.enabled){self.accountTitle.stringValue=@"尚未登录";self.accountDetail.stringValue=@"点击微信登录,在浏览器中完成账号确认后自动返回。";return;} + if(!self.logoutButton.enabled){if(![NSUserDefaults.standardUserDefaults boolForKey:@"DYOnlineLUTAutomaticLoginDisabled"]){[self restoreBoundOnlineAccount];return;}self.accountTitle.stringValue=@"已退出登录";self.accountDetail.stringValue=@"点击刷新权限可识别本机已绑定账号,也可以重新微信登录。";return;} self.accountTitle.stringValue=@"正在验证在线 LUT 权限…";self.accessButton.enabled=NO; self.accountTask=[DYOnlineLUTClient request:@"/dayu-color/v1/lut/status" body:@{} authenticated:YES completion:^(NSData *data,NSError *error){ if(generation!=self.accountGeneration)return;self.accountTask=nil;self.accessButton.enabled=YES; NSDictionary *value=[DYOnlineLUTClient JSON:data error:&error]; - if(error||!value){self.accountTitle.stringValue=@"暂时无法验证权限";self.accountDetail.stringValue=error.localizedDescription?:@"请稍后重试。";return;} - BOOL allowed=[value[@"allowed"]isKindOfClass:NSNumber.class]&&[value[@"allowed"]boolValue]; - self.accountTitle.stringValue=allowed?@"在线 LUT 已开放":@"账号已登录,尚无在线 LUT 权限"; - NSString *name=[value[@"username"]isKindOfClass:NSString.class]?value[@"username"]:@"大鱼用户"; - self.accountDetail.stringValue=[NSString stringWithFormat:@"%@\n%@",name,allowed?@"在 FCP 的 LUT 浏览器切换“在线 LUT”即可使用。":@"需要有效会员,或购买文章 14421 / 15792。购买后点击刷新权限。"]; + if(error||!value){if(error.code==401){[DYOnlineLUTClient clearCredential:nil];[self restoreBoundOnlineAccount];return;}self.accountTitle.stringValue=@"暂时无法验证权限";self.accountDetail.stringValue=error.localizedDescription?:@"请稍后重试。";return;} + [self showOnlineAccount:value]; }]; } - (void)loginOnlineAccount:(id)sender { @@ -333,15 +358,15 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe if(error){if(error.code==401||error.code==400){[self stopAccountLogin];self.accountDetail.stringValue=error.localizedDescription;}return;} if(![value[@"status"]isEqual:@"approved"]){self.accountDetail.stringValue=[value[@"message"]isKindOfClass:NSString.class]?value[@"message"]:@"等待微信登录…";return;} if(![DYOnlineLUTClient saveCredential:value error:&error]){[self stopAccountLogin];self.accountDetail.stringValue=error.localizedDescription;return;} - [self stopAccountLogin];[self refreshOnlineAccount:nil]; + [NSUserDefaults.standardUserDefaults setBool:NO forKey:@"DYOnlineLUTAutomaticLoginDisabled"];[self stopAccountLogin];[self refreshOnlineAccount:nil]; }]; } - (void)logoutOnlineAccount:(id)sender { - [self stopAccountLogin]; + [self stopAccountLogin];NSUInteger generation=self.accountGeneration; self.accountTask=[DYOnlineLUTClient request:@"/dayu-color/v1/lut/logout" body:@{} authenticated:YES completion:^(NSData *data,NSError *error){ - self.accountTask=nil; + if(generation!=self.accountGeneration)return;self.accountTask=nil; if(error&&error.code!=401){self.accountDetail.stringValue=@"暂时无法通知服务器退出,请联网后重试。";return;} - NSError *local=nil;if(![DYOnlineLUTClient clearCredential:&local]){self.accountDetail.stringValue=local.localizedDescription;return;}[self refreshOnlineAccount:nil]; + NSError *local=nil;if(![DYOnlineLUTClient clearCredential:&local]){self.accountDetail.stringValue=local.localizedDescription;return;}[NSUserDefaults.standardUserDefaults setBool:YES forKey:@"DYOnlineLUTAutomaticLoginDisabled"];[self refreshOnlineAccount:nil]; }]; } diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 2455968..fe2b243 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.0 CFBundleVersion - 130 + 131 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index cec8c51..72cd824 100644 --- a/开发交接.md +++ b/开发交接.md @@ -8,7 +8,7 @@ 两个 MU 后端文件已按 NAS 生产基线流程部署。36 项后端合约、46 项原生在线浏览器合约、40 项本地浏览器回归、6 项线上未授权检查和既有更新接口检查通过。最终正式 APP 从独立远端检出的提交 `0631e8b6c3aa6ef1cbcdb919d1267d9beeea7632` 编译,公证 `f5eb451e-5e1f-492e-99f8-289442229f3d` Accepted;签名、票据、Gatekeeper、1,028 项正式安装检查、17 套模板及 PluginKit 唯一路径通过。 -已从 `/Library/Plug-Ins/FxPlug/大鱼调色.app` 启动 **1.22.0(130)**。FCP 12.4 独立合成色卡库通过本地预览、在线来源、未登录提示、最终辅助功能标签和播放检查,宿主正常退出。主 APP 留在“尚未登录”状态。129 曾成功创建微信登录会话,但用户尚未扫码确认;**用户批准后的真实目录、下载与云端帧预览尚未实测**。无用户时间线帧上传。130 的 PKG 已通过公证和验包,但用户反馈微信确认失败,并要求复用硬件 UUID 已绑定账号免登录。暂停发布 130,正在增加既有 UUID 登录与在线 LUT 会话兑换,准备构建 131;130 验证证据保留。 +已从 `/Library/Plug-Ins/FxPlug/大鱼调色.app` 启动 **1.22.0(130)**。FCP 12.4 独立合成色卡库通过本地预览、在线来源、未登录提示、最终辅助功能标签和播放检查,宿主正常退出。主 APP 留在“尚未登录”状态。129 曾成功创建微信登录会话,但用户尚未扫码确认;**用户批准后的真实目录、下载与云端帧预览尚未实测**。无用户时间线帧上传。130 的 PKG 已通过公证和验包,但用户反馈微信确认失败,并要求复用硬件 UUID 已绑定账号免登录。暂停发布 130,正在增加既有 UUID 登录与在线 LUT 会话兑换,准备构建 131;130 验证证据保留。已验证 gethostuuid 与 IOPlatformUUID 相同,既有 app_device_login 成功识别本机绑定;新增兑换由共享 JWT 校验与当前绑定共同验证,43 项 PHP 合约通过。 [专项实现和生产映射](research/OnlineLUTIntegration-20261111.md) · [部署](verification/OnlineLUTDeployment.json) · [安装](verification/Delivery1.22.0.json) · [宿主范围](verification/HostOnlineLUT1.22.0.json) · [构建恢复](verification/OnlineLUTBuildRecovery.json)。127/128/129 为未发行候选,其诊断证据保留;最终 130 验证后已清理已知替换备份。工程文件既有的 Security 引用排序差异保留,不纳入本任务提交。站点文章和更新通道暂仍为 1.21.8(126),本轮没有改动它们。