mirror of
https://github.com/iflytek/skillhub.git
synced 2026-11-15 09:11:18 +00:00
Merge pull request #975 from iflytek/fix/issue-974-owner-membership-readonly
Some checks are pending
Deploy Docs / build (push) Waiting to run
Deploy Docs / Deploy (push) Blocked by required conditions
Security / CodeQL (python) (push) Waiting to run
Security / Dependency Review (push) Waiting to run
Security / CodeQL (java-kotlin) (push) Waiting to run
Security / CodeQL (javascript-typescript) (push) Waiting to run
Some checks are pending
Deploy Docs / build (push) Waiting to run
Deploy Docs / Deploy (push) Blocked by required conditions
Security / CodeQL (python) (push) Waiting to run
Security / Dependency Review (push) Waiting to run
Security / CodeQL (java-kotlin) (push) Waiting to run
Security / CodeQL (javascript-typescript) (push) Waiting to run
fix(auth): keep removed skill owners read-only
This commit is contained in:
commit
d424c91f1f
81 changed files with 1263 additions and 145 deletions
11
CONTEXT.md
11
CONTEXT.md
|
|
@ -15,3 +15,14 @@ _Avoid_:将所有技能包统称为 DSH 插件。
|
|||
|
||||
**DSH 插件托管**:由 SkillHub 管理和分发 DSH 插件这一类资产的能力,与 DSH 消费 SkillHub 技能是不同的产品范围。
|
||||
_Avoid_:用“接入 DSH”同时指代插件托管和技能消费。
|
||||
|
||||
## 技能归属
|
||||
|
||||
**技能所有者(Skill Owner)**:当前持有某一条技能所有权的用户。技能所有者与该技能所在空间的负责人是不同概念。
|
||||
_Avoid_: 将技能所有者与空间 OWNER 混称为“Owner”。
|
||||
|
||||
**空间负责人(Namespace OWNER)**:某个命名空间的负责人,属于空间成员角色。该身份不表示他是空间内每条技能的所有者。
|
||||
_Avoid_: 将空间负责人直接称为所有技能的作者。
|
||||
|
||||
**历史作者**:某次历史内容提交的实际作者。历史作者与技能当前所有者可能是不同用户。
|
||||
_Avoid_: 把所有权转移描述为改写历史作者。
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
| slug | varchar(128) | URL 友好标识 |
|
||||
| display_name | varchar(256) | |
|
||||
| summary | varchar(512) | |
|
||||
| owner_id | varchar(128) | 主要维护人(可转让) |
|
||||
| owner_id | varchar(128) | 当前技能所有者;不等同于命名空间 OWNER,当前无独立技能转让入口 |
|
||||
| source_skill_id | bigint | 派生来源(团队技能提升到全局时记录原 skill ID),nullable |
|
||||
| visibility | enum | `PUBLIC` / `NAMESPACE_ONLY` / `PRIVATE` |
|
||||
| status | enum | `ACTIVE` / `ARCHIVED` |
|
||||
|
|
@ -81,12 +81,14 @@
|
|||
- 若 `hidden=true`:仅 skill owner 或该 namespace 的 `ADMIN` / `OWNER` 可读
|
||||
- 若 `latest_version_id is null`:仅 skill owner 可读;即使 `visibility=PUBLIC` 也不会对外公开
|
||||
- `PUBLIC`:任意人可读 skill 容器与已发布版本
|
||||
- `NAMESPACE_ONLY`:该 namespace 任意成员可读(`MEMBER` / `ADMIN` / `OWNER`)
|
||||
- `NAMESPACE_ONLY`:该 namespace 任意成员及当前技能 owner 可读;owner 被移出 TEAM 空间后保留自己内容的只读访问
|
||||
- `PRIVATE`:仅 skill owner 或该 namespace 的 `ADMIN` / `OWNER` 可读,普通 `MEMBER` 不可读
|
||||
- `owner_id` 语义为"主要维护人",可转让。权限主轴是 namespace role,不是 owner:
|
||||
- namespace ADMIN 对空间内所有 skill 有完整管理权(归档、版本管理、提升到全局),不受 owner 限制
|
||||
- owner 作为 MEMBER 时可管理自己创建的 skill(提交审核、编辑草稿)
|
||||
- owner 离职/换组后,namespace ADMIN 仍能完整管理所有技能
|
||||
- `owner_id` 表示当前技能所有者,空间角色与技能所有权分别参与授权:
|
||||
- 正常账号且仍为 TEAM 空间成员的 owner 按既有规则维护自己的 skill。
|
||||
- 被移出 TEAM 空间但仍是当前 owner 时,可以查看、下载自己的内容,不能凭 owner 身份继续写入;不自动转移技能或所有权。
|
||||
- 账号正常、重新加入且仍为 owner 时恢复正常维护权限;停用账号继续服从认证层限制。
|
||||
- namespace ADMIN/OWNER 与平台角色的既有独立治理、审核权限保持不变,不因本条成为内容作者,也不新增全员覆盖能力。
|
||||
- 历史提交人不是当前 owner 时,按普通可见性与已有角色判断访问,不获得永久私有内容读取权。
|
||||
- `rating_avg` / `rating_count` 冗余字段,避免每次查询聚合
|
||||
- `slug`:面向用户的 URL 标识,来自 SKILL.md 的 `name` 字段,首次发布后不可变更。slug 格式校验规则与 namespace slug 相同:`[a-z0-9]([a-z0-9-]*[a-z0-9])?`,同样适用保留词限制,且不得包含连续两个以上的连字符 `--`(为兼容层坐标映射保留)。全局空间(`@global`)下的 skill slug 额外禁止包含 `--`,以避免与兼容层 canonical slug 产生歧义
|
||||
- `source_skill_id`:仅在"团队技能提升到全局"场景下填充,记录原始团队空间的 skill ID,用于追溯来源
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ Status: contract reference with documented implementation exception
|
|||
- 默认公开展示、安装与搜索以最新已发布版本为候选;显式版本或自定义标签可指向其他 `PUBLISHED` 版本,仍须通过入口授权与就绪检查
|
||||
- owner 详情页只有在不存在 `publishedVersion` 时,才允许 `headlineVersion = ownerPreviewVersion`
|
||||
- compat latest 和默认公开下载采用最新已发布版本语义;promotion 可选择来源 skill 的任一 `PUBLISHED` 版本,不要求等于 `publishedVersion`。原始指针与各入口解析差异见第 3.1 节
|
||||
- 管理者的授权预览下载与公开分发不同:owner 或 namespace ADMIN/OWNER 可下载 `UPLOADED` / `PENDING_REVIEW`,仍须通过 Skill 可见性检查;`DRAFT` 等其他非发布状态不能据此下载。常规 `downloadLatest` 读取原始指针后也使用相同版本授权判断,因此 PRIVATE 指针例外下,默认下载不一定是已发布版本;该行为不授予公众访问权。
|
||||
- 管理者的授权预览下载与公开分发不同:owner 或 namespace ADMIN/OWNER 可下载 `UPLOADED` / `PENDING_REVIEW`,当前 owner 另可受控下载自己的 `DRAFT` / `REJECTED`,仍须通过 Skill 可见性、文件就绪及其他安全检查;不因此放行 `SCANNING` / `SCAN_FAILED` / `YANKED` 或公开分发未发布版本。常规 `downloadLatest` 读取原始指针后也使用相同版本授权判断,因此 PRIVATE 指针例外下,默认下载不一定是已发布版本;该行为不授予公众访问权。
|
||||
- 已发布版本可安装还要求 `downloadReady=true`、`yankedAt=null`;下载要求容器为 `ACTIVE`,元数据可读不等于可下载
|
||||
|
||||
## 4. 代码实际链路
|
||||
|
|
@ -172,6 +172,14 @@ Status: contract reference with documented implementation exception
|
|||
|
||||
## 6. 权限边界
|
||||
|
||||
### TEAM 成员移除后的当前所有者
|
||||
|
||||
账号正常但已不是 TEAM 成员的当前技能所有者,保留自己的技能、私有内容、草稿及历史版本的查看和受控下载权限,不能凭所有者身份执行以下写操作。成员移除不删除技能、不迁移地址、不改 owner、不自动撤回待审核申请;既有审核人继续按原安全与审核规则处理。重新加入且账号正常、所有权未变时恢复原有维护权限。
|
||||
|
||||
本条只收紧普通 owner 的成员边界,空间/平台管理员的原有独立权限不变;其他空间和 GLOBAL 原有规则不变。账号停用仍由原认证机制拒绝,不能通过 owner 匹配绕过。以下各行中的 owner 写权限均以这条成员边界为前提,不影响管理员独立路径。
|
||||
|
||||
### 操作边界
|
||||
|
||||
- `withdraw-review`:仅提交人本人
|
||||
- 删除版本:owner 或 namespace ADMIN/OWNER,仅限 `DRAFT` / `REJECTED` / `SCAN_FAILED` / `UPLOADED`,禁止删除最后一个版本。数据库删除提交后清理对象存储,失败调用补偿入口;不是跨存储原子删除,补偿持久化的验证限制见[对象存储写入策略](./05-business-flows.md#对象存储写入策略)
|
||||
- 归档 / 取消归档:owner 或 namespace ADMIN/OWNER
|
||||
|
|
|
|||
|
|
@ -98,6 +98,16 @@ Anyone who obtains the link can use it after normal account admission. Do not po
|
|||
|
||||
> After freezing, all skill packages in the namespace cannot publish new versions, but existing versions remain downloadable.
|
||||
|
||||
## Skills After Member Removal
|
||||
|
||||
Removing a member does not delete, move, transfer, or unpublish their skills. The namespace, address, current owner, and version history remain unchanged.
|
||||
|
||||
An active account that still owns a skill can view and download its own content, including private content, drafts, and history, from My Skills. The management interface explains that membership has ended and the skill is read-only. The owner cannot upload or republish, change the avatar or visibility, withdraw requests, archive, or delete content. This exception does not grant access to another owner's internal skills.
|
||||
|
||||
Rejoining restores normal maintenance permissions if the account is active and ownership is unchanged. Disabled accounts cannot use the owner read exception. Re-enabling an account does not recreate removed namespace membership. Previously submitted review requests remain in the existing review workflow; removal does not automatically approve or withdraw them.
|
||||
|
||||
Existing namespace and platform governance permissions remain unchanged. Removal does not appoint a successor. This change adds no skill transfer, self-service namespace exit, or permanent account deletion feature.
|
||||
|
||||
## API Reference
|
||||
|
||||
**Create a Namespace**:
|
||||
|
|
|
|||
|
|
@ -98,6 +98,16 @@
|
|||
|
||||
> 冻结后,命名空间内的所有技能包无法发布新版本,但已有版本仍可下载。
|
||||
|
||||
## 成员被移除后,技能如何处理
|
||||
|
||||
移除成员不会删除、迁移或转让他的技能。技能地址、历史版本和所有者保持不变,已发布内容继续按原可见范围提供。
|
||||
|
||||
账号正常的当前技能所有者仍可在“我的技能”查看和下载自己的内容,包括私有内容、草稿和历史版本;页面会提示“已不在该空间,只能查看和下载”。不能继续上传、重新发布、改头像、改可见范围、撤回申请、归档或删除技能。其他成员的内部内容不因这项例外对他开放。
|
||||
|
||||
重新加入且仍为技能所有者时,按原规则恢复维护权限。如果账号被停用,则不能以该账号查看或操作;重新启用不会自动恢复已移除的空间成员关系。此前已提交的审核申请仍由有权审核人按原流程处理,不自动通过或撤回。
|
||||
|
||||
空间及平台管理员保留原有治理、审核权限,但成员移除不会自动为技能指定接任者。本期没有新增技能转让、自助退出或永久注销账号功能。
|
||||
|
||||
## API 接口
|
||||
|
||||
**创建命名空间**:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
schema: spec-driven
|
||||
created: 2026-10-16
|
||||
28
openspec/changes/clarify-skill-ownership-transfer/design.md
Normal file
28
openspec/changes/clarify-skill-ownership-transfer/design.md
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
## 范围与当前状态
|
||||
|
||||
本设计用于 Issue #974 的独立实现,当前处于开发检查与审查阶段,尚未完成正式运行验收。产品需求见能力规范,历史问答见 proposal;本文件不增加第二套验收规则。
|
||||
|
||||
## 选择的最小方案
|
||||
|
||||
沿用技能当前所有者、账号状态和既有空间成员关系,不增加 Maintainer、接管状态或成员覆盖开关。复用现有鉴权和角色分支,将普通所有者读取与写入条件分开:读取允许账号正常的当前所有者,维护还要求是当前空间成员;管理员继续按原有独立授权路径处理。
|
||||
|
||||
仅在客户端隐藏按钮不足以保证边界。实现时需逐项追踪已存在的技能写入口,特别是历史版本重新发布、确认发布、撤回审核、头像和提升。不能使用只检查 owner 的旧 helper,或以 bypassMembershipCheck 恢复普通所有者权限。
|
||||
|
||||
## 审核与状态恢复
|
||||
|
||||
成员移除不批量撤回已提交申请,也不阻止有权审核人继续按原有流程决策。异步审核、扫描及执行者的权限,与被移除者的新写请求分开判断。账号停用采用既有认证机制,不新增凭证生命周期;重新启用后是否可维护仍取决于成员关系和当前所有者。
|
||||
|
||||
## 兼容性与数据
|
||||
|
||||
不删除、重建或搬迁技能,不修改 owner_id 或历史作者,不引入业务 SQL CHECK。若前端需要额外权限投影,优先复用现有 management state/capabilities;只有确有字段缺口时才作 additive 扩展,并同步 OpenAPI。个人空间当前也是 TEAM,不能凭名称追加特殊绕过;GLOBAL 不可变成员规则保持现状。
|
||||
|
||||
## 实施前需核对的工程事实
|
||||
|
||||
- 冻结实现基线并逐项追踪 Session、Token、普通发布、兼容 CLI 和套件绑定发布路径;此前审查未完整覆盖全部兼容入口。
|
||||
- 盘点管理权限投影、列表、详情与下载的现有可见性分支,避免仅放开列表却使详情或下载拒绝。
|
||||
- 将管理员正常路径与普通 owner+空成员角色的旧测试分开;旧测试通过不意味着满足新规则。
|
||||
- 对待审核申请的批准路径复核操作者语义,保留现有独立安全及生命周期校验,避免批量改一个 helper 导致审批意外失效。
|
||||
|
||||
## 验证边界
|
||||
|
||||
本次仅完成需求与设计文档,不声称源码、镜像、API 或浏览器验收通过。正式实施后按项目风险流程设计最小相关用例:正常成员正例、移除后读取、全部受影响写入口拒绝及无副作用、停用认证、重新加入恢复、已有申请审核、跨空间隔离和管理员回归。UI 与鉴权改动须在固定提交的本地服务上验证;不为文档整理启动预览。
|
||||
136
openspec/changes/clarify-skill-ownership-transfer/proposal.md
Normal file
136
openspec/changes/clarify-skill-ownership-transfer/proposal.md
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
## 状态
|
||||
|
||||
用户已授权实施,由 Issue #974 跟踪,关联但不替代 PR #797 与 Issue #732 的完整协作需求。交接功能仍暂缓,永久注销与自助退出不在本期范围,不关闭原公开对象。目录名称沿用初始讨论,实际交付范围以本节及 `specs/skill-owner-membership-access/spec.md` 为准。
|
||||
|
||||
## What Changes
|
||||
|
||||
- 账号正常但已被移出 TEAM 空间的当前技能所有者,可以查看、下载自己的内容,不能凭所有者身份继续修改。
|
||||
- 技能、地址、当前所有者、历史记录和已有申请不因移除成员自动删除、迁移、转让或撤回。
|
||||
- 重新加入且仍是当前所有者时恢复正常维护权限;账号停用继续按既有认证规则拒绝,不使用所有者读取例外。
|
||||
- 空间/平台管理员的既有治理权限、审核规则保持现状;本轮不重新定义管理员权限。
|
||||
- Web 管理入口反映只读状态,服务端对所有相关写入口执行同一成员边界,覆盖有权限调用这些入口的 Session 与 Token/CLI。
|
||||
|
||||
## Capabilities
|
||||
|
||||
### New Capabilities
|
||||
|
||||
- `skill-owner-membership-access`: 技能所有者与当前空间成员关系共同决定的访问和维护边界。
|
||||
|
||||
### Modified Capabilities
|
||||
|
||||
现有审核、停用账号、成员移除、公开读取与管理员治理维持原有流程。本轮对所有者授权入口的行为收紧在新增能力中统一描述,不新增角色、开关或数据库业务约束。
|
||||
|
||||
## Impact
|
||||
|
||||
技能读取、文件下载、生命周期、发布、头像、可见范围、提升及相关应用层权限投影;现有客户端入口与服务端校验需一致。正常成员、管理员和公开读取路径需回归验证。不采用 PR #797 的全员覆盖代码,不引入技能转让 API。
|
||||
|
||||
## Why
|
||||
|
||||
现有跨所有者维护提案使用空间级开关授权所有成员更新他人技能。历史讨论反对该权限范围,也认为逐技能 Maintainer 增加过多配置。源码核查发现成员移除后的所有者读取与写入条件不一致,本期先统一该边界,技能交接暂缓。
|
||||
|
||||
## 历史讨论记录(不作为当前实施范围)
|
||||
|
||||
- Q1(2026-10-16):本期一起解决“退出后只读+明确转移技能所有者”,不能仅增加转让入口而保留退出后的写入路径。
|
||||
- 退出不表示技能被删除或自动搬出原空间。
|
||||
- Q2(2026-10-19):正常转让由当前技能所有者发起;未及时交接时的补救流程另行明确,不隐含管理员可任意转让。
|
||||
- Q3(2026-10-19):接收人确认后转让生效;确认前技能所有者不变。
|
||||
- Q4(2026-10-19):技能所有者退出空间后完全只读,不能发起转让。主动交接须先重新加入空间,不为转让新增退出后写权限例外。
|
||||
- Q5(2026-10-19):当原所有者已退出空间或账号已停用时,由空间负责人(Namespace OWNER)受限发起接管,记录原因,由接收人确认后生效;普通空间 ADMIN 不因此取得接管权限。
|
||||
- Q6(2026-10-19):空间负责人可以将符合接管条件的技能转给自己,自行发起和确认,必须记录原因及审计。不额外强制引入第二位审批人。
|
||||
- Q7(2026-10-19):未完成接管前,原所有者重新成为有效空间成员且账号正常,接管条件不再满足,申请失效;确认时重新校验,不依据过期条件转移所有权。
|
||||
|
||||
## 范围复核
|
||||
|
||||
2026-10-19:用户确认“暂缓交接功能,先核查现有权限”。此前 Q1–Q7 作为历史讨论保留,不作为当前开发要求;不继续细化转让流程,不创建转让 API 或修改业务规则。
|
||||
|
||||
当前核查范围:成员退出后对自己技能的读写路径、普通成员与空间管理员实际权限、相关测试与文档的一致性。只读源码核查与运行验证分开报告;有具体问题再确定是否另行修复,不将先前建议自动视为安全契约。
|
||||
|
||||
用户后续澄清:需要先弄明白“个人注销、退出命名空间后,技能和权限要怎么处理”。将此作为当前澄清重点,不把拒绝 PR #797 的全员覆盖实现解释为不再解决原问题。待核实并区分退出登录、账号停用、永久注销、主动退出空间与被管理员移除;分别讨论内容保留、读取、维护、署名、凭证及恢复,不将这些操作合并成一个权限规则。
|
||||
|
||||
Q8:永久注销账号后,已发布且公开或团队可见的技能继续保留,不因注销自动转让或下架。此为未来注销场景的产品原则,不表示本期已经决定新增永久注销功能;私有内容、草稿及历史署名尚未定案。
|
||||
|
||||
### 账号及成员生命周期现状核查
|
||||
|
||||
main `2fe1a44059f51c1fa2e72ea3f1f3d59942e1e8be` 静态核查:
|
||||
|
||||
- 存在退出登录、管理员停用/启用账号,没有找到完整永久注销/删除账号入口。用户状态为 ACTIVE、PENDING、DISABLED、MERGED。
|
||||
- 退出登录结束当前 Session,不删除账号或技能,也不等于撤销 API Token。
|
||||
- 停用不删除技能、空间或成员关系;请求认证会检查账号状态,停用账号的 Session/Token 被拒绝。不是停用时批量销毁所有凭证;重新启用后,仍有效且未撤销的 Token 可能恢复可用。
|
||||
- 存在管理员移除成员接口,未找到普通 MEMBER 自助退出接口。移除只删除成员关系,技能 owner 与空间归属不变。
|
||||
- 空间 OWNER 不能直接移除;既有空间所有权转移只改变成员角色,不转让技能。
|
||||
- 自动创建的个人空间在当前模型中也是 TEAM,不存在可直接依赖的独立 PERSONAL 删除生命周期。
|
||||
|
||||
主要证据:`SecurityConfig.java:170–179`、`UserStatus.java:3–5`、`AdminUserAppService.java:112–124`、`AuthContextFilter.java:68–118`、`ApiTokenAuthenticationFilter.java:79–90`、`NamespaceController.java:212–218`、`NamespaceMemberService.java:55–69,88–117`、`PersonalNamespaceProvisioningService.java:88–103`。本轮未运行测试,不能宣称永久注销功能已存在或已验证。
|
||||
|
||||
Q9:用户确认本期先理清既有停用账号/移除成员场景。不新增永久注销、自助退出、空间解散或所有权交接系统;Q8 保留为未来注销场景原则,不成为本期实施要求。
|
||||
|
||||
Q10:账号仍可正常使用、但已被移出空间的当前技能所有者,可以查看和下载自己的内容,包括私有内容、历史版本、草稿及被拒绝版本;禁止修改。停用账号不获得这项读取例外。未来转让后不再持有所有权的边界见 Q12,不将本条解释为永久访问授权。
|
||||
|
||||
Q11:停用或移除前已提交的待审核申请保留,由现有审核流程继续决定,不因停用/移除自动通过或自动撤回;受限用户不能继续修改申请。具体审核执行仍须遵守其他现有安全、状态和治理校验,不能将此原则解释为跳过这些校验。
|
||||
|
||||
Q12:用户确认未来技能正式转让后,前任所有者按普通访问权限判断;保留历史署名,但不因历史提交记录保留私有/草稿访问权。具体访问仍依赖当前成员身份、内容可见性及原有角色。此项仅定义边界,不扩大本期为所有权转让开发。
|
||||
|
||||
Q10 与 Q12 的衔接:没有转让时,原用户仍是当前技能所有者;账号正常但已被移出空间时保留自己技能的只读/下载权限,不得修改。账号停用则不能使用所有者只读例外。不能把成员移除等同于所有权转让,也不能把这项只读例外扩展为查看其他所有者的内部内容。
|
||||
|
||||
用户确认上述状态表:账号正常且仍是成员的所有者按正常权限维护;被移出但未转让时可读/下载自己的私有内容、草稿和历史版本,不能更新、删除、归档等;账号停用时不能以该账号访问,公开内容仍可匿名读取;重新加入且所有权未变时恢复正常维护权限。技能不因移除而删除、迁移或自动交给管理员;未交接期间不自动产生新维护人。现有管理员治理权限的本期处理边界尚待单独确认,不以本条暗中修改管理员授权。
|
||||
|
||||
Q13:用户确认本期只统一所有者权限,空间/平台管理员权限和既有审核规则保持现状。用户若另有平台管理员身份,其现有管理员授权仍适用;不凭技能所有者身份绕过成员边界,也不把本期变更升级为全角色权限重构。
|
||||
|
||||
Q13 已解决前述状态表中管理员边界的待确认项。后续实现和验证以本节及新增能力规范为准,历史建议中关于收紧管理员内容权限的内容不纳入本期。
|
||||
|
||||
## 暂缓事项
|
||||
|
||||
- 技能转让与异常接管 API、平台紧急恢复流程。
|
||||
- 转让接收人的资格、拒绝、申请取消/失效及接管条件变化的实现。
|
||||
- 转让时在途版本、头像、扫描、套件绑定及同名冲突的处理。
|
||||
- 团队与全局双记录的转让关系。
|
||||
- 永久注销、自助退出和空间解散。
|
||||
|
||||
当前所有者移除后的读取、写入、重新加入与已有申请规则已在能力规范明确;相应页面/API 与验收不是暂缓项,仅等待正式实施阶段。
|
||||
|
||||
## 当前事实与限制
|
||||
|
||||
基于 main `277f3be7fcb06b8d980246c67e6c2a355c510b38` 的只读源码核查,未作运行验证:
|
||||
|
||||
- 移除成员只删除成员关系,技能所有者和空间归属不变。
|
||||
- 尚无完整的技能所有权转让业务入口;现有空间 OWNER 转让不是技能转让。
|
||||
- PRIVATE/未发布技能的所有者读取路径与 NAMESPACE_ONLY 不一致,退出后并非统一可读。
|
||||
- 普通上传校验成员身份,但部分生命周期与历史版本重新发布路径未统一限制退出后的所有者写入。
|
||||
- 管理员现有生命周期和套件绑定发布权限不能直接等同于“只治理、不代传”的新方案。
|
||||
- 同空间同 slug 的目标所有者草稿可能导致转让唯一键冲突。
|
||||
- 再次提升的现有校验要求团队和全局技能 owner 相同,单边转让不能不处理该关联。
|
||||
|
||||
这些事实是后续设计输入,不表示所有现有行为都应保留,也不表示待确认项已经定案。
|
||||
|
||||
## 2026-10-19 权限核查与 PR #797 价值判断
|
||||
|
||||
核查 main `2fe1a44059f51c1fa2e72ea3f1f3d59942e1e8be`;PR #797 head `c8f1e79b41ab99a6e95c440f497193b9b6523bdb`。本轮只有源码、调用链、测试源码及公开 PR 信息核查,未运行测试或部署,不将潜在路径表述成已实测 HTTP 越权。
|
||||
|
||||
### 现有权限事实
|
||||
|
||||
| 操作 | 非空间成员、仍为技能所有者时的静态授权 |
|
||||
| --- | --- |
|
||||
| 普通 ZIP 发布新版 | 普通用户须仍为当前成员;SUPER_ADMIN 另有例外 |
|
||||
| 已有版本重新发布 | 所有者授权后明确绕过成员检查 |
|
||||
| 归档/恢复/删除版本/yank | 所有者授权不要求成员,但仍受状态及其他操作条件限制 |
|
||||
| 提交审核/确认私有版本发布 | 所有者授权不要求成员,仍需满足版本状态 |
|
||||
| 撤回审核 | 检查申请提交者,不额外检查成员身份 |
|
||||
| 修改可见范围 | 所有者可进入管理路径,仍受待审、扫描和技能状态约束 |
|
||||
| 部分头像所有者操作 | 按所有者定位技能,未额外检查成员身份 |
|
||||
| 读取自己的技能 | PRIVATE/未发布内容按所有者放行;已发布 NAMESPACE_ONLY 要求当前成员,所有者无例外 |
|
||||
|
||||
主要证据(固定 main 中行号):`SkillPublishService.java:379,395–405,460–465`、`SkillGovernanceService.java:353–361`、`SkillReviewSubmitService.java:179–188`、`ReviewService.java:360–370`、`SkillVisibilityService.java:81–86`、`SkillAvatarAppService.java:364–375,623–630,657–660`、`VisibilityChecker.java:25–32`。
|
||||
|
||||
生命周期控制器经 `GovernanceWorkflowAppService`、`SkillLifecycleAppService` 到领域服务的已核对调用链没有统一成员补检。Session 认证/CSRF 与 Token scope 仍有效,不能把成员边界不一致描述成未认证访问。现有部分单测以 owner+空空间角色集允许生命周期操作,表明“退出后统一只读”是需要明确实施的规则调整,而非仅凭此次讨论就认定全部路径为漏洞。
|
||||
|
||||
普通兼容 CLI 发布未完成独立入口核查,不将 ZIP 路径结论泛化到全部客户端。个人空间在模型中也是 TEAM,不能凭名称推导特殊规则。
|
||||
|
||||
### 价值与方案比较
|
||||
|
||||
- 原问题有价值:单一所有者不可用会影响后续维护,但当前暂缓交接,尚无必须立即上线的新协作契约。
|
||||
- PR 方案不采用:`canOverwriteOtherOwners()` 只要求空间开关开启且当前是成员,没有技能级授权或所有权交接。发布新版仍挂在原所有者记录上,作者、提交者与后续管理权继续分离;目标 PRIVATE 技能沿用私有路径,不创建普通公开/团队审核任务。不能仅因默认关闭或存在审核就认为授权范围足够窄。
|
||||
- 最小方案是继续保留现有内容所有者隔离,不新增成员覆盖能力。它暂不解决交接,但符合本轮范围收敛决定,避免引入第二套维护模型。
|
||||
- 所有权转移比全员覆盖更适合交接,但本轮明确暂缓;逐技能 Maintainer 更适合长期协作,投入和权限维护成本较高,也不纳入本期。
|
||||
- PR 当前有合并冲突,这是次要工程状态,不是拒绝方案的核心理由;不应先花时间解冲突或补测再讨论模型。
|
||||
|
||||
建议:PR #797 按不采用当前方案收尾,Issue #732 保留为暂缓需求;现有退出权限不一致单独列出供后续确定是否修复,不在本轮自动改代码。公开关闭、评论或标签操作未在本轮执行。
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
## ADDED Requirements
|
||||
|
||||
### Requirement: REQ-OWN-01 成员移除 SHALL 保留技能归属和内容
|
||||
|
||||
移除 TEAM 空间成员时,系统 SHALL 保留其技能的空间、地址、当前所有者、版本、文件和历史记录,不因成员移除自动删除、迁移、转让或下架。此规则不限制既有管理员另行执行有权限的治理操作,不新增技能交接能力。
|
||||
|
||||
#### Scenario: 移除拥有已发布技能的成员
|
||||
- **WHEN** 管理员按现有流程移除一位拥有技能的成员
|
||||
- **THEN** 技能仍留在原空间,所有者不变,原有版本及可见范围不因移除而改变
|
||||
- **AND** 其他用户仍按既有可见性和治理状态访问内容
|
||||
|
||||
### Requirement: REQ-OWN-02 被移除的当前所有者 SHALL 保留只读访问
|
||||
|
||||
账号正常但已不是目标 TEAM 空间成员的当前技能所有者 SHALL 能通过受控接口查看和下载自己的技能,包括私有内容、团队可见内容、历史版本、草稿及被拒绝版本。读取授权基于当前所有者,不基于历史提交者。原有文件安全、治理和账号限制继续适用,读取例外不得公开私有文件或开放其他所有者的内部内容。
|
||||
|
||||
#### Scenario: 查看自己的团队可见及私有技能
|
||||
- **WHEN** 被移除的当前所有者查看自己的 NAMESPACE_ONLY 或 PRIVATE 技能
|
||||
- **THEN** 可以查看技能和自己有权读取的历史内容,并通过受控接口下载
|
||||
- **AND** 不要求为其恢复空间成员身份
|
||||
|
||||
#### Scenario: 尝试查看其他人的内部技能
|
||||
- **WHEN** 同一用户请求其他所有者的内部技能或未发布内容,且无其他现有授权
|
||||
- **THEN** 系统按既有访问规则拒绝,不因其拥有本空间另一条技能而放行
|
||||
|
||||
#### Scenario: 用户只是历史作者
|
||||
- **WHEN** 用户不是当前技能所有者,仅有历史提交记录
|
||||
- **THEN** 系统按当前成员身份、可见性及其他原有角色授权读取,不授予所有者只读例外
|
||||
|
||||
### Requirement: REQ-OWN-03 非成员所有者 SHALL 不得凭所有者身份写入技能
|
||||
|
||||
被移除的当前技能所有者 SHALL NOT 凭所有者身份更新内容、发布或重新发布版本、确认发布、提交或撤回申请、修改可见范围、变更头像、修改技能标签/版本标签、归档/恢复、撤下或删除内容、发起提升或撤销全局发布等技能写操作。管理员原有授权按 REQ-OWN-06 处理。本条不重新定义收藏、评分等个人操作的既有授权。
|
||||
|
||||
同一边界 SHALL 覆盖相关 Session、API Token 与客户端入口,不只隐藏页面按钮。Token scope、CSRF 和其他原有校验继续生效,具备 scope 不等于仍具有空间所有者维护权。拒绝请求不得改变技能、申请、版本、文件引用或发布指针。
|
||||
|
||||
#### Scenario: 旧页面发起历史版本重新发布
|
||||
- **WHEN** 用户被移除后,使用旧页面或直接请求重新发布历史版本
|
||||
- **THEN** 请求被拒绝,不生成新版、不改变已发布指针
|
||||
|
||||
#### Scenario: 具有 scope 的 Token 尝试修改
|
||||
- **WHEN** 被移除的普通所有者使用仍有效且具有相关 scope 的 Token 修改该技能
|
||||
- **THEN** 请求仍因缺少当前空间成员身份被拒绝
|
||||
|
||||
#### Scenario: 修改操作覆盖
|
||||
- **WHEN** 被移除的普通所有者尝试头像、可见范围、归档、删除、标签或申请写操作
|
||||
- **THEN** 各入口执行同一成员边界,无部分修改或通过旧旁路生效
|
||||
|
||||
### Requirement: REQ-OWN-04 停用和重新加入 SHALL 服从现有账号与成员状态
|
||||
|
||||
停用账号 SHALL 不获得所有者读取例外,继续按既有认证规则拒绝身份请求;公开内容按既有匿名访问规则处理。重新启用不自动恢复已移除的空间成员关系。账号正常、重新加入且仍是当前所有者时,系统 SHALL 按既有成员规则恢复维护能力;若已不是当前所有者,不因重新加入自动取得技能。不得新增永久注销或修改现有 Token 撤销/有效期策略。
|
||||
|
||||
#### Scenario: 停用账号尝试读取自己的私有技能
|
||||
- **WHEN** 停用账号使用其 Session 或 Token 请求自己的私有内容
|
||||
- **THEN** 账号认证规则拒绝请求,不以 owner 匹配放行
|
||||
|
||||
#### Scenario: 重新启用但尚未重新加入
|
||||
- **WHEN** 被移除者的账号重新启用,但仍不是目标空间成员
|
||||
- **THEN** 当前所有者保持只读,不恢复写权限
|
||||
|
||||
#### Scenario: 正常账号重新加入
|
||||
- **WHEN** 账号正常的用户重新加入目标空间,且仍是技能当前所有者
|
||||
- **THEN** 按原有状态、扫描和审核规则恢复维护能力,不移动或重建技能
|
||||
|
||||
### Requirement: REQ-OWN-05 已提交申请 SHALL 继续既有审核流程
|
||||
|
||||
停用或移除前提交的待审核申请 SHALL 保留,不因停用/移除自动通过或撤回。现有审核人继续按原有审核、安全和状态规则处理;受限所有者不能再修改或撤回申请。此规则不授权跳过扫描或其他独立治理条件,也不将异步审核人的合法决策误当成受限所有者的新请求。
|
||||
|
||||
#### Scenario: 原所有者被移除后审核
|
||||
- **WHEN** 原所有者被移除,但此前已提交技能或头像审核申请
|
||||
- **THEN** 申请不因移除自动消失或获批,仍可由原有有权审核人按现有流程处理
|
||||
- **AND** 原所有者不能继续编辑或撤回申请
|
||||
|
||||
### Requirement: REQ-OWN-06 管理员及其他空间的既有授权 SHALL 保持不变
|
||||
|
||||
本期 SHALL 不新增或收紧空间/平台管理员原有治理和审核权限,不新增成员覆盖开关、Maintainer 或所有权转让。用户另有有效平台管理员授权时,继续按原管理员路径处理;普通所有者不能仅凭 owner 身份绕过成员限制。移除某 TEAM 成员不得导致用户在其他空间的正常权限或公开读取能力一并丢失;GLOBAL 及不可变成员规则保持现状。
|
||||
|
||||
#### Scenario: 原有管理员治理
|
||||
- **WHEN** 具备现有有效权限的管理员执行治理或审核
|
||||
- **THEN** 按原权限和审核规则处理,不因本轮普通所有者只读限制而被整体禁止
|
||||
|
||||
#### Scenario: 用户仍在另一个空间
|
||||
- **WHEN** 用户被空间 A 移除,但仍有空间 B 的正常成员与技能所有者身份
|
||||
- **THEN** 空间 A 的只读边界不影响其维护空间 B 的技能
|
||||
|
||||
### Requirement: REQ-OWN-07 管理页面 SHALL 明确只读状态
|
||||
|
||||
我的技能与详情等管理入口 SHALL 明确提示当前所有者“已不在该空间,只能查看和下载”,保留查看与下载入口,并依据服务端权限隐藏或禁用相关写动作。旧页面或缓存不得成为绕过服务端校验的依据。页面不新增自助加入、交接或管理员代传承诺,不把文档讨论记录展示成产品功能。
|
||||
|
||||
#### Scenario: 被移除者重新打开我的技能
|
||||
- **WHEN** 被移除的当前所有者打开自己的技能管理页面
|
||||
- **THEN** 能找到并读取自己的技能,看到只读原因,没有可用的维护入口
|
||||
|
||||
#### Scenario: 页面打开后成员被移除
|
||||
- **WHEN** 用户页面仍显示旧权限,但服务端已完成成员移除
|
||||
- **THEN** 后续写请求被拒绝,页面更新权限和提示,不假报修改成功
|
||||
19
openspec/changes/clarify-skill-ownership-transfer/tasks.md
Normal file
19
openspec/changes/clarify-skill-ownership-transfer/tasks.md
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
## 1. 实施前收敛
|
||||
|
||||
- [x] 刷新目标分支,确认当前需求与实施范围,用户已授权实施并创建 Issue #974。
|
||||
- [ ] 基于冻结源码补齐各客户端与套件绑定入口的权限追踪,映射 REQ-OWN-01 至 REQ-OWN-07。
|
||||
|
||||
## 2. 服务端与界面
|
||||
|
||||
- [x] 统一当前所有者读取与成员维护权限,保留管理员独立授权。
|
||||
- [x] 修正移除后写入口及旧旁路,补齐所有者列表、详情和受控下载读取。
|
||||
- [x] 保留已有审核申请与现有账号停用/恢复行为。
|
||||
- [x] 管理页面明确只读状态;如有契约变更,同步 OpenAPI 与生成类型。
|
||||
- [x] 更新现有领域模型和用户文档中过时的成员移除/所有者权限说明,不新增转让或接管功能。
|
||||
|
||||
## 3. 验证和交付
|
||||
|
||||
- [ ] 完成关键阶段独立代码审查,并按正式流程冻结验证提交。
|
||||
- [ ] 覆盖正常成员、移除后可读不可写、停用、重新加入、现有审核、管理员和跨空间回归。
|
||||
- [ ] 对改动入口执行必要源码检查及固定提交运行/浏览器验收,不以单测替代运行证据。
|
||||
- [ ] 汇总实际结果、人工复测、未验证项及 PR #797/Issue #732 的建议;未经授权不关闭或评论公开对象。
|
||||
|
|
@ -99,7 +99,7 @@ public class SkillController extends BaseApiController {
|
|||
Set<String> platformRoles = principal == null || principal.platformRoles() == null
|
||||
? Set.of() : principal.platformRoles();
|
||||
SkillQueryService.SkillDetailDTO detail = skillQueryService.getSkillDetail(
|
||||
namespace, slug, userId, namespaceRoles);
|
||||
namespace, slug, userId, namespaceRoles, platformRoles);
|
||||
PageResponse<SkillSuiteReferenceResponse> memberOfSuites =
|
||||
skillSuiteAppService.findVisibleMemberships(
|
||||
detail.id(), userId, namespaceRoles, platformRoles, 0, 20);
|
||||
|
|
@ -137,7 +137,8 @@ public class SkillController extends BaseApiController {
|
|||
SkillVisibility.PRIVATE == SkillVisibility.valueOf(detail.visibility())
|
||||
&& !detail.ownerId().equals(userId) ? null
|
||||
: SkillAvatarUrls.current(detail.activeAvatarId(), detail.activeAvatarAudience(),
|
||||
SkillVisibility.valueOf(detail.visibility()), namespace, detail.slug())
|
||||
SkillVisibility.valueOf(detail.visibility()), namespace, detail.slug()),
|
||||
detail.ownerReadOnly()
|
||||
);
|
||||
|
||||
return ok("response.success.read", response);
|
||||
|
|
@ -192,7 +193,7 @@ public class SkillController extends BaseApiController {
|
|||
v.getFileCount(),
|
||||
v.getTotalSize(),
|
||||
v.getPublishedAt(),
|
||||
skillQueryService.isDownloadAvailable(v),
|
||||
skillQueryService.isDownloadAvailable(v, userId),
|
||||
complianceSnapshotProjectionService.fromParsedMetadataJson(v.getParsedMetadataJson())
|
||||
)));
|
||||
|
||||
|
|
|
|||
|
|
@ -31,5 +31,37 @@ public record SkillDetailResponse(
|
|||
String resolutionMode,
|
||||
List<SkillSuiteReferenceResponse> entryForSuites,
|
||||
PageResponse<SkillSuiteReferenceResponse> memberOfSuites,
|
||||
String avatarUrl
|
||||
) {}
|
||||
String avatarUrl,
|
||||
boolean ownerReadOnly
|
||||
) {
|
||||
public SkillDetailResponse(Long id,
|
||||
String slug,
|
||||
String displayName,
|
||||
String ownerId,
|
||||
String ownerDisplayName,
|
||||
String summary,
|
||||
String visibility,
|
||||
String status,
|
||||
Long downloadCount,
|
||||
Integer starCount,
|
||||
Integer subscriptionCount,
|
||||
BigDecimal ratingAvg,
|
||||
Integer ratingCount,
|
||||
boolean hidden,
|
||||
String namespace,
|
||||
List<SkillLabelDto> labels,
|
||||
boolean canManageLifecycle,
|
||||
boolean canSubmitPromotion,
|
||||
boolean canInteract,
|
||||
boolean canReport,
|
||||
SkillLifecycleVersionResponse headlineVersion,
|
||||
SkillLifecycleVersionResponse publishedVersion,
|
||||
SkillLifecycleVersionResponse ownerPreviewVersion,
|
||||
String ownerPreviewReviewComment,
|
||||
String resolutionMode,
|
||||
List<SkillSuiteReferenceResponse> entryForSuites,
|
||||
PageResponse<SkillSuiteReferenceResponse> memberOfSuites,
|
||||
String avatarUrl) {
|
||||
this(id, slug, displayName, ownerId, ownerDisplayName, summary, visibility, status, downloadCount, starCount, subscriptionCount, ratingAvg, ratingCount, hidden, namespace, labels, canManageLifecycle, canSubmitPromotion, canInteract, canReport, headlineVersion, publishedVersion, ownerPreviewVersion, ownerPreviewReviewComment, resolutionMode, entryForSuites, memberOfSuites, avatarUrl, false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,13 @@ public record SkillSummaryResponse(
|
|||
|
||||
/** Owner workspace projection, never populated by public discovery or social lists. */
|
||||
public record ManagementState(String requestedVisibility, Long reviewTaskId,
|
||||
String promotionRole, String relatedNamespace, String relatedSlug) {}
|
||||
String promotionRole, String relatedNamespace, String relatedSlug,
|
||||
boolean ownerReadOnly) {
|
||||
public ManagementState(String requestedVisibility, Long reviewTaskId, String promotionRole,
|
||||
String relatedNamespace, String relatedSlug) {
|
||||
this(requestedVisibility, reviewTaskId, promotionRole, relatedNamespace, relatedSlug, false);
|
||||
}
|
||||
}
|
||||
|
||||
public SkillSummaryResponse(
|
||||
Long id, String slug, String displayName, String summary, String visibility, String status,
|
||||
|
|
@ -59,7 +65,7 @@ public record SkillSummaryResponse(
|
|||
public SkillSummaryResponse withManagementState(ManagementState state) {
|
||||
return new SkillSummaryResponse(id, slug, displayName, summary, visibility, status, downloadCount,
|
||||
starCount, ratingAvg, ratingCount, namespace, updatedAt, ownerId, ownerDisplayName,
|
||||
canSubmitPromotion, headlineVersion, publishedVersion, ownerPreviewVersion,
|
||||
canSubmitPromotion && (state == null || !state.ownerReadOnly()), headlineVersion, publishedVersion, ownerPreviewVersion,
|
||||
resolutionMode, complianceSnapshot, labels, avatarUrl, state);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ public class JpaStarredSkillQueryRepository implements StarredSkillQueryReposito
|
|||
Predicate member = roles.isEmpty() ? builder.disjunction() : skill.get("namespaceId").in(roles.keySet());
|
||||
Predicate visibility = builder.or(
|
||||
builder.equal(skill.get("visibility"), SkillVisibility.PUBLIC),
|
||||
builder.and(builder.equal(skill.get("visibility"), SkillVisibility.NAMESPACE_ONLY), member),
|
||||
builder.and(builder.equal(skill.get("visibility"), SkillVisibility.NAMESPACE_ONLY), builder.or(owner, member)),
|
||||
builder.and(builder.equal(skill.get("visibility"), SkillVisibility.PRIVATE), builder.or(owner, admin)));
|
||||
Predicate accessible = builder.or(
|
||||
builder.and(builder.isTrue(skill.get("hidden")), builder.or(owner, admin)),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.service;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.iflytek.skillhub.domain.namespace.Namespace;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRole;
|
||||
import com.iflytek.skillhub.repository.StarredSkillQueryRepository;
|
||||
|
|
@ -27,6 +28,7 @@ import java.util.List;
|
|||
*/
|
||||
@Service
|
||||
public class MySkillAppService {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
public enum MySkillFilter {
|
||||
ALL,
|
||||
PENDING_REVIEW,
|
||||
|
|
@ -46,6 +48,7 @@ public class MySkillAppService {
|
|||
private final NamespaceRepository namespaceRepository;
|
||||
|
||||
public MySkillAppService(
|
||||
SkillOwnerAccessPolicy ownerAccess,
|
||||
SkillRepository skillRepository,
|
||||
SkillVersionRepository skillVersionRepository,
|
||||
StarredSkillQueryRepository starredSkillQueryRepository,
|
||||
|
|
@ -54,6 +57,7 @@ public class MySkillAppService {
|
|||
HiddenSkillQueryRepository hiddenSkillQueryRepository,
|
||||
SkillLifecycleProjectionService skillLifecycleProjectionService,
|
||||
NamespaceRepository namespaceRepository) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.skillRepository = skillRepository;
|
||||
this.skillVersionRepository = skillVersionRepository;
|
||||
this.starredSkillQueryRepository = starredSkillQueryRepository;
|
||||
|
|
@ -104,7 +108,18 @@ public class MySkillAppService {
|
|||
|
||||
if (normalizedFilter != MySkillFilter.HIDDEN) {
|
||||
var managementStates = mySkillQueryRepository.getManagementStates(skillPage.getContent(), userId);
|
||||
items = items.stream().map(item -> item.withManagementState(managementStates.get(item.id()))).toList();
|
||||
Map<Long, Skill> skillsById = skillPage.getContent().stream()
|
||||
.collect(java.util.stream.Collectors.toMap(Skill::getId, skill -> skill));
|
||||
items = items.stream().map(item -> {
|
||||
var state = managementStates.get(item.id());
|
||||
boolean readOnly = ownerAccess.isReadOnly(skillsById.get(item.id()), userId, platformRoles);
|
||||
return item.withManagementState(new SkillSummaryResponse.ManagementState(
|
||||
state == null ? null : state.requestedVisibility(),
|
||||
state == null ? null : state.reviewTaskId(),
|
||||
state == null ? null : state.promotionRole(),
|
||||
state == null ? null : state.relatedNamespace(),
|
||||
state == null ? null : state.relatedSlug(), readOnly));
|
||||
}).toList();
|
||||
}
|
||||
return new PageResponse<>(items, skillPage.getTotalElements(), skillPage.getNumber(), skillPage.getSize());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,8 +138,8 @@ public class ReviewPortalAppService {
|
|||
return;
|
||||
}
|
||||
if (task.getSubjectType() == ReviewSubjectType.SKILL_METADATA) {
|
||||
reviewService.withdrawMetadata(task, userId);
|
||||
} else { reviewService.withdrawReview(task.getSkillVersionId(), userId); }
|
||||
reviewService.withdrawMetadata(task, userId, platformRoles(userId));
|
||||
} else { reviewService.withdrawReview(task.getSkillVersionId(), userId, platformRoles(userId)); }
|
||||
recordAudit(
|
||||
"REVIEW_WITHDRAW",
|
||||
userId,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.service;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.iflytek.skillhub.domain.audit.AuditDetail;
|
||||
import com.iflytek.skillhub.domain.audit.AuditLogService;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRole;
|
||||
|
|
@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
|
||||
@Service
|
||||
public class SecurityScanRetryAppService {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
|
||||
private final SkillRepository skillRepository;
|
||||
private final SkillVersionRepository skillVersionRepository;
|
||||
|
|
@ -31,12 +33,13 @@ public class SecurityScanRetryAppService {
|
|||
private final ObjectStorageService objectStorageService;
|
||||
private final AuditLogService auditLogService;
|
||||
|
||||
public SecurityScanRetryAppService(SkillRepository skillRepository,
|
||||
public SecurityScanRetryAppService(SkillOwnerAccessPolicy ownerAccess, SkillRepository skillRepository,
|
||||
SkillVersionRepository skillVersionRepository,
|
||||
SecurityAuditRepository securityAuditRepository,
|
||||
SecurityScanService securityScanService,
|
||||
ObjectStorageService objectStorageService,
|
||||
AuditLogService auditLogService) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.skillRepository = skillRepository;
|
||||
this.skillVersionRepository = skillVersionRepository;
|
||||
this.securityAuditRepository = securityAuditRepository;
|
||||
|
|
@ -104,6 +107,9 @@ public class SecurityScanRetryAppService {
|
|||
Set<String> roles = platformRoles != null ? platformRoles : Set.of();
|
||||
Map<Long, NamespaceRole> memberships = namespaceRoles != null ? namespaceRoles : Map.of();
|
||||
NamespaceRole namespaceRole = memberships.get(skill.getNamespaceId());
|
||||
if (!roles.contains("SKILL_ADMIN")) {
|
||||
ownerAccess.assertCanWrite(skill, userId, roles);
|
||||
}
|
||||
boolean allowed = skill.getOwnerId().equals(userId)
|
||||
|| namespaceRole == NamespaceRole.OWNER
|
||||
|| namespaceRole == NamespaceRole.ADMIN
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package com.iflytek.skillhub.service;
|
||||
|
||||
import com.iflytek.skillhub.auth.rbac.RbacService;
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.iflytek.skillhub.domain.review.ReviewAvatarParticipant;
|
||||
import com.iflytek.skillhub.domain.review.ReviewPermissionChecker;
|
||||
import com.iflytek.skillhub.domain.review.ReviewSubjectType;
|
||||
|
|
@ -54,6 +56,8 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
|
|||
|
||||
@Service
|
||||
public class SkillAvatarAppService implements ReviewAvatarParticipant {
|
||||
private final RbacService rbacService;
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
private final SkillJpaRepository skills;
|
||||
private final NamespaceRepository namespaces;
|
||||
private final SkillAvatarCandidateJpaRepository candidates;
|
||||
|
|
@ -83,12 +87,14 @@ public class SkillAvatarAppService implements ReviewAvatarParticipant {
|
|||
}
|
||||
|
||||
|
||||
public SkillAvatarAppService(SkillJpaRepository skills, NamespaceRepository namespaces,
|
||||
public SkillAvatarAppService(RbacService rbacService, SkillOwnerAccessPolicy ownerAccess, SkillJpaRepository skills, NamespaceRepository namespaces,
|
||||
SkillAvatarCandidateJpaRepository candidates, ObjectStorageService storage,
|
||||
SkillAvatarImageProcessor imageProcessor, AvatarReviewSettingsService settings,
|
||||
AvatarModerationGateway moderation, VisibilityChecker visibility,
|
||||
SkillQueryService skillQueries, AuditLogService audit, RequestIdAccessor requestIds,
|
||||
EntityManager entityManager, PlatformTransactionManager transactionManager) {
|
||||
this.rbacService = rbacService;
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.skills = skills;
|
||||
this.namespaces = namespaces;
|
||||
this.candidates = candidates;
|
||||
|
|
@ -109,6 +115,7 @@ public class SkillAvatarAppService implements ReviewAvatarParticipant {
|
|||
public SkillAvatarStatusResponse submit(String namespaceSlug, String slug, String actor, byte[] image,
|
||||
AuditRequestContext context) {
|
||||
Skill skill = lockedOwnedSkill(namespaceSlug, slug, actor);
|
||||
ownerAccess.assertCanWrite(skill, actor, rbacService.getUserRoleCodes(actor));
|
||||
requireOwner(skill, actor);
|
||||
byte[] normalized = imageProcessor.normalize(image);
|
||||
return createCandidate(skill, namespaceSlug, actor, actor, "SKILL_AVATAR_SUBMIT", normalized, context);
|
||||
|
|
@ -172,13 +179,16 @@ public class SkillAvatarAppService implements ReviewAvatarParticipant {
|
|||
|
||||
@Transactional
|
||||
public void lockOwnedSkill(String namespaceSlug, String slug, String actor) {
|
||||
requireOwner(lockedOwnedSkill(namespaceSlug, slug, actor), actor);
|
||||
Skill skill = lockedOwnedSkill(namespaceSlug, slug, actor);
|
||||
ownerAccess.assertCanWrite(skill, actor, rbacService.getUserRoleCodes(actor));
|
||||
requireOwner(skill, actor);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public SkillAvatarStatusResponse submitStored(String namespaceSlug, String slug, String actor,
|
||||
String objectKey, String sha256, SkillVisibility audience, AuditRequestContext context) {
|
||||
Skill skill = lockedOwnedSkill(namespaceSlug, slug, actor);
|
||||
ownerAccess.assertCanWrite(skill, actor, rbacService.getUserRoleCodes(actor));
|
||||
requireOwner(skill, actor);
|
||||
return submitStoredForReview(namespaceSlug, slug, actor, objectKey, sha256, audience, context, null);
|
||||
}
|
||||
|
|
@ -188,6 +198,7 @@ public class SkillAvatarAppService implements ReviewAvatarParticipant {
|
|||
String objectKey, String sha256, SkillVisibility audience, AuditRequestContext context,
|
||||
ReviewTask review) {
|
||||
Skill skill = lockedOwnedSkill(namespaceSlug, slug, actor);
|
||||
ownerAccess.assertCanWrite(skill, actor, rbacService.getUserRoleCodes(actor));
|
||||
requireOwner(skill, actor);
|
||||
return createStoredCandidate(skill, namespaceSlug, actor, actor, "SKILL_AVATAR_SUBMIT", objectKey, sha256,
|
||||
audience == null ? skill.getVisibility() : audience, context, review);
|
||||
|
|
@ -364,6 +375,7 @@ public class SkillAvatarAppService implements ReviewAvatarParticipant {
|
|||
public SkillAvatarStatusResponse appeal(String namespaceSlug, String slug, long candidateId, String actor,
|
||||
AuditRequestContext context) {
|
||||
Skill skill = lockedOwnedSkill(namespaceSlug, slug, actor);
|
||||
ownerAccess.assertCanWrite(skill, actor, rbacService.getUserRoleCodes(actor));
|
||||
requireOwner(skill, actor);
|
||||
SkillAvatarCandidate candidate = currentPending(skill, candidateId);
|
||||
candidate.appeal();
|
||||
|
|
@ -379,6 +391,7 @@ public class SkillAvatarAppService implements ReviewAvatarParticipant {
|
|||
@Transactional(readOnly = true)
|
||||
public void requireCurrentOwnerCandidate(String namespaceSlug, String slug, long candidateId, String actor) {
|
||||
Skill skill = findOwnedSkill(namespaceSlug, slug, actor);
|
||||
ownerAccess.assertCanWrite(skill, actor, rbacService.getUserRoleCodes(actor));
|
||||
requireOwner(skill, actor);
|
||||
if (!Objects.equals(skill.getPendingAvatarId(), candidateId)) {
|
||||
throw new DomainConflictException("error.skill.avatar.notPending");
|
||||
|
|
@ -423,6 +436,7 @@ public class SkillAvatarAppService implements ReviewAvatarParticipant {
|
|||
throw new DomainBadRequestException("error.skill.avatar.reasonRequired");
|
||||
}
|
||||
} else {
|
||||
ownerAccess.assertCanWrite(skill, actor, platformRoles);
|
||||
requireOwner(skill, actor);
|
||||
}
|
||||
if (skill.getActiveAvatarId() == null && skill.getPendingAvatarId() == null) {
|
||||
|
|
@ -557,6 +571,7 @@ public class SkillAvatarAppService implements ReviewAvatarParticipant {
|
|||
@Transactional
|
||||
public void prepareRemoval(ReviewTask task, String namespace, String slug, String actor) {
|
||||
Skill skill = lockedOwnedSkill(namespace, slug, actor);
|
||||
ownerAccess.assertCanWrite(skill, actor, rbacService.getUserRoleCodes(actor));
|
||||
task.prepareAvatarRemoval(skill.getActiveAvatarId(), skill.getPendingAvatarId());
|
||||
reviews.save(task);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.service;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.iflytek.skillhub.auth.rbac.PlatformPrincipal;
|
||||
import com.iflytek.skillhub.domain.namespace.Namespace;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRepository;
|
||||
|
|
@ -20,6 +21,7 @@ import java.util.Optional;
|
|||
*/
|
||||
@Service
|
||||
public class SkillDeleteAppService {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
|
||||
public record DeleteResult(Long skillId, String namespace, String slug, boolean deleted) {
|
||||
}
|
||||
|
|
@ -29,10 +31,11 @@ public class SkillDeleteAppService {
|
|||
private final SkillHardDeleteService skillHardDeleteService;
|
||||
private final SearchIndexService searchIndexService;
|
||||
|
||||
public SkillDeleteAppService(SkillRepository skillRepository,
|
||||
public SkillDeleteAppService(SkillOwnerAccessPolicy ownerAccess, SkillRepository skillRepository,
|
||||
NamespaceRepository namespaceRepository,
|
||||
SkillHardDeleteService skillHardDeleteService,
|
||||
SearchIndexService searchIndexService) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.skillRepository = skillRepository;
|
||||
this.namespaceRepository = namespaceRepository;
|
||||
this.skillHardDeleteService = skillHardDeleteService;
|
||||
|
|
@ -115,6 +118,10 @@ public class SkillDeleteAppService {
|
|||
if (enforcePortalOwnership && !canDeleteFromPortal(skill, principal)) {
|
||||
throw new DomainForbiddenException("error.forbidden");
|
||||
}
|
||||
if (principal == null || !principal.platformRoles().contains("SKILL_ADMIN")) {
|
||||
ownerAccess.assertCanWrite(skill, actorUserId,
|
||||
principal == null ? java.util.Set.of() : principal.platformRoles());
|
||||
}
|
||||
searchIndexService.remove(skill.getId());
|
||||
skillHardDeleteService.hardDeleteSkill(
|
||||
skill,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.service;
|
||||
|
||||
import com.iflytek.skillhub.auth.rbac.RbacService;
|
||||
import com.iflytek.skillhub.domain.audit.AuditDetail;
|
||||
import com.iflytek.skillhub.domain.audit.AuditLogService;
|
||||
import com.iflytek.skillhub.domain.namespace.Namespace;
|
||||
|
|
@ -27,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
*/
|
||||
@Service
|
||||
public class SkillLifecycleAppService {
|
||||
private final RbacService rbacService;
|
||||
|
||||
private final NamespaceRepository namespaceRepository;
|
||||
private final SkillVersionRepository skillVersionRepository;
|
||||
|
|
@ -37,7 +39,7 @@ public class SkillLifecycleAppService {
|
|||
private final AuditLogService auditLogService;
|
||||
private final SkillSlugResolutionService skillSlugResolutionService;
|
||||
|
||||
public SkillLifecycleAppService(NamespaceRepository namespaceRepository,
|
||||
public SkillLifecycleAppService(RbacService rbacService, NamespaceRepository namespaceRepository,
|
||||
SkillVersionRepository skillVersionRepository,
|
||||
SkillGovernanceService skillGovernanceService,
|
||||
ReviewService reviewService,
|
||||
|
|
@ -45,6 +47,7 @@ public class SkillLifecycleAppService {
|
|||
SkillReviewSubmitService skillReviewSubmitService,
|
||||
AuditLogService auditLogService,
|
||||
SkillSlugResolutionService skillSlugResolutionService) {
|
||||
this.rbacService = rbacService;
|
||||
this.namespaceRepository = namespaceRepository;
|
||||
this.skillVersionRepository = skillVersionRepository;
|
||||
this.skillGovernanceService = skillGovernanceService;
|
||||
|
|
@ -69,7 +72,8 @@ public class SkillLifecycleAppService {
|
|||
normalizeRoles(userNamespaceRoles),
|
||||
auditContext.clientIp(),
|
||||
auditContext.userAgent(),
|
||||
request != null ? request.reason() : null
|
||||
request != null ? request.reason() : null,
|
||||
ownerPlatformRoles(skill, userId)
|
||||
);
|
||||
return new SkillLifecycleMutationResponse(archived.getId(), null, "ARCHIVE", archived.getStatus().name());
|
||||
}
|
||||
|
|
@ -86,7 +90,8 @@ public class SkillLifecycleAppService {
|
|||
userId,
|
||||
normalizeRoles(userNamespaceRoles),
|
||||
auditContext.clientIp(),
|
||||
auditContext.userAgent()
|
||||
auditContext.userAgent(),
|
||||
ownerPlatformRoles(skill, userId)
|
||||
);
|
||||
return new SkillLifecycleMutationResponse(restored.getId(), null, "UNARCHIVE", restored.getStatus().name());
|
||||
}
|
||||
|
|
@ -107,7 +112,8 @@ public class SkillLifecycleAppService {
|
|||
normalizeRoles(userNamespaceRoles),
|
||||
auditContext.clientIp(),
|
||||
auditContext.userAgent(),
|
||||
namespace
|
||||
namespace,
|
||||
ownerPlatformRoles(skill, userId)
|
||||
);
|
||||
return new SkillLifecycleMutationResponse(skill.getId(), skillVersion.getId(), "DELETE_VERSION", version);
|
||||
}
|
||||
|
|
@ -129,7 +135,8 @@ public class SkillLifecycleAppService {
|
|||
normalizeRoles(userNamespaceRoles),
|
||||
auditContext.clientIp(),
|
||||
auditContext.userAgent(),
|
||||
request != null ? request.reason() : null
|
||||
request != null ? request.reason() : null,
|
||||
ownerPlatformRoles(skill, userId)
|
||||
);
|
||||
return new SkillLifecycleMutationResponse(skill.getId(), skillVersion.getId(), "YANK", yanked.getStatus().name());
|
||||
}
|
||||
|
|
@ -142,7 +149,7 @@ public class SkillLifecycleAppService {
|
|||
AuditRequestContext auditContext) {
|
||||
Skill skill = findSkill(namespace, slug, userId);
|
||||
SkillVersion skillVersion = findVersion(skill.getId(), version);
|
||||
SkillVersion withdrawnVersion = reviewService.withdrawReview(skillVersion.getId(), userId);
|
||||
SkillVersion withdrawnVersion = reviewService.withdrawReview(skillVersion.getId(), userId, ownerPlatformRoles(skill, userId));
|
||||
auditLogService.record(
|
||||
userId,
|
||||
"REVIEW_WITHDRAW",
|
||||
|
|
@ -178,7 +185,8 @@ public class SkillLifecycleAppService {
|
|||
targetVersion,
|
||||
userId,
|
||||
normalizeRoles(userNamespaceRoles),
|
||||
request.confirmWarnings()
|
||||
request.confirmWarnings(),
|
||||
ownerPlatformRoles(skill, userId)
|
||||
);
|
||||
auditLogService.record(
|
||||
userId,
|
||||
|
|
@ -213,7 +221,8 @@ public class SkillLifecycleAppService {
|
|||
skillVersion.getId(),
|
||||
com.iflytek.skillhub.domain.skill.SkillVisibility.valueOf(targetVisibility),
|
||||
userId,
|
||||
normalizeRoles(userNamespaceRoles)
|
||||
normalizeRoles(userNamespaceRoles),
|
||||
ownerPlatformRoles(skill, userId)
|
||||
);
|
||||
auditLogService.record(
|
||||
userId,
|
||||
|
|
@ -246,7 +255,8 @@ public class SkillLifecycleAppService {
|
|||
skill.getId(),
|
||||
skillVersion.getId(),
|
||||
userId,
|
||||
normalizeRoles(userNamespaceRoles)
|
||||
normalizeRoles(userNamespaceRoles),
|
||||
ownerPlatformRoles(skill, userId)
|
||||
);
|
||||
auditLogService.record(
|
||||
userId,
|
||||
|
|
@ -266,6 +276,11 @@ public class SkillLifecycleAppService {
|
|||
);
|
||||
}
|
||||
|
||||
private java.util.Set<String> ownerPlatformRoles(Skill skill, String userId) {
|
||||
// These legacy owner endpoints did not grant a new write path to non-owner platform admins.
|
||||
return skill.getOwnerId().equals(userId) ? rbacService.getUserRoleCodes(userId) : java.util.Set.of();
|
||||
}
|
||||
|
||||
private Skill findSkill(String namespaceSlug, String skillSlug, String currentUserId) {
|
||||
String cleanNamespace = namespaceSlug.startsWith("@") ? namespaceSlug.substring(1) : namespaceSlug;
|
||||
Namespace namespace = namespaceRepository.findBySlug(cleanNamespace)
|
||||
|
|
|
|||
|
|
@ -348,3 +348,5 @@ error.skill.visibility.notPublished=Only active published skills in an active na
|
|||
error.skill.visibility.scanUnavailable=The published bundle is unavailable for a security scan.
|
||||
error.skill.visibility.scanIncomplete=The current security scan has not passed. Wider access cannot be approved.
|
||||
error.skill.visibility.avatarPending=Finish or withdraw the pending avatar review before changing visibility.
|
||||
|
||||
error.skill.owner.readOnly=You are no longer a member of this namespace. You can only view and download this skill.
|
||||
|
|
|
|||
|
|
@ -291,3 +291,5 @@ error.skill.visibility.notPublished=Видимость можно менять
|
|||
error.skill.visibility.scanUnavailable=Опубликованный пакет недоступен для проверки безопасности.
|
||||
error.skill.visibility.scanIncomplete=Текущая проверка безопасности не пройдена. Расширение доступа нельзя одобрить.
|
||||
error.skill.visibility.avatarPending=Завершите или отзовите проверку аватара перед изменением видимости.
|
||||
|
||||
error.skill.owner.readOnly=You are no longer a member of this namespace. You can only view and download this skill.
|
||||
|
|
|
|||
|
|
@ -350,3 +350,5 @@ error.skill.visibility.notPublished=仅正常空间内正常、可见且已发
|
|||
error.skill.visibility.scanUnavailable=该发布版本的完整包尚不可用,无法发起安全扫描。
|
||||
error.skill.visibility.scanIncomplete=本次安全扫描尚未通过,无法批准扩大范围。
|
||||
error.skill.visibility.avatarPending=请先完成或撤回待审核头像,再修改可见范围。
|
||||
|
||||
error.skill.owner.readOnly=已不在该空间,只能查看和下载技能。
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ class SkillControllerTest {
|
|||
var pageable = org.springframework.data.domain.PageRequest.of(0, 1);
|
||||
when(skillQueryService.listVersions("team", "demo", null, Map.of(), pageable))
|
||||
.thenReturn(new org.springframework.data.domain.PageImpl<>(List.of(version), pageable, 3));
|
||||
when(skillQueryService.isDownloadAvailable(version)).thenReturn(true);
|
||||
when(skillQueryService.isDownloadAvailable(eq(version), org.mockito.ArgumentMatchers.nullable(String.class))).thenReturn(true);
|
||||
|
||||
mockMvc.perform(get("/api/v1/skills/team/demo/versions").param("page", "0").param("size", "1"))
|
||||
.andExpect(status().isOk())
|
||||
|
|
@ -235,7 +235,7 @@ class SkillControllerTest {
|
|||
eq("team"),
|
||||
eq("demo"),
|
||||
eq((String) null),
|
||||
eq(Map.<Long, NamespaceRole>of())))
|
||||
eq(Map.<Long, NamespaceRole>of()), org.mockito.ArgumentMatchers.anySet()))
|
||||
.thenReturn(new SkillQueryService.SkillDetailDTO(
|
||||
1L,
|
||||
"demo",
|
||||
|
|
@ -297,7 +297,7 @@ class SkillControllerTest {
|
|||
eq("team"),
|
||||
eq("demo"),
|
||||
eq((String) null),
|
||||
eq(Map.<Long, NamespaceRole>of())))
|
||||
eq(Map.<Long, NamespaceRole>of()), org.mockito.ArgumentMatchers.anySet()))
|
||||
.thenThrow(new DomainForbiddenException("error.namespace.archived", "team"));
|
||||
|
||||
mockMvc.perform(get("/api/web/skills/team/demo"))
|
||||
|
|
@ -336,7 +336,7 @@ class SkillControllerTest {
|
|||
eq(Map.<Long, NamespaceRole>of()),
|
||||
any()))
|
||||
.thenReturn(new org.springframework.data.domain.PageImpl<>(List.of(version)));
|
||||
when(skillQueryService.isDownloadAvailable(version)).thenReturn(false);
|
||||
when(skillQueryService.isDownloadAvailable(eq(version), org.mockito.ArgumentMatchers.nullable(String.class))).thenReturn(false);
|
||||
|
||||
mockMvc.perform(get("/api/v1/skills/team/demo/versions"))
|
||||
.andExpect(status().isOk())
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@ import com.iflytek.skillhub.TestRedisConfig;
|
|||
import com.iflytek.skillhub.auth.device.DeviceAuthService;
|
||||
import com.iflytek.skillhub.auth.rbac.PlatformPrincipal;
|
||||
import com.iflytek.skillhub.domain.namespace.Namespace;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceMember;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceMemberRepository;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRole;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRepository;
|
||||
import com.iflytek.skillhub.domain.skill.Skill;
|
||||
import com.iflytek.skillhub.domain.skill.SkillFile;
|
||||
|
|
@ -66,7 +68,7 @@ class SkillDeleteFlowIntegrationTest {
|
|||
@MockBean
|
||||
private ObjectStorageService objectStorageService;
|
||||
|
||||
@MockBean
|
||||
@Autowired
|
||||
private NamespaceMemberRepository namespaceMemberRepository;
|
||||
|
||||
@MockBean
|
||||
|
|
@ -135,6 +137,7 @@ class SkillDeleteFlowIntegrationTest {
|
|||
private PersistedSkillGraph createSkillGraph(String ownerId) {
|
||||
String suffix = UUID.randomUUID().toString().substring(0, 8);
|
||||
Namespace namespace = namespaceRepository.save(new Namespace("global-delete-" + suffix, "Global Delete " + suffix, "system"));
|
||||
namespaceMemberRepository.save(new NamespaceMember(namespace.getId(), ownerId, NamespaceRole.MEMBER));
|
||||
|
||||
Skill skill = new Skill(namespace.getId(), "demo-skill-" + suffix, ownerId, SkillVisibility.PUBLIC);
|
||||
skill.setCreatedBy(ownerId);
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ class SkillLifecycleControllerTest {
|
|||
given(namespaceRepository.findBySlug("global")).willReturn(java.util.Optional.of(namespace));
|
||||
given(skillSlugResolutionService.resolve(1L, "demo-skill", "usr_1", SkillSlugResolutionService.Preference.CURRENT_USER))
|
||||
.willReturn(skill);
|
||||
given(skillGovernanceService.archiveSkill(eq(1L), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class), eq("cleanup")))
|
||||
given(skillGovernanceService.archiveSkill(eq(1L), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class), eq("cleanup"), org.mockito.ArgumentMatchers.anySet()))
|
||||
.willReturn(skillWithStatus(skill, com.iflytek.skillhub.domain.skill.SkillStatus.ARCHIVED));
|
||||
|
||||
mockMvc.perform(post("/api/web/skills/global/demo-skill/archive")
|
||||
|
|
@ -117,7 +117,7 @@ class SkillLifecycleControllerTest {
|
|||
given(namespaceRepository.findBySlug("global")).willReturn(java.util.Optional.of(namespace));
|
||||
given(skillSlugResolutionService.resolve(1L, "demo-skill", "usr_1", SkillSlugResolutionService.Preference.CURRENT_USER))
|
||||
.willReturn(skill);
|
||||
given(skillGovernanceService.unarchiveSkill(eq(1L), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class)))
|
||||
given(skillGovernanceService.unarchiveSkill(eq(1L), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class), org.mockito.ArgumentMatchers.anySet()))
|
||||
.willReturn(skillWithStatus(skill, com.iflytek.skillhub.domain.skill.SkillStatus.ACTIVE));
|
||||
|
||||
mockMvc.perform(post("/api/web/skills/global/demo-skill/unarchive")
|
||||
|
|
@ -179,7 +179,7 @@ class SkillLifecycleControllerTest {
|
|||
.willReturn(skill);
|
||||
given(skillVersionRepository.findBySkillIdForUpdate(1L)).willReturn(java.util.List.of(version));
|
||||
given(skillGovernanceService.yankVersion(
|
||||
eq(skill), eq(version), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class), eq("broken")))
|
||||
eq(skill), eq(version), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class), eq("broken"), org.mockito.ArgumentMatchers.anySet()))
|
||||
.willReturn(yanked);
|
||||
|
||||
mockMvc.perform(post("/api/web/skills/global/demo-skill/versions/1.2.3/yank")
|
||||
|
|
@ -197,7 +197,7 @@ class SkillLifecycleControllerTest {
|
|||
.andExpect(jsonPath("$.data.status").value("YANKED"));
|
||||
|
||||
verify(skillGovernanceService).yankVersion(
|
||||
eq(skill), eq(version), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class), eq("broken"));
|
||||
eq(skill), eq(version), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class), eq("broken"), org.mockito.ArgumentMatchers.anySet());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -218,7 +218,7 @@ class SkillLifecycleControllerTest {
|
|||
.willReturn(skill);
|
||||
given(skillVersionRepository.findBySkillIdForUpdate(1L)).willReturn(java.util.List.of(version));
|
||||
given(skillGovernanceService.yankVersion(
|
||||
eq(skill), eq(version), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class), isNull()))
|
||||
eq(skill), eq(version), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class), isNull(), org.mockito.ArgumentMatchers.anySet()))
|
||||
.willReturn(yanked);
|
||||
|
||||
mockMvc.perform(post("/api/v1/skills/global/demo-skill/versions/1.2.3/yank")
|
||||
|
|
@ -248,7 +248,7 @@ class SkillLifecycleControllerTest {
|
|||
SkillVersion withdrawn = new SkillVersion(1L, "1.0.0", "owner");
|
||||
setSkillVersionId(withdrawn, 2L);
|
||||
withdrawn.setStatus(SkillVersionStatus.DRAFT);
|
||||
given(reviewService.withdrawReview(2L, "usr_1")).willReturn(withdrawn);
|
||||
given(reviewService.withdrawReview(eq(2L), eq("usr_1"), org.mockito.ArgumentMatchers.anySet())).willReturn(withdrawn);
|
||||
|
||||
mockMvc.perform(post("/api/web/skills/global/demo-skill/versions/1.0.0/withdraw-review")
|
||||
.requestAttr("userId", "usr_1")
|
||||
|
|
@ -285,7 +285,7 @@ class SkillLifecycleControllerTest {
|
|||
eq("1.2.4"),
|
||||
eq("usr_1"),
|
||||
anyMap(),
|
||||
eq(false)))
|
||||
eq(false), org.mockito.ArgumentMatchers.anySet()))
|
||||
.willReturn(new SkillPublishService.PublishResult(1L, "demo-skill", newVersion));
|
||||
|
||||
mockMvc.perform(post("/api/web/skills/global/demo-skill/versions/1.2.3/rerelease")
|
||||
|
|
@ -313,7 +313,7 @@ class SkillLifecycleControllerTest {
|
|||
given(namespaceRepository.findBySlug("global")).willReturn(java.util.Optional.of(namespace));
|
||||
given(skillSlugResolutionService.resolve(1L, "demo-skill", "usr_1", SkillSlugResolutionService.Preference.CURRENT_USER))
|
||||
.willReturn(skill);
|
||||
given(skillGovernanceService.archiveSkill(eq(1L), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class), eq("cleanup")))
|
||||
given(skillGovernanceService.archiveSkill(eq(1L), eq("usr_1"), anyMap(), nullable(String.class), nullable(String.class), eq("cleanup"), org.mockito.ArgumentMatchers.anySet()))
|
||||
.willReturn(skillWithStatus(skill, com.iflytek.skillhub.domain.skill.SkillStatus.ARCHIVED));
|
||||
|
||||
mockMvc.perform(post("/api/web/skills/@global/demo-skill/archive")
|
||||
|
|
@ -353,7 +353,7 @@ class SkillLifecycleControllerTest {
|
|||
eq("1.2.4"),
|
||||
eq("usr_1"),
|
||||
anyMap(),
|
||||
eq(false)))
|
||||
eq(false), org.mockito.ArgumentMatchers.anySet()))
|
||||
.willReturn(new SkillPublishService.PublishResult(1L, "demo-skill", newVersion));
|
||||
|
||||
mockMvc.perform(post("/api/web/skills/global/demo-skill/versions/1.2.3/rerelease")
|
||||
|
|
@ -374,7 +374,7 @@ class SkillLifecycleControllerTest {
|
|||
eq("1.2.4"),
|
||||
eq("usr_1"),
|
||||
anyMap(),
|
||||
eq(false));
|
||||
eq(false), org.mockito.ArgumentMatchers.anySet());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -395,7 +395,7 @@ class SkillLifecycleControllerTest {
|
|||
sourceVersion.setStatus(SkillVersionStatus.PUBLISHED);
|
||||
given(skillVersionRepository.findBySkillIdAndVersion(1L, "1.2.3")).willReturn(java.util.Optional.of(sourceVersion));
|
||||
given(skillPublishService.rereleasePublishedVersion(
|
||||
eq(1L), eq("1.2.3"), eq("1.2.4"), eq("usr_1"), anyMap(), eq(true)))
|
||||
eq(1L), eq("1.2.3"), eq("1.2.4"), eq("usr_1"), anyMap(), eq(true), org.mockito.ArgumentMatchers.anySet()))
|
||||
.willReturn(new SkillPublishService.PublishResult(1L, "demo-skill", newVersion));
|
||||
|
||||
mockMvc.perform(post("/api/web/skills/global/demo-skill/versions/1.2.3/rerelease")
|
||||
|
|
@ -410,7 +410,7 @@ class SkillLifecycleControllerTest {
|
|||
.andExpect(jsonPath("$.data.action").value("RERELEASE_VERSION"));
|
||||
|
||||
verify(skillPublishService).rereleasePublishedVersion(
|
||||
eq(1L), eq("1.2.3"), eq("1.2.4"), eq("usr_1"), anyMap(), eq(true));
|
||||
eq(1L), eq("1.2.3"), eq("1.2.4"), eq("usr_1"), anyMap(), eq(true), org.mockito.ArgumentMatchers.anySet());
|
||||
}
|
||||
|
||||
private Skill skillWithStatus(Skill skill, com.iflytek.skillhub.domain.skill.SkillStatus status) {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@ import com.iflytek.skillhub.TestRedisConfig;
|
|||
import com.iflytek.skillhub.auth.device.DeviceAuthService;
|
||||
import com.iflytek.skillhub.auth.rbac.PlatformPrincipal;
|
||||
import com.iflytek.skillhub.domain.namespace.Namespace;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceMember;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceMemberRepository;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRole;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRepository;
|
||||
import com.iflytek.skillhub.domain.review.ReviewTask;
|
||||
import com.iflytek.skillhub.domain.review.ReviewTaskRepository;
|
||||
|
|
@ -64,7 +66,7 @@ class SkillVersionDeleteFlowIntegrationTest {
|
|||
@MockBean
|
||||
private ObjectStorageService objectStorageService;
|
||||
|
||||
@MockBean
|
||||
@Autowired
|
||||
private NamespaceMemberRepository namespaceMemberRepository;
|
||||
|
||||
@MockBean
|
||||
|
|
@ -77,6 +79,7 @@ class SkillVersionDeleteFlowIntegrationTest {
|
|||
Namespace namespace = namespaceRepository.save(
|
||||
new Namespace("version-delete-" + suffix, "Version Delete " + suffix, ownerId)
|
||||
);
|
||||
namespaceMemberRepository.save(new NamespaceMember(namespace.getId(), ownerId, NamespaceRole.OWNER));
|
||||
|
||||
Skill skill = new Skill(namespace.getId(), "demo-skill-" + suffix, ownerId, SkillVisibility.PUBLIC);
|
||||
skill.setCreatedBy(ownerId);
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
|||
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
|
||||
@ActiveProfiles("test")
|
||||
@Testcontainers
|
||||
@Import({PromotionRevocationService.class, PromotionRevocationHistoryJpaRepository.class,
|
||||
@Import({com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class, PromotionRevocationService.class, PromotionRevocationHistoryJpaRepository.class,
|
||||
SkillHardDeleteService.class, AuditLogService.class, PromotionDeletionPostgresTest.Config.class})
|
||||
@Transactional(propagation = Propagation.NOT_SUPPORTED)
|
||||
class PromotionDeletionPostgresTest {
|
||||
|
|
@ -83,6 +83,7 @@ class PromotionDeletionPostgresTest {
|
|||
@Autowired private NamespaceJpaRepository namespaces;
|
||||
@Autowired private UserAccountJpaRepository users;
|
||||
@Autowired private SkillJpaRepository skills;
|
||||
@Autowired private com.iflytek.skillhub.infra.jpa.NamespaceMemberJpaRepository members;
|
||||
@Autowired private SkillVersionJpaRepository versions;
|
||||
@Autowired private PromotionRequestJpaRepository promotions;
|
||||
@Autowired private PromotionRevocationService revocations;
|
||||
|
|
@ -145,6 +146,8 @@ class PromotionDeletionPostgresTest {
|
|||
users.saveAndFlush(new UserAccount(owner, owner, null, null));
|
||||
users.saveAndFlush(new UserAccount(reviewer, reviewer, null, null));
|
||||
Namespace team = namespaces.saveAndFlush(new Namespace("delete-" + suffix, "Deletion team", owner));
|
||||
members.saveAndFlush(new com.iflytek.skillhub.domain.namespace.NamespaceMember(
|
||||
team.getId(), owner, com.iflytek.skillhub.domain.namespace.NamespaceRole.OWNER));
|
||||
Namespace global = namespaces.findBySlug("global").orElseGet(() -> {
|
||||
Namespace created = new Namespace("global", "Global", reviewer);
|
||||
created.setType(NamespaceType.GLOBAL);
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ import static org.mockito.Mockito.when;
|
|||
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
|
||||
@ActiveProfiles("test")
|
||||
@Testcontainers
|
||||
@Import({SkillAvatarRecoveryPostgresTest.ReviewConfiguration.class, com.iflytek.skillhub.domain.review.ReviewService.class, com.iflytek.skillhub.domain.review.ReviewPermissionChecker.class, SkillAvatarAppService.class, SkillAvatarMachineRecoveryTask.class,
|
||||
@Import({com.iflytek.skillhub.auth.rbac.RbacService.class, com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class, SkillAvatarRecoveryPostgresTest.ReviewConfiguration.class, com.iflytek.skillhub.domain.review.ReviewService.class, com.iflytek.skillhub.domain.review.ReviewPermissionChecker.class, SkillAvatarAppService.class, SkillAvatarMachineRecoveryTask.class,
|
||||
SkillAvatarScopeReviewListener.class, SkillAvatarScopeReviewRecoveryTask.class,
|
||||
com.iflytek.skillhub.task.SkillAvatarCleanupTask.class})
|
||||
@Transactional(propagation = Propagation.NOT_SUPPORTED)
|
||||
|
|
@ -82,6 +82,7 @@ class SkillAvatarRecoveryPostgresTest {
|
|||
|
||||
@Autowired private SkillJpaRepository skills;
|
||||
@Autowired private NamespaceJpaRepository namespaces;
|
||||
@Autowired private com.iflytek.skillhub.infra.jpa.NamespaceMemberJpaRepository members;
|
||||
@Autowired private com.iflytek.skillhub.infra.jpa.SkillVersionJpaRepository versions;
|
||||
@Autowired private SkillAvatarCandidateJpaRepository candidates;
|
||||
@Autowired private SkillAvatarAppService avatars;
|
||||
|
|
@ -616,6 +617,8 @@ class SkillAvatarRecoveryPostgresTest {
|
|||
return new TransactionTemplate(transactions).execute(status -> {
|
||||
String suffix = UUID.randomUUID().toString().substring(0, 8);
|
||||
Namespace ns = namespaces.saveAndFlush(new Namespace("avatar-" + suffix, "Avatar recovery", "owner"));
|
||||
members.saveAndFlush(new com.iflytek.skillhub.domain.namespace.NamespaceMember(
|
||||
ns.getId(), "owner", com.iflytek.skillhub.domain.namespace.NamespaceRole.OWNER));
|
||||
Skill skill = skills.saveAndFlush(new Skill(ns.getId(), "skill", "owner", expanded ? SkillVisibility.PRIVATE : SkillVisibility.PUBLIC));
|
||||
if (expanded) {
|
||||
SkillAvatarCandidate old = new SkillAvatarCandidate(skill.getId(), "owner", "old/" + skill.getId(), "old-sha-" + suffix,
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ import static org.mockito.Mockito.*;
|
|||
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
|
||||
@ActiveProfiles("test")
|
||||
@Testcontainers
|
||||
@Import({com.iflytek.skillhub.domain.review.ReviewService.class, com.iflytek.skillhub.domain.review.ReviewPermissionChecker.class, SkillAvatarAppService.class, SkillAvatarUploadService.class, SkillPublishAppService.class,
|
||||
@Import({com.iflytek.skillhub.auth.rbac.RbacService.class, com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class, com.iflytek.skillhub.domain.review.ReviewService.class, com.iflytek.skillhub.domain.review.ReviewPermissionChecker.class, SkillAvatarAppService.class, SkillAvatarUploadService.class, SkillPublishAppService.class,
|
||||
SkillPublishService.class, SkillStorageDeletionCompensationService.class, JpaSkillStorageDeletionCompensationRepositoryAdapter.class, SkillAvatarCleanupTask.class,
|
||||
SkillAvatarUploadPostgresTest.Configuration.class})
|
||||
@Transactional(propagation = Propagation.NOT_SUPPORTED)
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
|||
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
|
||||
@ActiveProfiles("test")
|
||||
@Testcontainers
|
||||
@Import({SkillVisibilityService.class, SkillReviewSubmitService.class,
|
||||
@Import({com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class, SkillVisibilityService.class, SkillReviewSubmitService.class,
|
||||
JpaSkillRepositoryAdapter.class, PromotionService.class, ReviewPermissionChecker.class, SkillVisibilityPostgresTest.Configuration.class})
|
||||
@Transactional(propagation = Propagation.NOT_SUPPORTED)
|
||||
class SkillVisibilityPostgresTest {
|
||||
|
|
@ -69,6 +69,7 @@ class SkillVisibilityPostgresTest {
|
|||
@Autowired SkillJpaRepository skills;
|
||||
@Autowired SkillVersionJpaRepository versions;
|
||||
@Autowired NamespaceJpaRepository namespaces;
|
||||
@Autowired NamespaceMemberJpaRepository members;
|
||||
@Autowired UserAccountJpaRepository users;
|
||||
@Autowired SecurityAuditJpaRepository audits;
|
||||
@Autowired ReviewTaskJpaRepository reviews;
|
||||
|
|
@ -238,6 +239,8 @@ class SkillVisibilityPostgresTest {
|
|||
String owner = "scope-owner-" + suffix;
|
||||
users.saveAndFlush(new UserAccount(owner, owner, null, null));
|
||||
Namespace ns = namespaces.saveAndFlush(new Namespace("scope-" + suffix, "Scope", owner));
|
||||
members.saveAndFlush(new com.iflytek.skillhub.domain.namespace.NamespaceMember(
|
||||
ns.getId(), owner, com.iflytek.skillhub.domain.namespace.NamespaceRole.OWNER));
|
||||
Skill skill = skills.saveAndFlush(new Skill(ns.getId(), "foo", owner, SkillVisibility.PRIVATE));
|
||||
SkillVersion published = new SkillVersion(skill.getId(), "1.0.0", owner);
|
||||
published.setStatus(SkillVersionStatus.PUBLISHED);
|
||||
|
|
|
|||
|
|
@ -122,6 +122,20 @@ class StarredSkillAccessPostgresTest {
|
|||
assertThat(query.findAccessible("viewer", Map.of(), Set.of(), PageRequest.of(0, 50)).getTotalElements()).isZero();
|
||||
}
|
||||
|
||||
@Test
|
||||
void removedOwnerRetainsInternalStarsWithoutExposingThemToOtherNonMembers() {
|
||||
Skill internal = fixtures.stream()
|
||||
.filter(skill -> skill.getVisibility() == SkillVisibility.NAMESPACE_ONLY)
|
||||
.filter(skill -> skill.getLatestVersionId() != null && !skill.isHidden())
|
||||
.findFirst().orElseThrow();
|
||||
var owner = query.findAccessible("owner", Map.of(), Set.of(), PageRequest.of(0, 50));
|
||||
var other = query.findAccessible("viewer", Map.of(), Set.of(), PageRequest.of(0, 50));
|
||||
assertThat(owner.getContent()).extracting(Skill::getId).contains(internal.getId());
|
||||
assertThat(owner.getTotalElements()).isEqualTo(12);
|
||||
assertThat(other.getContent()).extracting(Skill::getId).doesNotContain(internal.getId());
|
||||
assertThat(other.getTotalElements()).isEqualTo(1);
|
||||
}
|
||||
|
||||
private void assertPolicy(String user, Map<Long, NamespaceRole> roles, Set<String> platformRoles) {
|
||||
var checker = new VisibilityChecker();
|
||||
List<Long> expected = fixtures.stream().filter(skill -> checker.canAccess(skill, user, roles, platformRoles))
|
||||
|
|
|
|||
|
|
@ -81,8 +81,7 @@ class MySkillAppServiceTest {
|
|||
.thenReturn(managementQuery);
|
||||
org.mockito.Mockito.lenient().when(managementQuery.getResultList()).thenReturn(List.of());
|
||||
ReflectionTestUtils.setField(mySkillQueryRepository, "entityManager", entityManager);
|
||||
service = new MySkillAppService(
|
||||
skillRepository,
|
||||
service = new MySkillAppService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), skillRepository,
|
||||
skillVersionRepository,
|
||||
starredSkillQueryRepository,
|
||||
skillSubscriptionRepository,
|
||||
|
|
|
|||
|
|
@ -49,8 +49,7 @@ class SecurityScanRetryAppServiceTest {
|
|||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
service = new SecurityScanRetryAppService(
|
||||
skillRepository,
|
||||
service = new SecurityScanRetryAppService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), skillRepository,
|
||||
skillVersionRepository,
|
||||
securityAuditRepository,
|
||||
securityScanService,
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class SkillAvatarAppServiceTest {
|
|||
|
||||
@BeforeEach
|
||||
void setup() {
|
||||
service = new SkillAvatarAppService(skills, namespaces, candidates, storage, imageProcessor,
|
||||
service = new SkillAvatarAppService(org.mockito.Mockito.mock(com.iflytek.skillhub.auth.rbac.RbacService.class), org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), skills, namespaces, candidates, storage, imageProcessor,
|
||||
settings, moderation, visibility, skillQueries, audit, requestIds, entityManager, transactionManager);
|
||||
service.configureUnifiedReviews(reviews, new com.iflytek.skillhub.domain.review.ReviewPermissionChecker());
|
||||
service.setEvents(events);
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ class SkillDeleteAppServiceTest {
|
|||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
service = new SkillDeleteAppService(skillRepository, namespaceRepository, skillHardDeleteService, searchIndexService);
|
||||
service = new SkillDeleteAppService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), skillRepository, namespaceRepository, skillHardDeleteService, searchIndexService);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class SkillLifecycleAppServiceTest {
|
|||
private final AuditLogService auditLogService = mock(AuditLogService.class);
|
||||
private final SkillSlugResolutionService skillSlugResolutionService = mock(SkillSlugResolutionService.class);
|
||||
private final SkillLifecycleAppService service = new SkillLifecycleAppService(
|
||||
namespaceRepository,
|
||||
mock(com.iflytek.skillhub.auth.rbac.RbacService.class), namespaceRepository,
|
||||
skillVersionRepository,
|
||||
skillGovernanceService,
|
||||
reviewService,
|
||||
|
|
@ -61,7 +61,7 @@ class SkillLifecycleAppServiceTest {
|
|||
when(namespaceRepository.findBySlug("global")).thenReturn(Optional.of(namespace));
|
||||
when(skillSlugResolutionService.resolve(7L, "demo-skill", "owner-1", SkillSlugResolutionService.Preference.CURRENT_USER))
|
||||
.thenReturn(skill);
|
||||
when(skillGovernanceService.archiveSkill(eq(11L), eq("owner-1"), anyMap(), nullable(String.class), nullable(String.class), eq("cleanup")))
|
||||
when(skillGovernanceService.archiveSkill(eq(11L), eq("owner-1"), anyMap(), nullable(String.class), nullable(String.class), eq("cleanup"), org.mockito.ArgumentMatchers.anySet()))
|
||||
.thenReturn(skill);
|
||||
|
||||
var response = service.archiveSkill(
|
||||
|
|
@ -76,7 +76,7 @@ class SkillLifecycleAppServiceTest {
|
|||
assertThat(response.skillId()).isEqualTo(11L);
|
||||
assertThat(response.action()).isEqualTo("ARCHIVE");
|
||||
assertThat(response.status()).isEqualTo("ARCHIVED");
|
||||
verify(skillGovernanceService).archiveSkill(11L, "owner-1", Map.of(7L, NamespaceRole.OWNER), "127.0.0.1", "JUnit", "cleanup");
|
||||
verify(skillGovernanceService).archiveSkill(11L, "owner-1", Map.of(7L, NamespaceRole.OWNER), "127.0.0.1", "JUnit", "cleanup", java.util.Set.of());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -121,7 +121,7 @@ class SkillLifecycleAppServiceTest {
|
|||
Map.of(7L, NamespaceRole.OWNER),
|
||||
"127.0.0.1",
|
||||
"JUnit",
|
||||
"global"
|
||||
"global", java.util.Set.of()
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -151,7 +151,7 @@ class SkillLifecycleAppServiceTest {
|
|||
anyMap(),
|
||||
nullable(String.class),
|
||||
nullable(String.class),
|
||||
eq("broken")
|
||||
eq("broken"), org.mockito.ArgumentMatchers.anySet()
|
||||
)).thenReturn(version);
|
||||
|
||||
var response = service.yankVersion(
|
||||
|
|
@ -174,7 +174,7 @@ class SkillLifecycleAppServiceTest {
|
|||
Map.of(7L, NamespaceRole.OWNER),
|
||||
"127.0.0.1",
|
||||
"JUnit",
|
||||
"broken"
|
||||
"broken", java.util.Set.of()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,8 +121,7 @@ class SkillYankLockingTest {
|
|||
AuditLogService auditLogService = mock(AuditLogService.class);
|
||||
ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
|
||||
when(skillRepository.findById(fixture.skillId())).thenReturn(java.util.Optional.empty());
|
||||
SkillGovernanceService service = new SkillGovernanceService(
|
||||
skillRepository,
|
||||
SkillGovernanceService service = new SkillGovernanceService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), skillRepository,
|
||||
skillVersionRepository,
|
||||
mock(SkillFileRepository.class),
|
||||
mock(ReviewTaskRepository.class),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.domain.label;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRole;
|
||||
import com.iflytek.skillhub.domain.skill.Skill;
|
||||
import com.iflytek.skillhub.domain.suite.SkillSuite;
|
||||
|
|
@ -11,6 +12,12 @@ import org.springframework.stereotype.Component;
|
|||
|
||||
@Component
|
||||
public class LabelPermissionChecker {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
|
||||
public LabelPermissionChecker(SkillOwnerAccessPolicy ownerAccess) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
}
|
||||
|
||||
|
||||
public boolean canManageDefinitions(Set<String> platformRoles) {
|
||||
return platformRoles.contains("SUPER_ADMIN");
|
||||
|
|
@ -24,6 +31,9 @@ public class LabelPermissionChecker {
|
|||
if (platformRoles.contains("SUPER_ADMIN")) {
|
||||
return true;
|
||||
}
|
||||
if (ownerAccess.isReadOnly(skill, userId, platformRoles)) {
|
||||
return false;
|
||||
}
|
||||
if (userId == null) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.domain.review;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.iflytek.skillhub.domain.namespace.Namespace;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRepository;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRole;
|
||||
|
|
@ -21,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
/** Reviews a request to remove a specific derived global skill, preserving its promotion history. */
|
||||
@Service
|
||||
public class PromotionRevocationService {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
private final PromotionRequestRepository promotionRepository;
|
||||
private final PromotionRevocationRequestRepository revocationRepository;
|
||||
private final PromotionRevocationHistoryRepository historyRepository;
|
||||
|
|
@ -29,13 +31,14 @@ public class PromotionRevocationService {
|
|||
private final SkillHardDeleteService hardDeleteService;
|
||||
private final Clock clock;
|
||||
|
||||
public PromotionRevocationService(PromotionRequestRepository promotionRepository,
|
||||
public PromotionRevocationService(SkillOwnerAccessPolicy ownerAccess, PromotionRequestRepository promotionRepository,
|
||||
PromotionRevocationRequestRepository revocationRepository,
|
||||
PromotionRevocationHistoryRepository historyRepository,
|
||||
SkillRepository skillRepository,
|
||||
NamespaceRepository namespaceRepository,
|
||||
SkillHardDeleteService hardDeleteService,
|
||||
Clock clock) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.promotionRepository = promotionRepository;
|
||||
this.revocationRepository = revocationRepository;
|
||||
this.historyRepository = historyRepository;
|
||||
|
|
@ -51,6 +54,9 @@ public class PromotionRevocationService {
|
|||
Set<String> platformRoles, String reason) {
|
||||
Skill source = skillRepository.findById(sourceSkillId)
|
||||
.orElseThrow(() -> new DomainNotFoundException("skill.not_found", sourceSkillId));
|
||||
if (!platformRoles.contains("SKILL_ADMIN")) {
|
||||
ownerAccess.assertCanWrite(source, actorId, platformRoles);
|
||||
}
|
||||
if (!canSubmit(source, actorId, namespaceRoles, platformRoles)) {
|
||||
throw new DomainForbiddenException("promotion.revocation.submit_no_permission");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.domain.review;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.iflytek.skillhub.domain.audit.AuditDetail;
|
||||
import com.iflytek.skillhub.domain.event.PromotionApprovedEvent;
|
||||
|
|
@ -41,6 +42,7 @@ import java.util.Set;
|
|||
*/
|
||||
@Service
|
||||
public class PromotionService {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
|
||||
private final PromotionRequestRepository promotionRequestRepository;
|
||||
private final SkillRepository skillRepository;
|
||||
|
|
@ -60,7 +62,7 @@ public class PromotionService {
|
|||
this.visibilityService = service;
|
||||
}
|
||||
|
||||
public PromotionService(PromotionRequestRepository promotionRequestRepository,
|
||||
public PromotionService(SkillOwnerAccessPolicy ownerAccess, PromotionRequestRepository promotionRequestRepository,
|
||||
SkillRepository skillRepository,
|
||||
SkillVersionRepository skillVersionRepository,
|
||||
SkillFileRepository skillFileRepository,
|
||||
|
|
@ -72,6 +74,7 @@ public class PromotionService {
|
|||
EntityManager entityManager,
|
||||
Clock clock,
|
||||
ObjectMapper objectMapper) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.promotionRequestRepository = promotionRequestRepository;
|
||||
this.skillRepository = skillRepository;
|
||||
this.skillVersionRepository = skillVersionRepository;
|
||||
|
|
@ -123,6 +126,9 @@ public class PromotionService {
|
|||
.orElseThrow(() -> new DomainNotFoundException("namespace.not_found", sourceSkill.getNamespaceId()));
|
||||
assertNamespaceActive(sourceNamespace);
|
||||
|
||||
if (legacyAuth || !platformRoles.contains("SKILL_ADMIN")) {
|
||||
ownerAccess.assertCanWrite(sourceSkill, userId, platformRoles);
|
||||
}
|
||||
boolean permitted = legacyAuth
|
||||
? permissionChecker.canSubmitPromotion(sourceSkill, userId, userNamespaceRoles)
|
||||
: permissionChecker.canSubmitPromotion(sourceSkill, userId, userNamespaceRoles, platformRoles);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.domain.review;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.iflytek.skillhub.domain.audit.AuditDetail;
|
||||
|
|
@ -44,6 +45,7 @@ import java.util.Set;
|
|||
*/
|
||||
@Service
|
||||
public class ReviewService {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
|
||||
private final ReviewTaskRepository reviewTaskRepository;
|
||||
private final SkillVersionRepository skillVersionRepository;
|
||||
|
|
@ -69,7 +71,7 @@ public class ReviewService {
|
|||
public void setAvatarParticipant(ReviewAvatarParticipant participant) { this.avatarParticipant = participant; }
|
||||
|
||||
|
||||
public ReviewService(ReviewTaskRepository reviewTaskRepository,
|
||||
public ReviewService(SkillOwnerAccessPolicy ownerAccess, ReviewTaskRepository reviewTaskRepository,
|
||||
SkillVersionRepository skillVersionRepository,
|
||||
SkillRepository skillRepository,
|
||||
NamespaceRepository namespaceRepository,
|
||||
|
|
@ -80,6 +82,7 @@ public class ReviewService {
|
|||
GovernanceNotificationService governanceNotificationService,
|
||||
EntityManager entityManager,
|
||||
Clock clock) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.reviewTaskRepository = reviewTaskRepository;
|
||||
this.skillVersionRepository = skillVersionRepository;
|
||||
this.skillRepository = skillRepository;
|
||||
|
|
@ -110,6 +113,9 @@ public class ReviewService {
|
|||
Namespace namespace = namespaceRepository.findById(skill.getNamespaceId())
|
||||
.orElseThrow(() -> new DomainNotFoundException("namespace.not_found", skill.getNamespaceId()));
|
||||
assertNamespaceActive(namespace);
|
||||
if (!platformRoles.contains("SKILL_ADMIN")) {
|
||||
ownerAccess.assertCanWrite(skill, userId, platformRoles);
|
||||
}
|
||||
|
||||
if (!permissionChecker.canSubmitForReview(skill, userId, userNamespaceRoles, platformRoles)) {
|
||||
throw new DomainForbiddenException("review.submit.no_permission");
|
||||
|
|
@ -157,6 +163,7 @@ public class ReviewService {
|
|||
Namespace namespace = namespaceRepository.findById(skill.getNamespaceId())
|
||||
.orElseThrow(() -> new DomainNotFoundException("namespace.not_found", skill.getNamespaceId()));
|
||||
assertNamespaceActive(namespace);
|
||||
ownerAccess.assertCanWrite(skill, userId, Set.of());
|
||||
|
||||
if (visibilityService != null) {
|
||||
visibilityService.lockedSkill(skill.getId());
|
||||
|
|
@ -358,6 +365,11 @@ public class ReviewService {
|
|||
*/
|
||||
@Transactional
|
||||
public SkillVersion withdrawReview(Long skillVersionId, String userId) {
|
||||
return withdrawReview(skillVersionId, userId, java.util.Set.of());
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public SkillVersion withdrawReview(Long skillVersionId, String userId, java.util.Set<String> platformRoles) {
|
||||
ReviewTask task = reviewTaskRepository.findBySkillVersionIdAndStatus(
|
||||
skillVersionId, ReviewTaskStatus.PENDING)
|
||||
.orElseThrow(() -> new DomainNotFoundException("review_task.not_found_for_version", skillVersionId));
|
||||
|
|
@ -366,6 +378,10 @@ public class ReviewService {
|
|||
throw new DomainForbiddenException("review.withdraw.not_submitter");
|
||||
}
|
||||
|
||||
Skill withdrawnSkill = skillRepository.findById(task.getSkillId())
|
||||
.orElseThrow(() -> new DomainNotFoundException("skill.not_found", task.getSkillId()));
|
||||
ownerAccess.assertCanWrite(withdrawnSkill, userId, platformRoles);
|
||||
|
||||
if (avatarParticipant != null) { avatarParticipant.lock(task); avatarParticipant.withdraw(task); }
|
||||
reviewTaskRepository.delete(task);
|
||||
|
||||
|
|
@ -395,7 +411,15 @@ public class ReviewService {
|
|||
|
||||
@Transactional
|
||||
public void withdrawMetadata(ReviewTask task, String userId) {
|
||||
withdrawMetadata(task, userId, java.util.Set.of());
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void withdrawMetadata(ReviewTask task, String userId, java.util.Set<String> platformRoles) {
|
||||
if (!task.getSubmittedBy().equals(userId)) { throw new DomainForbiddenException("review.withdraw.not_submitter"); }
|
||||
Skill skill = skillRepository.findById(task.getSkillId())
|
||||
.orElseThrow(() -> new DomainNotFoundException("skill.not_found", task.getSkillId()));
|
||||
ownerAccess.assertCanWrite(skill, userId, platformRoles);
|
||||
if (avatarParticipant != null) { avatarParticipant.lock(task); entityManager.refresh(task); }
|
||||
if (avatarParticipant == null && (task.getAvatarCandidateId() != null || task.isAvatarRemoval()
|
||||
|| task.getSubjectType() == ReviewSubjectType.SKILL_METADATA)) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
package com.iflytek.skillhub.domain.skill;
|
||||
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceMemberRepository;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRepository;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceType;
|
||||
import com.iflytek.skillhub.domain.shared.exception.DomainForbiddenException;
|
||||
import com.iflytek.skillhub.domain.shared.exception.DomainNotFoundException;
|
||||
import java.util.Set;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/** Separates a current owner's read access from permission to maintain a TEAM skill. */
|
||||
@Component
|
||||
public class SkillOwnerAccessPolicy {
|
||||
private final NamespaceRepository namespaces;
|
||||
private final NamespaceMemberRepository members;
|
||||
|
||||
public SkillOwnerAccessPolicy(NamespaceRepository namespaces, NamespaceMemberRepository members) {
|
||||
this.namespaces = namespaces;
|
||||
this.members = members;
|
||||
}
|
||||
|
||||
public boolean isReadOnly(Skill skill, String actor, Set<String> platformRoles) {
|
||||
if (actor == null || !actor.equals(skill.getOwnerId())
|
||||
|| platformRoles != null && platformRoles.contains("SUPER_ADMIN")) {
|
||||
return false;
|
||||
}
|
||||
var namespace = namespaces.findById(skill.getNamespaceId())
|
||||
.orElseThrow(() -> new DomainNotFoundException("namespace.not_found", skill.getNamespaceId()));
|
||||
return namespace.getType() == NamespaceType.TEAM
|
||||
&& members.findByNamespaceIdAndUserId(skill.getNamespaceId(), actor).isEmpty();
|
||||
}
|
||||
|
||||
public void assertCanWrite(Skill skill, String actor, Set<String> platformRoles) {
|
||||
if (isReadOnly(skill, actor, platformRoles)) {
|
||||
throw new DomainForbiddenException("error.skill.owner.readOnly");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -28,7 +28,7 @@ public class VisibilityChecker {
|
|||
}
|
||||
return switch (skill.getVisibility()) {
|
||||
case PUBLIC -> true;
|
||||
case NAMESPACE_ONLY -> roles.containsKey(skill.getNamespaceId());
|
||||
case NAMESPACE_ONLY -> isOwner(skill, currentUserId) || roles.containsKey(skill.getNamespaceId());
|
||||
case PRIVATE -> isOwner(skill, currentUserId) || isAdminOrAbove(roles.get(skill.getNamespaceId()));
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -342,6 +342,11 @@ public class SkillDownloadService {
|
|||
throw new DomainBadRequestException("error.skill.version.notDownloadable", version.getVersion());
|
||||
}
|
||||
}
|
||||
case DRAFT, REJECTED -> {
|
||||
if (!skill.getOwnerId().equals(currentUserId) || version.getYankedAt() != null) {
|
||||
throw new DomainForbiddenException("error.skill.access.denied", skill.getSlug());
|
||||
}
|
||||
}
|
||||
case UPLOADED, PENDING_REVIEW -> {
|
||||
if (!canManageSkillDraft(skill, currentUserId, userNsRoles)) {
|
||||
throw new DomainForbiddenException("error.skill.access.denied", skill.getSlug());
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.domain.skill.service;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.iflytek.skillhub.domain.audit.AuditDetail;
|
||||
import com.iflytek.skillhub.domain.audit.AuditLogService;
|
||||
|
|
@ -40,6 +41,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
|
|||
*/
|
||||
@Service
|
||||
public class SkillGovernanceService {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(SkillGovernanceService.class);
|
||||
|
||||
|
|
@ -55,7 +57,7 @@ public class SkillGovernanceService {
|
|||
private final ObjectMapper objectMapper;
|
||||
private final Clock clock;
|
||||
|
||||
public SkillGovernanceService(SkillRepository skillRepository,
|
||||
public SkillGovernanceService(SkillOwnerAccessPolicy ownerAccess, SkillRepository skillRepository,
|
||||
SkillVersionRepository skillVersionRepository,
|
||||
SkillFileRepository skillFileRepository,
|
||||
ReviewTaskRepository reviewTaskRepository,
|
||||
|
|
@ -66,6 +68,7 @@ public class SkillGovernanceService {
|
|||
SkillStorageDeletionCompensationService compensationService,
|
||||
ObjectMapper objectMapper,
|
||||
Clock clock) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.skillRepository = skillRepository;
|
||||
this.skillVersionRepository = skillVersionRepository;
|
||||
this.skillFileRepository = skillFileRepository;
|
||||
|
|
@ -99,9 +102,19 @@ public class SkillGovernanceService {
|
|||
String clientIp,
|
||||
String userAgent,
|
||||
String reason) {
|
||||
return archiveSkill(skillId, actorUserId, userNamespaceRoles, clientIp, userAgent, reason, java.util.Set.of());
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Skill archiveSkill(Long skillId,
|
||||
String actorUserId,
|
||||
Map<Long, NamespaceRole> userNamespaceRoles,
|
||||
String clientIp,
|
||||
String userAgent,
|
||||
String reason, java.util.Set<String> platformRoles) {
|
||||
Skill skill = skillRepository.findById(skillId)
|
||||
.orElseThrow(() -> new DomainNotFoundException("error.skill.notFound", skillId));
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles);
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles, platformRoles);
|
||||
return archiveSkillInternal(skill, actorUserId, clientIp, userAgent, reason);
|
||||
}
|
||||
|
||||
|
|
@ -149,9 +162,18 @@ public class SkillGovernanceService {
|
|||
Map<Long, NamespaceRole> userNamespaceRoles,
|
||||
String clientIp,
|
||||
String userAgent) {
|
||||
return unarchiveSkill(skillId, actorUserId, userNamespaceRoles, clientIp, userAgent, java.util.Set.of());
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Skill unarchiveSkill(Long skillId,
|
||||
String actorUserId,
|
||||
Map<Long, NamespaceRole> userNamespaceRoles,
|
||||
String clientIp,
|
||||
String userAgent, java.util.Set<String> platformRoles) {
|
||||
Skill skill = skillRepository.findById(skillId)
|
||||
.orElseThrow(() -> new DomainNotFoundException("error.skill.notFound", skillId));
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles);
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles, platformRoles);
|
||||
|
||||
SkillStatus previousStatus = skill.getStatus();
|
||||
skill.setStatus(SkillStatus.ACTIVE);
|
||||
|
|
@ -170,7 +192,18 @@ public class SkillGovernanceService {
|
|||
String clientIp,
|
||||
String userAgent,
|
||||
String namespaceSlug) {
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles);
|
||||
deleteVersion(skill, version, actorUserId, userNamespaceRoles, clientIp, userAgent, namespaceSlug, java.util.Set.of());
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void deleteVersion(Skill skill,
|
||||
SkillVersion version,
|
||||
String actorUserId,
|
||||
Map<Long, NamespaceRole> userNamespaceRoles,
|
||||
String clientIp,
|
||||
String userAgent,
|
||||
String namespaceSlug, java.util.Set<String> platformRoles) {
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles, platformRoles);
|
||||
if (version.getStatus() != SkillVersionStatus.DRAFT
|
||||
&& version.getStatus() != SkillVersionStatus.REJECTED
|
||||
&& version.getStatus() != SkillVersionStatus.SCAN_FAILED
|
||||
|
|
@ -290,7 +323,18 @@ public class SkillGovernanceService {
|
|||
String clientIp,
|
||||
String userAgent,
|
||||
String reason) {
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles);
|
||||
return yankVersion(skill, version, actorUserId, userNamespaceRoles, clientIp, userAgent, reason, java.util.Set.of());
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public SkillVersion yankVersion(Skill skill,
|
||||
SkillVersion version,
|
||||
String actorUserId,
|
||||
Map<Long, NamespaceRole> userNamespaceRoles,
|
||||
String clientIp,
|
||||
String userAgent,
|
||||
String reason, java.util.Set<String> platformRoles) {
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles, platformRoles);
|
||||
return yankVersionInternal(version, actorUserId, clientIp, userAgent, reason);
|
||||
}
|
||||
|
||||
|
|
@ -352,7 +396,8 @@ public class SkillGovernanceService {
|
|||
|
||||
private void assertCanManageLifecycle(Skill skill,
|
||||
String actorUserId,
|
||||
Map<Long, NamespaceRole> userNamespaceRoles) {
|
||||
Map<Long, NamespaceRole> userNamespaceRoles, java.util.Set<String> platformRoles) {
|
||||
ownerAccess.assertCanWrite(skill, actorUserId, platformRoles);
|
||||
NamespaceRole namespaceRole = userNamespaceRoles.get(skill.getNamespaceId());
|
||||
boolean canManage = skill.getOwnerId().equals(actorUserId)
|
||||
|| namespaceRole == NamespaceRole.ADMIN
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.domain.skill.service;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.iflytek.skillhub.domain.review.ReviewAvatarParticipant;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
|
|
@ -68,6 +69,7 @@ import java.util.zip.ZipOutputStream;
|
|||
*/
|
||||
@Service
|
||||
public class SkillPublishService {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
|
||||
private static final DateTimeFormatter AUTO_VERSION_FORMATTER =
|
||||
DateTimeFormatter.ofPattern("yyyyMMdd.HHmmss").withZone(ZoneId.systemDefault());
|
||||
|
|
@ -128,6 +130,7 @@ public class SkillPublishService {
|
|||
private final Clock clock;
|
||||
|
||||
public SkillPublishService(
|
||||
SkillOwnerAccessPolicy ownerAccess,
|
||||
NamespaceRepository namespaceRepository,
|
||||
NamespaceMemberRepository namespaceMemberRepository,
|
||||
SkillRepository skillRepository,
|
||||
|
|
@ -143,6 +146,7 @@ public class SkillPublishService {
|
|||
SkillStorageDeletionCompensationService compensationService,
|
||||
ApplicationEventPublisher eventPublisher,
|
||||
Clock clock) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.namespaceRepository = namespaceRepository;
|
||||
this.namespaceMemberRepository = namespaceMemberRepository;
|
||||
this.skillRepository = skillRepository;
|
||||
|
|
@ -374,9 +378,20 @@ public class SkillPublishService {
|
|||
String publisherId,
|
||||
Map<Long, NamespaceRole> userNamespaceRoles,
|
||||
boolean confirmWarnings) {
|
||||
return rereleasePublishedVersion(skillId, sourceVersion, targetVersion, publisherId, userNamespaceRoles, confirmWarnings, java.util.Set.of());
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public PublishResult rereleasePublishedVersion(
|
||||
Long skillId,
|
||||
String sourceVersion,
|
||||
String targetVersion,
|
||||
String publisherId,
|
||||
Map<Long, NamespaceRole> userNamespaceRoles,
|
||||
boolean confirmWarnings, java.util.Set<String> platformRoles) {
|
||||
Skill skill = skillRepository.findById(skillId)
|
||||
.orElseThrow(() -> new DomainBadRequestException("error.skill.notFound", skillId));
|
||||
assertCanManageLifecycle(skill, publisherId, userNamespaceRoles);
|
||||
assertCanManageLifecycle(skill, publisherId, userNamespaceRoles, platformRoles);
|
||||
|
||||
SkillVersion publishedVersion = skillVersionRepository.findBySkillIdAndVersion(skillId, sourceVersion)
|
||||
.orElseThrow(() -> new DomainBadRequestException("error.skill.version.notFound", sourceVersion));
|
||||
|
|
@ -921,16 +936,11 @@ public class SkillPublishService {
|
|||
}
|
||||
}
|
||||
|
||||
private void assertCanManageLifecycle(Skill skill,
|
||||
String actorUserId,
|
||||
Map<Long, NamespaceRole> userNamespaceRoles) {
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles, Set.of());
|
||||
}
|
||||
|
||||
private void assertCanManageLifecycle(Skill skill,
|
||||
private void assertCanManageLifecycle(Skill skill,
|
||||
String actorUserId,
|
||||
Map<Long, NamespaceRole> userNamespaceRoles,
|
||||
Set<String> platformRoles) {
|
||||
ownerAccess.assertCanWrite(skill, actorUserId, platformRoles);
|
||||
NamespaceRole namespaceRole = userNamespaceRoles.get(skill.getNamespaceId());
|
||||
boolean canManage = skill.getOwnerId().equals(actorUserId)
|
||||
|| namespaceRole == NamespaceRole.ADMIN
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.domain.skill.service;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.iflytek.skillhub.domain.namespace.Namespace;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRepository;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRole;
|
||||
|
|
@ -49,6 +50,7 @@ import java.util.stream.Collectors;
|
|||
*/
|
||||
@Service
|
||||
public class SkillQueryService {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
|
||||
private final NamespaceRepository namespaceRepository;
|
||||
private final SkillRepository skillRepository;
|
||||
|
|
@ -64,6 +66,7 @@ public class SkillQueryService {
|
|||
private final UserAccountRepository userAccountRepository;
|
||||
|
||||
public SkillQueryService(
|
||||
SkillOwnerAccessPolicy ownerAccess,
|
||||
NamespaceRepository namespaceRepository,
|
||||
SkillRepository skillRepository,
|
||||
SkillVersionRepository skillVersionRepository,
|
||||
|
|
@ -76,6 +79,7 @@ public class SkillQueryService {
|
|||
SkillSlugResolutionService skillSlugResolutionService,
|
||||
SkillLifecycleProjectionService skillLifecycleProjectionService,
|
||||
UserAccountRepository userAccountRepository) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.namespaceRepository = namespaceRepository;
|
||||
this.skillRepository = skillRepository;
|
||||
this.skillVersionRepository = skillVersionRepository;
|
||||
|
|
@ -119,7 +123,40 @@ public class SkillQueryService {
|
|||
String resolutionMode,
|
||||
Long activeAvatarId,
|
||||
SkillVisibility activeAvatarAudience
|
||||
) {}
|
||||
,
|
||||
boolean ownerReadOnly
|
||||
) {
|
||||
public SkillDetailDTO(Long id,
|
||||
String slug,
|
||||
String displayName,
|
||||
String ownerId,
|
||||
String ownerDisplayName,
|
||||
String summary,
|
||||
String visibility,
|
||||
String status,
|
||||
Long downloadCount,
|
||||
Integer starCount,
|
||||
Integer subscriptionCount,
|
||||
java.math.BigDecimal ratingAvg,
|
||||
Integer ratingCount,
|
||||
boolean hidden,
|
||||
Long namespaceId,
|
||||
java.time.Instant createdAt,
|
||||
java.time.Instant updatedAt,
|
||||
boolean canManageLifecycle,
|
||||
boolean canSubmitPromotion,
|
||||
boolean canInteract,
|
||||
boolean canReport,
|
||||
SkillLifecycleProjectionService.VersionProjection headlineVersion,
|
||||
SkillLifecycleProjectionService.VersionProjection publishedVersion,
|
||||
SkillLifecycleProjectionService.VersionProjection ownerPreviewVersion,
|
||||
String ownerPreviewReviewComment,
|
||||
String resolutionMode,
|
||||
Long activeAvatarId,
|
||||
SkillVisibility activeAvatarAudience) {
|
||||
this(id, slug, displayName, ownerId, ownerDisplayName, summary, visibility, status, downloadCount, starCount, subscriptionCount, ratingAvg, ratingCount, hidden, namespaceId, createdAt, updatedAt, canManageLifecycle, canSubmitPromotion, canInteract, canReport, headlineVersion, publishedVersion, ownerPreviewVersion, ownerPreviewReviewComment, resolutionMode, activeAvatarId, activeAvatarAudience, false);
|
||||
}
|
||||
}
|
||||
|
||||
public record SkillVersionDetailDTO(
|
||||
Long id,
|
||||
|
|
@ -196,11 +233,17 @@ public class SkillQueryService {
|
|||
String documentationContent
|
||||
) {}
|
||||
|
||||
public SkillDetailDTO getSkillDetail(
|
||||
public SkillDetailDTO getSkillDetail(String namespaceSlug, String skillSlug, String currentUserId,
|
||||
Map<Long, NamespaceRole> userNsRoles) {
|
||||
return getSkillDetailInternal(namespaceSlug, skillSlug, currentUserId, userNsRoles, Set.of());
|
||||
}
|
||||
|
||||
private SkillDetailDTO getSkillDetailInternal(
|
||||
String namespaceSlug,
|
||||
String skillSlug,
|
||||
String currentUserId,
|
||||
Map<Long, NamespaceRole> userNsRoles) {
|
||||
Map<Long, NamespaceRole> userNsRoles,
|
||||
Set<String> platformRoles) {
|
||||
Namespace namespace = findNamespace(namespaceSlug);
|
||||
Skill skill = resolveVisibleSkill(namespace.getId(), skillSlug, currentUserId);
|
||||
|
||||
|
|
@ -242,8 +285,9 @@ public class SkillQueryService {
|
|||
skill.getNamespaceId(),
|
||||
skill.getCreatedAt(),
|
||||
skill.getUpdatedAt(),
|
||||
canManageRestrictedSkill(skill, currentUserId, userNsRoles),
|
||||
canSubmitPromotion(namespace, skill, publishedVersion, currentUserId, userNsRoles),
|
||||
canManageRestrictedSkill(skill, currentUserId, userNsRoles)
|
||||
&& !ownerAccess.isReadOnly(skill, currentUserId, platformRoles),
|
||||
canSubmitPromotion(namespace, skill, publishedVersion, currentUserId, userNsRoles, platformRoles),
|
||||
skill.getStatus() == SkillStatus.ACTIVE
|
||||
&& (headlineVersion == null || "PUBLISHED".equals(headlineVersion.status())),
|
||||
currentUserId == null || !Objects.equals(skill.getOwnerId(), currentUserId),
|
||||
|
|
@ -253,7 +297,8 @@ public class SkillQueryService {
|
|||
ownerPreviewReviewComment,
|
||||
projection.resolutionMode().name(),
|
||||
skill.getActiveAvatarId(),
|
||||
skill.getActiveAvatarAudience()
|
||||
skill.getActiveAvatarAudience(),
|
||||
ownerAccess.isReadOnly(skill, currentUserId, platformRoles)
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -263,7 +308,7 @@ public class SkillQueryService {
|
|||
String currentUserId,
|
||||
Map<Long, NamespaceRole> userNsRoles,
|
||||
Set<String> platformRoles) {
|
||||
return getSkillDetail(namespaceSlug, skillSlug, currentUserId, userNsRoles);
|
||||
return getSkillDetailInternal(namespaceSlug, skillSlug, currentUserId, userNsRoles, platformRoles);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -537,6 +582,26 @@ public class SkillQueryService {
|
|||
return SkillInstallability.isInstallableVersion(version);
|
||||
}
|
||||
|
||||
public boolean isDownloadAvailable(SkillVersion version, String currentUserId) {
|
||||
if (isDownloadAvailable(version)) {
|
||||
return true;
|
||||
}
|
||||
if (currentUserId == null || version.getYankedAt() != null) {
|
||||
return false;
|
||||
}
|
||||
Skill skill = skillRepository.findById(version.getSkillId()).orElse(null);
|
||||
if (skill == null || skill.getStatus() != SkillStatus.ACTIVE
|
||||
|| !currentUserId.equals(skill.getOwnerId())) {
|
||||
return false;
|
||||
}
|
||||
return switch (version.getStatus()) {
|
||||
case DRAFT, REJECTED, UPLOADED, PENDING_REVIEW ->
|
||||
objectStorageService.exists(getBundleStorageKey(skill.getId(), version.getId()))
|
||||
|| !availableFiles(version.getId()).isEmpty();
|
||||
default -> false;
|
||||
};
|
||||
}
|
||||
|
||||
public ReviewSkillSnapshotDTO getReviewSkillSnapshot(Long skillVersionId) {
|
||||
SkillVersion activeVersion = skillVersionRepository.findById(skillVersionId)
|
||||
.orElseThrow(() -> new DomainBadRequestException("error.skill.version.notFound", skillVersionId));
|
||||
|
|
@ -924,7 +989,8 @@ public class SkillQueryService {
|
|||
Skill skill,
|
||||
SkillLifecycleProjectionService.VersionProjection publishedVersion,
|
||||
String currentUserId,
|
||||
Map<Long, NamespaceRole> userNsRoles) {
|
||||
Map<Long, NamespaceRole> userNsRoles,
|
||||
Set<String> platformRoles) {
|
||||
if (namespace.getType() == NamespaceType.GLOBAL) {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -937,7 +1003,8 @@ public class SkillQueryService {
|
|||
if (promotionRequestRepository.findBySourceSkillIdAndStatus(skill.getId(), ReviewTaskStatus.PENDING).isPresent()) {
|
||||
return false;
|
||||
}
|
||||
return canManageRestrictedSkill(skill, currentUserId, userNsRoles);
|
||||
return canManageRestrictedSkill(skill, currentUserId, userNsRoles)
|
||||
&& !ownerAccess.isReadOnly(skill, currentUserId, platformRoles);
|
||||
}
|
||||
|
||||
private boolean isOwner(Skill skill, String currentUserId) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.domain.skill.service;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.iflytek.skillhub.domain.event.SkillPublishedEvent;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceMemberRepository;
|
||||
import com.iflytek.skillhub.domain.namespace.NamespaceRole;
|
||||
|
|
@ -33,6 +34,7 @@ import java.util.Set;
|
|||
*/
|
||||
@Service
|
||||
public class SkillReviewSubmitService {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
|
||||
private final SkillRepository skillRepository;
|
||||
private final SkillVersionRepository skillVersionRepository;
|
||||
|
|
@ -46,12 +48,14 @@ public class SkillReviewSubmitService {
|
|||
|
||||
|
||||
public SkillReviewSubmitService(
|
||||
SkillOwnerAccessPolicy ownerAccess,
|
||||
SkillRepository skillRepository,
|
||||
SkillVersionRepository skillVersionRepository,
|
||||
ReviewTaskRepository reviewTaskRepository,
|
||||
NamespaceMemberRepository namespaceMemberRepository,
|
||||
ApplicationEventPublisher eventPublisher,
|
||||
Clock clock) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.skillRepository = skillRepository;
|
||||
this.skillVersionRepository = skillVersionRepository;
|
||||
this.reviewTaskRepository = reviewTaskRepository;
|
||||
|
|
@ -75,6 +79,12 @@ public class SkillReviewSubmitService {
|
|||
@Transactional
|
||||
public void submitForReview(Long skillId, Long versionId, SkillVisibility targetVisibility,
|
||||
String actorUserId, Map<Long, NamespaceRole> userNamespaceRoles) {
|
||||
submitForReview(skillId, versionId, targetVisibility, actorUserId, userNamespaceRoles, java.util.Set.of());
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void submitForReview(Long skillId, Long versionId, SkillVisibility targetVisibility,
|
||||
String actorUserId, Map<Long, NamespaceRole> userNamespaceRoles, java.util.Set<String> platformRoles) {
|
||||
Skill skill = skillRepository.findById(skillId)
|
||||
.orElseThrow(() -> new DomainBadRequestException("error.skill.notFound", skillId));
|
||||
SkillVersion version = skillVersionRepository.findById(versionId)
|
||||
|
|
@ -85,7 +95,7 @@ public class SkillReviewSubmitService {
|
|||
visibilityService.assertNoPendingVisibility(skill.getId());
|
||||
}
|
||||
// Validate ownership
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles);
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles, platformRoles);
|
||||
|
||||
// Validate version status - support both UPLOADED (new) and DRAFT (legacy)
|
||||
if (version.getStatus() != SkillVersionStatus.UPLOADED
|
||||
|
|
@ -172,13 +182,10 @@ public class SkillReviewSubmitService {
|
|||
skill.getId(), version.getId(), actorUserId));
|
||||
}
|
||||
|
||||
private void assertCanManageLifecycle(Skill skill, String actorUserId, Map<Long, NamespaceRole> userNamespaceRoles) {
|
||||
assertCanManageLifecycle(skill, actorUserId, userNamespaceRoles, Set.of());
|
||||
}
|
||||
|
||||
private void assertCanManageLifecycle(Skill skill, String actorUserId,
|
||||
private void assertCanManageLifecycle(Skill skill, String actorUserId,
|
||||
Map<Long, NamespaceRole> userNamespaceRoles,
|
||||
Set<String> platformRoles) {
|
||||
ownerAccess.assertCanWrite(skill, actorUserId, platformRoles);
|
||||
NamespaceRole namespaceRole = userNamespaceRoles.get(skill.getNamespaceId());
|
||||
boolean canManage = skill.getOwnerId().equals(actorUserId)
|
||||
|| namespaceRole == NamespaceRole.ADMIN
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.iflytek.skillhub.domain.skill.service;
|
||||
|
||||
import com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy;
|
||||
import com.iflytek.skillhub.domain.event.SkillVisibilityChangedEvent;
|
||||
import com.iflytek.skillhub.domain.security.*;
|
||||
import com.iflytek.skillhub.domain.namespace.*;
|
||||
|
|
@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
/** Changes access scope without changing the published package or version identity. */
|
||||
@Service
|
||||
public class SkillVisibilityService {
|
||||
private final SkillOwnerAccessPolicy ownerAccess;
|
||||
@jakarta.persistence.PersistenceContext
|
||||
private jakarta.persistence.EntityManager entityManager;
|
||||
private final SkillRepository skills;
|
||||
|
|
@ -26,9 +28,10 @@ public class SkillVisibilityService {
|
|||
private final SecurityScanService scanner;
|
||||
private final SecurityAuditRepository audits;
|
||||
|
||||
public SkillVisibilityService(SkillRepository skills, SkillVersionRepository versions,
|
||||
public SkillVisibilityService(SkillOwnerAccessPolicy ownerAccess, SkillRepository skills, SkillVersionRepository versions,
|
||||
ReviewTaskRepository reviews, NamespaceRepository namespaces, ApplicationEventPublisher events,
|
||||
SecurityScanService scanner, SecurityAuditRepository audits) {
|
||||
this.ownerAccess = ownerAccess;
|
||||
this.skills = skills;
|
||||
this.versions = versions;
|
||||
this.reviews = reviews;
|
||||
|
|
@ -42,6 +45,7 @@ public class SkillVisibilityService {
|
|||
public ReviewTask change(Long skillId, SkillVisibility target, String actor,
|
||||
Map<Long, NamespaceRole> roles, Set<String> platformRoles) {
|
||||
Skill skill = lockedSkill(skillId);
|
||||
ownerAccess.assertCanWrite(skill, actor, platformRoles);
|
||||
assertCanManage(skill, actor, roles, platformRoles);
|
||||
assertActive(skill);
|
||||
if (target == null || target == skill.getVisibility()) {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
|||
|
||||
class LabelPermissionCheckerTest {
|
||||
|
||||
private final LabelPermissionChecker checker = new LabelPermissionChecker();
|
||||
private final LabelPermissionChecker checker = new LabelPermissionChecker(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class));
|
||||
private final SkillSuite suite = new SkillSuite(1L, "starter", "Starter", "author");
|
||||
|
||||
@Test
|
||||
|
|
@ -45,6 +45,24 @@ class LabelPermissionCheckerTest {
|
|||
Map.of(), Set.of("SUPER_ADMIN"))).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
void realMembershipPolicyRevokesRemovedOwnerButPreservesAdminAndRejoinedOwner() {
|
||||
var namespaces = org.mockito.Mockito.mock(com.iflytek.skillhub.domain.namespace.NamespaceRepository.class);
|
||||
var members = org.mockito.Mockito.mock(com.iflytek.skillhub.domain.namespace.NamespaceMemberRepository.class);
|
||||
var namespace = new com.iflytek.skillhub.domain.namespace.Namespace("team", "Team", "admin");
|
||||
org.mockito.Mockito.when(namespaces.findById(1L)).thenReturn(java.util.Optional.of(namespace));
|
||||
var policy = new com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy(namespaces, members);
|
||||
var realChecker = new LabelPermissionChecker(policy);
|
||||
var skill = new com.iflytek.skillhub.domain.skill.Skill(1L, "demo", "author",
|
||||
com.iflytek.skillhub.domain.skill.SkillVisibility.PRIVATE);
|
||||
assertThat(realChecker.canManageSkillLabel(skill, label(LabelType.RECOMMENDED), "author", Map.of(), Set.of())).isFalse();
|
||||
assertThat(realChecker.canManageSkillLabel(skill, label(LabelType.RECOMMENDED), "admin", Map.of(1L, NamespaceRole.ADMIN), Set.of())).isTrue();
|
||||
assertThat(realChecker.canManageSkillLabel(skill, label(LabelType.PRIVILEGED), "author", Map.of(), Set.of("SUPER_ADMIN"))).isTrue();
|
||||
org.mockito.Mockito.when(members.findByNamespaceIdAndUserId(1L, "author"))
|
||||
.thenReturn(java.util.Optional.of(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.namespace.NamespaceMember.class)));
|
||||
assertThat(realChecker.canManageSkillLabel(skill, label(LabelType.RECOMMENDED), "author", Map.of(1L, NamespaceRole.MEMBER), Set.of())).isTrue();
|
||||
}
|
||||
|
||||
private LabelDefinition label(LabelType type) {
|
||||
return new LabelDefinition("verified", type, true, 0, "creator");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ class SkillLabelServiceTest {
|
|||
when(skillRepository.findById(10L)).thenReturn(Optional.of(skill));
|
||||
when(labelDefinitionRepository.findBySlugIgnoreCase("automation")).thenReturn(Optional.of(label));
|
||||
return new SkillLabelService(skillRepository, labelDefinitionRepository, skillLabelRepository,
|
||||
new LabelPermissionChecker(), 10);
|
||||
new LabelPermissionChecker(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class)), 10);
|
||||
}
|
||||
|
||||
private static Stream<Arguments> skillLabelPermissions() {
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class PromotionRevocationServiceTest {
|
|||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
service = new PromotionRevocationService(promotionRepository, revocationRepository,
|
||||
service = new PromotionRevocationService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), promotionRepository, revocationRepository,
|
||||
historyRepository, skillRepository, namespaceRepository, hardDeleteService,
|
||||
Clock.fixed(Instant.parse("2026-10-09T00:00:00Z"), ZoneOffset.UTC));
|
||||
source = new Skill(2L, "foo", "owner-1", SkillVisibility.PUBLIC);
|
||||
|
|
|
|||
|
|
@ -64,8 +64,7 @@ class PromotionServiceTest {
|
|||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
promotionService = new PromotionService(
|
||||
promotionRequestRepository, skillRepository, skillVersionRepository,
|
||||
promotionService = new PromotionService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), promotionRequestRepository, skillRepository, skillVersionRepository,
|
||||
skillFileRepository, namespaceRepository, namespaceMemberRepository, permissionChecker,
|
||||
eventPublisher, governanceNotificationService, entityManager, CLOCK, new ObjectMapper());
|
||||
lenient().when(namespaceRepository.findById(5L)).thenReturn(Optional.of(createSourceNamespace()));
|
||||
|
|
|
|||
|
|
@ -70,8 +70,7 @@ class ReviewServiceTest {
|
|||
@BeforeEach
|
||||
void setUp() {
|
||||
objectMapper = new ObjectMapper();
|
||||
reviewService = new ReviewService(
|
||||
reviewTaskRepository, skillVersionRepository, skillRepository,
|
||||
reviewService = new ReviewService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), reviewTaskRepository, skillVersionRepository, skillRepository,
|
||||
namespaceRepository, permissionChecker, eventPublisher, objectMapper, skillGovernanceService, governanceNotificationService, entityManager, CLOCK);
|
||||
}
|
||||
|
||||
|
|
@ -94,7 +93,7 @@ class ReviewServiceTest {
|
|||
}
|
||||
|
||||
private ReviewTask createPendingReviewTask() {
|
||||
ReviewTask task = new ReviewTask(SKILL_VERSION_ID, NAMESPACE_ID, USER_ID);
|
||||
ReviewTask task = new ReviewTask(SKILL_VERSION_ID, SKILL_ID, NAMESPACE_ID, "1.0.0", USER_ID);
|
||||
setField(task, "id", REVIEW_TASK_ID);
|
||||
return task;
|
||||
}
|
||||
|
|
@ -121,6 +120,73 @@ class ReviewServiceTest {
|
|||
}
|
||||
}
|
||||
|
||||
private com.iflytek.skillhub.domain.namespace.NamespaceMemberRepository useRealMembershipPolicy() {
|
||||
var members = mock(com.iflytek.skillhub.domain.namespace.NamespaceMemberRepository.class);
|
||||
reviewService = new ReviewService(new com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy(namespaceRepository, members),
|
||||
reviewTaskRepository, skillVersionRepository, skillRepository, namespaceRepository,
|
||||
new ReviewPermissionChecker(), eventPublisher, objectMapper, skillGovernanceService,
|
||||
governanceNotificationService, entityManager, CLOCK);
|
||||
return members;
|
||||
}
|
||||
|
||||
@Test
|
||||
void removedOwnerCannotWithdrawExistingPendingReview() {
|
||||
useRealMembershipPolicy();
|
||||
var skill = createSkill();
|
||||
var task = createPendingReviewTask();
|
||||
when(reviewTaskRepository.findBySkillVersionIdAndStatus(SKILL_VERSION_ID, ReviewTaskStatus.PENDING))
|
||||
.thenReturn(Optional.of(task));
|
||||
when(skillRepository.findById(SKILL_ID)).thenReturn(Optional.of(skill));
|
||||
when(namespaceRepository.findById(NAMESPACE_ID)).thenReturn(Optional.of(createTeamNamespace()));
|
||||
|
||||
var error = assertThrows(DomainForbiddenException.class,
|
||||
() -> reviewService.withdrawReview(SKILL_VERSION_ID, USER_ID));
|
||||
assertEquals("error.skill.owner.readOnly", error.messageCode());
|
||||
assertEquals(ReviewTaskStatus.PENDING, task.getStatus());
|
||||
verify(reviewTaskRepository, never()).delete(any());
|
||||
verifyNoInteractions(skillGovernanceService, eventPublisher);
|
||||
}
|
||||
|
||||
@Test
|
||||
void removedOwnerCannotSubmitEvenWhenRequestContainsOldMemberRole() {
|
||||
useRealMembershipPolicy();
|
||||
var version = createDraftSkillVersion();
|
||||
when(skillVersionRepository.findById(SKILL_VERSION_ID)).thenReturn(Optional.of(version));
|
||||
when(skillRepository.findById(SKILL_ID)).thenReturn(Optional.of(createSkill()));
|
||||
when(namespaceRepository.findById(NAMESPACE_ID)).thenReturn(Optional.of(createTeamNamespace()));
|
||||
|
||||
var error = assertThrows(DomainForbiddenException.class, () -> reviewService.submitReview(
|
||||
SKILL_VERSION_ID, USER_ID, Map.of(NAMESPACE_ID, NamespaceRole.MEMBER), Set.of()));
|
||||
assertEquals("error.skill.owner.readOnly", error.messageCode());
|
||||
assertEquals(SkillVersionStatus.DRAFT, version.getStatus());
|
||||
verify(skillVersionRepository, never()).save(any());
|
||||
verifyNoInteractions(reviewTaskRepository, eventPublisher);
|
||||
}
|
||||
|
||||
@Test
|
||||
void existingReviewCanStillBeApprovedByNamespaceAdminAfterOwnerRemoval() {
|
||||
var members = useRealMembershipPolicy();
|
||||
var task = createPendingReviewTask();
|
||||
var version = createPendingReviewSkillVersion();
|
||||
var skill = createSkill();
|
||||
when(reviewTaskRepository.findById(REVIEW_TASK_ID)).thenReturn(Optional.of(task));
|
||||
when(namespaceRepository.findById(NAMESPACE_ID)).thenReturn(Optional.of(createTeamNamespace()));
|
||||
when(reviewTaskRepository.updateStatusWithVersion(REVIEW_TASK_ID, ReviewTaskStatus.APPROVED,
|
||||
REVIEWER_ID, "ok", task.getVersion())).thenReturn(1);
|
||||
when(skillVersionRepository.findById(SKILL_VERSION_ID)).thenReturn(Optional.of(version));
|
||||
when(skillRepository.findById(SKILL_ID)).thenReturn(Optional.of(skill));
|
||||
when(skillRepository.findByNamespaceIdAndSlug(NAMESPACE_ID, "my-skill")).thenReturn(List.of(skill));
|
||||
|
||||
var result = reviewService.approveReview(REVIEW_TASK_ID, REVIEWER_ID, "ok",
|
||||
Map.of(NAMESPACE_ID, NamespaceRole.ADMIN), Set.of());
|
||||
assertEquals(ReviewTaskStatus.APPROVED, result.getStatus());
|
||||
assertEquals(SkillVersionStatus.PUBLISHED, version.getStatus());
|
||||
assertEquals(SKILL_VERSION_ID, skill.getLatestVersionId());
|
||||
verify(skillVersionRepository).save(version);
|
||||
verify(eventPublisher).publishEvent(any(SkillPublishedEvent.class));
|
||||
verifyNoInteractions(members);
|
||||
}
|
||||
|
||||
@Nested
|
||||
class SubmitReview {
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ import static org.assertj.core.api.Assertions.*;
|
|||
class ReviewVisibilityWorkflowTest {
|
||||
private final ReviewTaskRepository tasks = mock(ReviewTaskRepository.class);
|
||||
private final SkillVersionRepository versions = mock(SkillVersionRepository.class);
|
||||
private final SkillRepository skills = mock(SkillRepository.class);
|
||||
private final NamespaceRepository namespaces = mock(NamespaceRepository.class);
|
||||
private final ReviewPermissionChecker permissions = mock(ReviewPermissionChecker.class);
|
||||
private final ReviewAvatarParticipant avatars = mock(ReviewAvatarParticipant.class);
|
||||
|
|
@ -28,12 +29,13 @@ class ReviewVisibilityWorkflowTest {
|
|||
|
||||
@BeforeEach
|
||||
void setup() throws Exception {
|
||||
service = new ReviewService(tasks, versions, mock(SkillRepository.class), namespaces, permissions,
|
||||
service = new ReviewService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), tasks, versions, skills, namespaces, permissions,
|
||||
mock(ApplicationEventPublisher.class), new ObjectMapper(), mock(SkillGovernanceService.class),
|
||||
mock(GovernanceNotificationService.class), mock(EntityManager.class), Clock.systemUTC());
|
||||
service.setAvatarParticipant(avatars); service.setVisibilityService(visibility);
|
||||
Skill skill = mock(Skill.class);
|
||||
when(skill.getId()).thenReturn(1L); when(skill.getNamespaceId()).thenReturn(2L);
|
||||
when(skills.findById(1L)).thenReturn(Optional.of(skill));
|
||||
when(skill.getVisibility()).thenReturn(SkillVisibility.PRIVATE); when(skill.getLatestVersionId()).thenReturn(3L);
|
||||
task = ReviewTask.forVisibility(skill, SkillVisibility.PUBLIC, "owner");
|
||||
var id = ReviewTask.class.getDeclaredField("id"); id.setAccessible(true); id.set(task, 4L);
|
||||
|
|
@ -67,6 +69,7 @@ class ReviewVisibilityWorkflowTest {
|
|||
@Test
|
||||
void withdrawUsesExistingReviewPathWithoutChangingPublishedContent() {
|
||||
service.withdrawMetadata(task, "owner");
|
||||
verify(skills).findById(1L);
|
||||
verify(tasks).delete(task);
|
||||
verify(avatars).withdraw(task);
|
||||
verifyNoInteractions(visibility, versions);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
package com.iflytek.skillhub.domain.skill;
|
||||
|
||||
import com.iflytek.skillhub.domain.namespace.*;
|
||||
import com.iflytek.skillhub.domain.shared.exception.DomainForbiddenException;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
class SkillOwnerAccessPolicyTest {
|
||||
private final NamespaceRepository namespaces = mock(NamespaceRepository.class);
|
||||
private final NamespaceMemberRepository members = mock(NamespaceMemberRepository.class);
|
||||
private final SkillOwnerAccessPolicy policy = new SkillOwnerAccessPolicy(namespaces, members);
|
||||
private final Skill skill = new Skill(1L, "owned", "owner", SkillVisibility.PRIVATE);
|
||||
|
||||
@Test
|
||||
void removedTeamOwnerIsReadOnlyAndRejoiningRestoresMaintenance() {
|
||||
Namespace namespace = mock(Namespace.class);
|
||||
when(namespace.getType()).thenReturn(NamespaceType.TEAM);
|
||||
when(namespaces.findById(1L)).thenReturn(Optional.of(namespace));
|
||||
when(members.findByNamespaceIdAndUserId(1L, "owner")).thenReturn(Optional.empty());
|
||||
assertTrue(policy.isReadOnly(skill, "owner", Set.of()));
|
||||
assertThrows(DomainForbiddenException.class, () -> policy.assertCanWrite(skill, "owner", Set.of()));
|
||||
when(members.findByNamespaceIdAndUserId(1L, "owner")).thenReturn(Optional.of(mock(NamespaceMember.class)));
|
||||
assertFalse(policy.isReadOnly(skill, "owner", Set.of()));
|
||||
assertDoesNotThrow(() -> policy.assertCanWrite(skill, "owner", Set.of()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void globalOwnerDoesNotAcquireTeamRestriction() {
|
||||
Namespace namespace = mock(Namespace.class);
|
||||
when(namespace.getType()).thenReturn(NamespaceType.GLOBAL);
|
||||
when(namespaces.findById(1L)).thenReturn(Optional.of(namespace));
|
||||
assertFalse(policy.isReadOnly(skill, "owner", Set.of()));
|
||||
verifyNoInteractions(members);
|
||||
}
|
||||
|
||||
@Test
|
||||
void nonOwnerAndSuperAdminRetainTheirIndependentAuthorizationPaths() {
|
||||
assertFalse(policy.isReadOnly(skill, "admin", Set.of()));
|
||||
assertFalse(policy.isReadOnly(skill, "owner", Set.of("SUPER_ADMIN")));
|
||||
verifyNoInteractions(namespaces, members);
|
||||
}
|
||||
}
|
||||
|
|
@ -64,6 +64,12 @@ class VisibilityCheckerTest {
|
|||
assertFalse(canAccess);
|
||||
}
|
||||
|
||||
@Test
|
||||
void namespaceOnlySkillRemainsReadableByCurrentOwnerAfterMembershipRemoval() {
|
||||
assertTrue(checker.canAccess(namespaceOnlySkill, OWNER_ID, Map.of()));
|
||||
assertFalse(checker.canAccess(namespaceOnlySkill, OTHER_USER_ID, Map.of()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void testNamespaceOnlySkillAccessibleByMember() {
|
||||
Map<Long, NamespaceRole> roles = Map.of(NAMESPACE_ID, NamespaceRole.MEMBER);
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ import com.iflytek.skillhub.storage.ObjectStorageService;
|
|||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.EnumSource;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import org.springframework.context.ApplicationEventPublisher;
|
||||
|
|
@ -386,7 +388,7 @@ class SkillDownloadServiceTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
void testDownloadVersion_ShouldRejectDraftVersion() throws Exception {
|
||||
void testDownloadVersion_ShouldRejectOtherUsersDraftVersion() throws Exception {
|
||||
String namespaceSlug = "test-ns";
|
||||
String skillSlug = "test-skill";
|
||||
String versionStr = "1.0.0";
|
||||
|
|
@ -398,17 +400,18 @@ class SkillDownloadServiceTest {
|
|||
Skill skill = new Skill(1L, skillSlug, userId, SkillVisibility.PUBLIC);
|
||||
setId(skill, 1L);
|
||||
skill.setStatus(SkillStatus.ACTIVE);
|
||||
skill.setLatestVersionId(9L);
|
||||
SkillVersion version = new SkillVersion(1L, versionStr, userId);
|
||||
setId(version, 10L);
|
||||
version.setStatus(SkillVersionStatus.DRAFT);
|
||||
|
||||
when(namespaceRepository.findBySlug(namespaceSlug)).thenReturn(Optional.of(namespace));
|
||||
when(skillRepository.findByNamespaceIdAndSlug(1L, skillSlug)).thenReturn(List.of(skill));
|
||||
when(visibilityChecker.canAccess(skill, userId, userNsRoles)).thenReturn(true);
|
||||
when(visibilityChecker.canAccess(skill, "another-user", userNsRoles)).thenReturn(true);
|
||||
when(skillVersionRepository.findBySkillIdAndVersion(1L, versionStr)).thenReturn(Optional.of(version));
|
||||
|
||||
assertThrows(DomainBadRequestException.class, () ->
|
||||
service.downloadVersion(namespaceSlug, skillSlug, versionStr, userId, userNsRoles));
|
||||
assertThrows(DomainForbiddenException.class, () ->
|
||||
service.downloadVersion(namespaceSlug, skillSlug, versionStr, "another-user", userNsRoles));
|
||||
verify(skillRepository, never()).incrementDownloadCount(anyLong());
|
||||
verify(skillVersionStatsRepository, never()).incrementDownloadCount(anyLong(), anyLong());
|
||||
verify(eventPublisher, never()).publishEvent(any(SkillDownloadedEvent.class));
|
||||
|
|
@ -631,6 +634,57 @@ class SkillDownloadServiceTest {
|
|||
verify(eventPublisher, never()).publishEvent(any(SkillDownloadedEvent.class));
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@EnumSource(value = SkillVersionStatus.class, names = {"DRAFT", "REJECTED", "PENDING_REVIEW", "UPLOADED"})
|
||||
void removedCurrentOwnerCanDownloadInternalVersionsWithoutPublishingOrCounting(SkillVersionStatus status) throws Exception {
|
||||
service = new SkillDownloadService(namespaceRepository, skillRepository, skillVersionRepository,
|
||||
skillVersionStatsRepository, skillFileRepository, skillTagRepository, objectStorageService,
|
||||
new VisibilityChecker(), eventPublisher, skillSlugResolutionService);
|
||||
Namespace namespace = new Namespace("team", "Team", "admin");
|
||||
setId(namespace, 1L);
|
||||
Skill skill = new Skill(1L, "owned", "removed-owner", SkillVisibility.NAMESPACE_ONLY);
|
||||
setId(skill, 9L);
|
||||
skill.setStatus(SkillStatus.ACTIVE);
|
||||
SkillVersion version = new SkillVersion(9L, "1.0.0", "removed-owner");
|
||||
setId(version, 10L);
|
||||
version.setStatus(status);
|
||||
when(namespaceRepository.findBySlug("team")).thenReturn(Optional.of(namespace));
|
||||
when(skillRepository.findByNamespaceIdAndSlug(1L, "owned")).thenReturn(List.of(skill));
|
||||
when(skillVersionRepository.findBySkillIdAndVersion(9L, "1.0.0")).thenReturn(Optional.of(version));
|
||||
when(objectStorageService.exists("packages/9/10/bundle.zip")).thenReturn(true);
|
||||
when(objectStorageService.getMetadata("packages/9/10/bundle.zip"))
|
||||
.thenReturn(new ObjectMetadata(4L, "application/zip", Instant.now()));
|
||||
when(objectStorageService.getObject("packages/9/10/bundle.zip"))
|
||||
.thenReturn(new ByteArrayInputStream("safe".getBytes()));
|
||||
|
||||
var result = service.downloadVersion("team", "owned", "1.0.0", "removed-owner", Map.of());
|
||||
assertArrayEquals("safe".getBytes(), result.openContent().readAllBytes());
|
||||
assertEquals(status, version.getStatus());
|
||||
verify(skillRepository, never()).incrementDownloadCount(anyLong());
|
||||
verify(skillVersionStatsRepository, never()).incrementDownloadCount(anyLong(), anyLong());
|
||||
verifyNoInteractions(eventPublisher);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@EnumSource(value = SkillVersionStatus.class, names = {"SCANNING", "SCAN_FAILED", "YANKED"})
|
||||
void currentOwnerReadExceptionDoesNotBypassUnsafeVersionState(SkillVersionStatus status) throws Exception {
|
||||
Namespace namespace = new Namespace("team", "Team", "admin");
|
||||
setId(namespace, 1L);
|
||||
Skill skill = new Skill(1L, "owned", "owner", SkillVisibility.NAMESPACE_ONLY);
|
||||
setId(skill, 9L);
|
||||
skill.setStatus(SkillStatus.ACTIVE);
|
||||
SkillVersion version = new SkillVersion(9L, "1.0.0", "owner");
|
||||
version.setStatus(status);
|
||||
when(namespaceRepository.findBySlug("team")).thenReturn(Optional.of(namespace));
|
||||
when(skillRepository.findByNamespaceIdAndSlug(1L, "owned")).thenReturn(List.of(skill));
|
||||
when(visibilityChecker.canAccess(skill, "owner", Map.of())).thenReturn(true);
|
||||
when(skillVersionRepository.findBySkillIdAndVersion(9L, "1.0.0")).thenReturn(Optional.of(version));
|
||||
assertThrows(DomainBadRequestException.class,
|
||||
() -> service.downloadVersion("team", "owned", "1.0.0", "owner", Map.of()));
|
||||
verifyNoInteractions(objectStorageService, eventPublisher);
|
||||
verify(skillRepository, never()).incrementDownloadCount(anyLong());
|
||||
}
|
||||
|
||||
private void setId(Object entity, Long id) throws Exception {
|
||||
Field idField = entity.getClass().getDeclaredField("id");
|
||||
idField.setAccessible(true);
|
||||
|
|
|
|||
|
|
@ -74,8 +74,7 @@ class SkillGovernanceServiceTest {
|
|||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
service = new SkillGovernanceService(
|
||||
skillRepository,
|
||||
service = new SkillGovernanceService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), skillRepository,
|
||||
skillVersionRepository,
|
||||
skillFileRepository,
|
||||
reviewTaskRepository,
|
||||
|
|
@ -89,6 +88,35 @@ class SkillGovernanceServiceTest {
|
|||
);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@ValueSource(strings = {"archive", "unarchive"})
|
||||
void removedOwnerCannotChangeLifecycleAndDenialHasNoSideEffects(String action) {
|
||||
var namespaces = org.mockito.Mockito.mock(com.iflytek.skillhub.domain.namespace.NamespaceRepository.class);
|
||||
var members = org.mockito.Mockito.mock(com.iflytek.skillhub.domain.namespace.NamespaceMemberRepository.class);
|
||||
var namespace = new com.iflytek.skillhub.domain.namespace.Namespace("team", "Team", "admin");
|
||||
org.mockito.Mockito.when(namespaces.findById(1L)).thenReturn(Optional.of(namespace));
|
||||
var policy = new com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy(namespaces, members);
|
||||
service = new SkillGovernanceService(policy, skillRepository, skillVersionRepository, skillFileRepository,
|
||||
reviewTaskRepository, objectStorageService, auditLogService, eventPublisher, securityScanService,
|
||||
compensationService, new ObjectMapper(), CLOCK);
|
||||
Skill skill = new Skill(1L, "demo", "owner", com.iflytek.skillhub.domain.skill.SkillVisibility.NAMESPACE_ONLY);
|
||||
skill.setStatus(action.equals("archive") ? SkillStatus.ACTIVE : SkillStatus.ARCHIVED);
|
||||
SkillStatus originalStatus = skill.getStatus();
|
||||
given(skillRepository.findById(10L)).willReturn(Optional.of(skill));
|
||||
|
||||
var error = assertThrows(DomainForbiddenException.class, () -> {
|
||||
if (action.equals("archive")) {
|
||||
service.archiveSkill(10L, "owner", Map.of(), "127.0.0.1", "JUnit", "test");
|
||||
} else {
|
||||
service.unarchiveSkill(10L, "owner", Map.of(), "127.0.0.1", "JUnit");
|
||||
}
|
||||
});
|
||||
assertThat(error.messageCode()).isEqualTo("error.skill.owner.readOnly");
|
||||
assertThat(skill.getStatus()).isEqualTo(originalStatus);
|
||||
verify(skillRepository, never()).save(any());
|
||||
org.mockito.Mockito.verifyNoInteractions(auditLogService, eventPublisher, objectStorageService);
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void tearDown() {
|
||||
if (TransactionSynchronizationManager.isSynchronizationActive()) {
|
||||
|
|
|
|||
|
|
@ -89,8 +89,7 @@ class SkillPublishServiceTest {
|
|||
@BeforeEach
|
||||
void setUp() {
|
||||
objectMapper = new ObjectMapper();
|
||||
service = new SkillPublishService(
|
||||
namespaceRepository,
|
||||
service = new SkillPublishService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), namespaceRepository,
|
||||
namespaceMemberRepository,
|
||||
skillRepository,
|
||||
skillVersionRepository,
|
||||
|
|
|
|||
|
|
@ -69,8 +69,7 @@ class SkillQueryServiceTest {
|
|||
visibilityChecker = new VisibilityChecker();
|
||||
skillSlugResolutionService = new SkillSlugResolutionService(skillRepository);
|
||||
skillLifecycleProjectionService = new SkillLifecycleProjectionService(skillVersionRepository);
|
||||
service = new SkillQueryService(
|
||||
namespaceRepository,
|
||||
service = new SkillQueryService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), namespaceRepository,
|
||||
skillRepository,
|
||||
skillVersionRepository,
|
||||
skillFileRepository,
|
||||
|
|
@ -85,6 +84,39 @@ class SkillQueryServiceTest {
|
|||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
void removedOwnerSeesReadOnlyDetailAndRejoiningRestoresManagement() throws Exception {
|
||||
var members = mock(com.iflytek.skillhub.domain.namespace.NamespaceMemberRepository.class);
|
||||
service = new SkillQueryService(new SkillOwnerAccessPolicy(namespaceRepository, members), namespaceRepository,
|
||||
skillRepository, skillVersionRepository, skillFileRepository, skillTagRepository,
|
||||
objectStorageService, visibilityChecker, promotionRequestRepository, reviewTaskRepository,
|
||||
skillSlugResolutionService, skillLifecycleProjectionService, userAccountRepository);
|
||||
Namespace namespace = new Namespace("team", "Team", "admin");
|
||||
setId(namespace, 1L);
|
||||
Skill skill = new Skill(1L, "owned", "owner", SkillVisibility.NAMESPACE_ONLY);
|
||||
setId(skill, 9L);
|
||||
skill.setLatestVersionId(10L);
|
||||
SkillVersion version = new SkillVersion(9L, "1.0.0", "owner");
|
||||
setId(version, 10L);
|
||||
version.setStatus(SkillVersionStatus.PUBLISHED);
|
||||
when(namespaceRepository.findBySlug("team")).thenReturn(Optional.of(namespace));
|
||||
when(namespaceRepository.findById(1L)).thenReturn(Optional.of(namespace));
|
||||
when(skillRepository.findByNamespaceIdAndSlug(1L, "owned")).thenReturn(List.of(skill));
|
||||
when(skillVersionRepository.findById(10L)).thenReturn(Optional.of(version));
|
||||
|
||||
var removed = service.getSkillDetail("team", "owned", "owner", Map.of());
|
||||
assertTrue(removed.ownerReadOnly());
|
||||
assertFalse(removed.canManageLifecycle());
|
||||
assertFalse(removed.canSubmitPromotion());
|
||||
assertEquals("1.0.0", removed.headlineVersion().version());
|
||||
when(members.findByNamespaceIdAndUserId(1L, "owner"))
|
||||
.thenReturn(Optional.of(mock(com.iflytek.skillhub.domain.namespace.NamespaceMember.class)));
|
||||
var rejoined = service.getSkillDetail("team", "owned", "owner", Map.of(1L, NamespaceRole.MEMBER));
|
||||
assertFalse(rejoined.ownerReadOnly());
|
||||
assertTrue(rejoined.canManageLifecycle());
|
||||
assertTrue(rejoined.canSubmitPromotion());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testGetSkillDetail_Success() throws Exception {
|
||||
// Arrange
|
||||
|
|
|
|||
|
|
@ -47,8 +47,7 @@ class SkillReviewSubmitServiceTest {
|
|||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
service = new SkillReviewSubmitService(
|
||||
skillRepository,
|
||||
service = new SkillReviewSubmitService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), skillRepository,
|
||||
skillVersionRepository,
|
||||
reviewTaskRepository,
|
||||
null, // namespaceMemberRepository not used in these tests
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class SkillVisibilityServiceTest {
|
|||
private final ApplicationEventPublisher events = mock(ApplicationEventPublisher.class);
|
||||
private final SecurityScanService scanner = mock(SecurityScanService.class);
|
||||
private final SecurityAuditRepository audits = mock(SecurityAuditRepository.class);
|
||||
private final SkillVisibilityService service = new SkillVisibilityService(skills, versions, reviews, namespaces, events, scanner, audits);
|
||||
private final SkillVisibilityService service = new SkillVisibilityService(org.mockito.Mockito.mock(com.iflytek.skillhub.domain.skill.SkillOwnerAccessPolicy.class), skills, versions, reviews, namespaces, events, scanner, audits);
|
||||
private Skill skill;
|
||||
|
||||
@BeforeEach
|
||||
|
|
|
|||
2
web/src/api/generated/schema.d.ts
vendored
2
web/src/api/generated/schema.d.ts
vendored
|
|
@ -7742,6 +7742,7 @@ export interface components {
|
|||
promotionRole?: string;
|
||||
relatedNamespace?: string;
|
||||
relatedSlug?: string;
|
||||
ownerReadOnly?: boolean;
|
||||
};
|
||||
SearchResponse: {
|
||||
items?: components["schemas"]["SkillSummaryResponse"][];
|
||||
|
|
@ -8083,6 +8084,7 @@ export interface components {
|
|||
entryForSuites?: components["schemas"]["SkillSuiteReferenceResponse"][];
|
||||
memberOfSuites?: components["schemas"]["PageResponseSkillSuiteReferenceResponse"];
|
||||
avatarUrl?: string;
|
||||
ownerReadOnly?: boolean;
|
||||
};
|
||||
ApiResponseReviewSkillDetailResponse: {
|
||||
/** Format: int32 */
|
||||
|
|
|
|||
|
|
@ -356,6 +356,7 @@ export type SkillDetail = Omit<
|
|||
GeneratedSkillDetail,
|
||||
| 'ownerId'
|
||||
| 'ownerDisplayName'
|
||||
| 'ownerReadOnly'
|
||||
| 'summary'
|
||||
| 'subscriptionCount'
|
||||
| 'ratingAvg'
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import { QueryClient, QueryClientProvider, QueryCache, MutationCache } from '@ta
|
|||
import { RouterProvider } from '@tanstack/react-router'
|
||||
import { Toaster } from '@/shared/components/toaster'
|
||||
import { handleApiError } from '@/shared/lib/api-error'
|
||||
import { refreshSkillPermissionsAfterForbidden } from '@/features/skill/refresh-skill-permissions'
|
||||
import { router } from './router'
|
||||
|
||||
/**
|
||||
|
|
@ -33,7 +34,8 @@ const queryClient = new QueryClient({
|
|||
},
|
||||
}),
|
||||
mutationCache: new MutationCache({
|
||||
onError: (error, _variables, _context, mutation) => {
|
||||
onError: async (error, _variables, _context, mutation) => {
|
||||
await refreshSkillPermissionsAfterForbidden(queryClient, error)
|
||||
if (mutation.meta?.skipGlobalErrorHandler) {
|
||||
return
|
||||
}
|
||||
|
|
|
|||
49
web/src/features/skill/refresh-skill-permissions.test.ts
Normal file
49
web/src/features/skill/refresh-skill-permissions.test.ts
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
import { MutationCache, QueryClient } from '@tanstack/react-query'
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import { ApiError } from '@/shared/lib/api-error'
|
||||
import { refreshSkillPermissionsAfterForbidden } from './refresh-skill-permissions'
|
||||
|
||||
describe('permission refresh after a rejected skill write', () => {
|
||||
it('invalidates only skill caches, keeps the write rejected and never reports success', async () => {
|
||||
const client: QueryClient = new QueryClient({ mutationCache: new MutationCache({
|
||||
onError: error => refreshSkillPermissionsAfterForbidden(client, error),
|
||||
}) })
|
||||
client.setQueryData(['skills', 'team', 'mine'], { canManageLifecycle: true })
|
||||
client.setQueryData(['skills', 'my'], { items: [] })
|
||||
client.setQueryData(['skill-avatar', 'team', 'mine'], { candidateStatus: 'PENDING' })
|
||||
client.setQueryData(['auth', 'me'], { userId: 'owner' })
|
||||
const write = vi.fn().mockRejectedValue(new ApiError('不允许修改', 403))
|
||||
const success = vi.fn()
|
||||
const mutation = client.getMutationCache().build(client, { mutationFn: write, onSuccess: success, retry: false })
|
||||
await expect(mutation.execute(undefined)).rejects.toMatchObject({ status: 403 })
|
||||
expect(write).toHaveBeenCalledTimes(1)
|
||||
expect(success).not.toHaveBeenCalled()
|
||||
expect(client.getQueryState(['skills', 'team', 'mine'])?.isInvalidated).toBe(true)
|
||||
expect(client.getQueryState(['skills', 'my'])?.isInvalidated).toBe(true)
|
||||
expect(client.getQueryState(['skill-avatar', 'team', 'mine'])?.isInvalidated).toBe(true)
|
||||
expect(client.getQueryState(['auth', 'me'])?.isInvalidated).toBe(false)
|
||||
client.clear()
|
||||
})
|
||||
|
||||
it('refetches an active detail observer with the server read-only permissions', async () => {
|
||||
const { QueryObserver } = await import('@tanstack/react-query')
|
||||
const client = new QueryClient({ defaultOptions: { queries: { retry: false } } })
|
||||
const loader = vi.fn().mockResolvedValueOnce({ ownerReadOnly: false }).mockResolvedValue({ ownerReadOnly: true })
|
||||
const observer = new QueryObserver(client, { queryKey: ['skills', 'team', 'mine'], queryFn: loader })
|
||||
const unsubscribe = observer.subscribe(() => {})
|
||||
await observer.refetch()
|
||||
await refreshSkillPermissionsAfterForbidden(client, new ApiError('Forbidden', 403))
|
||||
expect(observer.getCurrentResult().data).toEqual({ ownerReadOnly: true })
|
||||
expect(loader).toHaveBeenCalledTimes(2)
|
||||
unsubscribe()
|
||||
client.clear()
|
||||
})
|
||||
|
||||
it.each([new ApiError('Network error', 0), new ApiError('Conflict', 409), new Error('error')])('does not invalidate on other failures', async error => {
|
||||
const client = new QueryClient()
|
||||
client.setQueryData(['skills', 'my'], { items: [] })
|
||||
await refreshSkillPermissionsAfterForbidden(client, error)
|
||||
expect(client.getQueryState(['skills', 'my'])?.isInvalidated).toBe(false)
|
||||
client.clear()
|
||||
})
|
||||
})
|
||||
11
web/src/features/skill/refresh-skill-permissions.ts
Normal file
11
web/src/features/skill/refresh-skill-permissions.ts
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
import type { QueryClient } from '@tanstack/react-query'
|
||||
import { ApiError } from '@/shared/lib/api-error'
|
||||
|
||||
/** Re-read server permissions after a rejected write; never retry the write itself. */
|
||||
export async function refreshSkillPermissionsAfterForbidden(queryClient: QueryClient, error: unknown) {
|
||||
if (!(error instanceof ApiError) || error.status !== 403) return
|
||||
await Promise.all([
|
||||
queryClient.invalidateQueries({ queryKey: ['skills'] }),
|
||||
queryClient.invalidateQueries({ queryKey: ['skill-avatar'] }),
|
||||
])
|
||||
}
|
||||
|
|
@ -518,6 +518,7 @@
|
|||
"securityDesc": "Change password and account security options"
|
||||
},
|
||||
"mySkills": {
|
||||
"ownerReadOnly": "You are no longer a member of this space. You can view and download your skills, but cannot modify them.",
|
||||
"updateGlobalVersion": "Update global version",
|
||||
"viewGlobalCopy": "View global copy",
|
||||
"viewTeamSource": "View team source",
|
||||
|
|
|
|||
|
|
@ -518,6 +518,7 @@
|
|||
"securityDesc": "Изменение пароля и параметров безопасности"
|
||||
},
|
||||
"mySkills": {
|
||||
"ownerReadOnly": "Вы больше не участник этого пространства. Вы можете просматривать и скачивать свои навыки, но не изменять их.",
|
||||
"updateGlobalVersion": "Обновить глобальную версию",
|
||||
"viewGlobalCopy": "Открыть глобальную копию",
|
||||
"viewTeamSource": "Открыть командный источник",
|
||||
|
|
|
|||
|
|
@ -518,6 +518,7 @@
|
|||
"securityDesc": "修改密码和账户安全选项"
|
||||
},
|
||||
"mySkills": {
|
||||
"ownerReadOnly": "你已不在该空间,只能查看和下载自己的技能,不能修改。",
|
||||
"updateGlobalVersion": "更新全局版本",
|
||||
"viewGlobalCopy": "查看全局副本",
|
||||
"viewTeamSource": "查看团队来源",
|
||||
|
|
|
|||
|
|
@ -158,6 +158,24 @@ describe('MySkillsPage', () => {
|
|||
})
|
||||
})
|
||||
|
||||
it.each(['ACTIVE', 'ARCHIVED'])('keeps a removed owner’s %s skill readable without write actions', (status) => {
|
||||
useMySkillsMock.mockReturnValue({ data: { items: [{
|
||||
id: 1, displayName: 'Owned skill', namespace: 'team-ai', slug: 'owned',
|
||||
status, visibility: 'PRIVATE', downloadCount: 0, canSubmitPromotion: false,
|
||||
managementState: { ownerReadOnly: true },
|
||||
publishedVersion: { id: 1, version: '1.0.0', status: 'PUBLISHED' },
|
||||
ownerPreviewVersion: { id: 2, version: '1.1.0', status: 'PENDING_REVIEW' },
|
||||
}], total: 1, page: 0, size: 10 }, isLoading: false })
|
||||
const markup = renderToStaticMarkup(createElement(MySkillsPage))
|
||||
expect(markup).toContain('Owned skill')
|
||||
expect(markup).toContain('mySkills.ownerReadOnly')
|
||||
if (status === 'ACTIVE') expect(markup).toContain('data-submitted-avatar')
|
||||
expect(markup).not.toContain('visibility-control')
|
||||
for (const label of ['update', 'withdrawReview', 'archive', 'unarchive', 'promoteToGlobal']) {
|
||||
expect(buttonRecords.some(button => button.label === `mySkills.${label}`)).toBe(false)
|
||||
}
|
||||
})
|
||||
|
||||
it('renders a localized display name independently of the package slug', () => {
|
||||
useMySkillsMock.mockReturnValue({
|
||||
data: {
|
||||
|
|
|
|||
|
|
@ -371,6 +371,7 @@ export function MySkillsPage() {
|
|||
<div className="grid grid-cols-1 gap-4">
|
||||
{skills.map((skill, idx) => (
|
||||
(() => {
|
||||
const ownerReadOnly = skill.managementState?.ownerReadOnly === true
|
||||
const relatedNamespace = skill.managementState?.relatedNamespace
|
||||
const relatedSlug = skill.managementState?.relatedSlug
|
||||
const headlineVersion = getHeadlineVersion(skill)
|
||||
|
|
@ -399,6 +400,7 @@ export function MySkillsPage() {
|
|||
{displayName}
|
||||
</h3>
|
||||
</div>
|
||||
{ownerReadOnly && <p role="status" className="mb-3 text-sm text-muted-foreground">{t('mySkills.ownerReadOnly')}</p>}
|
||||
{skill.managementState?.promotionRole && (
|
||||
<div className="mb-3 flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
|
||||
<span>{t(`mySkills.promotionRoles.${skill.managementState.promotionRole}`)}</span>
|
||||
|
|
@ -456,7 +458,7 @@ export function MySkillsPage() {
|
|||
>
|
||||
{t('mySkills.restoreHidden')}
|
||||
</Button>
|
||||
) : filter === 'HIDDEN' ? null : skill.status !== 'ARCHIVED' && (
|
||||
) : filter === 'HIDDEN' || ownerReadOnly ? null : skill.status !== 'ARCHIVED' && (
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
|
|
@ -468,11 +470,11 @@ export function MySkillsPage() {
|
|||
{t('mySkills.update')}
|
||||
</Button>
|
||||
)}
|
||||
{filter !== 'HIDDEN' && skill.status === 'ACTIVE' && publishedVersion && (
|
||||
{!ownerReadOnly && filter !== 'HIDDEN' && skill.status === 'ACTIVE' && publishedVersion && (
|
||||
<SkillVisibilityDialog namespace={skill.namespace} slug={skill.slug}
|
||||
visibility={skill.visibility ?? 'PUBLIC'} disabled={hasPendingPreview} />
|
||||
)}
|
||||
{filter === 'HIDDEN' ? null : hasPendingPreview && ownerPreviewVersion ? (
|
||||
{filter === 'HIDDEN' || ownerReadOnly ? null : hasPendingPreview && ownerPreviewVersion ? (
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ vi.mock('@/features/skill/skill-avatar-editor', () => ({
|
|||
}))
|
||||
vi.mock('@/shared/lib/navigate-after-overlays', () => ({ navigateAfterOverlays: (callback: () => void) => callback() }))
|
||||
vi.mock('@/shared/lib/toast', () => ({ toast: { success: vi.fn(), error: vi.fn() } }))
|
||||
vi.mock('@/shared/hooks/use-skill-queries', async () => ({ ...await vi.importActual<typeof import('@/shared/hooks/use-skill-queries')>('@/shared/hooks/use-skill-queries'), useSkillDetail: () => ({ data: undefined }) }))
|
||||
import { PublishPage } from './publish'
|
||||
|
||||
describe('avatar-only removal refreshes inactive display caches', () => {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/** @vitest-environment jsdom */
|
||||
import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
const mocks = vi.hoisted(() => ({ publish: vi.fn(), navigate: vi.fn(), submit: vi.fn(), remove: vi.fn(), refresh: vi.fn(), search: { namespace: 'team', visibility: 'PUBLIC', updateSkill: 'foo', resubmitSkill: '' } }))
|
||||
const mocks = vi.hoisted(() => ({ publish: vi.fn(), navigate: vi.fn(), submit: vi.fn(), remove: vi.fn(), refresh: vi.fn(), ownerReadOnly: false, search: { namespace: 'team', visibility: 'PUBLIC', updateSkill: 'foo', resubmitSkill: '' } }))
|
||||
vi.mock('@tanstack/react-query', () => ({ useQueryClient: () => ({ invalidateQueries: mocks.refresh }), useQuery: ({ queryKey, enabled }: { queryKey: unknown[]; enabled?: boolean }) => queryKey[0] === 'skill-package-preview'
|
||||
? { data: enabled ? { name: 'foo', displayName: 'Foo', version: '1.1' } : undefined, isSuccess: !!enabled, isPending: false, isError: false }
|
||||
: { data: { avatarUrl: '/owner-active' }, isLoading: false, isError: false } }))
|
||||
|
|
@ -9,7 +9,7 @@ vi.mock('@tanstack/react-router', () => ({ useNavigate: () => mocks.navigate, us
|
|||
vi.mock('react-i18next', async () => ({ ...await vi.importActual<typeof import('react-i18next')>('react-i18next'), useTranslation: () => ({ t: (key: string) => key }) }))
|
||||
vi.mock('@/shared/hooks/use-skill-queries', () => ({
|
||||
usePublishSkill: () => ({ mutateAsync: mocks.publish, isPending: false }),
|
||||
useSkillDetail: () => ({ data: { displayName: 'Foo', avatarUrl: '/active' }, isLoading: false, isError: false }),
|
||||
useSkillDetail: () => ({ data: { displayName: 'Foo', avatarUrl: '/active', ownerReadOnly: mocks.ownerReadOnly }, isLoading: false, isError: false }),
|
||||
}))
|
||||
vi.mock('@/shared/hooks/use-namespace-queries', () => ({ useMyNamespaces: () => ({ data: [{ slug: 'team', displayName: 'Team' }], isLoading: false }) }))
|
||||
vi.mock('@/features/publish/upload-zone', () => ({ UploadZone: ({ onFileSelect }: { onFileSelect: (file: File) => void }) => <button onClick={() => onFileSelect(new File(['zip'], 'skill.zip'))}>choose package</button> }))
|
||||
|
|
@ -26,11 +26,38 @@ vi.mock('@/shared/lib/toast', () => ({ toast: { success: vi.fn(), error: vi.fn()
|
|||
vi.mock('@/features/skill/skill-avatar-manager', () => ({ SkillAvatarManager: () => null }))
|
||||
vi.mock('@/api/client', async () => ({ ...await vi.importActual<typeof import('@/api/client')>('@/api/client'), skillAvatarApi: { submit: mocks.submit, delete: mocks.remove } }))
|
||||
import { PublishPage } from './publish'
|
||||
import { ApiError } from '@/api/client'
|
||||
import { toast } from '@/shared/lib/toast'
|
||||
|
||||
describe('Publish avatar submission', () => {
|
||||
beforeEach(() => { mocks.publish.mockReset(); mocks.navigate.mockReset(); mocks.search.updateSkill = 'foo'; mocks.search.resubmitSkill = ''; mocks.submit.mockReset(); mocks.remove.mockReset(); mocks.refresh.mockReset(); mocks.refresh.mockResolvedValue(undefined) })
|
||||
beforeEach(() => { vi.mocked(toast.success).mockClear(); vi.mocked(toast.error).mockClear(); mocks.ownerReadOnly = false; mocks.publish.mockReset(); mocks.navigate.mockReset(); mocks.search.updateSkill = 'foo'; mocks.search.resubmitSkill = ''; mocks.submit.mockReset(); mocks.remove.mockReset(); mocks.refresh.mockReset(); mocks.refresh.mockResolvedValue(undefined) })
|
||||
afterEach(cleanup)
|
||||
|
||||
it('blocks both package and avatar-only updates when the server says the owner is read-only', () => {
|
||||
mocks.ownerReadOnly = true
|
||||
render(<PublishPage />)
|
||||
expect(screen.getByText('mySkills.ownerReadOnly')).toBeTruthy()
|
||||
fireEvent.click(screen.getByText('image uploaded'))
|
||||
expect(screen.getByRole('button', { name: 'publish.saveAvatar' }).hasAttribute('disabled')).toBe(true)
|
||||
fireEvent.click(screen.getByText('choose package'))
|
||||
expect(screen.getByRole('button', { name: 'publish.confirm' }).hasAttribute('disabled')).toBe(true)
|
||||
expect(mocks.submit).not.toHaveBeenCalled()
|
||||
expect(mocks.publish).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('refreshes permissions after an avatar API rejects a stale page, without a success notification', async () => {
|
||||
mocks.submit.mockRejectedValue(new ApiError('Forbidden', 403))
|
||||
render(<PublishPage />)
|
||||
fireEvent.click(screen.getByText('image uploaded'))
|
||||
fireEvent.click(screen.getByRole('button', { name: 'publish.saveAvatar' }))
|
||||
await waitFor(() => expect(toast.error).toHaveBeenCalled())
|
||||
expect(mocks.refresh).toHaveBeenCalledWith({ queryKey: ['skills'] })
|
||||
expect(mocks.refresh).toHaveBeenCalledWith({ queryKey: ['skill-avatar'] })
|
||||
expect(mocks.navigate).not.toHaveBeenCalled()
|
||||
expect(toast.success).not.toHaveBeenCalled()
|
||||
expect(mocks.submit).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('blocks publishing a selected image until staged upload completes', async () => {
|
||||
mocks.publish.mockResolvedValue({ namespace: 'team', slug: 'foo', version: '1.1', status: 'PENDING_REVIEW' })
|
||||
render(<PublishPage />)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ const preview = vi.hoisted(() => vi.fn())
|
|||
const publish = vi.hoisted(() => vi.fn())
|
||||
vi.mock('@tanstack/react-router', () => ({ useNavigate: () => vi.fn(), useSearch: () => ({ namespace: 'team-ai' }) }))
|
||||
vi.mock('react-i18next', async () => ({ ...await vi.importActual<typeof import('react-i18next')>('react-i18next'), useTranslation: () => ({ t: (key: string) => key }) }))
|
||||
vi.mock('@/shared/hooks/use-skill-queries', () => ({ previewSkillPackage: preview, usePublishSkill: () => ({ mutateAsync: publish, isPending: false }) }))
|
||||
vi.mock('@/shared/hooks/use-skill-queries', () => ({ useSkillDetail: () => ({ data: undefined }), previewSkillPackage: preview, usePublishSkill: () => ({ mutateAsync: publish, isPending: false }) }))
|
||||
vi.mock('@/shared/hooks/use-namespace-queries', () => ({ useMyNamespaces: () => ({ data: [{ id: 1, slug: 'team-ai', displayName: 'Team' }], isLoading: false }) }))
|
||||
vi.mock('@/features/publish/upload-zone', () => ({ UploadZone: ({ onFileSelect }: { onFileSelect: (file: File) => void }) => <input aria-label="package" type="file" onChange={e => { if (e.target.files?.[0]) onFileSelect(e.target.files[0]) }} /> }))
|
||||
vi.mock('@/features/skill/skill-avatar-editor', () => ({ KEEP_AVATAR: { action: 'KEEP', ready: true }, SkillAvatarEditor: () => null }))
|
||||
|
|
|
|||
52
web/src/pages/dashboard/publish-owner-permissions.test.tsx
Normal file
52
web/src/pages/dashboard/publish-owner-permissions.test.tsx
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
/** @vitest-environment jsdom */
|
||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||
import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
const api = vi.hoisted(() => ({ detail: vi.fn(), publish: vi.fn(), navigate: vi.fn(), search: {} as { namespace?: string; updateSkill?: string; resubmitSkill?: string; resubmitVersion?: string } }))
|
||||
vi.mock('@/api/client', async () => ({
|
||||
...await vi.importActual<typeof import('@/api/client')>('@/api/client'),
|
||||
fetchJson: api.detail,
|
||||
skillAvatarApi: { status: vi.fn().mockResolvedValue({ avatarUrl: '/active' }) },
|
||||
}))
|
||||
vi.mock('@/shared/hooks/use-skill-queries', async () => ({
|
||||
...await vi.importActual<typeof import('@/shared/hooks/use-skill-queries')>('@/shared/hooks/use-skill-queries'),
|
||||
previewSkillPackage: vi.fn().mockResolvedValue({ name: 'foo', displayName: 'Foo', version: '1.1' }),
|
||||
usePublishSkill: () => ({ mutateAsync: api.publish, isPending: false }),
|
||||
}))
|
||||
vi.mock('@tanstack/react-router', () => ({ useNavigate: () => api.navigate, useSearch: () => api.search }))
|
||||
vi.mock('react-i18next', async () => ({ ...await vi.importActual<typeof import('react-i18next')>('react-i18next'), useTranslation: () => ({ t: (key: string) => key }) }))
|
||||
vi.mock('@/shared/hooks/use-namespace-queries', () => ({ useMyNamespaces: () => ({ data: [{ slug: 'team', displayName: 'Team' }], isLoading: false }) }))
|
||||
vi.mock('@/features/publish/upload-zone', () => ({ UploadZone: ({ onFileSelect }: { onFileSelect: (file: File) => void }) => <button onClick={() => onFileSelect(new File(['zip'], 'skill.zip'))}>choose package</button> }))
|
||||
vi.mock('@/features/skill/skill-avatar-manager', () => ({ SkillAvatarManager: () => null }))
|
||||
vi.mock('@/features/skill/skill-avatar-editor', () => ({ KEEP_AVATAR: { action: 'KEEP', ready: true }, SkillAvatarEditor: () => null }))
|
||||
vi.mock('@/shared/lib/toast', () => ({ toast: { success: vi.fn(), error: vi.fn() } }))
|
||||
import { PublishPage } from './publish'
|
||||
import { ApiError } from '@/api/client'
|
||||
import { toast } from '@/shared/lib/toast'
|
||||
|
||||
afterEach(() => { cleanup(); vi.clearAllMocks() })
|
||||
|
||||
describe.each(['update', 'resubmit'])('%s package rejection refreshes current permissions', mode => {
|
||||
it.each([true, false])('uses the server ownerReadOnly=%s response after a rejected package', async ownerReadOnly => {
|
||||
api.search = mode === 'update' ? { namespace: 'team', updateSkill: 'foo' } : { namespace: 'team', resubmitSkill: 'foo', resubmitVersion: '1.0' }
|
||||
const client = new QueryClient({ defaultOptions: { queries: { retry: false, staleTime: Infinity } } })
|
||||
api.detail.mockResolvedValueOnce({ ownerReadOnly: false }).mockResolvedValue({ ownerReadOnly })
|
||||
api.publish.mockRejectedValue(new ApiError('Localized package rejection', 400))
|
||||
render(<QueryClientProvider client={client}><PublishPage /></QueryClientProvider>)
|
||||
await waitFor(() => expect(api.detail).toHaveBeenCalledTimes(1))
|
||||
fireEvent.click(screen.getByText('choose package'))
|
||||
const submit = screen.getByRole('button', { name: 'publish.confirm' })
|
||||
await waitFor(() => expect(submit.hasAttribute('disabled')).toBe(false))
|
||||
fireEvent.click(submit)
|
||||
await waitFor(() => expect(toast.error).toHaveBeenCalled())
|
||||
expect(api.detail).toHaveBeenCalledTimes(2)
|
||||
expect(api.publish).toHaveBeenCalledTimes(1)
|
||||
expect(submit.hasAttribute('disabled')).toBe(ownerReadOnly)
|
||||
expect(Boolean(screen.queryByText('mySkills.ownerReadOnly'))).toBe(ownerReadOnly)
|
||||
expect(toast.success).not.toHaveBeenCalled()
|
||||
expect(api.navigate).not.toHaveBeenCalled()
|
||||
cleanup()
|
||||
client.clear()
|
||||
})
|
||||
})
|
||||
|
|
@ -26,12 +26,14 @@ import { Label } from '@/shared/ui/label'
|
|||
import { Card } from '@/shared/ui/card'
|
||||
import { SkillAvatarEditor, KEEP_AVATAR, type AvatarEdit } from '@/features/skill/skill-avatar-editor'
|
||||
import { SkillAvatarManager } from '@/features/skill/skill-avatar-manager'
|
||||
import { previewSkillPackage, usePublishSkill } from '@/shared/hooks/use-skill-queries'
|
||||
import { previewSkillPackage, usePublishSkill, useSkillDetail } from '@/shared/hooks/use-skill-queries'
|
||||
import { getSkillDetailQueryKey } from '@/shared/hooks/query-keys'
|
||||
import { useMyNamespaces } from '@/shared/hooks/use-namespace-queries'
|
||||
import { ConfirmDialog } from '@/shared/components/confirm-dialog'
|
||||
import { DashboardPageHeader } from '@/shared/components/dashboard-page-header'
|
||||
import { navigateAfterOverlays } from '@/shared/lib/navigate-after-overlays'
|
||||
import { toast } from '@/shared/lib/toast'
|
||||
import { refreshSkillPermissionsAfterForbidden } from '@/features/skill/refresh-skill-permissions'
|
||||
import { ApiError, skillAvatarApi } from '@/api/client'
|
||||
|
||||
const EMPTY_NAMESPACE_VALUE = '__select_namespace__'
|
||||
|
|
@ -60,6 +62,8 @@ export function PublishPage() {
|
|||
|
||||
const { data: namespaces, isLoading: isLoadingNamespaces } = useMyNamespaces()
|
||||
const publishMutation = usePublishSkill()
|
||||
const { data: updateTarget } = useSkillDetail(namespaceSlug, updateSlug ?? '', !!namespaceSlug && !!updateSlug)
|
||||
const ownerReadOnly = updateTarget?.ownerReadOnly === true
|
||||
const packagePreview = useQuery({
|
||||
queryKey: ['skill-package-preview', previewId, fileRevision],
|
||||
queryFn: () => previewSkillPackage(selectedFile!),
|
||||
|
|
@ -76,7 +80,7 @@ export function PublishPage() {
|
|||
const avatarUnavailable = !!updateSlug && (avatarTarget.isLoading || avatarTarget.isError)
|
||||
const isBusy = publishMutation.isPending || isSavingAvatar
|
||||
const avatarOnly = isUpdate && !selectedFile
|
||||
const canSubmit = (!selectedFile || packagePreview.isSuccess) && displayName.trim().length <= 200 && !!namespaceSlug && avatarEdit.ready && !avatarUnavailable && !isBusy && (selectedFile !== null || (isUpdate && avatarEdit.action !== 'KEEP'))
|
||||
const canSubmit = !ownerReadOnly && (!selectedFile || packagePreview.isSuccess) && displayName.trim().length <= 200 && !!namespaceSlug && avatarEdit.ready && !avatarUnavailable && !isBusy && (selectedFile !== null || (isUpdate && avatarEdit.action !== 'KEEP'))
|
||||
const selectedNamespace = namespaces?.find((ns) => ns.slug === namespaceSlug)
|
||||
const namespaceOnlyLabel = selectedNamespace?.type === 'GLOBAL'
|
||||
? t('publish.visibilityOptions.loggedInUsersOnly')
|
||||
|
|
@ -116,7 +120,7 @@ export function PublishPage() {
|
|||
const publishSkill = async (confirmWarnings = false) => {
|
||||
if (submitting.current) return
|
||||
if (!canSubmit) {
|
||||
toast.error(t('publish.selectRequired'))
|
||||
toast.error(t(ownerReadOnly ? 'mySkills.ownerReadOnly' : 'publish.selectRequired'))
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -164,6 +168,13 @@ export function PublishPage() {
|
|||
navigate({ to: '/dashboard/skills' })
|
||||
})
|
||||
} catch (error) {
|
||||
// A package rejection may also reflect changed membership. Re-read the
|
||||
// server state instead of inferring permissions from its localized message.
|
||||
if (updateSlug && !avatarOnly && error instanceof ApiError && error.status === 400) {
|
||||
await queryClient.invalidateQueries({ queryKey: getSkillDetailQueryKey(namespaceSlug, updateSlug ?? '') })
|
||||
}
|
||||
// Avatar-only updates call the API directly rather than a mutation.
|
||||
if (avatarOnly) await refreshSkillPermissionsAfterForbidden(queryClient, error)
|
||||
if (error instanceof ApiError && error.status === 408) {
|
||||
toast.error(t('publish.timeoutTitle'), t('publish.timeoutDescription'))
|
||||
return
|
||||
|
|
@ -214,6 +225,7 @@ export function PublishPage() {
|
|||
<div className="mx-auto max-w-2xl space-y-8 animate-fade-up">
|
||||
<DashboardPageHeader title={t(isUpdate ? 'publish.updateTitle' : 'publish.title')} subtitle={t(isUpdate ? 'publish.updateSubtitle' : 'publish.subtitle')} />
|
||||
|
||||
{ownerReadOnly && <p role="status" className="rounded-lg border bg-muted/20 p-3 text-sm text-muted-foreground">{t('mySkills.ownerReadOnly')}</p>}
|
||||
<Card className="space-y-8 p-6 md:p-8">
|
||||
{prefill.resubmitSkill && prefill.resubmitVersion ? (
|
||||
<div className="rounded-xl border border-amber-500/25 bg-amber-500/5 p-4">
|
||||
|
|
@ -267,7 +279,7 @@ export function PublishPage() {
|
|||
|
||||
<div className="space-y-3">
|
||||
<Label htmlFor="visibility" className="text-sm font-semibold font-heading">{t('publish.visibility')}</Label>
|
||||
<Select value={visibility} onValueChange={setVisibility} disabled={isBusy || avatarOnly}>
|
||||
<Select value={visibility} onValueChange={setVisibility} disabled={ownerReadOnly || isBusy || avatarOnly}>
|
||||
<SelectTrigger id="visibility">
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
|
|
@ -285,7 +297,7 @@ export function PublishPage() {
|
|||
<UploadZone
|
||||
onFileSelect={handleFileSelect}
|
||||
onFolderSelect={handleFolderSelect}
|
||||
disabled={isBusy || isPackaging}
|
||||
disabled={ownerReadOnly || isBusy || isPackaging}
|
||||
/>
|
||||
{selectedFile && (
|
||||
<div className="flex items-center justify-between gap-3 rounded-lg border border-border/60 bg-secondary/30 px-4 py-3">
|
||||
|
|
@ -302,7 +314,7 @@ export function PublishPage() {
|
|||
variant="outline"
|
||||
size="sm"
|
||||
onClick={handleRemoveSelectedFile}
|
||||
disabled={isBusy}
|
||||
disabled={ownerReadOnly || isBusy}
|
||||
>
|
||||
{t('publish.removeSelectedFile')}
|
||||
</Button>
|
||||
|
|
@ -316,7 +328,7 @@ export function PublishPage() {
|
|||
id="skill-display-name"
|
||||
value={displayName}
|
||||
maxLength={200}
|
||||
disabled={isBusy || !selectedFile}
|
||||
disabled={ownerReadOnly || isBusy || !selectedFile}
|
||||
placeholder={isUpdate ? search.updateName : t('publish.displayNamePlaceholder')}
|
||||
aria-describedby="skill-display-name-help"
|
||||
onChange={event => {
|
||||
|
|
@ -333,8 +345,8 @@ export function PublishPage() {
|
|||
{selectedFile && packagePreview.data && <p className="break-all text-xs text-muted-foreground">{t('publish.packageName')}: <code>{packagePreview.data.name}</code></p>}
|
||||
</div>
|
||||
|
||||
<SkillAvatarEditor key={`${namespaceSlug}/${updateSlug}`} name={search.updateName ?? updateSlug} currentUrl={avatarTarget.data?.avatarUrl} canRemove={!!updateSlug} disabled={isBusy || avatarUnavailable} onChange={setAvatarEdit} />
|
||||
{updateSlug && <SkillAvatarManager namespace={namespaceSlug} slug={updateSlug} disabled={isBusy} />}
|
||||
<SkillAvatarEditor key={`${namespaceSlug}/${updateSlug}`} name={search.updateName ?? updateSlug} currentUrl={avatarTarget.data?.avatarUrl} canRemove={!!updateSlug} disabled={ownerReadOnly || isBusy || avatarUnavailable} onChange={setAvatarEdit} />
|
||||
{updateSlug && <SkillAvatarManager namespace={namespaceSlug} slug={updateSlug} disabled={ownerReadOnly || isBusy} />}
|
||||
{avatarTarget.isError && <p role="alert" className="text-sm text-destructive">{t('skillAvatar.failed')}</p>}
|
||||
|
||||
<Button
|
||||
|
|
|
|||
|
|
@ -336,6 +336,22 @@ describe('SkillDetailPage', () => {
|
|||
useSkillFileMock.mockReturnValue({ data: null, isLoading: false, error: null })
|
||||
})
|
||||
|
||||
it('shows the removed owner read-only reason and keeps controlled draft download without write controls', () => {
|
||||
useSkillDetailMock.mockReturnValue({ data: createSkill({
|
||||
ownerReadOnly: true, canManageLifecycle: false, canSubmitPromotion: false,
|
||||
resolutionMode: 'OWNER_PREVIEW', headlineVersion: { id: 11, version: '1.1.0', status: 'PENDING_REVIEW' },
|
||||
ownerPreviewVersion: { id: 11, version: '1.1.0', status: 'PENDING_REVIEW' },
|
||||
}), isLoading: false, isFetching: false, error: null })
|
||||
useSkillVersionsMock.mockReturnValue({ data: [{ id: 11, version: '1.1.0', status: 'PENDING_REVIEW', downloadAvailable: true }] })
|
||||
render(<SkillDetailPage />)
|
||||
expect(screen.getByText('mySkills.ownerReadOnly')).toBeTruthy()
|
||||
expect(screen.getByRole('button', { name: 'skillDetail.download' }).hasAttribute('disabled')).toBe(false)
|
||||
expect(screen.queryByRole('button', { name: 'skillDetail.deleteSkill' })).toBeNull()
|
||||
expect(screen.queryByRole('button', { name: 'skillDetail.rereleaseVersion' })).toBeNull()
|
||||
expect(screen.getByRole('button', { name: 'skillDetail.withdrawReview' }).hasAttribute('disabled')).toBe(true)
|
||||
expect(screen.queryByText('skillDetail.lifecycle')).toBeNull()
|
||||
})
|
||||
|
||||
it('consumes protected deletion failures at the actual button boundary and allows retry', async () => {
|
||||
deleteSkillMock.mockRejectedValue(new Error('revoke global publication first'))
|
||||
render(<SkillDetailPage />)
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@ export function SkillDetailPage() {
|
|||
const hasPublishedPendingReview = Boolean(publishedVersion && hasPendingOwnerPreview)
|
||||
const canInteract = skill?.canInteract ?? true
|
||||
const canReport = skill?.canReport ?? true
|
||||
const canHardDeleteSkill = Boolean(skill && user && (skill.ownerId === user.userId || hasRole('SUPER_ADMIN')))
|
||||
const canHardDeleteSkill = Boolean(skill && user && ((!skill.ownerReadOnly && skill.ownerId === user.userId) || hasRole('SUPER_ADMIN')))
|
||||
const canManageLabels = Boolean(skill && user && (skill.canManageLifecycle || hasRole('SUPER_ADMIN')))
|
||||
const canManageSecurityScan = Boolean(skill && user && (
|
||||
skill.canManageLifecycle || hasRole('SKILL_ADMIN') || hasRole('SUPER_ADMIN')
|
||||
|
|
@ -247,7 +247,8 @@ export function SkillDetailPage() {
|
|||
const securityAuditVersion = ownerPreviewVersion?.status === 'SCAN_FAILED'
|
||||
? ownerPreviewVersion
|
||||
: selectedVersionEntry
|
||||
const isVersionDownloadable = selectedVersionEntry?.status === 'PUBLISHED' && (selectedVersionEntry?.downloadAvailable ?? false)
|
||||
const isVersionDownloadable = selectedVersionEntry?.downloadAvailable ?? false
|
||||
const isVersionInstallable = selectedVersionEntry?.status === 'PUBLISHED' && isVersionDownloadable
|
||||
const suiteMemberships = skill?.memberOfSuites?.items ?? skill?.entryForSuites ?? []
|
||||
const suiteMembershipTotal = skill?.memberOfSuites?.total ?? suiteMemberships.length
|
||||
|
||||
|
|
@ -430,7 +431,7 @@ export function SkillDetailPage() {
|
|||
requireLogin()
|
||||
return
|
||||
}
|
||||
if (!selectedVersionEntry || isPendingPreview) {
|
||||
if (!selectedVersionEntry || !isVersionDownloadable) {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -865,6 +866,7 @@ export function SkillDetailPage() {
|
|||
<div className="max-w-6xl mx-auto flex flex-col lg:flex-row gap-8 animate-fade-up">
|
||||
{/* Main Content */}
|
||||
<div className="flex-1 min-w-0 space-y-8">
|
||||
{skill.ownerReadOnly && <p role="status" className="rounded-lg border bg-muted/20 p-3 text-sm text-muted-foreground">{t('mySkills.ownerReadOnly')}</p>}
|
||||
<div className="space-y-3">
|
||||
<Button
|
||||
variant="ghost"
|
||||
|
|
@ -1407,7 +1409,7 @@ export function SkillDetailPage() {
|
|||
<Button
|
||||
variant="outline"
|
||||
onClick={() => setWithdrawVersionTarget(ownerPreviewVersion.version)}
|
||||
disabled={withdrawReviewMutation.isPending}
|
||||
disabled={!skill.canManageLifecycle || withdrawReviewMutation.isPending}
|
||||
>
|
||||
{withdrawReviewMutation.isPending ? t('skillDetail.processing') : t('skillDetail.withdrawReview')}
|
||||
</Button>
|
||||
|
|
@ -1437,7 +1439,7 @@ export function SkillDetailPage() {
|
|||
namespace={namespace}
|
||||
slug={slug}
|
||||
version={selectedVersionEntry?.version ?? publishedVersion?.version ?? ''}
|
||||
disabled={!selectedVersionEntry || skill.status === 'ARCHIVED' || !isVersionDownloadable}
|
||||
disabled={!selectedVersionEntry || skill.status === 'ARCHIVED' || !isVersionInstallable}
|
||||
/>
|
||||
|
||||
{canManageSecurityScan && securityAuditVersion && (
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue