fix(공통): 로그인 후 보던 화면으로 복귀 + 깨진 users.json 덮어쓰기 방지

- app/store.py login_redirect(): 로그인 전 화면 주소를 /login?next= 로 넘긴다(GET 만 —
  폼 POST 주소로 돌아가면 405). 경비·쿠팡·휴가·말레이시아·배송·카페24·실적 11곳이
  next 없이 /login 으로 보내던 것과 프로젝트·입출고·안내문 발송의 복사본 4벌을 이 함수로.
- UserStore._read: JSONDecodeError 를 빈 목록으로 삼키지 않는다 — 다음 로그인이 전체
  사용자·권한을 그 한 명으로 덮어쓰던 것을 막는다.
- tests/test_login_redirect.py

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-30 10:45:58 +09:00
parent c9b4fa36fe
commit 007a16eb9c
12 changed files with 108 additions and 40 deletions
+2 -2
View File
@@ -96,11 +96,11 @@ def guard(request: Request):
반환이 tuple 이면 (store, user), 아니면 그대로 응답으로 돌려준다.
"""
from app.main import get_current_user_record, render_template # noqa: WPS433
from app.store import has_module, is_admin # noqa: WPS433
from app.store import has_module, is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
return RedirectResponse(url="/login", status_code=303)
return login_redirect(request)
if not has_module(user, MODULE_KEY):
return render_template(
request,
+2 -2
View File
@@ -75,11 +75,11 @@ def _render_config_needed(request: Request, user: dict[str, Any]) -> HTMLRespons
def _guard(request: Request) -> tuple[Any, dict[str, Any]] | HTMLResponse | RedirectResponse:
"""로그인+권한+store 점검을 한 번에. 페이지 핸들러 진입부에서 사용."""
from app.main import get_current_user_record, render_template # noqa: WPS433
from app.store import has_module, is_admin # noqa: WPS433
from app.store import has_module, is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
return RedirectResponse(url="/login", status_code=303)
return login_redirect(request)
if not has_module(user, "cupang"):
return render_template(
request,
+2 -2
View File
@@ -131,11 +131,11 @@ def _render_config_needed(request: Request, user: dict[str, Any]) -> HTMLRespons
def _guard(request: Request):
"""로그인+권한+store 점검. 페이지 핸들러 진입부에서 사용."""
from app.main import get_current_user_record, render_template # noqa: WPS433
from app.store import has_module, is_admin # noqa: WPS433
from app.store import has_module, is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
return RedirectResponse(url="/login", status_code=303)
return login_redirect(request)
if not has_module(user, "dispatch"):
return render_template(
request,
+10 -10
View File
@@ -265,11 +265,11 @@ def expense_index(request: Request) -> HTMLResponse:
get_current_user_record,
render_template,
)
from app.store import has_module, is_admin # noqa: WPS433
from app.store import has_module, is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
return RedirectResponse(url="/login", status_code=303)
return login_redirect(request)
if not has_module(user, "expense"):
return render_template(
request,
@@ -325,11 +325,11 @@ def pending_page(request: Request) -> HTMLResponse:
get_current_user_record,
render_template,
)
from app.store import has_module, is_admin # noqa: WPS433
from app.store import has_module, is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
return RedirectResponse(url="/login", status_code=303)
return login_redirect(request)
if not (is_admin(user) or has_module(user, "expense_approver")):
return render_template(
request,
@@ -362,11 +362,11 @@ def reports_page(request: Request) -> HTMLResponse:
get_current_user_record,
render_template,
)
from app.store import is_admin # noqa: WPS433
from app.store import is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
return RedirectResponse(url="/login", status_code=303)
return login_redirect(request)
store = _store(request)
_require_db_store(store)
year_str = request.query_params.get("year") or str(now_kst().year)
@@ -436,11 +436,11 @@ def approved_page(request: Request) -> HTMLResponse:
get_current_user_record,
render_template,
)
from app.store import has_module, is_admin # noqa: WPS433
from app.store import has_module, is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
return RedirectResponse(url="/login", status_code=303)
return login_redirect(request)
if not (is_admin(user) or has_module(user, "expense_approver")):
return render_template(
request,
@@ -667,11 +667,11 @@ def settings_page(request: Request) -> HTMLResponse:
get_current_user_record,
render_template,
)
from app.store import has_module, is_admin # noqa: WPS433
from app.store import has_module, is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
return RedirectResponse(url="/login", status_code=303)
return login_redirect(request)
if not (is_admin(user) or has_module(user, "expense_approver")):
return render_template(
request,
+2 -4
View File
@@ -68,13 +68,11 @@ def _user(request: Request) -> dict[str, Any]:
def _page_user(request: Request) -> Any:
"""화면 주소 — 로그인 전이면 로그인으로 보냈다가 돌아온다."""
from urllib.parse import quote # noqa: WPS433
from app.main import get_current_user_record # noqa: WPS433
from app.store import login_redirect # noqa: WPS433
if get_current_user_record(request) is None:
here = str(request.url.path) + ("?" + request.url.query if request.url.query else "")
return RedirectResponse(url="/login?next=" + quote(here, safe=""), status_code=303)
return login_redirect(request)
return _user(request)
+2 -2
View File
@@ -90,11 +90,11 @@ def _render_config_needed(request: Request, user: dict[str, Any]) -> HTMLRespons
def _guard(request: Request) -> tuple[Any, dict[str, Any]] | HTMLResponse | RedirectResponse:
"""로그인+권한+store 점검. 페이지 핸들러 진입부에서 사용."""
from app.main import get_current_user_record, render_template # noqa: WPS433
from app.store import has_module, is_admin # noqa: WPS433
from app.store import has_module, is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
return RedirectResponse(url="/login", status_code=303)
return login_redirect(request)
if not has_module(user, "malaysia"):
return render_template(
request,
+2 -5
View File
@@ -63,15 +63,12 @@ def _db(request: Request) -> Any:
def _page(request: Request) -> Any:
"""화면 공통 — (st, user) 또는 응답(로그인·권한·설정 필요)."""
from urllib.parse import quote # noqa: WPS433
from app.main import build_erp_nav, get_current_user_record, render_template # noqa: WPS433
from app.store import has_module, is_admin # noqa: WPS433
from app.store import has_module, is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
here = str(request.url.path) + ("?" + request.url.query if request.url.query else "")
return RedirectResponse(url="/login?next=" + quote(here, safe=""), status_code=303)
return login_redirect(request)
if not has_module(user, "outreach"):
return render_template(request, "denied.html", {"reason": "안내문 발송 모듈 접근 권한이 없습니다.",
"is_admin": is_admin(user)}, status_code=403)
+2 -2
View File
@@ -85,11 +85,11 @@ def require_store(request: Request, *, admin: bool = False) -> tuple[Any, dict[s
def guard(request: Request, *, admin: bool = False):
"""페이지 진입부. tuple(store, user) 이 아니면 그대로 응답으로 돌려준다."""
from app.main import get_current_user_record, render_template # noqa: WPS433
from app.store import has_module, is_admin # noqa: WPS433
from app.store import has_module, is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
return RedirectResponse(url="/login", status_code=303)
return login_redirect(request)
if not has_module(user, MODULE_KEY) or (admin and not is_admin(user)):
reason = "실적 설정은 관리자만 볼 수 있습니다." if admin else f"{MODULE_NAME} 접근 권한이 없습니다."
return render_template(request, "denied.html",
+4 -8
View File
@@ -89,13 +89,11 @@ def _require_user(request: Request) -> dict[str, Any]:
def _page_user(request: Request) -> Any:
"""화면(HTML) 주소용 — 로그인 전이면 오류 JSON 대신 로그인 화면으로 보냈다가 이 주소로 되돌아온다
(공유한 회의록·업무 링크를 로그인 안 된 브라우저에서 열 때, 2026-10-14). 로그인했으면 _require_user 와 같다."""
from urllib.parse import quote # noqa: WPS433
from app.main import get_current_user_record # noqa: WPS433
from app.store import login_redirect # noqa: WPS433
if get_current_user_record(request) is None:
here = str(request.url.path) + ("?" + request.url.query if request.url.query else "")
return RedirectResponse(url="/login?next=" + quote(here, safe=""), status_code=303)
return login_redirect(request)
return _require_user(request)
@@ -2948,12 +2946,10 @@ def notifier_download(request: Request) -> Any:
def notifier_page(request: Request) -> Any:
"""PC 알림 프로그램 — 연결 승인(?code=)·연결된 PC 목록·내려받기."""
from app.main import DATA_DIR, build_erp_nav, get_current_user_record, render_template # noqa: WPS433
from app.store import is_admin # noqa: WPS433
from urllib.parse import quote # noqa: WPS433
from app.store import is_admin, login_redirect # noqa: WPS433
if get_current_user_record(request) is None:
return RedirectResponse(url="/login?next=" + quote(str(request.url.path) + (
"?" + request.url.query if request.url.query else ""), safe=""), status_code=303)
return login_redirect(request)
user = _require_user(request)
st = _store(request)
if st is None:
+2 -2
View File
@@ -151,11 +151,11 @@ def _guard(
) -> tuple[Any, dict[str, Any]] | HTMLResponse | RedirectResponse:
"""로그인+권한+store 점검. 페이지 핸들러 진입부에서 사용."""
from app.main import get_current_user_record, render_template # noqa: WPS433
from app.store import has_module, is_admin # noqa: WPS433
from app.store import has_module, is_admin, login_redirect # noqa: WPS433
user = get_current_user_record(request)
if user is None:
return RedirectResponse(url="/login", status_code=303)
return login_redirect(request)
if not has_module(user, "vacation"):
return render_template(
request,
+13 -1
View File
@@ -12,6 +12,9 @@ import tempfile
import threading
from pathlib import Path
from typing import Any, Iterable
from urllib.parse import quote
from fastapi.responses import RedirectResponse
from .timezone import now_kst_iso
@@ -67,7 +70,7 @@ class UserStore:
try:
with self._path.open("r", encoding="utf-8") as f:
data = json.load(f)
except (FileNotFoundError, json.JSONDecodeError):
except FileNotFoundError: # 깨진 JSON 은 잡지 않는다 — 빈 목록으로 읽으면 다음 로그인이 전체 사용자를 덮어쓴다
data = {"users": {}}
if "users" not in data or not isinstance(data["users"], dict):
data["users"] = {}
@@ -265,3 +268,12 @@ def is_approver(user_rec: dict[str, Any] | None, kind: str) -> bool:
def allowed_modules(user_rec: dict[str, Any] | None) -> set[str]:
return {m for m in MODULE_KEYS if has_module(user_rec, m)}
def login_redirect(request: Any) -> RedirectResponse:
"""로그인 화면으로 — 로그인 뒤 지금 보던 화면(경로+쿼리)으로 돌아온다(모든 모듈 화면 공통).
GET 만 next 를 붙인다(폼 POST 주소로 돌아가면 GET 이라 405 가 난다)."""
if request.method != "GET":
return RedirectResponse(url="/login", status_code=303)
here = request.url.path + ("?" + request.url.query if request.url.query else "")
return RedirectResponse(url="/login?next=" + quote(here, safe=""), status_code=303)
+65
View File
@@ -0,0 +1,65 @@
"""로그인 전 화면 주소 → /login?next=(GET 만), 깨진 users.json 은 덮어쓰지 않는다."""
import os
import subprocess
import sys
import tempfile
import unittest
from pathlib import Path
class LoginRedirectTests(unittest.TestCase):
def test_next_and_broken_users_json(self):
env = dict(os.environ)
for module in (
"ASSET", "CAFE24", "CUPANG", "VACATION", "PROJECT", "DISPATCH",
"PERFORMANCE", "MALAYSIA_STOCK", "ITEMCODE", "EXPENSE", "INOUT",
):
env[module + "_DB_URL"] = ""
env.update(
SESSION_SECRET_KEY="login-redirect-test-only", SESSION_COOKIE_SECURE="false",
PERFORMANCE_AUTO_SYNC="false", PROJECT_REMINDERS="false", PYTHONIOENCODING="utf-8",
)
code = '''
import json
from fastapi.testclient import TestClient
import app.main as main
client = TestClient(main.app, follow_redirects=False)
for path, nxt in [
("/cafe24/?selected=123", "%2Fcafe24%2F%3Fselected%3D123"),
("/expense/", "%2Fexpense%2F"),
("/vacation/", "%2Fvacation%2F"),
("/performance/", "%2Fperformance%2F"),
]:
r = client.get(path)
assert r.status_code == 303, (path, r.status_code)
assert r.headers["location"] == "/login?next=" + nxt, (path, r.headers["location"])
# 폼 POST 는 next 없이 — 로그인 뒤 같은 주소를 GET 으로 열면 405 가 난다.
r = client.post("/cafe24/schedules/1/cancel")
assert r.status_code == 303 and r.headers["location"] == "/login", r.headers.get("location")
# 깨진 users.json — 빈 목록으로 읽고 덮어쓰지 않고 오류를 낸다.
path = main.user_store._path
path.write_text('{"users": {"a@x.test": {},}}', encoding="utf-8")
broken = path.read_text(encoding="utf-8")
try:
main.user_store.upsert_login(email="b@x.test", name="B", picture="")
except json.JSONDecodeError:
pass
else:
raise AssertionError("깨진 users.json 을 덮어썼다")
assert path.read_text(encoding="utf-8") == broken
print("login redirect OK")
'''
with tempfile.TemporaryDirectory(prefix="login-redirect-") as directory:
env["DATA_DIR"] = directory
result = subprocess.run(
[sys.executable, "-c", code], cwd=Path(__file__).resolve().parents[1],
env=env, capture_output=True, text=True, encoding="utf-8", timeout=60,
)
self.assertEqual(result.returncode, 0, result.stdout + result.stderr)
if __name__ == "__main__":
unittest.main()