fix: 修复登录重复创建会话 + 备注输入框不可交互

- login.js 增加防重复提交锁,请求期间禁用按钮
- Manager.Create 增加幂等检查,同用户同IP同UA 10秒内复用已有会话
- 移除当前设备备注输入框的 readonly 限制,改为 data-current 标记
- 修复 readonly 状态下输入框完全透明无法点击的问题
This commit is contained in:
2026-05-31 00:28:00 +08:00
parent 47ef3f2a99
commit d5d33c3ace
4 changed files with 68 additions and 14 deletions

View File

@ -2,6 +2,7 @@ package session
import ( import (
"log" "log"
"sync"
"time" "time"
"metazone.cc/metalab/internal/config" "metazone.cc/metalab/internal/config"
@ -18,15 +19,43 @@ type Manager struct {
store Store store Store
userRepo userStore userRepo userStore
cfg *config.Config cfg *config.Config
mu sync.Mutex
recentLogin map[uint]*loginEntry // uid → 最近一次登录记录(防重复创建)
}
type loginEntry struct {
sid string
ip string
userAgent string
createdAt time.Time
} }
// NewManager 构造函数 // NewManager 构造函数
func NewManager(store Store, userRepo userStore, cfg *config.Config) *Manager { func NewManager(store Store, userRepo userStore, cfg *config.Config) *Manager {
return &Manager{store: store, userRepo: userRepo, cfg: cfg} return &Manager{
store: store,
userRepo: userRepo,
cfg: cfg,
recentLogin: make(map[uint]*loginEntry),
}
} }
// Create 创建会话并写入存储 // Create 创建会话并写入存储(同用户+同 IP+同 UA 在 10 秒内重复调用时返回已有会话,防重复创建)
func (m *Manager) Create(user *model.User, rememberMe bool, ip, userAgent string) (string, error) { func (m *Manager) Create(user *model.User, rememberMe bool, ip, userAgent string) (string, error) {
m.mu.Lock()
// 幂等检查:同用户+同 IP+同 UA10 秒内不重复创建
if entry, ok := m.recentLogin[user.ID]; ok {
if entry.ip == ip && entry.userAgent == userAgent && time.Since(entry.createdAt) < 10*time.Second {
// 验证旧会话仍然有效
if s, _ := m.store.Get(entry.sid); s != nil {
m.mu.Unlock()
log.Printf("[SessionManager] Create dedup uid=%d reuse sid=%s", user.ID, entry.sid[:16]+"...")
return entry.sid, nil
}
}
}
m.mu.Unlock()
sid, err := NewID() sid, err := NewID()
if err != nil { if err != nil {
return "", err return "", err
@ -47,6 +76,11 @@ func (m *Manager) Create(user *model.User, rememberMe bool, ip, userAgent string
if err := m.store.Set(s); err != nil { if err := m.store.Set(s); err != nil {
return "", err return "", err
} }
m.mu.Lock()
m.recentLogin[user.ID] = &loginEntry{sid: sid, ip: ip, userAgent: userAgent, createdAt: now}
m.mu.Unlock()
log.Printf("[SessionManager] Created sid=%s uid=%d rememberMe=%v ip=%s", sid[:16]+"...", user.ID, rememberMe, ip) log.Printf("[SessionManager] Created sid=%s uid=%d rememberMe=%v ip=%s", sid[:16]+"...", user.ID, rememberMe, ip)
return sid, nil return sid, nil
} }

View File

@ -125,7 +125,7 @@
<span class="session-time">最后活动 {{.LastAccess.Format "2006-01-02 15:04"}}</span> <span class="session-time">最后活动 {{.LastAccess.Format "2006-01-02 15:04"}}</span>
</div> </div>
<div class="session-remark-row"> <div class="session-remark-row">
<input type="text" class="session-remark-input" value="{{.Remark}}" placeholder="添加备注(如 我的笔记本)" maxlength="32" data-sid="{{.ID}}" {{if .IsCurrent}}readonly{{end}}> <input type="text" class="session-remark-input" value="{{.Remark}}" placeholder="添加备注(如 我的笔记本)" maxlength="32" data-sid="{{.ID}}" data-current="{{.IsCurrent}}">
</div> </div>
</div> </div>
<div class="session-action"> <div class="session-action">

View File

@ -690,15 +690,15 @@ body {
background: #fff; background: #fff;
} }
.session-remark-input[readonly] { .session-remark-input[data-current="true"] {
background: transparent; background: rgba(46, 204, 113, .03);
border-color: transparent; border-color: rgba(46, 204, 113, .2);
cursor: default;
} }
.session-remark-input[readonly]:focus { .session-remark-input[data-current="true"]:focus {
box-shadow: none; border-color: var(--color-accent);
border-color: transparent; box-shadow: 0 0 0 3px rgba(52, 152, 219, .15);
background: #fff;
} }
.session-action { .session-action {

View File

@ -55,7 +55,14 @@
doLogin(email, password); doLogin(email, password);
}); });
var loginInProgress = false;
function doLogin(email, password) { function doLogin(email, password) {
if (loginInProgress) return;
loginInProgress = true;
submitBtn.disabled = true;
submitBtn.textContent = '登录中...';
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('POST', '/api/auth/login', true); xhr.open('POST', '/api/auth/login', true);
xhr.setRequestHeader('Content-Type', 'application/json'); xhr.setRequestHeader('Content-Type', 'application/json');
@ -65,7 +72,9 @@
try { resp = JSON.parse(xhr.responseText); } catch (err) { resp = null; } try { resp = JSON.parse(xhr.responseText); } catch (err) { resp = null; }
if (xhr.status === 200 && resp && resp.success && resp.action === 'confirm_restore') { if (xhr.status === 200 && resp && resp.success && resp.action === 'confirm_restore') {
// 注销账号登录 → 二次确认恢复 loginInProgress = false;
submitBtn.disabled = false;
submitBtn.textContent = '登录';
if (confirm(resp.message + '\n\n确认继续登录将中止注销流程。')) { if (confirm(resp.message + '\n\n确认继续登录将中止注销流程。')) {
doConfirmRestore(email, password); doConfirmRestore(email, password);
} }
@ -75,6 +84,9 @@
window.location.href = '/'; window.location.href = '/';
}, 800); }, 800);
} else { } else {
loginInProgress = false;
submitBtn.disabled = false;
submitBtn.textContent = '登录';
var msg = (resp && resp.message) ? resp.message : '登录失败,请稍后重试'; var msg = (resp && resp.message) ? resp.message : '登录失败,请稍后重试';
window.MetaLab.toast(toast, msg, true); window.MetaLab.toast(toast, msg, true);
} }
@ -84,6 +96,11 @@
} }
function doConfirmRestore(email, password) { function doConfirmRestore(email, password) {
if (loginInProgress) return;
loginInProgress = true;
submitBtn.disabled = true;
submitBtn.textContent = '恢复中...';
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('POST', '/api/auth/confirm-restore', true); xhr.open('POST', '/api/auth/confirm-restore', true);
xhr.setRequestHeader('Content-Type', 'application/json'); xhr.setRequestHeader('Content-Type', 'application/json');
@ -98,6 +115,9 @@
window.location.href = '/'; window.location.href = '/';
}, 800); }, 800);
} else { } else {
loginInProgress = false;
submitBtn.disabled = false;
submitBtn.textContent = '登录';
var msg = (resp && resp.message) ? resp.message : '操作失败,请稍后重试'; var msg = (resp && resp.message) ? resp.message : '操作失败,请稍后重试';
window.MetaLab.toast(toast, msg, true); window.MetaLab.toast(toast, msg, true);
} }