为什么
转码页的多选框只列 /api/files 的内容,也就是录播目录和成片目录两处;后端的
resolveTranscodeInput 走 resolveFile,也只认 record/merge 两个目录名。结果是
录播原片被合并且清掉之后(或者录播目录本来就空),转码页里只剩合并结果可挑,
磁盘上别处的视频一个都进不来。
怎么改
- transcodeJobReq 加 Path 字段,与 dir/name 二选一;新增 resolveTranscodeJob()
把「填了路径就按路径找(认绝对路径和从资源管理器复制来的带引号路径,走
resolveMergeInput)、否则回落 dir+name」收在一处,两条路最后统一过
mergeVideoExts 白名单 —— 路径这条能指向磁盘上任何文件,不挡的话手滑把 .jsonl
丢进来要等 ffmpeg 跑起来才报错。三个调用点和 runTranscode 全部改走它。
- transcodeProbe 回显绝对路径,页面拿它当任务身份:同名文件在不同目录里不会再
被认成一个,重复加入也因此挡得住。
- 转码卡片改成两栏:左边保留原来的文件列表多选,右边加「一行一个路径」的输入框
和「浏览…」按钮(复用已有的目录选择器,可多选、可跨文件夹跨盘攒,选完只追加不
覆盖)。openPick 多了个可选的第 5 参数用来指定起始目录,浏览转码文件时从成片
目录开始(录播目录可能是空的)。
- 报错前缀改用 transcodeJobReq.label():按路径进来时 Name 是空的,直接拼 j.Name
会变成「:参数不合法」。
验证
gofmt -l 干净;go vet 干净;Windows 与 GOOS=linux 编译均通过。
go test ./... 全绿;go test -race -count=1 ./... 27.2s 全绿;顶层用例 209 个
(含子测试 226),本次新增 3 个:-run 单独跑过 TestResolveTranscodeJobByPath /
TestResolveTranscodeJobRejectsBadPath / TestTranscodeProbeHandlerAcceptsPath。
反向验证 44/44:把 resolveTranscodeJob 的路径分支退回 resolveFile 后,上面两个
用例确实变红。
转码接口冒烟 40/40(新增 11 项按路径的:探测回显路径、估算、不存在 400、非视频
后缀 400、指向文件夹 400、真排队转出成片)。
页面 jsdom 冒烟 49/49 且无 JS 报错(新增 12 项:路径框存在、空框不给加入、手填能
进列表并带上绝对路径、探测请求按 path 发、重复加入不重复、浏览弹窗打开/追加不
覆盖/关闭/清空)。
449 lines
15 KiB
Go
449 lines
15 KiB
Go
// web UI 相关
|
||
package main
|
||
|
||
import (
|
||
"bytes"
|
||
"context"
|
||
"encoding/json"
|
||
"fmt"
|
||
"net/http"
|
||
"net/http/httptest"
|
||
"net/url"
|
||
"path/filepath"
|
||
"regexp"
|
||
"testing"
|
||
"time"
|
||
)
|
||
|
||
// 测试期间换一个管理口令
|
||
func withAuthToken(t *testing.T, token string) {
|
||
t.Helper()
|
||
streamers.Lock()
|
||
old := config.AuthToken
|
||
config.AuthToken = token
|
||
streamers.Unlock()
|
||
t.Cleanup(func() {
|
||
streamers.Lock()
|
||
config.AuthToken = old
|
||
streamers.Unlock()
|
||
})
|
||
}
|
||
|
||
// 页面上发给服务端的 X-Auth-Token 是 encodeURIComponent 过的口令,
|
||
// 这里用 url.QueryEscape 造出同样的形状(对中文而言两者产出一致)
|
||
func pageHeader(r *http.Request, token string) *http.Request {
|
||
r.Header.Set("X-Auth-Token", url.QueryEscape(token))
|
||
return r
|
||
}
|
||
|
||
func TestCheckAuthTokenPlainASCII(t *testing.T) {
|
||
withAuthToken(t, "a1b2c3d4e5f6")
|
||
|
||
r := httptest.NewRequest(http.MethodGet, "/api/status", nil)
|
||
r.Header.Set("X-Auth-Token", "a1b2c3d4e5f6")
|
||
if !checkAuthToken(r) {
|
||
t.Fatal("ASCII 口令应该通过")
|
||
}
|
||
|
||
// 带 % 的口令:页面会编码成 %25,服务端解码后要能对上
|
||
withAuthToken(t, "ab%20cd")
|
||
r = pageHeader(httptest.NewRequest(http.MethodGet, "/api/status", nil), "ab%20cd")
|
||
if r.Header.Get("X-Auth-Token") != "ab%2520cd" {
|
||
t.Fatalf("编码结果不对:%q", r.Header.Get("X-Auth-Token"))
|
||
}
|
||
if !checkAuthToken(r) {
|
||
t.Fatal("含 % 的口令应该通过")
|
||
}
|
||
}
|
||
|
||
func TestCheckAuthTokenNonASCII(t *testing.T) {
|
||
// 中文口令是最容易踩的:原先直接把中文塞进请求头,浏览器会抛
|
||
// TypeError(Failed to read the 'headers' property…),请求根本发不出去,
|
||
// 页面上只显示「无法连接到服务器」,用户被彻底锁在门外
|
||
withAuthToken(t, "我的口令abc123")
|
||
|
||
r := pageHeader(httptest.NewRequest(http.MethodGet, "/api/status", nil), "我的口令abc123")
|
||
if r.Header.Get("X-Auth-Token") == "我的口令abc123" {
|
||
t.Fatal("测试前提不成立:头里不该是原文")
|
||
}
|
||
if !checkAuthToken(r) {
|
||
t.Fatal("编码后的中文口令应该通过")
|
||
}
|
||
|
||
// 手写 curl 按文档原样发中文口令,也要能通过
|
||
r = httptest.NewRequest(http.MethodGet, "/api/status", nil)
|
||
r.Header.Set("X-Auth-Token", "我的口令abc123")
|
||
if !checkAuthToken(r) {
|
||
t.Fatal("原样的中文口令也应该通过")
|
||
}
|
||
}
|
||
|
||
func TestCheckAuthTokenAllSources(t *testing.T) {
|
||
withAuthToken(t, "口令abc123")
|
||
|
||
// Authorization: Bearer
|
||
r := httptest.NewRequest(http.MethodGet, "/api/status", nil)
|
||
r.Header.Set("Authorization", "Bearer "+url.QueryEscape("口令abc123"))
|
||
if !checkAuthToken(r) {
|
||
t.Fatal("Bearer 写法应该通过")
|
||
}
|
||
|
||
// ?token=(net/http 已经把查询串解码好了)
|
||
r = httptest.NewRequest(http.MethodGet, "/api/status?token="+url.QueryEscape("口令abc123"), nil)
|
||
if !checkAuthToken(r) {
|
||
t.Fatal("查询参数写法应该通过")
|
||
}
|
||
|
||
// 下载链接里的 ?token= 也是这个路径,混着 % 的口令同样要对上
|
||
withAuthToken(t, "口令%20abc")
|
||
r = httptest.NewRequest(http.MethodGet, "/api/file?token="+url.QueryEscape("口令%20abc"), nil)
|
||
if !checkAuthToken(r) {
|
||
t.Fatal("查询参数里的混合口令应该通过")
|
||
}
|
||
}
|
||
|
||
func TestCheckAuthTokenRejects(t *testing.T) {
|
||
withAuthToken(t, "正确的口令")
|
||
|
||
cases := map[string]*http.Request{
|
||
"口令错了": func() *http.Request {
|
||
return pageHeader(httptest.NewRequest(http.MethodGet, "/api/status", nil), "错误的口令")
|
||
}(),
|
||
"没带口令": httptest.NewRequest(http.MethodGet, "/api/status", nil),
|
||
"空口令头": func() *http.Request {
|
||
r := httptest.NewRequest(http.MethodGet, "/api/status", nil)
|
||
r.Header.Set("X-Auth-Token", "")
|
||
return r
|
||
}(),
|
||
"编码了但不是口令": func() *http.Request {
|
||
r := httptest.NewRequest(http.MethodGet, "/api/status", nil)
|
||
r.Header.Set("X-Auth-Token", "%E5%8F%A3%E4%BB%A4")
|
||
return r
|
||
}(),
|
||
}
|
||
for name, r := range cases {
|
||
if checkAuthToken(r) {
|
||
t.Fatalf("%s:不该通过", name)
|
||
}
|
||
}
|
||
|
||
// 口令没配时一律拒绝,不能因为「都是空」就放行
|
||
withAuthToken(t, "")
|
||
r := httptest.NewRequest(http.MethodGet, "/api/status", nil)
|
||
r.Header.Set("X-Auth-Token", "")
|
||
if checkAuthToken(r) {
|
||
t.Fatal("口令为空时不该通过")
|
||
}
|
||
}
|
||
|
||
func TestAuthTokenCandidatesOrder(t *testing.T) {
|
||
// 三种写法同时出现时按 Bearer → X-Auth-Token → ?token= 的顺序给候选,
|
||
// 顺序本身不影响结果,但别写出重复项(重复比较纯属浪费)
|
||
r := httptest.NewRequest(http.MethodGet, "/api/status?token=qqq", nil)
|
||
r.Header.Set("Authorization", "Bearer aaa")
|
||
r.Header.Set("X-Auth-Token", "bbb")
|
||
got := authTokenCandidates(r)
|
||
want := []string{"aaa", "bbb", "qqq"}
|
||
if len(got) != len(want) {
|
||
t.Fatalf("候选数量不对:%q", got)
|
||
}
|
||
for i := range want {
|
||
if got[i] != want[i] {
|
||
t.Fatalf("候选顺序不对:%q,想要 %q", got, want)
|
||
}
|
||
}
|
||
|
||
// Authorization 不是 Bearer 前缀时不算数
|
||
r = httptest.NewRequest(http.MethodGet, "/api/status", nil)
|
||
r.Header.Set("Authorization", "Basic zzz")
|
||
r.Header.Set("X-Auth-Token", "bbb")
|
||
got = authTokenCandidates(r)
|
||
if len(got) != 1 || got[0] != "bbb" {
|
||
t.Fatalf("非 Bearer 的 Authorization 不该当候选:%q", got)
|
||
}
|
||
}
|
||
|
||
// ==================== 口令错误记录的容量 ====================
|
||
// IP 是外部给的:只靠「过期清理」挡不住换着地址撞口令的情况,
|
||
// 必须要有硬上限。这些用例锁住这一点。
|
||
|
||
// 换着来源持续撞口令,表必须被压在上限以内,不能一直涨
|
||
func TestAuthFailTableHasHardCap(t *testing.T) {
|
||
saved, savedSweep := authFail.m, authFail.sinceSweep
|
||
t.Cleanup(func() {
|
||
authFail.Lock()
|
||
authFail.m, authFail.sinceSweep = saved, savedSweep
|
||
authFail.Unlock()
|
||
})
|
||
authFail.Lock()
|
||
authFail.m, authFail.sinceSweep = nil, 0
|
||
authFail.Unlock()
|
||
|
||
// 每个都是新来源、且都是「刚刚」失败过 —— 过期清理一条都删不掉的情况
|
||
for i := 0; i < authFailMaxEntries*2; i++ {
|
||
authFailDelay(fmt.Sprintf("198.51.100.%d", i))
|
||
}
|
||
got := 0
|
||
authFail.Lock()
|
||
got = len(authFail.m)
|
||
authFail.Unlock()
|
||
if got > authFailMaxEntries {
|
||
t.Errorf("记录数应被压在上限 %d 以内,实际 %d(换 IP 撞口令会把内存写满)",
|
||
authFailMaxEntries, got)
|
||
}
|
||
t.Logf(" %d 个新来源撞完,表内留下 %d 条(上限 %d)", authFailMaxEntries*2, got, authFailMaxEntries)
|
||
}
|
||
|
||
// 超过过期时间的记录要被扫掉,不是在表里一直躺着
|
||
func TestAuthFailExpiredEntriesGetSwept(t *testing.T) {
|
||
saved, savedSweep := authFail.m, authFail.sinceSweep
|
||
t.Cleanup(func() {
|
||
authFail.Lock()
|
||
authFail.m, authFail.sinceSweep = saved, savedSweep
|
||
authFail.Unlock()
|
||
})
|
||
authFail.Lock()
|
||
authFail.m, authFail.sinceSweep = nil, 0
|
||
authFail.Unlock()
|
||
|
||
for i := 0; i < authFailSweepEvery+5; i++ {
|
||
authFailDelay(fmt.Sprintf("203.0.113.%d", i))
|
||
}
|
||
authFail.Lock()
|
||
before := len(authFail.m)
|
||
// 把记录的最后时间推到过期之前
|
||
for k, v := range authFail.m {
|
||
authFail.m[k] = authFailEntry{count: v.count, last: time.Now().Add(-2 * authFailExpire)}
|
||
}
|
||
authFail.Unlock()
|
||
|
||
sweepAuthFail(time.Now())
|
||
authFail.Lock()
|
||
after := len(authFail.m)
|
||
authFail.Unlock()
|
||
if after != 0 {
|
||
t.Errorf("已经全部过期的记录应被扫干净,扫之前 %d 条,扫之后 %d 条", before, after)
|
||
}
|
||
}
|
||
|
||
// 扫表必须是自动发生的:不要求调用方记着手动清理,
|
||
// 混在里面的过期项应该在若干次记录之后自己消失
|
||
func TestAuthFailSweepsPeriodically(t *testing.T) {
|
||
saved, savedSweep := authFail.m, authFail.sinceSweep
|
||
t.Cleanup(func() {
|
||
authFail.Lock()
|
||
authFail.m, authFail.sinceSweep = saved, savedSweep
|
||
authFail.Unlock()
|
||
})
|
||
authFail.Lock()
|
||
authFail.m, authFail.sinceSweep = nil, 0
|
||
authFail.Unlock()
|
||
|
||
// 直接往里塞一条早就过期了的记录(绕过 authFailDelay,模拟「以前留下的」)
|
||
authFail.Lock()
|
||
if authFail.m == nil {
|
||
authFail.m = make(map[string]authFailEntry)
|
||
}
|
||
authFail.m["203.0.113.99"] = authFailEntry{count: 1, last: time.Now().Add(-2 * authFailExpire)}
|
||
authFail.Unlock()
|
||
|
||
// 之后只要还在有人失败,过一阵子它就应该被清掉
|
||
for i := 0; i < authFailSweepEvery+1; i++ {
|
||
authFailDelay(fmt.Sprintf("198.51.100.%d", i))
|
||
}
|
||
|
||
authFail.Lock()
|
||
_, still := authFail.m["203.0.113.99"]
|
||
authFail.Unlock()
|
||
if still {
|
||
t.Errorf("记了 %d 次之后,过期记录应当已经被自动扫掉", authFailSweepEvery+1)
|
||
}
|
||
}
|
||
|
||
// 同一个来源的计数不能无限涨(临界点是延迟早已封顶,再涨只是让数字溢出)
|
||
func TestAuthFailCountCapped(t *testing.T) {
|
||
saved, savedSweep := authFail.m, authFail.sinceSweep
|
||
t.Cleanup(func() {
|
||
authFail.Lock()
|
||
authFail.m, authFail.sinceSweep = saved, savedSweep
|
||
authFail.Unlock()
|
||
})
|
||
authFail.Lock()
|
||
authFail.m, authFail.sinceSweep = nil, 0
|
||
authFail.Unlock()
|
||
|
||
for i := 0; i < authFailMaxCount+50; i++ {
|
||
authFailDelay("192.0.2.9")
|
||
}
|
||
authFail.Lock()
|
||
c := authFail.m["192.0.2.9"].count
|
||
authFail.Unlock()
|
||
if c > authFailMaxCount {
|
||
t.Errorf("同一来源的次数应封顶在 %d,实际 %d", authFailMaxCount, c)
|
||
}
|
||
if d := authFailDelay("192.0.2.9"); d != authMaxDelay {
|
||
t.Errorf("打满之后延迟应封顶在 %v,实际 %v", authMaxDelay, d)
|
||
}
|
||
}
|
||
|
||
// 客户端断开时延迟等待必须立刻返回,不能傻等满 2 秒
|
||
func TestAwaitAuthDelayStopsOnCancel(t *testing.T) {
|
||
ctx, cancel := context.WithCancel(context.Background())
|
||
go func() {
|
||
time.Sleep(80 * time.Millisecond)
|
||
cancel()
|
||
}()
|
||
start := time.Now()
|
||
waited := awaitAuthDelay(ctx, 2*time.Second)
|
||
used := time.Since(start)
|
||
if waited {
|
||
t.Error("上游取消时 awaitAuthDelay 应返回 false")
|
||
}
|
||
if used > time.Second {
|
||
t.Errorf("上游取消后应立刻返回,实际等了 %v", used)
|
||
}
|
||
// 正常等待不受影响
|
||
if !awaitAuthDelay(context.Background(), 10*time.Millisecond) {
|
||
t.Error("没被取消时应当正常等完再返回 true")
|
||
}
|
||
}
|
||
|
||
var (
|
||
webInputIDRe = regexp.MustCompile(`<(?:input|select|textarea)[^>]*\bid="([A-Za-z0-9_]+)"`)
|
||
webSettingFieldsRe = regexp.MustCompile(`var settingFields = \[([^\]]*)\]`)
|
||
webNumberFieldsRe = regexp.MustCompile(`var numberFields = \{([^}]*)\}`)
|
||
webQuotedRe = regexp.MustCompile(`"([A-Za-z0-9_]+)"`)
|
||
)
|
||
|
||
// 设置页里每个能改的输入框都必须在 settingFields 里登记:漏登记的后果是「改了、按了保存,
|
||
// 值却没被提交」,3 秒后刷新又被刷回原值 —— 页面看起来完全正常,也没有任何报错。
|
||
// 反过来,settingFields 里写的 id 如果页面上不存在,refresh 时就静默填不进去。
|
||
//
|
||
// settingFields / numberFields 都是页面里的 JS 变量(整页在 webuiHTML 这个原始串里),
|
||
// 所以这里直接把它们从串里抠出来比对,不另维护一份名单
|
||
func TestWebuiSettingFieldsMatchInputs(t *testing.T) {
|
||
ids := map[string]bool{}
|
||
for _, m := range webInputIDRe.FindAllStringSubmatch(webuiHTML, -1) {
|
||
ids[m[1]] = true
|
||
}
|
||
|
||
m := webSettingFieldsRe.FindStringSubmatch(webuiHTML)
|
||
if m == nil {
|
||
t.Fatal("没能在页面里找到 settingFields 列表")
|
||
}
|
||
settings := map[string]bool{}
|
||
for _, q := range webQuotedRe.FindAllStringSubmatch(m[1], -1) {
|
||
settings[q[1]] = true
|
||
if !ids[q[1]] {
|
||
t.Errorf("settingFields 里的 %q 在页面上找不到对应的输入框", q[1])
|
||
}
|
||
}
|
||
|
||
// 这些输入框刻意不进设置:要么是手动合并卡片自己的参数(随合并请求提交),
|
||
// 要么是路径选择弹窗 / 口令框的内部状态
|
||
notSettings := map[string]string{
|
||
"authTokenNew": "重新生成口令,走单独的接口",
|
||
"authTokenView": "只读展示当前口令",
|
||
"tokenInput": "页面解锁框,不是设置项",
|
||
"newuid": "添加主播,走主播接口",
|
||
"pickHidden": "路径选择弹窗的内部状态",
|
||
"pickPath": "路径选择弹窗的内部状态",
|
||
"mrgVideoPick": "手动合并:视频列表,随合并请求提交",
|
||
"tcFilePick": "转码:待选文件列表,随转码请求提交",
|
||
"tcPaths": "转码:手填的文件路径列表,随转码请求提交",
|
||
"tcOutDir": "转码:输出目录,随转码请求提交",
|
||
}
|
||
for id := range ids {
|
||
if settings[id] {
|
||
continue
|
||
}
|
||
if _, ok := notSettings[id]; ok {
|
||
continue
|
||
}
|
||
t.Errorf("页面上的 %q 既不在 settingFields 里,也没说明为什么不算设置项:改了它不会被保存", id)
|
||
}
|
||
|
||
// numberFields 里的 id 必须都是设置项,否则 parseInt 的结果没人用
|
||
n := webNumberFieldsRe.FindStringSubmatch(webuiHTML)
|
||
if n == nil {
|
||
t.Fatal("没能在页面里找到 numberFields 列表")
|
||
}
|
||
for _, m := range regexp.MustCompile(`([A-Za-z0-9_]+)\s*:`).FindAllStringSubmatch(n[1], -1) {
|
||
if !settings[m[1]] {
|
||
t.Errorf("numberFields 里的 %q 不是设置项", m[1])
|
||
}
|
||
}
|
||
}
|
||
|
||
// 保存设置必须把新增字段真的落到 config 上:漏一个赋值就是「界面显示已保存、实际没生效」,
|
||
// 3 秒后刷新还被刷回原值,页面上完全看不出问题
|
||
func TestWebConfigHandlerSavesMergeFpsAndNotifyMergeFail(t *testing.T) {
|
||
dir := setupMergeTest(t)
|
||
savedConfig := config
|
||
savedLocation := configFileLocation
|
||
oldDir := configDir
|
||
if configDir == nil {
|
||
configDir = new(string)
|
||
}
|
||
defer func() {
|
||
config = savedConfig
|
||
configFileLocation = savedLocation
|
||
configDir = oldDir
|
||
}()
|
||
*configDir = dir
|
||
configFileLocation = filepath.Join(dir, configFile)
|
||
|
||
post := func(body map[string]any) string {
|
||
t.Helper()
|
||
data, err := json.Marshal(body)
|
||
if err != nil {
|
||
t.Fatal(err)
|
||
}
|
||
req := httptest.NewRequest(http.MethodPost, "/api/config", bytes.NewReader(data))
|
||
rec := httptest.NewRecorder()
|
||
webConfigHandler(rec, req)
|
||
if rec.Code != http.StatusOK {
|
||
t.Fatalf("保存设置被拒(%d):%s", rec.Code, rec.Body.String())
|
||
}
|
||
return rec.Body.String()
|
||
}
|
||
base := func() map[string]any {
|
||
return map[string]any{
|
||
"directory": dir,
|
||
"ffmpegPath": testFFmpeg(t),
|
||
"recordSubdir": defaultRecordSubdir,
|
||
"mergeSubdir": defaultMergeSubdir,
|
||
}
|
||
}
|
||
|
||
config.MergeFps = 0
|
||
config.NotifyMergeFail = true
|
||
b := base()
|
||
b["mergeFps"] = 60
|
||
b["notifyMergeFail"] = false
|
||
post(b)
|
||
if config.MergeFps != 60 {
|
||
t.Errorf("mergeFps 没被保存下来:%d", config.MergeFps)
|
||
}
|
||
if config.NotifyMergeFail {
|
||
t.Error("notifyMergeFail=false 没被保存下来")
|
||
}
|
||
|
||
// 超范围(负数或大得离谱)必须挡在保存之前
|
||
for _, bad := range []int{-1, maxMergeFps + 1} {
|
||
config.MergeFps = 7
|
||
b = base()
|
||
b["mergeFps"] = bad
|
||
data, _ := json.Marshal(b)
|
||
req := httptest.NewRequest(http.MethodPost, "/api/config", bytes.NewReader(data))
|
||
rec := httptest.NewRecorder()
|
||
webConfigHandler(rec, req)
|
||
if rec.Code != http.StatusBadRequest {
|
||
t.Errorf("mergeFps=%d 应当被拒(400),实际 %d", bad, rec.Code)
|
||
}
|
||
if config.MergeFps != 7 {
|
||
t.Errorf("mergeFps=%d 被拒后不该改到配置里,实际 %d", bad, config.MergeFps)
|
||
}
|
||
}
|
||
}
|