From dfe51628324d4886ba60ab06571c35cdf15e6965 Mon Sep 17 00:00:00 2001 From: devops Date: Sat, 24 Oct 2026 04:25:09 +0000 Subject: [PATCH] fix(orchestration): provision explicit Stage owner Gate1 review access Preserve independent proposer checks, canonical Admin UUID allowlist and deny ordinary admins. Revalidate pinned owner in read-only CI preflight; expose server-advertised card decisions and distinguish reservation from unknown real cost. Verified backend 42 HTTP/service/config tests and build; admin 18 relevant tests, app tsc and Vite build; 3 CI config tests and bash syntax. --- .../src/orchestration/orchestration.module.ts | 3 +- .../src/orchestration/owner-decisions.spec.ts | 21 +++++++- .../orchestration/owner-review.http.spec.ts | 48 +++++++++++++++++++ .../orchestration/prepare-workflow.service.ts | 13 +++-- .../src/orchestration/workflow-config.spec.ts | 11 +++++ backend/src/orchestration/workflow-config.ts | 9 ++++ .../pages/OrchestrationCommandCenter.test.tsx | 14 ++++++ .../src/pages/OrchestrationCommandCenter.tsx | 6 +-- scripts/rollout-stage.sh | 18 +++++-- scripts/stage-owner-review.py | 8 ++++ scripts/test_stage_owner_review.py | 32 +++++++++++++ 11 files changed, 172 insertions(+), 11 deletions(-) create mode 100644 backend/src/orchestration/owner-review.http.spec.ts create mode 100644 backend/src/orchestration/workflow-config.spec.ts create mode 100644 backend/src/orchestration/workflow-config.ts create mode 100644 scripts/stage-owner-review.py create mode 100644 scripts/test_stage_owner_review.py diff --git a/backend/src/orchestration/orchestration.module.ts b/backend/src/orchestration/orchestration.module.ts index 6bd7ab74..9d4ecf9d 100644 --- a/backend/src/orchestration/orchestration.module.ts +++ b/backend/src/orchestration/orchestration.module.ts @@ -2,6 +2,7 @@ import { PrepareWorkflowService, PREPARE_WORKFLOW_CONFIG, } from './prepare-workflow.service'; +import { workflowConfig } from './workflow-config'; import { Module } from '@nestjs/common'; import { PrismaModule } from '../prisma/prisma.module'; import { KillSwitchService } from './kill-switch.service'; @@ -18,7 +19,7 @@ import { OrchestrationService } from './orchestration.service'; PrepareWorkflowService, { provide: PREPARE_WORKFLOW_CONFIG, - useValue: { workerIds: [], stageCiIds: [] }, + useFactory: () => workflowConfig(process.env), }, ], exports: [ diff --git a/backend/src/orchestration/owner-decisions.spec.ts b/backend/src/orchestration/owner-decisions.spec.ts index 7e65c914..b5025984 100644 --- a/backend/src/orchestration/owner-decisions.spec.ts +++ b/backend/src/orchestration/owner-decisions.spec.ts @@ -6,7 +6,26 @@ describe('owner Gate1 hold operation', () => { beforeEach(()=>{ task={id:'t',state:'GATE1_PENDING',version:2,operationMode:'PREPARE',metadata:{workflowScope:'STAGE_PREPARE',createdBy:'proposer'}}; tx={$queryRaw:jest.fn().mockResolvedValue([]),orchestrationTask:{findUnique:jest.fn(async()=>task),update:jest.fn(async({data}:any)=>(task={...task,state:data.state,version:task.version+1}))},orchestrationEvent:{findUnique:jest.fn(),create:jest.fn()},orchestrationApprovalDecision:{create:jest.fn()}}; - service=new PrepareWorkflowService({$transaction:async(cb:any)=>cb(tx)}, {workerIds:[],stageCiIds:[]}); + service=new PrepareWorkflowService({$transaction:async(cb:any)=>cb(tx)}, {workerIds:[],stageCiIds:[],ownerReviewerIds:['12345678-1234-1234-1234-123456789012']} as any); + }); + it('advertises and permits the pinned canonical Admin independent reviewer only',async()=>{ + const owner={id:'12345678-1234-1234-1234-123456789012',role:'Admin'}; + expect(service.project(task,owner).availableActions).toEqual(['APPROVE_GATE1','REJECT_GATE1','HOLD_GATE1']); + await expect(service.transition('t',hold,owner)).resolves.toMatchObject({state:'GATE1_HELD'}); + await expect(service.decide('t',1,{decision:'APPROVED',expectedVersion:3,idempotencyKey:'owner-approve',expiresAt:new Date(Date.now()+60000).toISOString()},owner)).resolves.toMatchObject({state:'GATE1_APPROVED'}); + expect(tx.orchestrationApprovalDecision.create).toHaveBeenCalledWith({data:expect.objectContaining({actorId:owner.id})}); + }); + it.each(['Admin','SUPER_ADMIN'])('never permits proposer self-review even if allowlisted: %s',async role=>{ + const actor={id:'12345678-1234-1234-1234-123456789012',role}; task.metadata.createdBy=actor.id; + expect(service.project(task,actor).availableActions).toEqual([]); + await expect(service.transition('t',hold,actor)).rejects.toMatchObject({status:403}); + await expect(service.decide('t',1,{decision:'REJECTED',expectedVersion:2,idempotencyKey:'self',expiresAt:new Date(Date.now()+60000).toISOString()},actor)).rejects.toMatchObject({status:403}); + expect(tx.orchestrationTask.update).not.toHaveBeenCalled(); + }); + it.each([{id:'other',role:'Admin'},{id:'12345678-1234-1234-1234-123456789012',role:'User'},{id:'12345678-1234-1234-1234-123456789012',role:'ADMIN'}])('denies noncanonical or ungranted reviewer %j',async actor=>{ + expect(service.project(task,actor).availableActions).toEqual([]); + await expect(service.decide('t',1,{decision:'REJECTED',expectedVersion:2,idempotencyKey:'deny',expiresAt:new Date(Date.now()+60000).toISOString()},actor)).rejects.toMatchObject({status:403}); + expect(tx.orchestrationTask.update).not.toHaveBeenCalled(); }); const hold={toState:'GATE1_HELD',expectedVersion:2,idempotencyKey:'hold-t',reason:'Need revised budget'}; it('advertises hold only to independent owner reviewer',()=>{ diff --git a/backend/src/orchestration/owner-review.http.spec.ts b/backend/src/orchestration/owner-review.http.spec.ts new file mode 100644 index 00000000..eed53be5 --- /dev/null +++ b/backend/src/orchestration/owner-review.http.spec.ts @@ -0,0 +1,48 @@ +import {Test} from '@nestjs/testing'; +import {INestApplication} from '@nestjs/common'; +import request from 'supertest'; +import {OrchestrationController} from './orchestration.controller'; +import {OrchestrationService} from './orchestration.service'; +import {PrepareWorkflowService} from './prepare-workflow.service'; +import {JwtAuthGuard} from '../auth/jwt-auth.guard'; +import {RolesGuard} from '../common/guards/roles.guard'; +describe('configured owner real workflow HTTP authorization',()=>{ + const owner='12345678-1234-1234-1234-123456789012'; + let app:INestApplication,task:any,tx:any; + beforeAll(async()=>{ + tx={$queryRaw:jest.fn(async()=>[]),orchestrationTask:{findUnique:async()=>task,update:jest.fn(async({data}:any)=>(task={...task,state:data.state,version:task.version+1}))},orchestrationEvent:{findUnique:jest.fn(),create:jest.fn()},orchestrationApprovalDecision:{create:jest.fn()}}; + const workflow=new PrepareWorkflowService({$transaction:async(cb:any)=>cb(tx)},{workerIds:[],stageCiIds:[],ownerReviewerIds:[owner]}); + const m=await Test.createTestingModule({controllers:[OrchestrationController],providers:[{provide:OrchestrationService,useValue:{findAll:async()=>[task],findOne:async()=>task}},{provide:PrepareWorkflowService,useValue:workflow},RolesGuard]}) + .overrideGuard(JwtAuthGuard).useValue({canActivate(c:any){const r=c.switchToHttp().getRequest();if(!r.headers.authorization)return false;r.user={sub:r.headers.authorization,role:'ADMIN'};return true;}}).compile(); + app=m.createNestApplication();await app.init(); + }); + beforeEach(()=>{jest.clearAllMocks();task={id:'t',state:'GATE1_PENDING',version:2,operationMode:'PREPARE',metadata:{workflowScope:'STAGE_PREPARE',createdBy:'pmo'}};}); + afterAll(async()=>{await app.close();}); + it.each(['APPROVED','REJECTED'])('advertises and executes %s only for verified granted JWT subject',async decision=>{ + const r=await request(app.getHttpServer()).get('/admin/orchestration/tasks').set('Authorization',owner).expect(200); + expect(r.body[0].availableActions).toEqual(['APPROVE_GATE1','REJECT_GATE1','HOLD_GATE1']); + await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/gates/1/decide').set('Authorization',owner).send({decision,expectedVersion:2,idempotencyKey:'decision',expiresAt:new Date(Date.now()+60000).toISOString(),notes:'Delegated system testing by independent owner'}).expect(201); + expect(tx.orchestrationApprovalDecision.create).toHaveBeenCalledWith({data:expect.objectContaining({actorId:owner,decision})}); + expect(tx.orchestrationEvent.create).toHaveBeenCalledWith({data:expect.objectContaining({actorId:owner,payload:expect.objectContaining({fingerprint:expect.stringContaining('Delegated system testing')})})}); + }); + it('holds via canonicalized ADMIN without granting proposer powers',async()=>{ + await request(app.getHttpServer()).put('/admin/orchestration/tasks/t/transition').set('Authorization',owner).send({toState:'GATE1_HELD',expectedVersion:2,idempotencyKey:'hold',reason:'Independent owner needs evidence'}).expect(200); + expect(tx.orchestrationApprovalDecision.create).not.toHaveBeenCalled(); + }); + it.each(['ordinary-admin','pmo'])('denies ungranted subject %s and body impersonation',async subject=>{ + const r=await request(app.getHttpServer()).get('/admin/orchestration/tasks').set('Authorization',subject).expect(200); + expect(r.body[0].availableActions).toEqual([]); + const body={decision:'APPROVED',expectedVersion:2,idempotencyKey:'deny',expiresAt:new Date(Date.now()+60000).toISOString()}; + await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/gates/1/decide').set('Authorization',subject).send(body).expect(403); + await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/gates/1/decide').set('Authorization',subject).send({...body,actorId:owner}).expect(400); + await request(app.getHttpServer()).put('/admin/orchestration/tasks/t/transition').set('Authorization',subject).send({toState:'GATE1_HELD',expectedVersion:2,idempotencyKey:'hold',reason:'hold'}).expect(403); + expect(tx.orchestrationTask.update).not.toHaveBeenCalled(); + }); + it('denies grant holder self review, Gate2 and release',async()=>{ + task.metadata.createdBy=owner; + await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/gates/1/decide').set('Authorization',owner).send({decision:'APPROVED',expectedVersion:2,idempotencyKey:'self',expiresAt:new Date(Date.now()+60000).toISOString()}).expect(403); + await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/gates/2/decide').set('Authorization',owner).send({}).expect(403); + await request(app.getHttpServer()).post('/admin/orchestration/tasks/t/commands/RELEASE_AUTHORIZE').set('Authorization',owner).send({}).expect(403); + expect(tx.orchestrationTask.update).not.toHaveBeenCalled(); + }); +}); diff --git a/backend/src/orchestration/prepare-workflow.service.ts b/backend/src/orchestration/prepare-workflow.service.ts index 7c25d7e8..6699059e 100644 --- a/backend/src/orchestration/prepare-workflow.service.ts +++ b/backend/src/orchestration/prepare-workflow.service.ts @@ -14,6 +14,7 @@ export interface WorkflowIdentity { role: string; } export interface WorkflowConfig { + ownerReviewerIds?: string[]; workerIds: string[]; stageCiIds: string[]; } @@ -34,6 +35,11 @@ export class PrepareWorkflowService { ) throw new ForbiddenException('Authenticated workflow identity required'); } + private reviewer(a: WorkflowIdentity) { + return typeof a?.id === 'string' && !!a.id && a.id.length <= 100 && + (a.role === 'SUPER_ADMIN' || + (a.role === 'Admin' && (this.config.ownerReviewerIds ?? []).includes(a.id))); + } private worker(a: WorkflowIdentity) { this.identity(a, ['WORKFLOW_WORKER']); if (!this.config.workerIds.includes(a.id)) @@ -199,7 +205,7 @@ export class PrepareWorkflowService { if (await this.replay(tx, dto.idempotencyKey, fingerprint)) return t; this.version(t, dto); if (dto.toState === 'GATE1_HELD') { - if (a.role !== 'SUPER_ADMIN' || t.metadata.createdBy === a.id || t.state !== 'GATE1_PENDING') + if (!this.reviewer(a) || t.metadata.createdBy === a.id || t.state !== 'GATE1_PENDING') throw new ForbiddenException('Independent Gate1 reviewer and pending proposal required'); if (typeof dto.reason !== 'string' || !dto.reason.trim() || dto.reason.length > 2000) throw new BadRequestException('Hold requires reason of 1..2000 characters'); @@ -237,7 +243,8 @@ export class PrepareWorkflowService { }); } async decide(id: string, gate: number, dto: any, a: WorkflowIdentity) { - this.identity(a, ['SUPER_ADMIN']); + if (!this.reviewer(a)) + throw new ForbiddenException('Provisioned independent Gate1 reviewer required'); if (gate !== 1) throw new ForbiddenException( 'Gate2 decisions and release remain disabled', @@ -543,7 +550,7 @@ export class PrepareWorkflowService { actions.push('QUEUE_PREPARE'); if ( safe && - a?.role === 'SUPER_ADMIN' && + this.reviewer(a) && t.metadata?.createdBy !== a.id && ['GATE1_PENDING', 'GATE1_HELD'].includes(t.state) ) { diff --git a/backend/src/orchestration/workflow-config.spec.ts b/backend/src/orchestration/workflow-config.spec.ts new file mode 100644 index 00000000..e1baebc6 --- /dev/null +++ b/backend/src/orchestration/workflow-config.spec.ts @@ -0,0 +1,11 @@ +import { workflowConfig } from './workflow-config'; +describe('startup owner reviewer configuration',()=>{ + it('defaults denied, accepts explicit UUID only in staging',()=>{ + expect(workflowConfig({}).ownerReviewerIds).toEqual([]); + expect(workflowConfig({NODE_ENV:'production',CANINA_WORKFLOW_OWNER_REVIEWER_IDS:'12345678-1234-1234-1234-123456789012'})).toMatchObject({ownerReviewerIds:[]}); + expect(workflowConfig({CANINA_ENV:'staging',CANINA_WORKFLOW_OWNER_REVIEWER_IDS:'12345678-1234-1234-1234-123456789012'}).ownerReviewerIds).toEqual(['12345678-1234-1234-1234-123456789012']); + }); + it.each(['*','admin','12345678-1234-1234-1234-123456789012,'])('fails startup on malformed explicit grant %s',ids=>{ + expect(()=>workflowConfig({CANINA_ENV:'staging',CANINA_WORKFLOW_OWNER_REVIEWER_IDS:ids})).toThrow('Invalid owner reviewer UUID allowlist'); + }); +}); diff --git a/backend/src/orchestration/workflow-config.ts b/backend/src/orchestration/workflow-config.ts new file mode 100644 index 00000000..cf1104be --- /dev/null +++ b/backend/src/orchestration/workflow-config.ts @@ -0,0 +1,9 @@ +import type { WorkflowConfig } from './prepare-workflow.service'; +/** Startup-only configuration; HTTP payloads can never supply reviewer grants. */ +export function workflowConfig(env: NodeJS.ProcessEnv): WorkflowConfig { + const raw = env.CANINA_ENV === 'staging' ? env.CANINA_WORKFLOW_OWNER_REVIEWER_IDS ?? '' : ''; + const ids = raw ? raw.split(',') : []; + if (ids.length > 20 || ids.some(id => !/^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/.test(id))) + throw new Error('Invalid owner reviewer UUID allowlist'); + return {workerIds:[],stageCiIds:[],ownerReviewerIds:[...new Set(ids)]}; +} diff --git a/frontend/admin-panel/src/pages/OrchestrationCommandCenter.test.tsx b/frontend/admin-panel/src/pages/OrchestrationCommandCenter.test.tsx index 1c96e25d..e94c5ddd 100644 --- a/frontend/admin-panel/src/pages/OrchestrationCommandCenter.test.tsx +++ b/frontend/admin-panel/src/pages/OrchestrationCommandCenter.test.tsx @@ -116,3 +116,17 @@ it('separates human evidence from server workflow scope without inventing a mark expect(await screen.findByText('محدوده و معیارهای پذیرش گزارش‌شده از سرور')).toBeInTheDocument(); expect(screen.getByText('محدوده گردش کار سرور: در نمای امن در دسترس نیست.')).toBeInTheDocument(); }); + +it('shows advertised decisions directly on pending card and labels reservation not measured cost',async()=>{ + const ownerTask={...task,budgetLimitCents:20,availableActions:['APPROVE_GATE1','REJECT_GATE1','HOLD_GATE1']}; + vi.mocked(api.get).mockImplementation(async url=>({data:url.endsWith('/overview')?{items:[],measuredAt:'now',capabilities:{mutations:true}}:url.endsWith('/tasks')?[ownerTask]:ownerTask})); + render(); + const card=await screen.findByRole('region',{name:'منتظر تصمیم شما'}); + expect(await within(card).findByRole('button',{name:'تأیید کار محدود در Gate1'})).toBeEnabled(); + expect(within(card).getByRole('button',{name:'رد کار در Gate1'})).toBeEnabled(); + expect(within(card).getByRole('button',{name:'تعویق تصمیم Gate1'})).toBeEnabled(); + expect(within(card).getByText('رزرو آزمایشی؛ هزینه واقعی نامشخص')).toBeInTheDocument(); + fireEvent.click(within(card).getByRole('button',{name:'تعویق تصمیم Gate1'})); + expect(await screen.findByRole('region',{name:'جزئیات وظیفه'})).toBeInTheDocument(); + expect(api.post).not.toHaveBeenCalled(); expect(api.put).not.toHaveBeenCalled(); +}); diff --git a/frontend/admin-panel/src/pages/OrchestrationCommandCenter.tsx b/frontend/admin-panel/src/pages/OrchestrationCommandCenter.tsx index 0a8fef67..0d3ec538 100644 --- a/frontend/admin-panel/src/pages/OrchestrationCommandCenter.tsx +++ b/frontend/admin-panel/src/pages/OrchestrationCommandCenter.tsx @@ -64,10 +64,10 @@ export default function OrchestrationCommandCenter() { {success&&

{success}

} {section==='وظیفه‌ها و تأییدها'&&capabilities.mutations&&void loadTasks()}/>} {section==='نمای کلی'&&
-

منتظر تصمیم شما

تصمیم Gate1 برای کار محدود؛ تأیید به‌معنای انتشار یا اجرای Production نیست. اقدام‌ها پس از دریافت جزئیات از سرور نمایش داده می‌شوند.

+

منتظر تصمیم شما

تصمیم Gate1 برای کار محدود؛ تأیید به‌معنای انتشار یا اجرای Production نیست. دکمه‌ها فقط اقدام‌های مجاز اعلام‌شده توسط سرور هستند؛ برای بررسی و تصمیم، جزئیات را باز کنید.

{!loading&&!error&&!tasks.some(t=>['GATE1_PENDING','GATE1_HELD'].includes(t.state)&&(decisionFilter==='ALL'||t.state===decisionFilter))&&

تصمیمی در این فیلتر منتظر نیست.

} - {!loading&&!error&&tasks.filter(t=>['GATE1_PENDING','GATE1_HELD'].includes(t.state)&&(decisionFilter==='ALL'||t.state===decisionFilter)).map(t=>

{label(t.department)} · {label(t.state)} · سقف بودجه: {t.budgetLimitCents??'نامشخص'} سنت

{selected?.id!==t.id&&<>

محدوده: {typeof t.metadata?.scope==='string'?t.metadata.scope:'گزارش نشده؛ جزئیات را بررسی کنید'}

معیارهای پذیرش

{Array.isArray(t.metadata?.acceptanceCriteria)&&t.metadata.acceptanceCriteria.every(c=>typeof c==='string')?
    {(t.metadata.acceptanceCriteria as string[]).map((c,i)=>
  • {c}
  • )}
:

گزارش نشده؛ جزئیات را بررسی کنید

}}
)} + {!loading&&!error&&tasks.filter(t=>['GATE1_PENDING','GATE1_HELD'].includes(t.state)&&(decisionFilter==='ALL'||t.state===decisionFilter)).map(t=>

{label(t.department)} · {label(t.state)} · سقف بودجه: {t.budgetLimitCents??'نامشخص'} سنت

رزرو آزمایشی؛ هزینه واقعی نامشخص

{t.availableActions.filter(a=>['APPROVE_GATE1','REJECT_GATE1','HOLD_GATE1'].includes(a.id)).map(a=>)}
{selected?.id!==t.id&&<>

محدوده: {typeof t.metadata?.scope==='string'?t.metadata.scope:'گزارش نشده؛ جزئیات را بررسی کنید'}

معیارهای پذیرش

{Array.isArray(t.metadata?.acceptanceCriteria)&&t.metadata.acceptanceCriteria.every(c=>typeof c==='string')?
    {(t.metadata.acceptanceCriteria as string[]).map((c,i)=>
  • {c}
  • )}
:

گزارش نشده؛ جزئیات را بررسی کنید

}}
)}
} {section==='نمای کلی'&&!loading&&!error&&

فهرست وظیفه‌های ثبت‌شده

{tasks.length} وظیفه از سرور دریافت شد. این فهرست نشان‌دهنده سلامت عامل یا وضعیت زنده اجرا نیست.

{[...new Set(tasks.map(t=>t.state))].map(state=>{label(state)}: {tasks.filter(t=>t.state===state).length})}
} {(['نمای کلی','وظیفه‌ها و تأییدها','اجراها و خروجی‌ها'] as Section[]).includes(section)&&
@@ -78,7 +78,7 @@ export default function OrchestrationCommandCenter() {

اقدام‌های مجاز اعلام‌شده توسط سرور

{!selected.availableActions.length&&

اقدامی اعلام نشده است. این نما فقط خواندنی است؛ مرورگر مجوز یا تغییر وضعیت ایجاد نمی‌کند.

}
{selected.availableActions.map(a=>)}

تصمیم‌های تأیید تغییرناپذیر

اجراها و خروجی‌های ثبت‌شده

{!selected.runs?.length&&

اجرای ثبت‌شده‌ای وجود ندارد.

}{selected.runs?.map(r=>

{r.id} · {label(r.status)}

کامیت: {r.commitSha} · محیط: {r.environment}

{r.artifacts.map(a=>)}
)} -

دفتر بودجه (سنت؛ نه مصرف تخمینی)

رویدادهای ممیزی به‌ترتیب

+

رزرو آزمایشی؛ هزینه واقعی نامشخص

دفتر بودجه (سنت؛ رزرو با هزینه واقعی متفاوت است)

رویدادهای ممیزی به‌ترتیب

} {snapshot&&

{section}

زمان دریافت از سرور: {snapshot.measuredAt}

{!snapshot.items.length&&

رکوردی از سرور دریافت نشد.

}
{snapshot.items.map(item=>

{item.title??item.id}

{Object.entries(item).filter(([k])=>k!=='id'&&k!=='title').map(([k,v])=>
{label(k)}
{String(v??'نامشخص')}
)}
)}

تغییر تنظیمات فقط با فرمان مجاز سرور ممکن است؛ مرورگر فرمانی ایجاد نمی‌کند.

} {section==='توقف اضطراری'&&!capabilities.killSwitch&&

کنترل توقف اضطراری در این نسخه در دسترس نیست؛ مسیر سرور اجازه تغییر نمی‌دهد.

} diff --git a/scripts/rollout-stage.sh b/scripts/rollout-stage.sh index 6eafc5ec..cd487220 100644 --- a/scripts/rollout-stage.sh +++ b/scripts/rollout-stage.sh @@ -5,6 +5,7 @@ stage_runtime_provision() { [ "${GITHUB_ACTIONS:-${GITEA_ACTIONS:-}}" = true ] [ "${STAGE_PROVISION_ENABLED:-}" = true ] export DEPLOY_SHA STAGE_PROVISION_APPROVED_SHA="$DEPLOY_SHA" CI=true + PYTHONDONTWRITEBYTECODE=1 python3 -m unittest discover -s scripts -p test_stage_owner_review.py PYTHONDONTWRITEBYTECODE=1 python3 -m unittest discover -s infra/hermes-editorial/tests PYTHONDONTWRITEBYTECODE=1 python3 -m unittest discover -s scripts -p test_editorial_provision.py PYTHONDONTWRITEBYTECODE=1 python3 - <<'PY' @@ -59,11 +60,14 @@ root=Path('/opt/services/canina/stage-runtime') query="""const {PrismaClient}=require('@prisma/client');const p=new PrismaClient(); (async()=>{try{const rows=await p.$transaction(async tx=>{ await tx.$executeRawUnsafe('SET TRANSACTION READ ONLY'); -return tx.$queryRawUnsafe(\"SELECT id::text FROM users WHERE lower(replace(replace(role::text, '_', ''), '-', '')) IN ('admin','superadmin') ORDER BY id LIMIT 1001\"); +return tx.$queryRawUnsafe(\"SELECT id::text, role::text FROM users WHERE lower(replace(replace(role::text, '_', ''), '-', '')) IN ('admin','superadmin') ORDER BY id LIMIT 1001\"); });process.stdout.write(JSON.stringify(rows));}catch{process.exitCode=1;}finally{await p.$disconnect();}})();""" rows=json.loads(docker('exec','-w','/app','canino_backend_stage','node','-e',query)) -if not 1<=len(rows)<=1000 or any(not isinstance(r,dict) or set(r)!={'id'} or not isinstance(r['id'],str) or not re.fullmatch('[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}',r['id']) for r in rows): +if not 1<=len(rows)<=1000 or any(not isinstance(r,dict) or set(r)!={'id','role'} or not isinstance(r['id'],str) or not re.fullmatch('[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}',r['id']) for r in rows): raise ValueError('Verified admin subjects required') +spec=importlib.util.spec_from_file_location('owner','scripts/stage-owner-review.py') +owner=importlib.util.module_from_spec(spec);spec.loader.exec_module(owner) +owner_ids=owner.verified_owner_ids(rows) m.provision(root,uid,gid) spec=importlib.util.spec_from_file_location('editorial','scripts/provision-editorial-runtime.py') editorial=importlib.util.module_from_spec(spec);spec.loader.exec_module(editorial) @@ -74,7 +78,7 @@ dest=root/'snapshots'/capture m.export_snapshot(db,dest,'default',uid,gid) grants=root/'snapshots'/(capture+'-grants.json') m.write_private(grants,json.dumps({r['id']:['default'] for r in rows}),uid,gid) -Path('.stage-runtime.json').write_text(json.dumps({'snapshot':str(dest),'grants':str(grants)})) +Path('.stage-runtime.json').write_text(json.dumps({'snapshot':str(dest),'grants':str(grants),'ownerReviewerIds':owner_ids})) print('Stage projected snapshot captured; existing admin grants verified; no executor started') PY } @@ -93,6 +97,14 @@ from pathlib import Path p=Path('.stage-runtime-merged.json');c=json.loads(p.read_text()) b=c['services']['backend_stage'] b.setdefault('environment',{})['CANINA_RUNTIME_READ_ENABLED']='true' +owner_ids=json.loads(Path('.stage-runtime.json').read_text())['ownerReviewerIds'] +spec_path=Path('scripts/stage-owner-review.py') +import importlib.util +spec=importlib.util.spec_from_file_location('owner',spec_path) +owner=importlib.util.module_from_spec(spec);spec.loader.exec_module(owner) +assert owner_ids==[owner.STAGE_OWNER_SUBJECT], 'Explicit verified owner required' +b['environment']['CANINA_ENV']='staging' +b['environment']['CANINA_WORKFLOW_OWNER_REVIEWER_IDS']=','.join(owner_ids) b.setdefault('networks',{})['traefik_public']=None b.setdefault('labels',{})['traefik.docker.network']='traefik_public' c['secrets']['hermes_runtime_grants']['file']=json.loads(Path('.stage-runtime.json').read_text())['grants'] diff --git a/scripts/stage-owner-review.py b/scripts/stage-owner-review.py new file mode 100644 index 00000000..94439e95 --- /dev/null +++ b/scripts/stage-owner-review.py @@ -0,0 +1,8 @@ +# Stage-only named grant: explicit user-authorized owner, not discovery of all admins. +# Parent verified this exact persisted subject read-only; CI rechecks before rendering. +STAGE_OWNER_SUBJECT='12345678-1234-1234-1234-123456789012' +def verified_owner_ids(rows): + matches=[r for r in rows if r.get('id')==STAGE_OWNER_SUBJECT] + if len(matches)!=1 or matches[0].get('role','').lower().replace('_','').replace('-','')!='admin': + raise ValueError('Pinned Stage owner must exist with Admin role') + return [STAGE_OWNER_SUBJECT] diff --git a/scripts/test_stage_owner_review.py b/scripts/test_stage_owner_review.py new file mode 100644 index 00000000..ca7519f3 --- /dev/null +++ b/scripts/test_stage_owner_review.py @@ -0,0 +1,32 @@ +import importlib.util +import unittest +from pathlib import Path +spec=importlib.util.spec_from_file_location('owner',Path(__file__).with_name('stage-owner-review.py')) +owner=importlib.util.module_from_spec(spec);spec.loader.exec_module(owner) +class OwnerReviewTests(unittest.TestCase): + def test_verified_pinned_admin_only(self): + self.assertEqual(owner.verified_owner_ids([{'id':owner.STAGE_OWNER_SUBJECT,'role':'ADMIN'},{'id':'other','role':'ADMIN'}]),[owner.STAGE_OWNER_SUBJECT]) + def test_missing_wrong_role_denied(self): + for rows in [[],[{'id':'other','role':'ADMIN'}],[{'id':owner.STAGE_OWNER_SUBJECT,'role':'SUPER_ADMIN'}],[{'id':owner.STAGE_OWNER_SUBJECT,'role':'User_PetOwner'}]]: + with self.subTest(rows=rows),self.assertRaises(ValueError):owner.verified_owner_ids(rows) + + def test_actual_ci_render_sets_only_pinned_backend_reviewer(self): + import json, os, tempfile, subprocess + script=Path(__file__).with_name('rollout-stage.sh').read_text() + render=script.split('stage_runtime_render() {',1)[1].split("python3 - <<'PY'",1)[1].split('\nPY',1)[0] + with tempfile.TemporaryDirectory(dir=Path(__file__).parent.parent) as d: + root=Path(d);(root/'scripts').mkdir() + (root/'scripts/stage-owner-review.py').write_text(Path(__file__).with_name('stage-owner-review.py').read_text()) + compose={'services':{'db_stage':{},'redis_stage':{},'frontend_stage':{},'backend_stage':{},'runtime-inventory':{}},'secrets':{'hermes_runtime_grants':{}},'networks':{'hermes_inventory_backend':{'internal':True},'traefik_public':{'external':True}}} + def write(ids): + (root/'.stage-runtime-merged.json').write_text(json.dumps(compose)) + (root/'.stage-runtime.json').write_text(json.dumps({'grants':'/verified/grants','ownerReviewerIds':ids})) + write([owner.STAGE_OWNER_SUBJECT]) + subprocess.run(['python3','-c',render],cwd=root,check=True,env={**os.environ,'PYTHONDONTWRITEBYTECODE':'1'}) + result=json.loads((root/'.stage-compose.json').read_text()) + self.assertEqual(result['services']['backend_stage']['environment']['CANINA_WORKFLOW_OWNER_REVIEWER_IDS'],owner.STAGE_OWNER_SUBJECT) + self.assertEqual(result['services']['backend_stage']['environment']['CANINA_ENV'],'staging') + self.assertNotIn('environment',result['services']['frontend_stage']) + write(['another-admin']) + rejected=subprocess.run(['python3','-c',render],cwd=root,capture_output=True) + self.assertNotEqual(rejected.returncode,0)