diff --git a/backend/routers/__pycache__/page_permissions.cpython-311.pyc b/backend/routers/__pycache__/page_permissions.cpython-311.pyc index 179afc9..28b228b 100644 Binary files a/backend/routers/__pycache__/page_permissions.cpython-311.pyc and b/backend/routers/__pycache__/page_permissions.cpython-311.pyc differ diff --git a/backend/routers/page_permissions.py b/backend/routers/page_permissions.py index b5159ab..37f3e92 100644 --- a/backend/routers/page_permissions.py +++ b/backend/routers/page_permissions.py @@ -6,7 +6,8 @@ from fastapi import APIRouter, Depends, HTTPException, status from sqlalchemy.orm import Session from typing import List, Optional -from pydantic import BaseModel +from pydantic import BaseModel, Field +from datetime import datetime from database.database import get_db from database.models import User, UserPagePermission, UserRole @@ -27,7 +28,7 @@ class PagePermissionResponse(BaseModel): page_name: str can_access: bool granted_by_id: Optional[int] - granted_at: str + granted_at: Optional[datetime] notes: Optional[str] class Config: diff --git a/nginx/nginx.conf b/nginx/nginx.conf index bc0b3e1..6bdb326 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -17,7 +17,24 @@ http { listen 80; server_name localhost; - # 경기도 IP 대역만 허용 (주요 ISP) + # 클라우드플레어 IP 대역 허용 + allow 173.245.48.0/20; + allow 103.21.244.0/22; + allow 103.22.200.0/22; + allow 103.31.4.0/22; + allow 141.101.64.0/18; + allow 108.162.192.0/18; + allow 190.93.240.0/20; + allow 188.114.96.0/20; + allow 197.234.240.0/22; + allow 198.41.128.0/17; + allow 162.158.0.0/15; + allow 104.16.0.0/13; + allow 104.24.0.0/14; + allow 172.64.0.0/13; + allow 131.0.72.0/22; + + # 경기도 IP 대역 허용 (주요 ISP) allow 211.0.0.0/8; # KT allow 175.0.0.0/8; # KT allow 121.0.0.0/8; # SK브로드밴드