提交登录修改
This commit is contained in:
super
@@ -1,107 +1,55 @@
|
||||
"""
|
||||
认证蓝图：登录、登出、登录状态校验
|
||||
"""
|
||||
from flask import Blueprint, request, redirect, url_for, session, jsonify
|
||||
from werkzeug.security import check_password_hash
|
||||
|
||||
from app_common import (
|
||||
get_db,
|
||||
_render_html,
|
||||
_is_session_user_valid,
|
||||
login_required,
|
||||
BASE_DIR,
|
||||
)
|
||||
from tool.devices import DeviceIDGenerator
|
||||
|
||||
auth_bp = Blueprint('auth', __name__)
|
||||
|
||||
|
||||
@auth_bp.route('/login', methods=['GET', 'POST'])
|
||||
def login():
|
||||
if session.get('user_id') and _is_session_user_valid():
|
||||
return redirect(url_for('main.home'))
|
||||
if request.method == 'POST':
|
||||
data = request.get_json() if request.is_json else request.form
|
||||
username = (data.get('username') or '').strip()
|
||||
password = data.get('password') or ''
|
||||
if not username or not password:
|
||||
if request.is_json:
|
||||
return jsonify({'success': False, 'error': '请输入用户名和密码'})
|
||||
return _render_html('login.html', error='请输入用户名和密码')
|
||||
try:
|
||||
conn = get_db()
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"SELECT id, password_hash, machine, is_admin FROM users WHERE username = %s",
|
||||
(username,)
|
||||
)
|
||||
row = cur.fetchone()
|
||||
if row and check_password_hash(row['password_hash'], password):
|
||||
current_machine = DeviceIDGenerator().get_device_id()
|
||||
stored_machine = (row.get('machine') or '').strip()
|
||||
if not stored_machine:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute("UPDATE users SET machine = %s WHERE id = %s", (current_machine, row['id']))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
session.permanent = True
|
||||
session['user_id'] = row['id']
|
||||
session['username'] = username
|
||||
if request.is_json:
|
||||
return jsonify({'success': True, 'redirect': url_for('main.home')})
|
||||
return redirect(url_for('main.home'))
|
||||
print("验证设备",stored_machine)
|
||||
print("当前设备",current_machine)
|
||||
if stored_machine != current_machine and row.get("is_admin") != 1:
|
||||
conn.close()
|
||||
err_msg = '当前设备与首次登录设备不一致，请在原设备上登录'
|
||||
if request.is_json:
|
||||
return jsonify({'success': False, 'error': err_msg})
|
||||
return _render_html('login.html', error=err_msg)
|
||||
conn.close()
|
||||
session.permanent = True
|
||||
session['user_id'] = row['id']
|
||||
session['username'] = username
|
||||
if request.is_json:
|
||||
return jsonify({'success': True, 'redirect': url_for('main.home')})
|
||||
return redirect(url_for('main.home'))
|
||||
conn.close()
|
||||
except Exception as e:
|
||||
if request.is_json:
|
||||
return jsonify({'success': False, 'error': str(e)})
|
||||
return _render_html('login.html', error='登录失败，请稍后重试')
|
||||
if request.is_json:
|
||||
return jsonify({'success': False, 'error': '用户名或密码错误'})
|
||||
return _render_html('login.html', error='用户名或密码错误')
|
||||
return _render_html('login.html')
|
||||
|
||||
|
||||
@auth_bp.route('/api/auth/check')
|
||||
@login_required
|
||||
def api_auth_check():
|
||||
"""校验登录状态，用于页面加载时判断是否已登录；同时校验机器码是否与首次登录设备一致"""
|
||||
if not session.get('user_id'):
|
||||
return jsonify({'logged_in': False})
|
||||
try:
|
||||
conn = get_db()
|
||||
with conn.cursor() as cur:
|
||||
cur.execute("SELECT machine, is_admin FROM users WHERE id = %s", (session['user_id'],))
|
||||
row = cur.fetchone()
|
||||
conn.close()
|
||||
if not row:
|
||||
return jsonify({'logged_in': False})
|
||||
stored_machine = (row.get('machine') or '').strip()
|
||||
if stored_machine:
|
||||
current_machine = DeviceIDGenerator().get_device_id()
|
||||
if stored_machine != current_machine and row.get("is_admin") != 1:
|
||||
session.clear()
|
||||
return jsonify({'logged_in': False, 'error': '当前设备与首次登录设备不一致'})
|
||||
except Exception:
|
||||
return jsonify({'logged_in': False})
|
||||
return jsonify({'logged_in': True, 'redirect': url_for('main.home')})
|
||||
|
||||
|
||||
@auth_bp.route('/logout')
|
||||
def logout():
|
||||
session.clear()
|
||||
return redirect(url_for('auth.login'))
|
||||
"""
|
||||
认证蓝图：登录页（仅 GET 渲染模板）+ 登出（清 JWT cookie）+ token 同步
|
||||
登录表单提交已经直连 Java 后端 /login，Python 这边只负责：
|
||||
1. 渲染登录页模板
|
||||
2. 把 Java 签发的 JWT 从前端写到 Python 同源 cookie，供后续页面跳转携带
|
||||
3. 登出：清 cookie 跳回登录页
|
||||
"""
|
||||
import sys
|
||||
|
||||
from flask import Blueprint, redirect, url_for, make_response, request, jsonify
|
||||
|
||||
from app_common import _render_html, current_user_id
|
||||
from config import JAVA_API_BASE
|
||||
from jwt_util import COOKIE_NAME, parse_token_with_reason
|
||||
|
||||
auth_bp = Blueprint('auth', __name__)
|
||||
|
||||
|
||||
@auth_bp.route('/login', methods=['GET'])
|
||||
def login():
|
||||
if current_user_id():
|
||||
return redirect(url_for('main.home'))
|
||||
return _render_html('login.html', java_api_base=JAVA_API_BASE)
|
||||
|
||||
|
||||
@auth_bp.route('/api/auth/sync', methods=['POST'])
|
||||
def api_auth_sync():
|
||||
"""前端拿到 Java 返回的 JWT 后调用，把 token 写进 Python 同源 cookie。"""
|
||||
data = request.get_json(silent=True) or {}
|
||||
token = (data.get('token') or '').strip()
|
||||
if not token:
|
||||
return jsonify({'success': False, 'error': '缺少 token'}), 400
|
||||
payload, reason = parse_token_with_reason(token)
|
||||
if not payload:
|
||||
# 把根因打到服务端日志，并回传给前端，便于现场排查
|
||||
print(f"[auth] /api/auth/sync 校验失败: {reason}", file=sys.stderr)
|
||||
return jsonify({'success': False, 'error': f'token 无效: {reason}'}), 401
|
||||
resp = make_response(jsonify({'success': True}))
|
||||
resp.set_cookie(
|
||||
COOKIE_NAME,
|
||||
token,
|
||||
max_age=7 * 24 * 3600,
|
||||
path='/',
|
||||
httponly=True,
|
||||
samesite='Lax',
|
||||
)
|
||||
return resp
|
||||
|
||||
|
||||
@auth_bp.route('/logout')
|
||||
def logout():
|
||||
resp = make_response(redirect(url_for('auth.login')))
|
||||
resp.delete_cookie(COOKIE_NAME, path='/')
|
||||
return resp
|
||||
|
||||
|
||||
Reference in New Issue
Block a user