Spaces:
Runtime error
Runtime error
Update app.py
Browse files
app.py
CHANGED
|
@@ -36,6 +36,11 @@ from validators import (
|
|
| 36 |
mask_ip_for_teacher,
|
| 37 |
normalize_room_name,
|
| 38 |
normalize_user_text,
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 39 |
with_fallback_author_role,
|
| 40 |
)
|
| 41 |
|
|
@@ -352,9 +357,23 @@ with st.sidebar:
|
|
| 352 |
teacher_id_input = st.text_input("교사 ID", key="teacher_id_input")
|
| 353 |
teacher_pw_input = st.text_input("교사 PW", type="password", key="teacher_pw_input")
|
| 354 |
if st.button("교사 로그인", use_container_width=True):
|
| 355 |
-
safe_teacher_id
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 356 |
account = fetch_teacher_account(supabase, safe_teacher_id)
|
| 357 |
-
safe_pw = normalize_user_text(teacher_pw_input, max_len=60)
|
| 358 |
if isinstance(account, dict) and account.get("_query_failed"):
|
| 359 |
st.session_state['teacher_auth'] = False
|
| 360 |
st.session_state['admin_auth'] = False
|
|
@@ -408,10 +427,20 @@ with st.sidebar:
|
|
| 408 |
req_teacher_id = st.text_input("신청할 교사 ID", key="req_teacher_id")
|
| 409 |
req_teacher_pw = st.text_input("신청할 교사 PW", type="password", key="req_teacher_pw")
|
| 410 |
if st.button("교사 계정 신청", type="primary", use_container_width=True):
|
| 411 |
-
safe_id
|
| 412 |
-
|
| 413 |
-
|
| 414 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 415 |
elif fetch_teacher_account(supabase, safe_id):
|
| 416 |
st.warning("이미 존재하는 ID입니다. 다른 ID를 사용해 주세요.")
|
| 417 |
else:
|
|
@@ -458,12 +487,18 @@ with st.sidebar:
|
|
| 458 |
new_pw = st.text_input("🔒 학생 입장용 암호 (비워두면 공개방)")
|
| 459 |
|
| 460 |
if st.button("새 방 개설하기", type="primary"):
|
| 461 |
-
safe_new_room =
|
| 462 |
-
safe_new_title =
|
| 463 |
-
safe_new_pw =
|
| 464 |
can_store_room_pw = topic_entry_code_column_available()
|
| 465 |
|
| 466 |
-
if
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 467 |
st.error("현재 DB 구조에서는 방 비밀번호 저장을 지원하지 않습니다. 비밀번호를 비우거나 DB에 topic.entry_code 컬럼을 추가해 주세요.")
|
| 468 |
elif safe_new_room and safe_new_title:
|
| 469 |
res = upsert_topic_room(
|
|
@@ -476,11 +511,6 @@ with st.sidebar:
|
|
| 476 |
)
|
| 477 |
if res is not None:
|
| 478 |
st.success(f"'{safe_new_room}' 방이 개설되었습니다! '기존 방 선택'을 눌러 입장하세요.")
|
| 479 |
-
else:
|
| 480 |
-
st.error(
|
| 481 |
-
f"방 이름({MAX_ROOM_NAME_LEN}자 이하)과 주제({MAX_TOPIC_LEN}자 이하)를 모두 입력해주세요. "
|
| 482 |
-
f"입장 암호는 {MAX_ENTRY_CODE_LEN}자까지 저장됩니다."
|
| 483 |
-
)
|
| 484 |
room_name = ""
|
| 485 |
|
| 486 |
else:
|
|
@@ -606,12 +636,15 @@ with col_stt:
|
|
| 606 |
)
|
| 607 |
|
| 608 |
if st.button("의견 제출", use_container_width=True, type="primary"):
|
| 609 |
-
safe_input =
|
| 610 |
-
safe_student_name =
|
| 611 |
-
safe_student_number =
|
|
|
|
|
|
|
|
|
|
| 612 |
if user_role == "학생" and (not safe_student_name or safe_student_name == "익명"):
|
| 613 |
safe_student_name = safe_student_number or "학번미입력"
|
| 614 |
-
if safe_input:
|
| 615 |
now = get_kst_now_str()
|
| 616 |
author_role_for_submit = "교사" if user_role == "교사" else "학생"
|
| 617 |
client_ip = get_client_ip()
|
|
@@ -635,7 +668,7 @@ if st.button("의견 제출", use_container_width=True, type="primary"):
|
|
| 635 |
except Exception as e:
|
| 636 |
st.error(f"저장 실패: {e}")
|
| 637 |
else:
|
| 638 |
-
st.warning("
|
| 639 |
|
| 640 |
st.divider()
|
| 641 |
|
|
|
|
| 36 |
mask_ip_for_teacher,
|
| 37 |
normalize_room_name,
|
| 38 |
normalize_user_text,
|
| 39 |
+
validate_entry_code,
|
| 40 |
+
validate_opinion_content,
|
| 41 |
+
validate_room_name,
|
| 42 |
+
validate_student_name,
|
| 43 |
+
validate_teacher_credential,
|
| 44 |
with_fallback_author_role,
|
| 45 |
)
|
| 46 |
|
|
|
|
| 357 |
teacher_id_input = st.text_input("교사 ID", key="teacher_id_input")
|
| 358 |
teacher_pw_input = st.text_input("교사 PW", type="password", key="teacher_pw_input")
|
| 359 |
if st.button("교사 로그인", use_container_width=True):
|
| 360 |
+
id_ok, safe_teacher_id, id_error_code, id_error_message = validate_teacher_credential(
|
| 361 |
+
teacher_id_input,
|
| 362 |
+
field_name="교사 ID",
|
| 363 |
+
max_len=60,
|
| 364 |
+
)
|
| 365 |
+
pw_ok, safe_pw, pw_error_code, pw_error_message = validate_teacher_credential(
|
| 366 |
+
teacher_pw_input,
|
| 367 |
+
field_name="교사 PW",
|
| 368 |
+
max_len=60,
|
| 369 |
+
)
|
| 370 |
+
if not id_ok:
|
| 371 |
+
st.error(f"❌ {id_error_message} ({id_error_code})")
|
| 372 |
+
st.stop()
|
| 373 |
+
if not pw_ok:
|
| 374 |
+
st.error(f"❌ {pw_error_message} ({pw_error_code})")
|
| 375 |
+
st.stop()
|
| 376 |
account = fetch_teacher_account(supabase, safe_teacher_id)
|
|
|
|
| 377 |
if isinstance(account, dict) and account.get("_query_failed"):
|
| 378 |
st.session_state['teacher_auth'] = False
|
| 379 |
st.session_state['admin_auth'] = False
|
|
|
|
| 427 |
req_teacher_id = st.text_input("신청할 교사 ID", key="req_teacher_id")
|
| 428 |
req_teacher_pw = st.text_input("신청할 교사 PW", type="password", key="req_teacher_pw")
|
| 429 |
if st.button("교사 계정 신청", type="primary", use_container_width=True):
|
| 430 |
+
id_ok, safe_id, id_error_code, id_error_message = validate_teacher_credential(
|
| 431 |
+
req_teacher_id,
|
| 432 |
+
field_name="교사 ID",
|
| 433 |
+
max_len=60,
|
| 434 |
+
)
|
| 435 |
+
pw_ok, safe_pw, pw_error_code, pw_error_message = validate_teacher_credential(
|
| 436 |
+
req_teacher_pw,
|
| 437 |
+
field_name="교사 PW",
|
| 438 |
+
max_len=60,
|
| 439 |
+
)
|
| 440 |
+
if not id_ok:
|
| 441 |
+
st.error(f"❌ {id_error_message} ({id_error_code})")
|
| 442 |
+
elif not pw_ok:
|
| 443 |
+
st.error(f"❌ {pw_error_message} ({pw_error_code})")
|
| 444 |
elif fetch_teacher_account(supabase, safe_id):
|
| 445 |
st.warning("이미 존재하는 ID입니다. 다른 ID를 사용해 주세요.")
|
| 446 |
else:
|
|
|
|
| 487 |
new_pw = st.text_input("🔒 학생 입장용 암호 (비워두면 공개방)")
|
| 488 |
|
| 489 |
if st.button("새 방 개설하기", type="primary"):
|
| 490 |
+
room_ok, safe_new_room, room_error_code, room_error_message = validate_room_name(new_room, max_len=MAX_ROOM_NAME_LEN)
|
| 491 |
+
title_ok, safe_new_title, title_error_code, title_error_message = validate_opinion_content(new_title, max_len=MAX_TOPIC_LEN)
|
| 492 |
+
entry_ok, safe_new_pw, entry_error_code, entry_error_message = validate_entry_code(new_pw, max_len=MAX_ENTRY_CODE_LEN)
|
| 493 |
can_store_room_pw = topic_entry_code_column_available()
|
| 494 |
|
| 495 |
+
if not room_ok:
|
| 496 |
+
st.error(f"❌ {room_error_message} ({room_error_code})")
|
| 497 |
+
elif not title_ok:
|
| 498 |
+
st.error(f"❌ {title_error_message} ({title_error_code})")
|
| 499 |
+
elif not entry_ok:
|
| 500 |
+
st.error(f"❌ {entry_error_message} ({entry_error_code})")
|
| 501 |
+
elif safe_new_pw and not can_store_room_pw:
|
| 502 |
st.error("현재 DB 구조에서는 방 비밀번호 저장을 지원하지 않습니다. 비밀번호를 비우거나 DB에 topic.entry_code 컬럼을 추가해 주세요.")
|
| 503 |
elif safe_new_room and safe_new_title:
|
| 504 |
res = upsert_topic_room(
|
|
|
|
| 511 |
)
|
| 512 |
if res is not None:
|
| 513 |
st.success(f"'{safe_new_room}' 방이 개설되었습니다! '기존 방 선택'을 눌러 입장하세요.")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 514 |
room_name = ""
|
| 515 |
|
| 516 |
else:
|
|
|
|
| 636 |
)
|
| 637 |
|
| 638 |
if st.button("의견 제출", use_container_width=True, type="primary"):
|
| 639 |
+
input_ok, safe_input, input_error_code, input_error_message = validate_opinion_content(user_input, max_len=700)
|
| 640 |
+
student_ok, safe_student_name, student_error_code, student_error_message = validate_student_name(student_name, max_len=MAX_STUDENT_NAME_LEN)
|
| 641 |
+
student_number_ok, safe_student_number, student_number_error_code, student_number_error_message = validate_student_name(student_number, max_len=20)
|
| 642 |
+
if not student_number_ok and user_role == "학생":
|
| 643 |
+
st.error(f"❌ {student_number_error_message} ({student_number_error_code})")
|
| 644 |
+
st.stop()
|
| 645 |
if user_role == "학생" and (not safe_student_name or safe_student_name == "익명"):
|
| 646 |
safe_student_name = safe_student_number or "학번미입력"
|
| 647 |
+
if input_ok and safe_input:
|
| 648 |
now = get_kst_now_str()
|
| 649 |
author_role_for_submit = "교사" if user_role == "교사" else "학생"
|
| 650 |
client_ip = get_client_ip()
|
|
|
|
| 668 |
except Exception as e:
|
| 669 |
st.error(f"저장 실패: {e}")
|
| 670 |
else:
|
| 671 |
+
st.warning(f"{input_error_message} ({input_error_code}))
|
| 672 |
|
| 673 |
st.divider()
|
| 674 |
|