diff --git a/M02_MasterTemplete/M02_Layer_Access.py b/M02_MasterTemplete/M02_Layer_Access.py index 2a0cc5dc8..7c5238800 100644 --- a/M02_MasterTemplete/M02_Layer_Access.py +++ b/M02_MasterTemplete/M02_Layer_Access.py @@ -1,5 +1,6 @@ """M02 층 권한 한 벌 — 나무 · 항목(`Router_Items`) · 양식 · 남의 층 목록(`Router_Layers`)이 함께 씀 -(PLAN 27-1c). 화면 쪽 짝 = `M02_MasterTemplete_Layer.ts` 의 `accessFor`. +(PLAN 27-1c). 화면 쪽 짝 = `M02_MasterTemplete_Layer.ts` 의 `accessFor` · 거울 시험 +`test_858_1_access_mirror.py`. 서고 지우기 · 합치기 쓰기 판단도 `can_write` 한 벌(858-B). 「회사 C 를 맡음」(`manages` · 39-6) = SYSTEM_ADMIN · 또는 C 의 회사 관리자(ADMIN · 마스터). system 읽기 = 로그인 누구나 · 수정 = SYSTEM_ADMIN @@ -94,6 +95,16 @@ def require( return got +def can_write(session: dict[str, Any] | None, here: tuple[str, str | None]) -> bool: + """층 `here` = (층, 주인) 에 쓸 수 있나 — 읽기 못 함 · 회사 없음 · 모양 틀림도 False.""" + if session is None: + return False + try: + return grant(session, here[0], here[1]).write + except HTTPException: + return False + + def folder(got: Grant, create: bool = False) -> Path: """회사 · 개인 층 폴더 — 남의 층은 그 층 폴더가 있어야 함 · `create` = 쓰기(부르는 쪽이 소속을 본 뒤 뼈대를 만듦).""" diff --git a/M02_MasterTemplete/M02_Library_Delete.py b/M02_MasterTemplete/M02_Library_Delete.py index 9ecc46e87..4e8a678b3 100644 --- a/M02_MasterTemplete/M02_Library_Delete.py +++ b/M02_MasterTemplete/M02_Library_Delete.py @@ -22,8 +22,6 @@ from datetime import datetime from pathlib import Path from typing import Any -from fastapi import HTTPException - from common_util.common_util_json import atomic_write_json from M02_MasterTemplete import M02_Labor_Ref as refs from M02_MasterTemplete import M02_Layer_Access as access @@ -37,13 +35,7 @@ _ADD = re.compile(r"^add:#(\d+)(.*)$") _PATCH = ("덮개", "고름", "자재표시") -def can_write(session: dict[str, Any] | None, at: refs.Here) -> bool: - if session is None: - return False - try: - return access.grant(session, at[0], at[1]).write - except HTTPException: - return False +can_write = access.can_write # 쓰기 판단 한 벌(858-B) — 이름은 5-8 에서 걷음 def _hits(doc: dict[str, Any], rids: dict[str, str]) -> list[tuple[str, str]]: diff --git a/M02_MasterTemplete/M02_Library_Same_Router.py b/M02_MasterTemplete/M02_Library_Same_Router.py index 390350545..362261e12 100644 --- a/M02_MasterTemplete/M02_Library_Same_Router.py +++ b/M02_MasterTemplete/M02_Library_Same_Router.py @@ -34,6 +34,7 @@ from pydantic import BaseModel from common_util.common_util_auth import verify_session from common_util.common_util_json import atomic_write_json from M02_MasterTemplete import M02_Labor_Ref as refs +from M02_MasterTemplete import M02_Layer_Access as access from M02_MasterTemplete import M02_Library_Delete as deleting from M02_MasterTemplete import M02_Library_Flat as flat from M02_MasterTemplete import M02_Library_Same as same @@ -106,7 +107,7 @@ def _user_index() -> dict[str, list[tuple[Path, str, str]]]: def _can_write(session: Session, at: refs.Here) -> bool: - return deleting.can_write(session, at) + return access.can_write(session, at) def _retarget(doc: dict[str, Any], olds: set[str], new: refs.Ref) -> dict[str, Any]: diff --git a/M02_MasterTemplete/M02_MasterTemplete_Layer.ts b/M02_MasterTemplete/M02_MasterTemplete_Layer.ts index cee791ad5..77f586f5a 100644 --- a/M02_MasterTemplete/M02_MasterTemplete_Layer.ts +++ b/M02_MasterTemplete/M02_MasterTemplete_Layer.ts @@ -4,6 +4,7 @@ * `#/m02-master-template?open=구조물조합|옵션|도면|일위대가조합|단가산출&root=master|company|personal&owner=…&company=…&pre=…` * (옛 `?layer=` 도 root 로 읽음 · `pre` = 일위대가 사전조합 층 · 134-3) · 고칠 권한(`accessFor` — 서버 `M02_Layer_Access` 와 짝 · 27-1c) · * 회사 없음 안내 · 회사용 읽기만일 때 [개인용 복사] 막대. + * 짝 거울 시험 = `resources/tester/test_858_1_access_mirror.py`(`accessFor` ↔ 서버 `can_write` · `grant` 409). * ========================================================================== */ import { ROUTES } from "@config/config_frontend"; diff --git a/resources/tester/test_858_1_access_mirror.py b/resources/tester/test_858_1_access_mirror.py new file mode 100644 index 000000000..eae0e96a8 --- /dev/null +++ b/resources/tester/test_858_1_access_mirror.py @@ -0,0 +1,88 @@ +"""858-B 권한 짝 거울 시험 — 화면 `M02_MasterTemplete_Layer.ts` 의 `accessFor` 와 서버 +`M02_Layer_Access`(`can_write` · `grant` 409 = 회사 없음)가 같은 답을 내는지. + +사람 여덟 × 층 · 주인 열하나를 통째로 맞춤 — 고침(canWrite) · 회사부터 등록(needCompany). +""" + +from __future__ import annotations + +import itertools +import json +import re +import shutil +import subprocess +from pathlib import Path + +import pytest +from fastapi import HTTPException + +from M02_MasterTemplete import M02_Layer_Access as access + +LAYER = Path(__file__).resolve().parents[2] / "M02_MasterTemplete" / "M02_MasterTemplete_Layer.ts" + +PEOPLE = { + "시스템": {"id": "1", "role": "SYSTEM_ADMIN", "company_id": None}, + "시스템3": {"id": "1", "role": "SYSTEM_ADMIN", "company_id": 3}, + "관리자3": {"id": "5", "role": "ADMIN", "company_id": 3}, + "마스터3": {"id": "6", "role": "USER", "company_id": 3, "is_master": True}, + "일반3": {"id": "7", "role": "USER", "company_id": 3}, + "관리자9": {"id": "90", "role": "ADMIN", "company_id": 9}, + "회사없음": {"id": "8", "role": "USER", "company_id": None}, + "없음": None, +} +PLACES = [ + ("system", None), + ("company", None), ("company", "3"), ("company", "9"), + ("personal", None), ("personal", "3/7"), ("personal", "3/5"), ("personal", "3/1"), + ("personal", "9/90"), ("personal", "9/91"), ("personal", "3/8"), +] # fmt: skip + + +def _server(user: dict | None, layer: str, owner: str | None) -> dict[str, bool]: + session = None if user is None else {**user, "user_id": user["id"]} + try: + access.grant(session or {}, layer, owner) + need = False + except HTTPException as error: + need = error.status_code == 409 + return {"canWrite": access.can_write(session, (layer, owner)), "needCompany": need} + + +def _screen(cases: list) -> list[dict[str, bool]]: + text = LAYER.read_text(encoding="utf-8") + parts = [ + re.search(r"^export const ownOwner[\s\S]*?;\n", text, re.M), + re.search(r"^export function accessFor[\s\S]*?^}", text, re.M), + re.search(r"^export function manages[\s\S]*?^}", text, re.M), + ] + assert all(parts), "ownOwner · accessFor · manages 를 못 찾음" + script = ( + 'type ManageLayer = "system" | "company" | "personal";\n' + "interface SessionUser { id: string; role?: string; company_id?: number | null;" + " is_master?: boolean }\n" + "interface LayerAccess { canWrite: boolean; needCompany: boolean }\n" + + "\n".join(p.group(0).replace("export ", "") for p in parts) + + "\nconst cases = JSON.parse(process.argv[1]);" + + "\nconsole.log(JSON.stringify(cases.map((c) => accessFor(c[0], c[1], c[2]))));" + ) + result = subprocess.run( + ["node", "--experimental-strip-types", "--no-warnings", + "--input-type=module-typescript", "-e", script, json.dumps(cases)], + capture_output=True, text=True, encoding="utf-8", timeout=60, + ) # fmt: skip + assert result.returncode == 0, result.stderr + return json.loads(result.stdout) + + +@pytest.mark.skipif(shutil.which("node") is None, reason="node 가 없음") +def test_화면_서버_권한_같음(): + combos = list(itertools.product(PEOPLE.items(), PLACES)) + screen = _screen([[layer, owner, user] for (_n, user), (layer, owner) in combos]) + differ = [ + (name, layer, owner, got, _server(user, layer, owner)) + for ((name, user), (layer, owner)), got in zip(combos, screen, strict=True) + if got != _server(user, layer, owner) + ] + assert differ == [] + writes = sum(s["canWrite"] for s in screen) + assert 0 < writes < len(screen) # 고침 · 못 고침이 둘 다 나옴(빈 비교가 아님)