Compare commits

..

3 Commits

Author SHA1 Message Date
7362b45846 feat(logs): date filter + clear log endpoints
- API GET /api/logs now accepts from_ts / to_ts (unix epoch, half-open
  [from, to)) so callers can scope by arbitrary time range.
- API DELETE /api/logs added. Same from_ts / to_ts semantics. No params
  = wipe everything and reset the AUTOINCREMENT counter.
- Dashboard Logs page: date picker that scopes both the view and the
  delete button to the selected day in the user's local timezone. The
  clear button is red and confirms before deleting; label switches
  between "전체 로그 초기화" and "<날짜> 하루치 삭제".
2026-05-23 17:55:58 +09:00
8312cfe861 fix(proxy): flush disconnect packet cleanly + label handshake errors
Two related diagnostics from production:

1) "Connection reset" instead of the custom block_message screen.
   Root cause: writer.close() returned before the kernel flushed the
   Login Disconnect packet, and the OS sent RST instead of FIN. Fix:
   write_eof() + await wait_closed() so the FIN goes out after the
   payload and the client has time to read the chat component.

2) Log entries showing reason "handshake error:" with an empty tail.
   Root cause: bare OSError() / ConnectionResetError() have empty
   str(), so the f-string interpolated to nothing. Fix: prepend the
   exception class name so the reason is always informative.
2026-05-23 17:46:12 +09:00
d9a1ee1a69 fix(nginx): bake nginx.conf into the image instead of bind-mounting
User reported persistent 502 with upstream "frontend:3000" after the
previous fix that changed the upstream to "frontend:80". Symptom is
a stale conf still being served by the nginx container - the host
volume mount was keeping an old file in play (cached image, missing
git pull, or the conf simply not being re-read).

Make this class of bug impossible: ship the conf inside the nginx
service's image. A fresh build now guarantees the conf in the
container matches the conf in the repo.

- nginx/Dockerfile added (FROM nginx:alpine + COPY nginx.conf)
- docker-compose nginx service: image -> build ./nginx; remove
  the conf bind mount entirely.

Deploy:  git pull && docker compose build nginx frontend && docker compose up -d --force-recreate
2026-05-23 17:38:10 +09:00
7 changed files with 145 additions and 12 deletions

View File

@@ -88,7 +88,8 @@ mc-filter-proxy 컨테이너 (25565)
| POST | `/api/domains` | 도메인 추가 |
| PATCH | `/api/domains/{domain}` | 활성/메모 변경 |
| DELETE | `/api/domains/{domain}` | 도메인 삭제 |
| GET | `/api/logs?limit&offset&action` | 접속 로그 (페이지네이션) |
| GET | `/api/logs?limit&offset&action&from_ts&to_ts` | 접속 로그 (페이지네이션, 날짜 필터) |
| DELETE | `/api/logs?from_ts&to_ts` | 접속 로그 삭제 (범위 미지정 시 전체) |
| GET | `/api/status` | 프록시 상태 + 통계 |
| POST | `/api/proxy/restart` | config 파일 touch (프록시 재로드 트리거) |

View File

@@ -1,4 +1,4 @@
"""접속 로그 조회."""
"""접속 로그 조회 및 초기화."""
from __future__ import annotations
import sqlite3
@@ -15,16 +15,26 @@ def list_logs(
limit: int = Query(50, ge=1, le=500),
offset: int = Query(0, ge=0),
action: str | None = Query(None),
from_ts: float | None = Query(None, description="unix epoch seconds, inclusive"),
to_ts: float | None = Query(None, description="unix epoch seconds, exclusive"),
) -> dict:
if not LOG_DB.exists():
return {"total": 0, "items": []}
con = sqlite3.connect(LOG_DB)
try:
con.row_factory = sqlite3.Row
where, params = "", []
conds: list[str] = []
params: list = []
if action:
where = "WHERE action = ?"
conds.append("action = ?")
params.append(action)
if from_ts is not None:
conds.append("ts >= ?")
params.append(from_ts)
if to_ts is not None:
conds.append("ts < ?")
params.append(to_ts)
where = ("WHERE " + " AND ".join(conds)) if conds else ""
total = con.execute(
f"SELECT COUNT(*) FROM connections {where}", params
).fetchone()[0]
@@ -36,3 +46,40 @@ def list_logs(
finally:
con.close()
return {"total": total, "items": [dict(r) for r in rows]}
@router.delete("/logs")
def clear_logs(
from_ts: float | None = Query(None, description="ts >= from_ts 만 삭제"),
to_ts: float | None = Query(None, description="ts < to_ts 만 삭제"),
) -> dict:
"""접속 로그를 삭제한다.
- from_ts/to_ts 둘 다 없으면 전체 삭제 (AUTOINCREMENT 카운터까지 리셋)
- 둘 중 하나만 있으면 그 조건만 적용
- 둘 다 있으면 [from_ts, to_ts) 범위 삭제 — 날짜 선택 삭제 용도
"""
if not LOG_DB.exists():
return {"deleted": 0}
con = sqlite3.connect(LOG_DB, timeout=5)
try:
conds: list[str] = []
params: list = []
if from_ts is not None:
conds.append("ts >= ?")
params.append(from_ts)
if to_ts is not None:
conds.append("ts < ?")
params.append(to_ts)
if conds:
where = "WHERE " + " AND ".join(conds)
cur = con.execute(f"DELETE FROM connections {where}", params)
deleted = cur.rowcount
else:
cur = con.execute("DELETE FROM connections")
deleted = cur.rowcount
con.execute("DELETE FROM sqlite_sequence WHERE name='connections'")
con.commit()
finally:
con.close()
return {"deleted": deleted}

View File

@@ -31,12 +31,10 @@ services:
- mc-filter
nginx:
image: nginx:alpine
build: ./nginx
container_name: mc-filter-nginx
ports:
- "8080:80" # 대시보드 접근 포트 (외부 포트포워딩 금지 권장)
volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
depends_on:
- api
- frontend

View File

@@ -32,5 +32,11 @@ export const api = {
).toString()
return req('/logs' + (q ? `?${q}` : ''))
},
clearLogs: (params = {}) => {
const q = new URLSearchParams(
Object.fromEntries(Object.entries(params).filter(([, v]) => v !== '' && v != null))
).toString()
return req('/logs' + (q ? `?${q}` : ''), { method: 'DELETE' })
},
restart: () => req('/proxy/restart', { method: 'POST' }),
}

