diff --git a/M02_MasterTemplete/M02_MasterTemplete_Router_Items.py b/M02_MasterTemplete/M02_MasterTemplete_Router_Items.py index 4afb42205..2580f8717 100644 --- a/M02_MasterTemplete/M02_MasterTemplete_Router_Items.py +++ b/M02_MasterTemplete/M02_MasterTemplete_Router_Items.py @@ -142,9 +142,18 @@ async def others_write(session: Session, got: access.Grant, folder: Path) -> Non pending.append((session, got)) -def _root(session: Session, layer: str, owner: str | None = None, write: bool = False) -> Path: +def _root( + session: Session, + layer: str, + owner: str | None = None, + write: bool = False, + personal: str | None = None, +) -> Path: """층 폴더(권한까지 · `M02_Layer_Access`) — 자기 회사 · 개인 층은 없으면 빈 뼈대를 만듦 · - 남의 층 쓰기(맡은 회사 · 39-6)는 `others_write`.""" + 남의 층 쓰기(맡은 회사 · 39-6)는 `others_write` · `personal` = 개인 층만 받는 종류(내 기계 + 등)의 그 밖 층 404 글(858 5-2 — 층 폴더 찾기 한 벌).""" + if personal and layer != "personal": + raise HTTPException(status_code=404, detail=personal) got = access.require(session, layer, owner, write=write) if layer == "system": return store.FOLDER diff --git a/M02_MasterTemplete/M02_MyMachine.py b/M02_MasterTemplete/M02_MyMachine.py index 2ceab589c..9a5f2b25f 100644 --- a/M02_MasterTemplete/M02_MyMachine.py +++ b/M02_MasterTemplete/M02_MyMachine.py @@ -410,14 +410,14 @@ def _seed(key: str) -> dict: def _user() -> str: - """개인 층(`storage/{회사}/{사용자}/templates`) 사용자 번호 — 그 밖 층 = 404.""" - from M02_MasterTemplete import M02_Template_Layers as layers + """개인 층(`storage/{회사}/{사용자}/templates`) 사용자 번호 — 그 밖 층 = 404 · 층 판정 = + `Labor_Ref.where` 한 벌(858 5-2).""" + from M02_MasterTemplete import M02_Labor_Ref as refs - here = store.root().resolve() - user, company = here.parent.name, here.parent.parent.name - if not (user.isdigit() and company.isdigit()) or here != layers.personal_dir(company, user): + layer, owner = refs.where(store.root()) + if layer != "personal" or not owner: raise _bad("내 기계는 개인 층만", 404) - return user + return owner.split("/")[1] def not_m01(raw: Any, skip: str = "") -> None: diff --git a/M02_MasterTemplete/M02_MyMachine_Router.py b/M02_MasterTemplete/M02_MyMachine_Router.py index 2637bf04b..725d07f61 100644 --- a/M02_MasterTemplete/M02_MyMachine_Router.py +++ b/M02_MasterTemplete/M02_MyMachine_Router.py @@ -13,7 +13,7 @@ from __future__ import annotations from typing import Any -from fastapi import APIRouter, Depends, HTTPException +from fastapi import APIRouter, Depends from pydantic import BaseModel from common_util.common_util_auth import verify_session @@ -32,9 +32,7 @@ class MachineBody(BaseModel): def _folder(session: Session, layer: str, owner: str | None, write: bool = False): - if layer != "personal": - raise HTTPException(status_code=404, detail="내 기계는 개인 층만") - return _root(session, layer, owner, write=write) + return _root(session, layer, owner, write=write, personal="내 기계는 개인 층만") @router.get(PATH) diff --git a/M02_MasterTemplete/M02_Template_Layers.py b/M02_MasterTemplete/M02_Template_Layers.py index 31f69c704..9513f016f 100644 --- a/M02_MasterTemplete/M02_Template_Layers.py +++ b/M02_MasterTemplete/M02_Template_Layers.py @@ -15,7 +15,6 @@ from __future__ import annotations -import hashlib import json import os import shutil @@ -137,10 +136,13 @@ def template_path(layer_dir: str | Path, kind: str, name: str) -> Path: def version_of(path: str | Path) -> str | None: + """파일 판 — 몸은 `Store.version_of` 한 벌(858 5-3 · Store 가 이 파일을 불러 안에서 부름).""" + from M02_MasterTemplete import M02_MasterTemplete_Store as store + path = Path(path) if not path.is_file(): return None - return hashlib.sha256(path.read_bytes()).hexdigest()[:16] + return store.version_of(path.read_bytes()) def _modified(path: Path) -> str: @@ -176,11 +178,13 @@ def read_template(layer_dir: str | Path, kind: str, name: str) -> dict[str, Any] path = template_path(layer_dir, kind, name) if not path.is_file(): return None + from M02_MasterTemplete import M02_MasterTemplete_Store as store + raw = path.read_bytes() return { "종류": kind, "이름": name, - "판": hashlib.sha256(raw).hexdigest()[:16], + "판": store.version_of(raw), "문서": json.loads(raw.decode("utf-8")), } @@ -257,16 +261,20 @@ def write_template( version: str | None = None, check_version: bool = False, ) -> str: - """원자 쓰기 → 새 판. `check_version` 이면 `version` 이 지금 판과 같아야 함(새 파일은 None).""" + """원자 쓰기 → 새 판. `check_version` 이면 `version` 이 지금 판과 같아야 함(새 파일은 None) · + 판 대조 · 쓰기 = `Store._LOCK` 안(858 5-3 — 대조와 쓰기 사이가 열려 있던 것).""" + from M02_MasterTemplete import M02_MasterTemplete_Store as store + if not isinstance(document, dict): raise ValueError("양식 문서는 JSON 객체여야 합니다.") path = template_path(layer_dir, kind, name) - if check_version: - current = version_of(path) - if current != (version or None): - raise StaleTemplate(current) - atomic_write_json(path, document) - return version_of(path) or "" + with store._LOCK: + if check_version: + current = version_of(path) + if current != (version or None): + raise StaleTemplate(current) + atomic_write_json(path, document) + return version_of(path) or "" def delete_template(