View File

@@ -5,16 +5,33 @@ function fmtTime(ts) {
return new Date(ts * 1000).toLocaleString('ko-KR')
}
// 'YYYY-MM-DD' 문자열을 로컬 자정 unix epoch (초) 로 바꾼다.
function dayStart(dateStr) {
if (!dateStr) return null
const [y, m, d] = dateStr.split('-').map((s) => parseInt(s, 10))
return new Date(y, m - 1, d, 0, 0, 0, 0).getTime() / 1000
}
function dayEnd(dateStr) {
const start = dayStart(dateStr)
return start == null ? null : start + 86400
}
export default function Logs() {
const [data, setData] = useState({ total: 0, items: [] })
const [filter, setFilter] = useState('')
const [date, setDate] = useState('')
const [auto, setAuto] = useState(true)
const [error, setError] = useState(null)
const [msg, setMsg] = useState(null)
async function load() {
try {
const params = { limit: 100 }
if (filter) params.action = filter
if (date) {
params.from_ts = dayStart(date)
params.to_ts = dayEnd(date)
}
setData(await api.logs(params))
setError(null)
} catch (e) {
@@ -27,7 +44,30 @@ export default function Logs() {
if (!auto) return
const id = setInterval(load, 3000)
return () => clearInterval(id)
}, [filter, auto])
}, [filter, date, auto])
async function clearLogs() {
const scope = date ? `${date} 하루치` : '전체'
if (!window.confirm(`${scope} 접속 로그를 정말 삭제할까요? (되돌릴 수 없음)`)) {
return
}
try {
const params = {}
if (date) {
params.from_ts = dayStart(date)
params.to_ts = dayEnd(date)
}
const res = await api.clearLogs(params)
setMsg(`${res.deleted.toLocaleString()}건 삭제됨`)
setError(null)
setTimeout(() => setMsg(null), 2500)
load()
} catch (e) {
setError(e.message)
}
}
const clearLabel = date ? `${date} 하루치 삭제` : '전체 로그 초기화'
return (
<div>
@@ -40,6 +80,19 @@ export default function Logs() {
<option value="blocked">차단</option>
<option value="error">에러</option>
</select>
<label className="inline">
날짜
<input
type="date"
value={date}
onChange={(e) => setDate(e.target.value)}
/>
</label>
{date && (
<button className="ghost" onClick={() => setDate('')}>
오늘 해제
</button>
)}
<label className="inline">
<input
type="checkbox"
@@ -49,6 +102,10 @@ export default function Logs() {
자동 갱신 (3)
</label>
<span className="muted"> {data.total.toLocaleString()}</span>
<button className="danger" onClick={clearLogs}>
{clearLabel}
</button>
{msg && <span className="ok">{msg}</span>}
</div>
<table className="table">
<thead>

6
nginx/Dockerfile Normal file
View File

@@ -0,0 +1,6 @@
# nginx.conf 를 image 에 굽는다.
# (volume mount 로 운영하다 보면 호스트 측 conf 가 stale 일 때 영문도 모르고
# 502 가 나는 경우가 있어 image 안에 직접 포함시킨다.)
FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf
EXPOSE 80

View File

@@ -228,9 +228,16 @@ async def handle_client(
)
hs = parse_handshake(hs_bytes)
except (HandshakeError, asyncio.TimeoutError, asyncio.IncompleteReadError, OSError) as exc:
log_event(client_ip, None, None, "blocked", f"handshake error: {exc}")
log.info("BLOCK %s reason=handshake_error (%s)", client_ip, exc)
# str(exc) 가 빈 문자열인 예외들(OSError(), ConnectionResetError())
# 도 있어서 class 이름을 함께 남긴다 — 빈 reason 로 보이는 문제 회피.
reason = f"handshake error: {type(exc).__name__}: {exc}".rstrip(": ")
log_event(client_ip, None, None, "blocked", reason)
log.info("BLOCK %s reason=%s", client_ip, reason)
try:
client_writer.close()
await client_writer.wait_closed()
except Exception: # noqa: BLE001
pass
return
domain = hs.server_address.lower().strip()
@@ -247,9 +254,20 @@ async def handle_client(
msg = state.cfg.get("block_message") or DEFAULT_BLOCK_MESSAGE
client_writer.write(build_login_disconnect(msg))
await client_writer.drain()
# FIN 으로 마무리해서 클라이언트가 disconnect 패킷을 다 읽기 전에
# RST 가 가는 (그러면 "Connection reset" 으로 보인다) 일을 막는다.
try:
if client_writer.can_write_eof():
client_writer.write_eof()
except (OSError, NotImplementedError):
pass
except (OSError, ConnectionResetError, BrokenPipeError):
pass
try:
client_writer.close()
await client_writer.wait_closed()
except Exception: # noqa: BLE001
pass
return
backend_host, backend_port = target