Compare commits
38
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dde84c8687 | ||
|
|
64b9ea8462 | ||
|
|
15340507eb | ||
|
|
e83b359cc5 | ||
|
|
86b4dd7a07 | ||
|
|
f6fda99aa2 | ||
|
|
ea9a89f851 | ||
|
|
f07952cb98 | ||
|
|
be1b479f68 | ||
|
|
20066172c3 | ||
|
|
18a4b8379c | ||
|
|
3297937e53 | ||
|
|
a8a01d9a0a | ||
|
|
da5318f8f0 | ||
|
|
4042011345 | ||
|
|
136caf189e | ||
|
|
6075433402 | ||
|
|
65798d01b6 | ||
|
|
b383f0a8d8 | ||
|
|
74070aa0f9 | ||
|
|
d0e947ca02 | ||
|
|
c29ce45971 | ||
|
|
ff93592001 | ||
|
|
5b466b4ae6 | ||
|
|
c8cf53291f | ||
|
|
850ca4fead | ||
|
|
05100c4f37 | ||
|
|
523fe81fb2 | ||
|
|
2591517c76 | ||
|
|
440831fb4d | ||
|
|
ef85943ef4 | ||
|
|
6bbaa07962 | ||
|
|
5a178986e5 | ||
|
|
5e5aa48cf9 | ||
|
|
21624f6c55 | ||
|
|
c4a799c99c | ||
|
|
62ed5cc1ce | ||
|
|
048a6ec969 |
@@ -5,6 +5,7 @@ for %%I in ("%~dp0..") do set "SENSE_ROOT=%%~fI"
|
|||||||
for %%I in ("%SENSE_ROOT%\dist") do set "OUTPUT_ROOT=%%~fI"
|
for %%I in ("%SENSE_ROOT%\dist") do set "OUTPUT_ROOT=%%~fI"
|
||||||
for %%I in ("%OUTPUT_ROOT%\sense-windows-amd64") do set "PACKAGE_DIR=%%~fI"
|
for %%I in ("%OUTPUT_ROOT%\sense-windows-amd64") do set "PACKAGE_DIR=%%~fI"
|
||||||
for %%I in ("%OUTPUT_ROOT%\sense-windows-amd64.zip") do set "ZIP_PATH=%%~fI"
|
for %%I in ("%OUTPUT_ROOT%\sense-windows-amd64.zip") do set "ZIP_PATH=%%~fI"
|
||||||
|
for %%I in ("%OUTPUT_ROOT%\.sense.env.preserve") do set "PRESERVED_ENV=%%~fI"
|
||||||
for %%I in ("%SENSE_ROOT%\ui\dist") do set "UI_DIST=%%~fI"
|
for %%I in ("%SENSE_ROOT%\ui\dist") do set "UI_DIST=%%~fI"
|
||||||
|
|
||||||
if /I not "%PACKAGE_DIR%"=="%SENSE_ROOT%\dist\sense-windows-amd64" (
|
if /I not "%PACKAGE_DIR%"=="%SENSE_ROOT%\dist\sense-windows-amd64" (
|
||||||
@@ -15,6 +16,10 @@ if /I not "%ZIP_PATH%"=="%SENSE_ROOT%\dist\sense-windows-amd64.zip" (
|
|||||||
echo [ERROR] Unsafe ZIP path: %ZIP_PATH%
|
echo [ERROR] Unsafe ZIP path: %ZIP_PATH%
|
||||||
exit /b 1
|
exit /b 1
|
||||||
)
|
)
|
||||||
|
if /I not "%PRESERVED_ENV%"=="%SENSE_ROOT%\dist\.sense.env.preserve" (
|
||||||
|
echo [ERROR] Unsafe preserved configuration path: %PRESERVED_ENV%
|
||||||
|
exit /b 1
|
||||||
|
)
|
||||||
|
|
||||||
where go >nul 2>nul || goto :missing_go
|
where go >nul 2>nul || goto :missing_go
|
||||||
for /f "tokens=3" %%V in ('go version') do set "GO_VERSION=%%V"
|
for /f "tokens=3" %%V in ('go version') do set "GO_VERSION=%%V"
|
||||||
@@ -45,6 +50,14 @@ echo [2/5] Building frontend...
|
|||||||
call corepack pnpm@9.15.1 build || goto :failed_popd
|
call corepack pnpm@9.15.1 build || goto :failed_popd
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
if exist "%PRESERVED_ENV%" (
|
||||||
|
echo [ERROR] Preserved configuration already exists: %PRESERVED_ENV%
|
||||||
|
echo Move it back to config\sense.env or remove it after confirming it is obsolete.
|
||||||
|
exit /b 1
|
||||||
|
)
|
||||||
|
if exist "%PACKAGE_DIR%\config\sense.env" (
|
||||||
|
copy /y "%PACKAGE_DIR%\config\sense.env" "%PRESERVED_ENV%" >nul || goto :failed
|
||||||
|
)
|
||||||
if exist "%PACKAGE_DIR%" rmdir /s /q "%PACKAGE_DIR%"
|
if exist "%PACKAGE_DIR%" rmdir /s /q "%PACKAGE_DIR%"
|
||||||
if exist "%ZIP_PATH%" del /q "%ZIP_PATH%"
|
if exist "%ZIP_PATH%" del /q "%ZIP_PATH%"
|
||||||
mkdir "%PACKAGE_DIR%\config" || goto :failed
|
mkdir "%PACKAGE_DIR%\config" || goto :failed
|
||||||
@@ -64,10 +77,14 @@ robocopy "%SENSE_ROOT%\LICENSES" "%PACKAGE_DIR%\LICENSES" /E /NFL /NDL /NJH /NJS
|
|||||||
if errorlevel 8 goto :failed
|
if errorlevel 8 goto :failed
|
||||||
copy /y "%SENSE_ROOT%\config\sense.env.example" "%PACKAGE_DIR%\config\sense.env.example" >nul || goto :failed
|
copy /y "%SENSE_ROOT%\config\sense.env.example" "%PACKAGE_DIR%\config\sense.env.example" >nul || goto :failed
|
||||||
copy /y "%SENSE_ROOT%\scripts\runtime\start-sense.bat" "%PACKAGE_DIR%\start-sense.bat" >nul || goto :failed
|
copy /y "%SENSE_ROOT%\scripts\runtime\start-sense.bat" "%PACKAGE_DIR%\start-sense.bat" >nul || goto :failed
|
||||||
|
copy /y "%SENSE_ROOT%\scripts\runtime\start-sense.ps1" "%PACKAGE_DIR%\start-sense.ps1" >nul || goto :failed
|
||||||
copy /y "%SENSE_ROOT%\scripts\runtime\README-WINDOWS.md" "%PACKAGE_DIR%\README-WINDOWS.md" >nul || goto :failed
|
copy /y "%SENSE_ROOT%\scripts\runtime\README-WINDOWS.md" "%PACKAGE_DIR%\README-WINDOWS.md" >nul || goto :failed
|
||||||
|
|
||||||
echo [5/5] Creating ZIP...
|
echo [5/5] Creating ZIP...
|
||||||
powershell -NoProfile -ExecutionPolicy Bypass -Command "Compress-Archive -Path '%PACKAGE_DIR%' -DestinationPath '%ZIP_PATH%' -Force" || goto :failed
|
powershell -NoProfile -ExecutionPolicy Bypass -Command "Compress-Archive -Path '%PACKAGE_DIR%' -DestinationPath '%ZIP_PATH%' -Force" || goto :failed
|
||||||
|
if exist "%PRESERVED_ENV%" (
|
||||||
|
move /y "%PRESERVED_ENV%" "%PACKAGE_DIR%\config\sense.env" >nul || goto :failed
|
||||||
|
)
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo Package directory: %PACKAGE_DIR%
|
echo Package directory: %PACKAGE_DIR%
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ start-sense.bat demo
|
|||||||
|
|
||||||
## 生产启动
|
## 生产启动
|
||||||
|
|
||||||
生产环境必须先安装并准备独立 PostgreSQL,然后在仓库和运行包之外安全设置以下环境变量:
|
生产环境必须先安装并准备独立 PostgreSQL。把配置写入运行目录的 `config\sense.env`,或在 Windows 进程环境中提供;已存在的非空进程环境变量优先于文件:
|
||||||
|
|
||||||
- `SENSE_DATABASE_URL`:PostgreSQL 连接地址。
|
- `SENSE_DATABASE_URL`:PostgreSQL 连接地址。
|
||||||
- `SENSE_IDENTITY_SIGNING_KEY`:至少 32 个字符的会话签名密钥。
|
- `SENSE_IDENTITY_SIGNING_KEY`:至少 32 个字符的会话签名密钥。
|
||||||
@@ -27,6 +27,12 @@ start-sense.bat demo
|
|||||||
start-sense.bat
|
start-sense.bat
|
||||||
```
|
```
|
||||||
|
|
||||||
完整变量名可参考 `config\sense.env.example`。示例文件只有空值和非秘密默认值,启动脚本不会自动读取它;请使用 Windows 环境变量或外部秘密管理工具注入真实值。
|
启动前可只检查配置,不连接数据库也不启动服务:
|
||||||
|
|
||||||
|
```bat
|
||||||
|
start-sense.bat check
|
||||||
|
```
|
||||||
|
|
||||||
|
完整变量名可参考 `config\sense.env.example`。复制为 `config\sense.env` 后填写真实值;该文件不会进入 ZIP 或 Git。本机在同一运行目录重新打包时会保留该文件,但交付 ZIP 始终不包含它。启动器只读取 `SENSE_*` 键,忽略空行与 `#` 注释,且不会打印配置值。生产环境仍建议使用 Windows 环境变量或外部秘密管理工具注入真实值。
|
||||||
|
|
||||||
健康检查为 `GET /healthz` 和 `GET /readyz`。MediaMTX 仍是独立程序,本运行包不会安装 PostgreSQL、MediaMTX 或 Windows 服务。
|
健康检查为 `GET /healthz` 和 `GET /readyz`。MediaMTX 仍是独立程序,本运行包不会安装 PostgreSQL、MediaMTX 或 Windows 服务。
|
||||||
|
|||||||
@@ -1,45 +1,5 @@
|
|||||||
@echo off
|
@echo off
|
||||||
setlocal
|
setlocal
|
||||||
cd /d "%~dp0"
|
|
||||||
|
|
||||||
set "SENSE_UI_STATIC_DIR=%~dp0ui"
|
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%~dp0start-sense.ps1" %*
|
||||||
|
|
||||||
if /I "%~1"=="demo" goto :demo
|
|
||||||
|
|
||||||
set "SENSE_DATABASE_MODE=postgres"
|
|
||||||
if "%SENSE_DATABASE_URL%"=="" goto :missing_database_url
|
|
||||||
if "%SENSE_IDENTITY_SIGNING_KEY%"=="" goto :missing_identity_key
|
|
||||||
if "%SENSE_BOOTSTRAP_TOKEN%"=="" goto :missing_bootstrap_token
|
|
||||||
if "%SENSE_CREDENTIAL_KEY%"=="" goto :missing_credential_key
|
|
||||||
|
|
||||||
echo Starting Sense in production mode at %SENSE_HTTP_ADDRESS%...
|
|
||||||
"%~dp0sense-server.exe"
|
|
||||||
exit /b %ERRORLEVEL%
|
exit /b %ERRORLEVEL%
|
||||||
|
|
||||||
:demo
|
|
||||||
set "SENSE_DATABASE_MODE=memory"
|
|
||||||
if "%SENSE_HTTP_ADDRESS%"=="" set "SENSE_HTTP_ADDRESS=127.0.0.1:18080"
|
|
||||||
echo Starting Sense in temporary demo mode at http://%SENSE_HTTP_ADDRESS% ...
|
|
||||||
echo Demo data is discarded when the process stops. Do not use this mode in production.
|
|
||||||
"%~dp0sense-server.exe"
|
|
||||||
exit /b %ERRORLEVEL%
|
|
||||||
|
|
||||||
:missing_database_url
|
|
||||||
echo [ERROR] SENSE_DATABASE_URL is required in production mode.
|
|
||||||
goto :configuration_help
|
|
||||||
|
|
||||||
:missing_identity_key
|
|
||||||
echo [ERROR] SENSE_IDENTITY_SIGNING_KEY is required in production mode.
|
|
||||||
goto :configuration_help
|
|
||||||
|
|
||||||
:missing_bootstrap_token
|
|
||||||
echo [ERROR] SENSE_BOOTSTRAP_TOKEN is required in production mode.
|
|
||||||
goto :configuration_help
|
|
||||||
|
|
||||||
:missing_credential_key
|
|
||||||
echo [ERROR] SENSE_CREDENTIAL_KEY is required in production mode.
|
|
||||||
|
|
||||||
:configuration_help
|
|
||||||
echo Set the required environment variables outside this directory.
|
|
||||||
echo See README-WINDOWS.md and config\sense.env.example.
|
|
||||||
exit /b 1
|
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
param(
|
||||||
|
[ValidateSet('production', 'demo', 'check')]
|
||||||
|
[string]$Mode = 'production'
|
||||||
|
)
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
|
||||||
|
function Import-SenseEnvironment {
|
||||||
|
param([string]$Path)
|
||||||
|
|
||||||
|
if (-not (Test-Path -LiteralPath $Path -PathType Leaf)) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
$lineNumber = 0
|
||||||
|
foreach ($line in Get-Content -LiteralPath $Path -Encoding UTF8) {
|
||||||
|
$lineNumber++
|
||||||
|
$trimmed = $line.Trim()
|
||||||
|
if ($trimmed.Length -eq 0 -or $trimmed.StartsWith('#')) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if ($line -notmatch '^\s*(SENSE_[A-Z0-9_]+)\s*=(.*)$') {
|
||||||
|
throw "config\sense.env line $lineNumber must use SENSE_NAME=value format"
|
||||||
|
}
|
||||||
|
|
||||||
|
$name = $Matches[1]
|
||||||
|
$value = $Matches[2].Trim()
|
||||||
|
if ($value.Length -ge 2) {
|
||||||
|
$first = $value[0]
|
||||||
|
$last = $value[$value.Length - 1]
|
||||||
|
if (($first -eq '"' -and $last -eq '"') -or ($first -eq "'" -and $last -eq "'")) {
|
||||||
|
$value = $value.Substring(1, $value.Length - 2)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$current = [Environment]::GetEnvironmentVariable($name, 'Process')
|
||||||
|
if ([string]::IsNullOrEmpty($current)) {
|
||||||
|
[Environment]::SetEnvironmentVariable($name, $value, 'Process')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Assert-RequiredEnvironment {
|
||||||
|
param([string[]]$Names)
|
||||||
|
|
||||||
|
foreach ($name in $Names) {
|
||||||
|
if ([string]::IsNullOrWhiteSpace([Environment]::GetEnvironmentVariable($name, 'Process'))) {
|
||||||
|
throw "$name is required in production mode"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$runtimeRoot = Split-Path -Parent $MyInvocation.MyCommand.Path
|
||||||
|
Import-SenseEnvironment -Path (Join-Path $runtimeRoot 'config\sense.env')
|
||||||
|
|
||||||
|
[Environment]::SetEnvironmentVariable('SENSE_UI_STATIC_DIR', (Join-Path $runtimeRoot 'ui'), 'Process')
|
||||||
|
if ([string]::IsNullOrWhiteSpace($env:SENSE_HTTP_ADDRESS)) {
|
||||||
|
$env:SENSE_HTTP_ADDRESS = '127.0.0.1:18080'
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($Mode -eq 'demo') {
|
||||||
|
$env:SENSE_DATABASE_MODE = 'memory'
|
||||||
|
Write-Host "Starting Sense in temporary demo mode at http://$($env:SENSE_HTTP_ADDRESS) ..."
|
||||||
|
Write-Host 'Demo data is discarded when the process stops. Do not use this mode in production.'
|
||||||
|
} else {
|
||||||
|
$env:SENSE_DATABASE_MODE = 'postgres'
|
||||||
|
Assert-RequiredEnvironment -Names @(
|
||||||
|
'SENSE_DATABASE_URL',
|
||||||
|
'SENSE_IDENTITY_SIGNING_KEY',
|
||||||
|
'SENSE_BOOTSTRAP_TOKEN',
|
||||||
|
'SENSE_CREDENTIAL_KEY'
|
||||||
|
)
|
||||||
|
if ($Mode -eq 'check') {
|
||||||
|
Write-Host 'Sense production configuration check passed.'
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
Write-Host "Starting Sense in production mode at $($env:SENSE_HTTP_ADDRESS) ..."
|
||||||
|
}
|
||||||
|
|
||||||
|
$server = Join-Path $runtimeRoot 'sense-server.exe'
|
||||||
|
if (-not (Test-Path -LiteralPath $server -PathType Leaf)) {
|
||||||
|
throw 'sense-server.exe was not found beside the start script'
|
||||||
|
}
|
||||||
|
& $server
|
||||||
|
exit $LASTEXITCODE
|
||||||
|
} catch {
|
||||||
|
Write-Host "[ERROR] $($_.Exception.Message)"
|
||||||
|
Write-Host 'See README-WINDOWS.md and config\sense.env.example.'
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
@@ -3,11 +3,16 @@ package onvif
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/md5"
|
||||||
|
"crypto/rand"
|
||||||
|
"crypto/sha256"
|
||||||
"encoding/xml"
|
"encoding/xml"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -34,10 +39,28 @@ func NewHTTPClient(timeout time.Duration) *HTTPClient {
|
|||||||
if timeout <= 0 {
|
if timeout <= 0 {
|
||||||
timeout = 8 * time.Second
|
timeout = 8 * time.Second
|
||||||
}
|
}
|
||||||
return &HTTPClient{client: &http.Client{Timeout: timeout}}
|
return &HTTPClient{client: &http.Client{
|
||||||
|
Timeout: timeout,
|
||||||
|
CheckRedirect: func(_ *http.Request, _ []*http.Request) error {
|
||||||
|
return http.ErrUseLastResponse
|
||||||
|
},
|
||||||
|
}}
|
||||||
}
|
}
|
||||||
func (c *HTTPClient) Profiles(ctx context.Context, address string, credential Credential) ([]Profile, error) {
|
func (c *HTTPClient) Profiles(ctx context.Context, address string, credential Credential) ([]Profile, error) {
|
||||||
endpoint, err := validateEndpoint(address)
|
deviceEndpoint, err := validateEndpoint(address)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
capabilitiesBody := `<?xml version="1.0"?><s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body><GetCapabilities xmlns="http://www.onvif.org/ver10/device/wsdl"><Category>All</Category></GetCapabilities></s:Body></s:Envelope>`
|
||||||
|
capabilities, err := c.soap(ctx, deviceEndpoint, credential, capabilitiesBody)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
mediaAddress, err := ParseMediaServiceAddress(capabilities)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
endpoint, err := normalizeServiceEndpoint(deviceEndpoint, mediaAddress)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -60,16 +83,45 @@ func (c *HTTPClient) Profiles(ctx context.Context, address string, credential Cr
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
profiles[i].StreamURI, err = normalizeStreamURI(deviceEndpoint, profiles[i].StreamURI)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return profiles, nil
|
return profiles, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func normalizeStreamURI(deviceEndpoint, streamURI string) (string, error) {
|
||||||
|
device, err := url.Parse(deviceEndpoint)
|
||||||
|
if err != nil || device.Hostname() == "" {
|
||||||
|
return "", fmt.Errorf("invalid ONVIF address")
|
||||||
|
}
|
||||||
|
stream, err := url.Parse(streamURI)
|
||||||
|
if err != nil || stream.Scheme != "rtsp" || stream.Host == "" || stream.User != nil {
|
||||||
|
return "", fmt.Errorf("invalid RTSP stream URI")
|
||||||
|
}
|
||||||
|
if !strings.EqualFold(stream.Hostname(), device.Hostname()) {
|
||||||
|
port := stream.Port()
|
||||||
|
stream.Host = device.Hostname()
|
||||||
|
if port != "" {
|
||||||
|
stream.Host = net.JoinHostPort(device.Hostname(), port)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return stream.String(), nil
|
||||||
|
}
|
||||||
func (c *HTTPClient) soap(ctx context.Context, endpoint string, credential Credential, body string) ([]byte, error) {
|
func (c *HTTPClient) soap(ctx context.Context, endpoint string, credential Credential, body string) ([]byte, error) {
|
||||||
|
return c.soapAttempt(ctx, endpoint, credential, body, "")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *HTTPClient) soapAttempt(ctx context.Context, endpoint string, credential Credential, body, authorization string) ([]byte, error) {
|
||||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewBufferString(body))
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewBufferString(body))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
req.Header.Set("Content-Type", "application/soap+xml; charset=utf-8")
|
req.Header.Set("Content-Type", "application/soap+xml; charset=utf-8")
|
||||||
if credential.Username != "" {
|
if authorization != "" {
|
||||||
|
req.Header.Set("Authorization", authorization)
|
||||||
|
} else if credential.Username != "" {
|
||||||
req.SetBasicAuth(credential.Username, credential.Password)
|
req.SetBasicAuth(credential.Username, credential.Password)
|
||||||
}
|
}
|
||||||
res, err := c.client.Do(req)
|
res, err := c.client.Do(req)
|
||||||
@@ -82,6 +134,16 @@ func (c *HTTPClient) soap(ctx context.Context, endpoint string, credential Crede
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if res.StatusCode == http.StatusUnauthorized {
|
if res.StatusCode == http.StatusUnauthorized {
|
||||||
|
if authorization == "" && credential.Username != "" {
|
||||||
|
challenge, challengeErr := parseDigestChallenge(res.Header.Values("WWW-Authenticate"))
|
||||||
|
if challengeErr == nil {
|
||||||
|
digest, digestErr := digestAuthorization(http.MethodPost, req.URL.RequestURI(), credential, challenge)
|
||||||
|
if digestErr != nil {
|
||||||
|
return nil, digestErr
|
||||||
|
}
|
||||||
|
return c.soapAttempt(ctx, endpoint, credential, body, digest)
|
||||||
|
}
|
||||||
|
}
|
||||||
return nil, fmt.Errorf("authentication_failed")
|
return nil, fmt.Errorf("authentication_failed")
|
||||||
}
|
}
|
||||||
if res.StatusCode < 200 || res.StatusCode >= 300 {
|
if res.StatusCode < 200 || res.StatusCode >= 300 {
|
||||||
@@ -89,6 +151,157 @@ func (c *HTTPClient) soap(ctx context.Context, endpoint string, credential Crede
|
|||||||
}
|
}
|
||||||
return data, nil
|
return data, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type digestChallenge struct {
|
||||||
|
realm string
|
||||||
|
nonce string
|
||||||
|
opaque string
|
||||||
|
algorithm string
|
||||||
|
qop string
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseDigestChallenge(values []string) (digestChallenge, error) {
|
||||||
|
for _, value := range values {
|
||||||
|
if !strings.EqualFold(strings.TrimSpace(strings.SplitN(value, " ", 2)[0]), "Digest") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
parts := strings.SplitN(strings.TrimSpace(value), " ", 2)
|
||||||
|
if len(parts) != 2 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
params, err := parseAuthParameters(parts[1])
|
||||||
|
if err != nil {
|
||||||
|
return digestChallenge{}, err
|
||||||
|
}
|
||||||
|
challenge := digestChallenge{
|
||||||
|
realm: strings.TrimSpace(params["realm"]), nonce: strings.TrimSpace(params["nonce"]),
|
||||||
|
opaque: strings.TrimSpace(params["opaque"]), algorithm: strings.ToUpper(strings.TrimSpace(params["algorithm"])),
|
||||||
|
}
|
||||||
|
if challenge.realm == "" || challenge.nonce == "" {
|
||||||
|
return digestChallenge{}, fmt.Errorf("invalid_digest_challenge")
|
||||||
|
}
|
||||||
|
if challenge.algorithm == "" {
|
||||||
|
challenge.algorithm = "MD5"
|
||||||
|
}
|
||||||
|
if challenge.algorithm != "MD5" && challenge.algorithm != "SHA-256" {
|
||||||
|
return digestChallenge{}, fmt.Errorf("unsupported_digest_algorithm")
|
||||||
|
}
|
||||||
|
qops := strings.Split(params["qop"], ",")
|
||||||
|
for _, qop := range qops {
|
||||||
|
if strings.EqualFold(strings.TrimSpace(qop), "auth") {
|
||||||
|
challenge.qop = "auth"
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if params["qop"] != "" && challenge.qop == "" {
|
||||||
|
return digestChallenge{}, fmt.Errorf("unsupported_digest_qop")
|
||||||
|
}
|
||||||
|
return challenge, nil
|
||||||
|
}
|
||||||
|
return digestChallenge{}, fmt.Errorf("digest_challenge_not_found")
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseAuthParameters(value string) (map[string]string, error) {
|
||||||
|
result := map[string]string{}
|
||||||
|
for position := 0; position < len(value); {
|
||||||
|
for position < len(value) && (value[position] == ' ' || value[position] == ',') {
|
||||||
|
position++
|
||||||
|
}
|
||||||
|
start := position
|
||||||
|
for position < len(value) && value[position] != '=' && value[position] != ',' {
|
||||||
|
position++
|
||||||
|
}
|
||||||
|
if position == start || position >= len(value) || value[position] != '=' {
|
||||||
|
return nil, fmt.Errorf("invalid_digest_challenge")
|
||||||
|
}
|
||||||
|
name := strings.ToLower(strings.TrimSpace(value[start:position]))
|
||||||
|
position++
|
||||||
|
var parameter string
|
||||||
|
if position < len(value) && value[position] == '"' {
|
||||||
|
position++
|
||||||
|
var builder strings.Builder
|
||||||
|
closed := false
|
||||||
|
for position < len(value) {
|
||||||
|
if value[position] == '"' {
|
||||||
|
position++
|
||||||
|
closed = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if value[position] == '\\' && position+1 < len(value) {
|
||||||
|
position++
|
||||||
|
}
|
||||||
|
builder.WriteByte(value[position])
|
||||||
|
position++
|
||||||
|
}
|
||||||
|
if !closed {
|
||||||
|
return nil, fmt.Errorf("invalid_digest_challenge")
|
||||||
|
}
|
||||||
|
parameter = builder.String()
|
||||||
|
} else {
|
||||||
|
start = position
|
||||||
|
for position < len(value) && value[position] != ',' {
|
||||||
|
position++
|
||||||
|
}
|
||||||
|
parameter = strings.TrimSpace(value[start:position])
|
||||||
|
}
|
||||||
|
result[name] = parameter
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func digestAuthorization(method, uri string, credential Credential, challenge digestChallenge) (string, error) {
|
||||||
|
cnonceBytes := make([]byte, 16)
|
||||||
|
if _, err := rand.Read(cnonceBytes); err != nil {
|
||||||
|
return "", fmt.Errorf("generate_digest_cnonce: %w", err)
|
||||||
|
}
|
||||||
|
cnonce := fmt.Sprintf("%x", cnonceBytes)
|
||||||
|
hash := func(value string) string {
|
||||||
|
if challenge.algorithm == "SHA-256" {
|
||||||
|
sum := sha256.Sum256([]byte(value))
|
||||||
|
return fmt.Sprintf("%x", sum)
|
||||||
|
}
|
||||||
|
sum := md5.Sum([]byte(value))
|
||||||
|
return fmt.Sprintf("%x", sum)
|
||||||
|
}
|
||||||
|
ha1 := hash(credential.Username + ":" + challenge.realm + ":" + credential.Password)
|
||||||
|
ha2 := hash(method + ":" + uri)
|
||||||
|
nonceCount := "00000001"
|
||||||
|
response := hash(ha1 + ":" + challenge.nonce + ":" + ha2)
|
||||||
|
if challenge.qop != "" {
|
||||||
|
response = hash(ha1 + ":" + challenge.nonce + ":" + nonceCount + ":" + cnonce + ":" + challenge.qop + ":" + ha2)
|
||||||
|
}
|
||||||
|
values := []string{
|
||||||
|
`username=` + strconv.Quote(credential.Username), `realm=` + strconv.Quote(challenge.realm),
|
||||||
|
`nonce=` + strconv.Quote(challenge.nonce), `uri=` + strconv.Quote(uri),
|
||||||
|
`response=` + strconv.Quote(response), `algorithm=` + challenge.algorithm,
|
||||||
|
}
|
||||||
|
if challenge.opaque != "" {
|
||||||
|
values = append(values, `opaque=`+strconv.Quote(challenge.opaque))
|
||||||
|
}
|
||||||
|
if challenge.qop != "" {
|
||||||
|
values = append(values, `qop=`+challenge.qop, `nc=`+nonceCount, `cnonce=`+strconv.Quote(cnonce))
|
||||||
|
}
|
||||||
|
return "Digest " + strings.Join(values, ", "), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func normalizeServiceEndpoint(deviceEndpoint, advertisedEndpoint string) (string, error) {
|
||||||
|
device, err := url.Parse(deviceEndpoint)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("invalid ONVIF address")
|
||||||
|
}
|
||||||
|
advertised, err := url.Parse(advertisedEndpoint)
|
||||||
|
if err != nil || advertised.Scheme == "" || advertised.Host == "" || advertised.User != nil {
|
||||||
|
return "", fmt.Errorf("invalid ONVIF media address")
|
||||||
|
}
|
||||||
|
if advertised.Scheme != "http" && advertised.Scheme != "https" {
|
||||||
|
return "", fmt.Errorf("unsupported ONVIF media scheme")
|
||||||
|
}
|
||||||
|
if !strings.EqualFold(advertised.Hostname(), device.Hostname()) {
|
||||||
|
advertised.Scheme = device.Scheme
|
||||||
|
advertised.Host = device.Host
|
||||||
|
}
|
||||||
|
return advertised.String(), nil
|
||||||
|
}
|
||||||
func validateEndpoint(value string) (string, error) {
|
func validateEndpoint(value string) (string, error) {
|
||||||
parsed, err := url.Parse(value)
|
parsed, err := url.Parse(value)
|
||||||
if err != nil || parsed.Scheme == "" || parsed.Host == "" {
|
if err != nil || parsed.Scheme == "" || parsed.Host == "" {
|
||||||
@@ -107,3 +320,4 @@ func xmlEscape(value string) string {
|
|||||||
_ = xml.EscapeText(&b, []byte(value))
|
_ = xml.EscapeText(&b, []byte(value))
|
||||||
return b.String()
|
return b.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,158 @@
|
|||||||
|
package onvif
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
"sync/atomic"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestProfilesDiscoversMediaServiceAndUsesDigest(t *testing.T) {
|
||||||
|
var digestRequests atomic.Int32
|
||||||
|
var server *httptest.Server
|
||||||
|
server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
switch r.URL.Path {
|
||||||
|
case "/onvif/device_service":
|
||||||
|
fmt.Fprintf(w, `<Envelope><Body><GetCapabilitiesResponse><Capabilities><Media><XAddr>%s/onvif/media_service</XAddr></Media></Capabilities></GetCapabilitiesResponse></Body></Envelope>`, server.URL)
|
||||||
|
case "/onvif/media_service":
|
||||||
|
authorization := r.Header.Get("Authorization")
|
||||||
|
if !strings.HasPrefix(authorization, "Digest ") {
|
||||||
|
w.Header().Set("WWW-Authenticate", `Digest realm="camera", nonce="nonce-1", algorithm=MD5, qop="auth"`)
|
||||||
|
w.WriteHeader(http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
digestRequests.Add(1)
|
||||||
|
if strings.Contains(readRequestBody(t, r), "GetProfiles") {
|
||||||
|
fmt.Fprint(w, `<Envelope><Body><GetProfilesResponse><Profiles token="main"><Name>Main</Name><VideoEncoderConfiguration><Encoding>H264</Encoding><Resolution><Width>1920</Width><Height>1080</Height></Resolution></VideoEncoderConfiguration></Profiles></GetProfilesResponse></Body></Envelope>`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.Fprint(w, `<Envelope><Body><GetStreamUriResponse><MediaUri><Uri>rtsp://camera.invalid/live</Uri></MediaUri></GetStreamUriResponse></Body></Envelope>`)
|
||||||
|
default:
|
||||||
|
http.NotFound(w, r)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
profiles, err := NewHTTPClient(2*time.Second).Profiles(context.Background(), server.URL+"/onvif/device_service", Credential{Username: "operator", Password: "secret"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
serverURL, _ := url.Parse(server.URL)
|
||||||
|
if len(profiles) != 1 || profiles[0].Width != 1920 || profiles[0].StreamURI != "rtsp://"+serverURL.Hostname()+"/live" {
|
||||||
|
t.Fatalf("profiles=%#v", profiles)
|
||||||
|
}
|
||||||
|
if digestRequests.Load() != 2 {
|
||||||
|
t.Fatalf("digest requests=%d", digestRequests.Load())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNormalizeServiceEndpoint(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
device string
|
||||||
|
advertised string
|
||||||
|
want string
|
||||||
|
wantError bool
|
||||||
|
}{
|
||||||
|
{name: "same host keeps media port", device: "http://camera.local:80/device", advertised: "http://camera.local:8000/media", want: "http://camera.local:8000/media"},
|
||||||
|
{name: "different host uses authorized origin", device: "http://192.0.2.10:8080/device", advertised: "http://unusable.local:9000/media?profile=1", want: "http://192.0.2.10:8080/media?profile=1"},
|
||||||
|
{name: "reject credentials", device: "http://camera.local/device", advertised: "http://user:pass@camera.local/media", wantError: true},
|
||||||
|
{name: "reject scheme", device: "http://camera.local/device", advertised: "ftp://camera.local/media", wantError: true},
|
||||||
|
}
|
||||||
|
for _, test := range tests {
|
||||||
|
t.Run(test.name, func(t *testing.T) {
|
||||||
|
got, err := normalizeServiceEndpoint(test.device, test.advertised)
|
||||||
|
if test.wantError {
|
||||||
|
if err == nil {
|
||||||
|
t.Fatalf("got=%q", got)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err != nil || got != test.want {
|
||||||
|
t.Fatalf("got=%q err=%v", got, err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNormalizeStreamURI(t *testing.T) {
|
||||||
|
got, err := normalizeStreamURI("http://192.0.2.10:80/onvif/device_service", "rtsp://unusable.local:8554/live/main?channel=1")
|
||||||
|
if err != nil || got != "rtsp://192.0.2.10:8554/live/main?channel=1" {
|
||||||
|
t.Fatalf("got=%q err=%v", got, err)
|
||||||
|
}
|
||||||
|
if _, err := normalizeStreamURI("http://camera.local/onvif", "rtsp://user:pass@camera.local/live"); err == nil {
|
||||||
|
t.Fatal("credential stream URI accepted")
|
||||||
|
}
|
||||||
|
if _, err := normalizeStreamURI("http://camera.local/onvif", "http://camera.local/live"); err == nil {
|
||||||
|
t.Fatal("non-RTSP URI accepted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRejectUnsupportedDigestChallenge(t *testing.T) {
|
||||||
|
for _, challenge := range []string{
|
||||||
|
`Digest realm="camera", nonce="n", algorithm=SHA-512, qop="auth"`,
|
||||||
|
`Digest realm="camera", nonce="n", algorithm=MD5, qop="auth-int"`,
|
||||||
|
`Digest realm="camera"`,
|
||||||
|
} {
|
||||||
|
if _, err := parseDigestChallenge([]string{challenge}); err == nil {
|
||||||
|
t.Fatalf("challenge accepted: %s", challenge)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateEndpointRejectsCredentials(t *testing.T) {
|
||||||
|
if _, err := validateEndpoint("http://user:pass@camera.invalid/onvif"); err == nil {
|
||||||
|
t.Fatal("credential endpoint accepted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSOAPDoesNotFollowRedirect(t *testing.T) {
|
||||||
|
redirectTargetCalled := false
|
||||||
|
target := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {
|
||||||
|
redirectTargetCalled = true
|
||||||
|
}))
|
||||||
|
defer target.Close()
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
http.Redirect(w, r, target.URL, http.StatusFound)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
_, err := NewHTTPClient(time.Second).soap(context.Background(), server.URL, Credential{Username: "operator", Password: "secret"}, "<Envelope />")
|
||||||
|
if err == nil || redirectTargetCalled {
|
||||||
|
t.Fatalf("err=%v redirect_target_called=%v", err, redirectTargetCalled)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func readRequestBody(t *testing.T, r *http.Request) string {
|
||||||
|
t.Helper()
|
||||||
|
defer r.Body.Close()
|
||||||
|
data, err := io.ReadAll(r.Body)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
return string(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDigestAuthorizationUsesRequestURI(t *testing.T) {
|
||||||
|
header, err := digestAuthorization(http.MethodPost, "/media?profile=1", Credential{Username: "operator", Password: "secret"}, digestChallenge{realm: "camera", nonce: "n", algorithm: "SHA-256", qop: "auth"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
parsed, err := parseAuthParameters(strings.TrimPrefix(header, "Digest "))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if parsed["uri"] != "/media?profile=1" || parsed["username"] != "operator" || parsed["response"] == "" {
|
||||||
|
t.Fatalf("invalid digest fields: %#v", parsed)
|
||||||
|
}
|
||||||
|
if _, err := url.Parse(parsed["uri"]); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -54,3 +54,33 @@ func ParseStreamURI(data []byte) (string, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ParseMediaServiceAddress(data []byte) (string, error) {
|
||||||
|
decoder := xml.NewDecoder(strings.NewReader(string(data)))
|
||||||
|
mediaDepth := 0
|
||||||
|
for {
|
||||||
|
token, err := decoder.Token()
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("media_service_not_found")
|
||||||
|
}
|
||||||
|
switch value := token.(type) {
|
||||||
|
case xml.StartElement:
|
||||||
|
if value.Name.Local == "Media" {
|
||||||
|
mediaDepth++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if mediaDepth > 0 && value.Name.Local == "XAddr" {
|
||||||
|
var address string
|
||||||
|
if err := decoder.DecodeElement(&address, &value); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(address), nil
|
||||||
|
}
|
||||||
|
case xml.EndElement:
|
||||||
|
if value.Name.Local == "Media" && mediaDepth > 0 {
|
||||||
|
mediaDepth--
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,3 +29,18 @@ func TestRejectCredentialInStreamURI(t *testing.T) {
|
|||||||
t.Fatal("credential URI accepted")
|
t.Fatal("credential URI accepted")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParseMediaServiceAddress(t *testing.T) {
|
||||||
|
data := []byte(`<Envelope><Body><GetCapabilitiesResponse><Capabilities><Media><XAddr>http://camera.invalid:8000/onvif/media_service</XAddr></Media></Capabilities></GetCapabilitiesResponse></Body></Envelope>`)
|
||||||
|
address, err := ParseMediaServiceAddress(data)
|
||||||
|
if err != nil || address != "http://camera.invalid:8000/onvif/media_service" {
|
||||||
|
t.Fatalf("address=%q err=%v", address, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseMediaServiceAddressRejectsMissingMedia(t *testing.T) {
|
||||||
|
if _, err := ParseMediaServiceAddress([]byte(`<Envelope><Body /></Envelope>`)); err == nil {
|
||||||
|
t.Fatal("missing media service accepted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package admission
|
||||||
|
|
||||||
|
const MigrationSQL = `
|
||||||
|
CREATE TABLE IF NOT EXISTS sense_admission_results (
|
||||||
|
device_id TEXT PRIMARY KEY REFERENCES sense_devices(id),
|
||||||
|
address TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL,
|
||||||
|
detail TEXT NOT NULL DEFAULT '',
|
||||||
|
checked_at TIMESTAMPTZ NOT NULL
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS sense_admission_profiles (
|
||||||
|
device_id TEXT NOT NULL REFERENCES sense_devices(id),
|
||||||
|
token TEXT NOT NULL,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
width INTEGER NOT NULL,
|
||||||
|
height INTEGER NOT NULL,
|
||||||
|
encoding TEXT NOT NULL,
|
||||||
|
stream_uri TEXT NOT NULL,
|
||||||
|
kind TEXT NOT NULL,
|
||||||
|
verification_status TEXT NOT NULL,
|
||||||
|
verification_latency_ms BIGINT NOT NULL DEFAULT 0,
|
||||||
|
verification_detail TEXT NOT NULL DEFAULT '',
|
||||||
|
PRIMARY KEY(device_id, token)
|
||||||
|
);
|
||||||
|
`
|
||||||
|
|
||||||
@@ -5,7 +5,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"yovision.local/sense/app/sense/adapters/onvif"
|
"yovision.local/sense/app/sense/adapters/onvif"
|
||||||
@@ -37,13 +36,16 @@ type Service struct {
|
|||||||
rtsp rtsp.Verifier
|
rtsp rtsp.Verifier
|
||||||
discoveryIP string
|
discoveryIP string
|
||||||
discoveryTimeout time.Duration
|
discoveryTimeout time.Duration
|
||||||
mu sync.RWMutex
|
store Store
|
||||||
results map[string]Result
|
|
||||||
now func() time.Time
|
now func() time.Time
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewService(client onvif.Client, verifier rtsp.Verifier, discoveryIP string) *Service {
|
func NewService(client onvif.Client, verifier rtsp.Verifier, discoveryIP string, stores ...Store) *Service {
|
||||||
return &Service{onvif: client, rtsp: verifier, discoveryIP: discoveryIP, discoveryTimeout: 3 * time.Second, results: map[string]Result{}, now: time.Now}
|
var store Store = NewMemoryStore()
|
||||||
|
if len(stores) > 0 && stores[0] != nil {
|
||||||
|
store = stores[0]
|
||||||
|
}
|
||||||
|
return &Service{onvif: client, rtsp: verifier, discoveryIP: discoveryIP, discoveryTimeout: 3 * time.Second, store: store, now: time.Now}
|
||||||
}
|
}
|
||||||
func (s *Service) Discover(ctx context.Context) ([]string, error) {
|
func (s *Service) Discover(ctx context.Context) ([]string, error) {
|
||||||
if strings.TrimSpace(s.discoveryIP) == "" {
|
if strings.TrimSpace(s.discoveryIP) == "" {
|
||||||
@@ -52,21 +54,25 @@ func (s *Service) Discover(ctx context.Context) ([]string, error) {
|
|||||||
return onvif.Discover(ctx, s.discoveryIP, s.discoveryTimeout)
|
return onvif.Discover(ctx, s.discoveryIP, s.discoveryTimeout)
|
||||||
}
|
}
|
||||||
func (s *Service) Probe(ctx context.Context, actor identity.Principal, deviceID, address string) (Result, error) {
|
func (s *Service) Probe(ctx context.Context, actor identity.Principal, deviceID, address string) (Result, error) {
|
||||||
credential, err := device.ReadCredential(ctx, deviceID)
|
onvifCredential, err := device.ReadONVIFCredential(ctx, deviceID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return Result{}, fmt.Errorf("credential_required")
|
return Result{}, fmt.Errorf("credential_required")
|
||||||
}
|
}
|
||||||
profiles, err := s.onvif.Profiles(ctx, address, onvif.Credential{Username: credential.Username, Password: credential.Password})
|
profiles, err := s.onvif.Profiles(ctx, address, onvif.Credential{Username: onvifCredential.Username, Password: onvifCredential.Password})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
status, detail := classify(err)
|
status, detail := classify(err)
|
||||||
result := Result{DeviceID: deviceID, Address: address, Status: status, Detail: detail, CheckedAt: s.now().UTC()}
|
result := Result{DeviceID: deviceID, Address: address, Status: status, Detail: detail, CheckedAt: s.now().UTC()}
|
||||||
s.save(result)
|
_ = s.store.Save(ctx, result)
|
||||||
identity.RecordAudit(ctx, actor.UserID, "admission.probe", deviceID, "failure", map[string]any{"status": status})
|
identity.RecordAudit(ctx, actor.UserID, "admission.probe", deviceID, "failure", map[string]any{"status": status})
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
rtspCredential, err := device.ReadRTSPCredential(ctx, deviceID)
|
||||||
|
if err != nil {
|
||||||
|
return Result{}, fmt.Errorf("rtsp_credential_required")
|
||||||
|
}
|
||||||
items := make([]Profile, 0, len(profiles))
|
items := make([]Profile, 0, len(profiles))
|
||||||
for _, profile := range profiles {
|
for _, profile := range profiles {
|
||||||
verification, verifyErr := s.rtsp.Verify(ctx, profile.StreamURI, rtsp.Credential{Username: credential.Username, Password: credential.Password})
|
verification, verifyErr := s.rtsp.Verify(ctx, profile.StreamURI, rtsp.Credential{Username: rtspCredential.Username, Password: rtspCredential.Password})
|
||||||
if verifyErr != nil {
|
if verifyErr != nil {
|
||||||
verification = rtsp.Result{Status: "failed", Detail: "视频地址格式不正确"}
|
verification = rtsp.Result{Status: "failed", Detail: "视频地址格式不正确"}
|
||||||
}
|
}
|
||||||
@@ -89,20 +95,23 @@ func (s *Service) Probe(ctx context.Context, actor identity.Principal, deviceID,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
result := Result{DeviceID: deviceID, Address: address, Status: status, Detail: detail, Profiles: items, CheckedAt: s.now().UTC()}
|
result := Result{DeviceID: deviceID, Address: address, Status: status, Detail: detail, Profiles: items, CheckedAt: s.now().UTC()}
|
||||||
s.save(result)
|
if err := s.store.Save(ctx, result); err != nil {
|
||||||
|
return Result{}, err
|
||||||
|
}
|
||||||
|
for _, item := range items {
|
||||||
|
if item.Verification.Status == "ready" {
|
||||||
|
if err := device.MarkActive(ctx, deviceID); err != nil {
|
||||||
|
return Result{}, err
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
identity.RecordAudit(ctx, actor.UserID, "admission.probe", deviceID, "success", map[string]any{"profile_count": len(items), "status": status})
|
identity.RecordAudit(ctx, actor.UserID, "admission.probe", deviceID, "success", map[string]any{"profile_count": len(items), "status": status})
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
func (s *Service) Get(deviceID string) (Result, bool) {
|
func (s *Service) Get(deviceID string) (Result, bool) {
|
||||||
s.mu.RLock()
|
value, err := s.store.Get(context.Background(), deviceID)
|
||||||
defer s.mu.RUnlock()
|
return value, err == nil
|
||||||
value, ok := s.results[deviceID]
|
|
||||||
return value, ok
|
|
||||||
}
|
|
||||||
func (s *Service) save(result Result) {
|
|
||||||
s.mu.Lock()
|
|
||||||
defer s.mu.Unlock()
|
|
||||||
s.results[result.DeviceID] = result
|
|
||||||
}
|
}
|
||||||
func classify(err error) (string, string) {
|
func classify(err error) (string, string) {
|
||||||
value := strings.ToLower(err.Error())
|
value := strings.ToLower(err.Error())
|
||||||
@@ -117,3 +126,4 @@ func classify(err error) (string, string) {
|
|||||||
return "unreachable", "无法读取设备信息,请检查地址和网络"
|
return "unreachable", "无法读取设备信息,请检查地址和网络"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,20 @@ type fakeRTSP struct{}
|
|||||||
func (fakeRTSP) Verify(context.Context, string, rtsp.Credential) (rtsp.Result, error) {
|
func (fakeRTSP) Verify(context.Context, string, rtsp.Credential) (rtsp.Result, error) {
|
||||||
return rtsp.Result{Status: "ready"}, nil
|
return rtsp.Result{Status: "ready"}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type credentialCapturingONVIF struct{ got onvif.Credential }
|
||||||
|
|
||||||
|
func (f *credentialCapturingONVIF) Profiles(_ context.Context, _ string, credential onvif.Credential) ([]onvif.Profile, error) {
|
||||||
|
f.got = credential
|
||||||
|
return fakeONVIF{}.Profiles(context.Background(), "", credential)
|
||||||
|
}
|
||||||
|
|
||||||
|
type credentialCapturingRTSP struct{ got rtsp.Credential }
|
||||||
|
|
||||||
|
func (f *credentialCapturingRTSP) Verify(_ context.Context, _ string, credential rtsp.Credential) (rtsp.Result, error) {
|
||||||
|
f.got = credential
|
||||||
|
return rtsp.Result{Status: "ready"}, nil
|
||||||
|
}
|
||||||
func TestProbeProfilesWithoutCredentialURI(t *testing.T) {
|
func TestProbeProfilesWithoutCredentialURI(t *testing.T) {
|
||||||
vault, err := device.NewCredentialVault(base64.StdEncoding.EncodeToString([]byte("0123456789abcdef0123456789abcdef")), false)
|
vault, err := device.NewCredentialVault(base64.StdEncoding.EncodeToString([]byte("0123456789abcdef0123456789abcdef")), false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -44,3 +58,41 @@ func TestProbeProfilesWithoutCredentialURI(t *testing.T) {
|
|||||||
t.Fatalf("result=%#v err=%v", result, err)
|
t.Fatalf("result=%#v err=%v", result, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestProbeUsesSeparateCredentialsPersistsProfilesAndActivatesDevice(t *testing.T) {
|
||||||
|
vault, err := device.NewCredentialVault(base64.StdEncoding.EncodeToString([]byte("0123456789abcdef0123456789abcdef")), false)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
deviceStore := device.NewMemoryStore()
|
||||||
|
deviceService := device.NewService(deviceStore, vault)
|
||||||
|
device.NewModule(deviceService).Register(platform.NewApp(platform.Config{DatabaseMode: platform.DatabaseModeMemory}, nil, nil))
|
||||||
|
item, err := deviceService.Create(context.Background(), identity.Principal{}, "camera", "gate", device.ModalityVideo, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err = deviceService.SetCredentials(context.Background(), identity.Principal{}, item.ID, "onvif-user", "onvif-password", false, "rtsp-user", "rtsp-password"); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
onvifClient := &credentialCapturingONVIF{}
|
||||||
|
rtspVerifier := &credentialCapturingRTSP{}
|
||||||
|
store := NewMemoryStore()
|
||||||
|
service := NewService(onvifClient, rtspVerifier, "", store)
|
||||||
|
result, err := service.Probe(context.Background(), identity.Principal{}, item.ID, "http://camera.invalid/onvif/device_service")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if onvifClient.got.Username != "onvif-user" || rtspVerifier.got.Username != "rtsp-user" {
|
||||||
|
t.Fatal("credentials were not separated")
|
||||||
|
}
|
||||||
|
restarted := NewService(onvifClient, rtspVerifier, "", store)
|
||||||
|
persisted, ok := restarted.Get(item.ID)
|
||||||
|
if !ok || len(persisted.Profiles) != len(result.Profiles) {
|
||||||
|
t.Fatalf("persisted=%#v", persisted)
|
||||||
|
}
|
||||||
|
updated, err := deviceService.Get(context.Background(), item.ID)
|
||||||
|
if err != nil || updated.Status != device.StatusActive {
|
||||||
|
t.Fatalf("device=%#v err=%v", updated, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
package admission
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"errors"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrNotFound = errors.New("admission result not found")
|
||||||
|
|
||||||
|
type Store interface {
|
||||||
|
Save(context.Context, Result) error
|
||||||
|
Get(context.Context, string) (Result, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
type MemoryStore struct {
|
||||||
|
mu sync.RWMutex
|
||||||
|
results map[string]Result
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMemoryStore() *MemoryStore { return &MemoryStore{results: map[string]Result{}} }
|
||||||
|
func (s *MemoryStore) Save(_ context.Context, result Result) error {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
s.results[result.DeviceID] = result
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
func (s *MemoryStore) Get(_ context.Context, deviceID string) (Result, error) {
|
||||||
|
s.mu.RLock()
|
||||||
|
defer s.mu.RUnlock()
|
||||||
|
result, ok := s.results[deviceID]
|
||||||
|
if !ok {
|
||||||
|
return Result{}, ErrNotFound
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type PostgresStore struct{ database *sql.DB }
|
||||||
|
|
||||||
|
func NewPostgresStore(database *sql.DB) *PostgresStore { return &PostgresStore{database: database} }
|
||||||
|
func (s *PostgresStore) Save(ctx context.Context, result Result) error {
|
||||||
|
tx, err := s.database.BeginTx(ctx, nil)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer tx.Rollback()
|
||||||
|
_, err = tx.ExecContext(ctx, `INSERT INTO sense_admission_results(device_id,address,status,detail,checked_at) VALUES($1,$2,$3,$4,$5) ON CONFLICT(device_id) DO UPDATE SET address=EXCLUDED.address,status=EXCLUDED.status,detail=EXCLUDED.detail,checked_at=EXCLUDED.checked_at`, result.DeviceID, result.Address, result.Status, result.Detail, result.CheckedAt)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if _, err = tx.ExecContext(ctx, `DELETE FROM sense_admission_profiles WHERE device_id=$1`, result.DeviceID); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, profile := range result.Profiles {
|
||||||
|
_, err = tx.ExecContext(ctx, `INSERT INTO sense_admission_profiles(device_id,token,name,width,height,encoding,stream_uri,kind,verification_status,verification_latency_ms,verification_detail) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11)`, result.DeviceID, profile.Token, profile.Name, profile.Width, profile.Height, profile.Encoding, profile.StreamURI, profile.Kind, profile.Verification.Status, profile.Verification.LatencyMS, profile.Verification.Detail)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return tx.Commit()
|
||||||
|
}
|
||||||
|
func (s *PostgresStore) Get(ctx context.Context, deviceID string) (Result, error) {
|
||||||
|
var result Result
|
||||||
|
err := s.database.QueryRowContext(ctx, `SELECT device_id,address,status,detail,checked_at FROM sense_admission_results WHERE device_id=$1`, deviceID).Scan(&result.DeviceID, &result.Address, &result.Status, &result.Detail, &result.CheckedAt)
|
||||||
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
|
return Result{}, ErrNotFound
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return Result{}, err
|
||||||
|
}
|
||||||
|
rows, err := s.database.QueryContext(ctx, `SELECT token,name,width,height,encoding,stream_uri,kind,verification_status,verification_latency_ms,verification_detail FROM sense_admission_profiles WHERE device_id=$1 ORDER BY width*height DESC`, deviceID)
|
||||||
|
if err != nil {
|
||||||
|
return Result{}, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
for rows.Next() {
|
||||||
|
var profile Profile
|
||||||
|
if err := rows.Scan(&profile.Token, &profile.Name, &profile.Width, &profile.Height, &profile.Encoding, &profile.StreamURI, &profile.Kind, &profile.Verification.Status, &profile.Verification.LatencyMS, &profile.Verification.Detail); err != nil {
|
||||||
|
return Result{}, err
|
||||||
|
}
|
||||||
|
result.Profiles = append(result.Profiles, profile)
|
||||||
|
}
|
||||||
|
return result, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
@@ -16,6 +16,9 @@ var activeService atomic.Pointer[Service]
|
|||||||
// ReadCredential is an internal adapter port. Credentials must never be
|
// ReadCredential is an internal adapter port. Credentials must never be
|
||||||
// returned from HTTP handlers, logged, or placed in a URL.
|
// returned from HTTP handlers, logged, or placed in a URL.
|
||||||
func ReadCredential(ctx context.Context, id string) (Credential, error) {
|
func ReadCredential(ctx context.Context, id string) (Credential, error) {
|
||||||
|
return ReadONVIFCredential(ctx, id)
|
||||||
|
}
|
||||||
|
func ReadONVIFCredential(ctx context.Context, id string) (Credential, error) {
|
||||||
service := activeService.Load()
|
service := activeService.Load()
|
||||||
if service == nil {
|
if service == nil {
|
||||||
return Credential{}, fmt.Errorf("device service is not ready")
|
return Credential{}, fmt.Errorf("device service is not ready")
|
||||||
@@ -30,3 +33,39 @@ func ReadCredential(ctx context.Context, id string) (Credential, error) {
|
|||||||
username, password, err := service.vault.Decrypt(item.CredentialCiphertext)
|
username, password, err := service.vault.Decrypt(item.CredentialCiphertext)
|
||||||
return Credential{Username: username, Password: password}, err
|
return Credential{Username: username, Password: password}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ReadRTSPCredential(ctx context.Context, id string) (Credential, error) {
|
||||||
|
service := activeService.Load()
|
||||||
|
if service == nil {
|
||||||
|
return Credential{}, fmt.Errorf("device service is not ready")
|
||||||
|
}
|
||||||
|
item, err := service.store.Get(ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
return Credential{}, err
|
||||||
|
}
|
||||||
|
if len(item.RTSPCredentialCiphertext) == 0 {
|
||||||
|
return Credential{}, fmt.Errorf("RTSP credential is not configured")
|
||||||
|
}
|
||||||
|
username, password, err := service.vault.Decrypt(item.RTSPCredentialCiphertext)
|
||||||
|
return Credential{Username: username, Password: password}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func MarkActive(ctx context.Context, id string) error {
|
||||||
|
service := activeService.Load()
|
||||||
|
if service == nil {
|
||||||
|
return fmt.Errorf("device service is not ready")
|
||||||
|
}
|
||||||
|
item, err := service.store.Get(ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if item.Status == StatusDisabled || item.Status == StatusActive {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
expected := item.Version
|
||||||
|
item.Status = StatusActive
|
||||||
|
item.Version++
|
||||||
|
item.UpdatedAt = service.now().UTC()
|
||||||
|
return service.store.Update(ctx, item, expected)
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -78,15 +78,30 @@ func (m *Module) update(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
func (m *Module) credential(w http.ResponseWriter, r *http.Request) {
|
func (m *Module) credential(w http.ResponseWriter, r *http.Request) {
|
||||||
var req struct {
|
var req struct {
|
||||||
Username string `json:"username"`
|
Username string `json:"username"`
|
||||||
Password string `json:"password"`
|
Password string `json:"password"`
|
||||||
|
ONVIFUsername string `json:"onvif_username"`
|
||||||
|
ONVIFPassword string `json:"onvif_password"`
|
||||||
|
RTSPSameAsONVIF *bool `json:"rtsp_same_as_onvif"`
|
||||||
|
RTSPUsername string `json:"rtsp_username"`
|
||||||
|
RTSPPassword string `json:"rtsp_password"`
|
||||||
}
|
}
|
||||||
if err := platform.DecodeJSON(r, &req); err != nil {
|
if err := platform.DecodeJSON(r, &req); err != nil {
|
||||||
platform.WriteError(w, err)
|
platform.WriteError(w, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
actor, _ := identity.PrincipalFromContext(r.Context())
|
actor, _ := identity.PrincipalFromContext(r.Context())
|
||||||
item, err := m.service.SetCredential(r.Context(), actor, r.PathValue("id"), req.Username, req.Password)
|
if req.ONVIFUsername == "" {
|
||||||
|
req.ONVIFUsername = req.Username
|
||||||
|
}
|
||||||
|
if req.ONVIFPassword == "" {
|
||||||
|
req.ONVIFPassword = req.Password
|
||||||
|
}
|
||||||
|
rtspSame := true
|
||||||
|
if req.RTSPSameAsONVIF != nil {
|
||||||
|
rtspSame = *req.RTSPSameAsONVIF
|
||||||
|
}
|
||||||
|
item, err := m.service.SetCredentials(r.Context(), actor, r.PathValue("id"), req.ONVIFUsername, req.ONVIFPassword, rtspSame, req.RTSPUsername, req.RTSPPassword)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writeDeviceError(w, err)
|
writeDeviceError(w, err)
|
||||||
return
|
return
|
||||||
@@ -122,3 +137,4 @@ func writeDeviceError(w http.ResponseWriter, err error) {
|
|||||||
}
|
}
|
||||||
platform.WriteError(w, &platform.APIError{Status: status, Code: code, Message: err.Error()})
|
platform.WriteError(w, &platform.APIError{Status: status, Code: code, Message: err.Error()})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
package device
|
package device
|
||||||
|
|
||||||
const MigrationSQL = `CREATE TABLE IF NOT EXISTS sense_devices(id TEXT PRIMARY KEY,name TEXT NOT NULL,location TEXT NOT NULL DEFAULT '',modality TEXT NOT NULL,capabilities TEXT NOT NULL DEFAULT '',status TEXT NOT NULL,adapter_status TEXT NOT NULL,credential_ciphertext BYTEA NULL,version BIGINT NOT NULL,created_at TIMESTAMPTZ NOT NULL,updated_at TIMESTAMPTZ NOT NULL);CREATE INDEX IF NOT EXISTS sense_devices_created_idx ON sense_devices(created_at DESC);`
|
const MigrationSQL = `CREATE TABLE IF NOT EXISTS sense_devices(id TEXT PRIMARY KEY,name TEXT NOT NULL,location TEXT NOT NULL DEFAULT '',modality TEXT NOT NULL,capabilities TEXT NOT NULL DEFAULT '',status TEXT NOT NULL,adapter_status TEXT NOT NULL,credential_ciphertext BYTEA NULL,version BIGINT NOT NULL,created_at TIMESTAMPTZ NOT NULL,updated_at TIMESTAMPTZ NOT NULL);CREATE INDEX IF NOT EXISTS sense_devices_created_idx ON sense_devices(created_at DESC);`
|
||||||
|
|
||||||
|
const SplitCredentialMigrationSQL = `ALTER TABLE sense_devices ADD COLUMN IF NOT EXISTS rtsp_credential_ciphertext BYTEA NULL;ALTER TABLE sense_devices ADD COLUMN IF NOT EXISTS rtsp_credential_same_as_onvif BOOLEAN NOT NULL DEFAULT TRUE;UPDATE sense_devices SET rtsp_credential_ciphertext=credential_ciphertext WHERE rtsp_credential_ciphertext IS NULL AND credential_ciphertext IS NOT NULL AND rtsp_credential_same_as_onvif=TRUE;`
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ func (s *Service) Create(ctx context.Context, actor identity.Principal, name, lo
|
|||||||
adapter = AdapterReady
|
adapter = AdapterReady
|
||||||
}
|
}
|
||||||
now := s.now().UTC()
|
now := s.now().UTC()
|
||||||
item := Device{ID: newID(), Name: name, Location: strings.TrimSpace(location), Modality: modality, Capabilities: capabilities, Status: StatusPending, AdapterStatus: adapter, Version: 1, CreatedAt: now, UpdatedAt: now}
|
item := Device{ID: newID(), Name: name, Location: strings.TrimSpace(location), Modality: modality, Capabilities: capabilities, Status: StatusPending, AdapterStatus: adapter, RTSPCredentialSameAsONVIF: true, Version: 1, CreatedAt: now, UpdatedAt: now}
|
||||||
if err := s.store.Create(ctx, item); err != nil {
|
if err := s.store.Create(ctx, item); err != nil {
|
||||||
return Device{}, err
|
return Device{}, err
|
||||||
}
|
}
|
||||||
@@ -45,7 +45,9 @@ func (s *Service) Get(ctx context.Context, id string) (Device, error) {
|
|||||||
item, err := s.store.Get(ctx, id)
|
item, err := s.store.Get(ctx, id)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
item.CredentialConfigured = len(item.CredentialCiphertext) > 0
|
item.CredentialConfigured = len(item.CredentialCiphertext) > 0
|
||||||
|
item.RTSPCredentialConfigured = len(item.RTSPCredentialCiphertext) > 0
|
||||||
item.CredentialCiphertext = nil
|
item.CredentialCiphertext = nil
|
||||||
|
item.RTSPCredentialCiphertext = nil
|
||||||
}
|
}
|
||||||
return item, err
|
return item, err
|
||||||
}
|
}
|
||||||
@@ -53,6 +55,7 @@ func (s *Service) List(ctx context.Context, filter ListFilter) (Page, error) {
|
|||||||
page, err := s.store.List(ctx, filter)
|
page, err := s.store.List(ctx, filter)
|
||||||
for i := range page.Items {
|
for i := range page.Items {
|
||||||
page.Items[i].CredentialCiphertext = nil
|
page.Items[i].CredentialCiphertext = nil
|
||||||
|
page.Items[i].RTSPCredentialCiphertext = nil
|
||||||
}
|
}
|
||||||
return page, err
|
return page, err
|
||||||
}
|
}
|
||||||
@@ -74,31 +77,50 @@ func (s *Service) Update(ctx context.Context, actor identity.Principal, id, name
|
|||||||
}
|
}
|
||||||
identity.RecordAudit(ctx, actor.UserID, "device.update", id, "success", map[string]any{"version": item.Version})
|
identity.RecordAudit(ctx, actor.UserID, "device.update", id, "success", map[string]any{"version": item.Version})
|
||||||
item.CredentialConfigured = len(item.CredentialCiphertext) > 0
|
item.CredentialConfigured = len(item.CredentialCiphertext) > 0
|
||||||
|
item.RTSPCredentialConfigured = len(item.RTSPCredentialCiphertext) > 0
|
||||||
item.CredentialCiphertext = nil
|
item.CredentialCiphertext = nil
|
||||||
|
item.RTSPCredentialCiphertext = nil
|
||||||
return item, nil
|
return item, nil
|
||||||
}
|
}
|
||||||
func (s *Service) SetCredential(ctx context.Context, actor identity.Principal, id, username, password string) (Device, error) {
|
func (s *Service) SetCredential(ctx context.Context, actor identity.Principal, id, username, password string) (Device, error) {
|
||||||
if strings.TrimSpace(username) == "" || password == "" {
|
return s.SetCredentials(ctx, actor, id, username, password, true, "", "")
|
||||||
|
}
|
||||||
|
func (s *Service) SetCredentials(ctx context.Context, actor identity.Principal, id, onvifUsername, onvifPassword string, rtspSame bool, rtspUsername, rtspPassword string) (Device, error) {
|
||||||
|
if strings.TrimSpace(onvifUsername) == "" || onvifPassword == "" {
|
||||||
return Device{}, fmt.Errorf("用户名和密码不能为空")
|
return Device{}, fmt.Errorf("用户名和密码不能为空")
|
||||||
}
|
}
|
||||||
|
if !rtspSame && (strings.TrimSpace(rtspUsername) == "" || rtspPassword == "") {
|
||||||
|
return Device{}, fmt.Errorf("RTSP 用户名和密码不能为空")
|
||||||
|
}
|
||||||
item, err := s.store.Get(ctx, id)
|
item, err := s.store.Get(ctx, id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return Device{}, err
|
return Device{}, err
|
||||||
}
|
}
|
||||||
ciphertext, err := s.vault.Encrypt(username, password)
|
ciphertext, err := s.vault.Encrypt(onvifUsername, onvifPassword)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return Device{}, err
|
return Device{}, err
|
||||||
}
|
}
|
||||||
expected := item.Version
|
expected := item.Version
|
||||||
item.CredentialCiphertext = ciphertext
|
item.CredentialCiphertext = ciphertext
|
||||||
|
item.RTSPCredentialSameAsONVIF = rtspSame
|
||||||
|
if rtspSame {
|
||||||
|
item.RTSPCredentialCiphertext = append([]byte(nil), ciphertext...)
|
||||||
|
} else {
|
||||||
|
item.RTSPCredentialCiphertext, err = s.vault.Encrypt(rtspUsername, rtspPassword)
|
||||||
|
if err != nil {
|
||||||
|
return Device{}, err
|
||||||
|
}
|
||||||
|
}
|
||||||
item.CredentialConfigured = true
|
item.CredentialConfigured = true
|
||||||
|
item.RTSPCredentialConfigured = true
|
||||||
item.Version++
|
item.Version++
|
||||||
item.UpdatedAt = s.now().UTC()
|
item.UpdatedAt = s.now().UTC()
|
||||||
if err := s.store.Update(ctx, item, expected); err != nil {
|
if err := s.store.Update(ctx, item, expected); err != nil {
|
||||||
return Device{}, err
|
return Device{}, err
|
||||||
}
|
}
|
||||||
identity.RecordAudit(ctx, actor.UserID, "device.credential.update", id, "success", map[string]any{"configured": true})
|
identity.RecordAudit(ctx, actor.UserID, "device.credential.update", id, "success", map[string]any{"configured": true, "rtsp_same_as_onvif": rtspSame})
|
||||||
item.CredentialCiphertext = nil
|
item.CredentialCiphertext = nil
|
||||||
|
item.RTSPCredentialCiphertext = nil
|
||||||
return item, nil
|
return item, nil
|
||||||
}
|
}
|
||||||
func (s *Service) Disable(ctx context.Context, actor identity.Principal, id string, expected int64) (Device, error) {
|
func (s *Service) Disable(ctx context.Context, actor identity.Principal, id string, expected int64) (Device, error) {
|
||||||
@@ -114,7 +136,9 @@ func (s *Service) Disable(ctx context.Context, actor identity.Principal, id stri
|
|||||||
}
|
}
|
||||||
identity.RecordAudit(ctx, actor.UserID, "device.disable", id, "success", nil)
|
identity.RecordAudit(ctx, actor.UserID, "device.disable", id, "success", nil)
|
||||||
item.CredentialConfigured = len(item.CredentialCiphertext) > 0
|
item.CredentialConfigured = len(item.CredentialCiphertext) > 0
|
||||||
|
item.RTSPCredentialConfigured = len(item.RTSPCredentialCiphertext) > 0
|
||||||
item.CredentialCiphertext = nil
|
item.CredentialCiphertext = nil
|
||||||
|
item.RTSPCredentialCiphertext = nil
|
||||||
return item, nil
|
return item, nil
|
||||||
}
|
}
|
||||||
func newID() string {
|
func newID() string {
|
||||||
@@ -124,3 +148,4 @@ func newID() string {
|
|||||||
}
|
}
|
||||||
return "dev_" + hex.EncodeToString(b)
|
return "dev_" + hex.EncodeToString(b)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -89,22 +89,23 @@ type PostgresStore struct{ database *sql.DB }
|
|||||||
func NewPostgresStore(database *sql.DB) *PostgresStore { return &PostgresStore{database: database} }
|
func NewPostgresStore(database *sql.DB) *PostgresStore { return &PostgresStore{database: database} }
|
||||||
|
|
||||||
func (s *PostgresStore) Create(ctx context.Context, item Device) error {
|
func (s *PostgresStore) Create(ctx context.Context, item Device) error {
|
||||||
_, err := s.database.ExecContext(ctx, `INSERT INTO sense_devices(id,name,location,modality,capabilities,status,adapter_status,credential_ciphertext,version,created_at,updated_at) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11)`, item.ID, item.Name, item.Location, item.Modality, strings.Join(item.Capabilities, ","), item.Status, item.AdapterStatus, item.CredentialCiphertext, item.Version, item.CreatedAt, item.UpdatedAt)
|
_, err := s.database.ExecContext(ctx, `INSERT INTO sense_devices(id,name,location,modality,capabilities,status,adapter_status,credential_ciphertext,rtsp_credential_ciphertext,rtsp_credential_same_as_onvif,version,created_at,updated_at) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)`, item.ID, item.Name, item.Location, item.Modality, strings.Join(item.Capabilities, ","), item.Status, item.AdapterStatus, item.CredentialCiphertext, item.RTSPCredentialCiphertext, item.RTSPCredentialSameAsONVIF, item.Version, item.CreatedAt, item.UpdatedAt)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
func (s *PostgresStore) Get(ctx context.Context, id string) (Device, error) {
|
func (s *PostgresStore) Get(ctx context.Context, id string) (Device, error) {
|
||||||
var item Device
|
var item Device
|
||||||
var capabilities string
|
var capabilities string
|
||||||
err := s.database.QueryRowContext(ctx, `SELECT id,name,location,modality,capabilities,status,adapter_status,credential_ciphertext,version,created_at,updated_at FROM sense_devices WHERE id=$1`, id).Scan(&item.ID, &item.Name, &item.Location, &item.Modality, &capabilities, &item.Status, &item.AdapterStatus, &item.CredentialCiphertext, &item.Version, &item.CreatedAt, &item.UpdatedAt)
|
err := s.database.QueryRowContext(ctx, `SELECT id,name,location,modality,capabilities,status,adapter_status,credential_ciphertext,rtsp_credential_ciphertext,rtsp_credential_same_as_onvif,version,created_at,updated_at FROM sense_devices WHERE id=$1`, id).Scan(&item.ID, &item.Name, &item.Location, &item.Modality, &capabilities, &item.Status, &item.AdapterStatus, &item.CredentialCiphertext, &item.RTSPCredentialCiphertext, &item.RTSPCredentialSameAsONVIF, &item.Version, &item.CreatedAt, &item.UpdatedAt)
|
||||||
if errors.Is(err, sql.ErrNoRows) {
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
return Device{}, ErrNotFound
|
return Device{}, ErrNotFound
|
||||||
}
|
}
|
||||||
item.Capabilities = splitCapabilities(capabilities)
|
item.Capabilities = splitCapabilities(capabilities)
|
||||||
item.CredentialConfigured = len(item.CredentialCiphertext) > 0
|
item.CredentialConfigured = len(item.CredentialCiphertext) > 0
|
||||||
|
item.RTSPCredentialConfigured = len(item.RTSPCredentialCiphertext) > 0
|
||||||
return item, err
|
return item, err
|
||||||
}
|
}
|
||||||
func (s *PostgresStore) Update(ctx context.Context, item Device, expected int64) error {
|
func (s *PostgresStore) Update(ctx context.Context, item Device, expected int64) error {
|
||||||
result, err := s.database.ExecContext(ctx, `UPDATE sense_devices SET name=$2,location=$3,modality=$4,capabilities=$5,status=$6,adapter_status=$7,credential_ciphertext=$8,version=$9,updated_at=$10 WHERE id=$1 AND version=$11`, item.ID, item.Name, item.Location, item.Modality, strings.Join(item.Capabilities, ","), item.Status, item.AdapterStatus, item.CredentialCiphertext, item.Version, item.UpdatedAt, expected)
|
result, err := s.database.ExecContext(ctx, `UPDATE sense_devices SET name=$2,location=$3,modality=$4,capabilities=$5,status=$6,adapter_status=$7,credential_ciphertext=$8,rtsp_credential_ciphertext=$9,rtsp_credential_same_as_onvif=$10,version=$11,updated_at=$12 WHERE id=$1 AND version=$13`, item.ID, item.Name, item.Location, item.Modality, strings.Join(item.Capabilities, ","), item.Status, item.AdapterStatus, item.CredentialCiphertext, item.RTSPCredentialCiphertext, item.RTSPCredentialSameAsONVIF, item.Version, item.UpdatedAt, expected)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -121,7 +122,7 @@ func (s *PostgresStore) List(ctx context.Context, filter ListFilter) (Page, erro
|
|||||||
if err := s.database.QueryRowContext(ctx, `SELECT count(*) FROM sense_devices WHERE name ILIKE $1 OR location ILIKE $1`, keyword).Scan(&total); err != nil {
|
if err := s.database.QueryRowContext(ctx, `SELECT count(*) FROM sense_devices WHERE name ILIKE $1 OR location ILIKE $1`, keyword).Scan(&total); err != nil {
|
||||||
return Page{}, err
|
return Page{}, err
|
||||||
}
|
}
|
||||||
rows, err := s.database.QueryContext(ctx, `SELECT id,name,location,modality,capabilities,status,adapter_status,(credential_ciphertext IS NOT NULL),version,created_at,updated_at FROM sense_devices WHERE name ILIKE $1 OR location ILIKE $1 ORDER BY created_at DESC LIMIT $2 OFFSET $3`, keyword, size, (page-1)*size)
|
rows, err := s.database.QueryContext(ctx, `SELECT id,name,location,modality,capabilities,status,adapter_status,(credential_ciphertext IS NOT NULL),(rtsp_credential_ciphertext IS NOT NULL),rtsp_credential_same_as_onvif,version,created_at,updated_at FROM sense_devices WHERE name ILIKE $1 OR location ILIKE $1 ORDER BY created_at DESC LIMIT $2 OFFSET $3`, keyword, size, (page-1)*size)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return Page{}, err
|
return Page{}, err
|
||||||
}
|
}
|
||||||
@@ -130,7 +131,7 @@ func (s *PostgresStore) List(ctx context.Context, filter ListFilter) (Page, erro
|
|||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var item Device
|
var item Device
|
||||||
var caps string
|
var caps string
|
||||||
if err := rows.Scan(&item.ID, &item.Name, &item.Location, &item.Modality, &caps, &item.Status, &item.AdapterStatus, &item.CredentialConfigured, &item.Version, &item.CreatedAt, &item.UpdatedAt); err != nil {
|
if err := rows.Scan(&item.ID, &item.Name, &item.Location, &item.Modality, &caps, &item.Status, &item.AdapterStatus, &item.CredentialConfigured, &item.RTSPCredentialConfigured, &item.RTSPCredentialSameAsONVIF, &item.Version, &item.CreatedAt, &item.UpdatedAt); err != nil {
|
||||||
return Page{}, err
|
return Page{}, err
|
||||||
}
|
}
|
||||||
item.Capabilities = splitCapabilities(caps)
|
item.Capabilities = splitCapabilities(caps)
|
||||||
@@ -158,3 +159,4 @@ func splitCapabilities(value string) []string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var _ = time.Time{}
|
var _ = time.Time{}
|
||||||
|
|
||||||
|
|||||||
@@ -13,18 +13,21 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Device struct {
|
type Device struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Location string `json:"location"`
|
Location string `json:"location"`
|
||||||
Modality string `json:"modality"`
|
Modality string `json:"modality"`
|
||||||
Capabilities []string `json:"capabilities"`
|
Capabilities []string `json:"capabilities"`
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
AdapterStatus string `json:"adapter_status"`
|
AdapterStatus string `json:"adapter_status"`
|
||||||
CredentialConfigured bool `json:"credential_configured"`
|
CredentialConfigured bool `json:"credential_configured"`
|
||||||
CredentialCiphertext []byte `json:"-"`
|
CredentialCiphertext []byte `json:"-"`
|
||||||
Version int64 `json:"version"`
|
RTSPCredentialConfigured bool `json:"rtsp_credential_configured"`
|
||||||
CreatedAt time.Time `json:"created_at"`
|
RTSPCredentialSameAsONVIF bool `json:"rtsp_credential_same_as_onvif"`
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
RTSPCredentialCiphertext []byte `json:"-"`
|
||||||
|
Version int64 `json:"version"`
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ListFilter struct {
|
type ListFilter struct {
|
||||||
@@ -39,3 +42,4 @@ type Page struct {
|
|||||||
Page int `json:"page"`
|
Page int `json:"page"`
|
||||||
PageSize int `json:"page_size"`
|
PageSize int `json:"page_size"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,8 +11,16 @@ import (
|
|||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
registerModule(func(app *platform.App) error {
|
registerModule(func(app *platform.App) error {
|
||||||
service := admission.NewService(onvif.NewHTTPClient(8*time.Second), rtsp.NetVerifier{Timeout: 5 * time.Second}, os.Getenv("SENSE_ONVIF_DISCOVERY_IP"))
|
var store admission.Store
|
||||||
|
if app.Config().DatabaseMode == platform.DatabaseModeMemory {
|
||||||
|
store = admission.NewMemoryStore()
|
||||||
|
} else {
|
||||||
|
store = admission.NewPostgresStore(app.Database())
|
||||||
|
}
|
||||||
|
app.RegisterMigration(platform.Migration{Version: 2026081302, Name: "sense_admission_profiles", SQL: admission.MigrationSQL})
|
||||||
|
service := admission.NewService(onvif.NewHTTPClient(8*time.Second), rtsp.NetVerifier{Timeout: 5 * time.Second}, os.Getenv("SENSE_ONVIF_DISCOVERY_IP"), store)
|
||||||
admission.NewModule(service).Register(app)
|
admission.NewModule(service).Register(app)
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,9 @@ func init() {
|
|||||||
store = device.NewPostgresStore(app.Database())
|
store = device.NewPostgresStore(app.Database())
|
||||||
}
|
}
|
||||||
app.RegisterMigration(platform.Migration{Version: 2026081202, Name: "sense_device", SQL: device.MigrationSQL})
|
app.RegisterMigration(platform.Migration{Version: 2026081202, Name: "sense_device", SQL: device.MigrationSQL})
|
||||||
|
app.RegisterMigration(platform.Migration{Version: 2026081301, Name: "sense_device_split_credentials", SQL: device.SplitCredentialMigrationSQL})
|
||||||
device.NewModule(device.NewService(store, vault)).Register(app)
|
device.NewModule(device.NewService(store, vault)).Register(app)
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,8 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"serve": "vue-cli-service serve",
|
"serve": "vue-cli-service serve",
|
||||||
"build": "vue-cli-service build",
|
"build": "vue-cli-service build",
|
||||||
"lint": "eslint \"src/**/*.{js,vue}\""
|
"lint": "eslint \"src/**/*.{js,vue}\"",
|
||||||
|
"test:navigation": "node --test tests/navigation.test.cjs"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@element-plus/icons-vue": "2.3.2",
|
"@element-plus/icons-vue": "2.3.2",
|
||||||
@@ -50,4 +51,3 @@
|
|||||||
"not dead"
|
"not dead"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -58,22 +58,14 @@ import { computed, ref } from 'vue'
|
|||||||
import { useRouter } from 'vue-router'
|
import { useRouter } from 'vue-router'
|
||||||
import { useStore } from 'vuex'
|
import { useStore } from 'vuex'
|
||||||
|
|
||||||
|
import { buildNavigation } from './navigation'
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const store = useStore()
|
const store = useStore()
|
||||||
const collapsed = ref(false)
|
const collapsed = ref(false)
|
||||||
const navigation = computed(() => {
|
const navigation = computed(() => {
|
||||||
const root = router.getRoutes().find((route) => route.path === '/')
|
|
||||||
const permissions = store.getters['sense-identity/permissions'] || []
|
const permissions = store.getters['sense-identity/permissions'] || []
|
||||||
return (root?.children || [])
|
return buildNavigation(router.getRoutes(), permissions)
|
||||||
.filter((route) => route.meta?.title && !route.meta?.hidden)
|
|
||||||
.filter((route) => !route.meta?.permission || permissions.includes(route.meta.permission))
|
|
||||||
.map((route) => ({
|
|
||||||
path: route.path ? `/${route.path}`.replace('//', '/') : '/',
|
|
||||||
title: route.meta.title,
|
|
||||||
icon: route.meta.icon,
|
|
||||||
order: route.meta.order || 0
|
|
||||||
}))
|
|
||||||
.sort((left, right) => left.order - right.order)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
async function logout() {
|
async function logout() {
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
function buildNavigation(routes, permissions = []) {
|
||||||
|
const layout = routes
|
||||||
|
.filter((route) => route.path === '/' && Array.isArray(route.children) && route.children.length > 0)
|
||||||
|
.sort((left, right) => right.children.length - left.children.length)[0]
|
||||||
|
|
||||||
|
return (layout?.children || [])
|
||||||
|
.filter((route) => route.meta?.title && !route.meta?.hidden)
|
||||||
|
.filter((route) => !route.meta?.permission || permissions.includes(route.meta.permission))
|
||||||
|
.map((route) => ({
|
||||||
|
path: route.path ? `/${route.path}`.replace('//', '/') : '/',
|
||||||
|
title: route.meta.title,
|
||||||
|
icon: route.meta.icon,
|
||||||
|
order: route.meta.order || 0
|
||||||
|
}))
|
||||||
|
.sort((left, right) => left.order - right.order)
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { buildNavigation }
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
<template #header><strong>接入检查</strong></template>
|
<template #header><strong>接入检查</strong></template>
|
||||||
<el-alert title="发现功能只在实施人员配置获准网卡后启用,不会扫描其他网络。" type="info" show-icon :closable="false" />
|
<el-alert title="发现功能只在实施人员配置获准网卡后启用,不会扫描其他网络。" type="info" show-icon :closable="false" />
|
||||||
<el-form ref="formRef" :model="form" :rules="rules" label-position="top" class="admission-form">
|
<el-form ref="formRef" :model="form" :rules="rules" label-position="top" class="admission-form">
|
||||||
<el-form-item label="设备" prop="device_id"><el-select v-model="form.device_id" filterable placeholder="选择已登记的视频设备" style="width: 100%"><el-option v-for="item in devices" :key="item.id" :label="`${item.name} · ${item.location || '未填写位置'}`" :value="item.id" /></el-select></el-form-item>
|
<el-form-item label="设备" prop="device_id"><el-select v-model="form.device_id" filterable placeholder="选择已登记的视频设备" style="width: 100%" @change="loadSavedResult"><el-option v-for="item in devices" :key="item.id" :label="`${item.name} · ${item.location || '未填写位置'}`" :value="item.id" /></el-select></el-form-item>
|
||||||
<el-form-item label="ONVIF 服务地址" prop="address"><el-input v-model="form.address" placeholder="例如:http://设备地址/onvif/device_service" /><div class="field-hint">地址中不能包含用户名或密码;凭据来自设备管理中的安全配置。</div></el-form-item>
|
<el-form-item label="ONVIF 服务地址" prop="address"><el-input v-model="form.address" placeholder="例如:http://设备地址/onvif/device_service" /><div class="field-hint">地址中不能包含用户名或密码;凭据来自设备管理中的安全配置。</div></el-form-item>
|
||||||
<el-form-item><el-button type="primary" :loading="probing" @click="probe">检查设备与视频</el-button><el-button :loading="discovering" @click="discover">发现设备</el-button></el-form-item>
|
<el-form-item><el-button type="primary" :loading="probing" @click="probe">检查设备与视频</el-button><el-button :loading="discovering" @click="discover">发现设备</el-button></el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
@@ -38,15 +38,17 @@
|
|||||||
import { onMounted, reactive, ref } from 'vue'
|
import { onMounted, reactive, ref } from 'vue'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { listDevices } from '../../../api/sense/device'
|
import { listDevices } from '../../../api/sense/device'
|
||||||
import { discoverDevices, probeDevice } from '../../../api/sense/admission'
|
import { admissionResult, discoverDevices, probeDevice } from '../../../api/sense/admission'
|
||||||
const devices=ref([]),probing=ref(false),discovering=ref(false),discoveryDialog=ref(false),discovered=ref([]),formRef=ref()
|
const devices=ref([]),probing=ref(false),discovering=ref(false),discoveryDialog=ref(false),discovered=ref([]),formRef=ref()
|
||||||
const form=reactive({device_id:'',address:''}),result=reactive({})
|
const form=reactive({device_id:'',address:''}),result=reactive({})
|
||||||
const rules={device_id:[{required:true,message:'请选择设备',trigger:'change'}],address:[{required:true,message:'请输入 ONVIF 服务地址',trigger:'blur'},{validator:(_r,v,done)=>v.includes('@')?done(new Error('地址中不能包含凭据')):done(),trigger:'blur'}]}
|
const rules={device_id:[{required:true,message:'请选择设备',trigger:'change'}],address:[{required:true,message:'请输入 ONVIF 服务地址',trigger:'blur'},{validator:(_r,v,done)=>v.includes('@')?done(new Error('地址中不能包含凭据')):done(),trigger:'blur'}]}
|
||||||
function statusLabel(value){return({ready:'接入正常',profile_failed:'部分码流失败',authentication_failed:'认证失败',timeout:'响应超时',clock_skew:'需要校时',unreachable:'设备不可达'})[value]||value}
|
function statusLabel(value){return({ready:'接入正常',profile_failed:'部分码流失败',authentication_failed:'认证失败',timeout:'响应超时',clock_skew:'需要校时',unreachable:'设备不可达'})[value]||value}
|
||||||
async function loadDevices(){devices.value=(await listDevices({page:1,page_size:100})).items.filter(item=>item.modality==='video'&&item.status!=='disabled')}
|
async function loadDevices(){devices.value=(await listDevices({page:1,page_size:100})).items.filter(item=>item.modality==='video'&&item.status!=='disabled')}
|
||||||
|
async function loadSavedResult(){Object.keys(result).forEach(key=>delete result[key]);if(!form.device_id)return;try{Object.assign(result,await admissionResult(form.device_id))}catch{/* 尚未接入时保持空状态 */}}
|
||||||
async function probe(){const valid=await formRef.value?.validate().catch(()=>false);if(!valid)return;probing.value=true;try{Object.assign(result,await probeDevice(form))}catch(error){ElMessage.error(error.message||'检查失败')}finally{probing.value=false}}
|
async function probe(){const valid=await formRef.value?.validate().catch(()=>false);if(!valid)return;probing.value=true;try{Object.assign(result,await probeDevice(form))}catch(error){ElMessage.error(error.message||'检查失败')}finally{probing.value=false}}
|
||||||
async function discover(){discovering.value=true;try{discovered.value=(await discoverDevices()).items||[];discoveryDialog.value=true}catch(error){ElMessage.warning(error.message||'未配置获准发现网卡')}finally{discovering.value=false}}
|
async function discover(){discovering.value=true;try{discovered.value=(await discoverDevices()).items||[];discoveryDialog.value=true}catch(error){ElMessage.warning(error.message||'未配置获准发现网卡')}finally{discovering.value=false}}
|
||||||
function useAddress(value){form.address=value;discoveryDialog.value=false}
|
function useAddress(value){form.address=value;discoveryDialog.value=false}
|
||||||
onMounted(loadDevices)
|
onMounted(loadDevices)
|
||||||
</script>
|
</script>
|
||||||
<style scoped>.admission-form{margin-top:18px}.field-hint{color:#86909c;font-size:12px;line-height:1.5}.result-header{display:flex;align-items:center;justify-content:space-between}</style>
|
<style scoped>.admission-form{margin-top:18px}.field-hint{color:#86909c;font-size:12px;line-height:1.5}.result-header{display:flex;align-items:center;justify-content:space-between}</style>
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<el-table-column prop="location" label="安装位置" min-width="150" />
|
<el-table-column prop="location" label="安装位置" min-width="150" />
|
||||||
<el-table-column label="类型" width="110"><template #default="scope">{{ scope.row.modality === 'video' ? '视频设备' : scope.row.modality }}</template></el-table-column>
|
<el-table-column label="类型" width="110"><template #default="scope">{{ scope.row.modality === 'video' ? '视频设备' : scope.row.modality }}</template></el-table-column>
|
||||||
<el-table-column label="接入能力" width="140"><template #default="scope"><el-tag :type="scope.row.adapter_status === 'ready' ? 'success' : 'warning'">{{ scope.row.adapter_status === 'ready' ? '可接入' : '适配器未就绪' }}</el-tag></template></el-table-column>
|
<el-table-column label="接入能力" width="140"><template #default="scope"><el-tag :type="scope.row.adapter_status === 'ready' ? 'success' : 'warning'">{{ scope.row.adapter_status === 'ready' ? '可接入' : '适配器未就绪' }}</el-tag></template></el-table-column>
|
||||||
<el-table-column label="凭据" width="110"><template #default="scope"><el-tag :type="scope.row.credential_configured ? 'success' : 'info'">{{ scope.row.credential_configured ? '已配置' : '未配置' }}</el-tag></template></el-table-column>
|
<el-table-column label="设备凭据" width="150"><template #default="scope"><el-tag :type="scope.row.credential_configured && scope.row.rtsp_credential_configured ? 'success' : 'info'">{{ scope.row.credential_configured && scope.row.rtsp_credential_configured ? '已配置' : '未完整配置' }}</el-tag></template></el-table-column>
|
||||||
<el-table-column label="状态" width="100"><template #default="scope"><el-tag :type="scope.row.status === 'disabled' ? 'info' : 'primary'">{{ statusLabel(scope.row.status) }}</el-tag></template></el-table-column>
|
<el-table-column label="状态" width="100"><template #default="scope"><el-tag :type="scope.row.status === 'disabled' ? 'info' : 'primary'">{{ statusLabel(scope.row.status) }}</el-tag></template></el-table-column>
|
||||||
<el-table-column v-if="canWrite" label="操作" width="210" fixed="right"><template #default="scope"><el-button link type="primary" @click="openEdit(scope.row)">编辑</el-button><el-button link type="primary" @click="openCredential(scope.row)">更新凭据</el-button><el-button v-if="scope.row.status !== 'disabled'" link type="danger" @click="disable(scope.row)">停用</el-button></template></el-table-column>
|
<el-table-column v-if="canWrite" label="操作" width="210" fixed="right"><template #default="scope"><el-button link type="primary" @click="openEdit(scope.row)">编辑</el-button><el-button link type="primary" @click="openCredential(scope.row)">更新凭据</el-button><el-button v-if="scope.row.status !== 'disabled'" link type="danger" @click="disable(scope.row)">停用</el-button></template></el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -33,8 +33,13 @@
|
|||||||
<el-dialog v-model="credentialDialog" title="更新设备凭据" width="520px" destroy-on-close>
|
<el-dialog v-model="credentialDialog" title="更新设备凭据" width="520px" destroy-on-close>
|
||||||
<el-alert title="凭据保存后不能查看,只能再次更新。请勿把密码写入设备地址。" type="warning" show-icon :closable="false" />
|
<el-alert title="凭据保存后不能查看,只能再次更新。请勿把密码写入设备地址。" type="warning" show-icon :closable="false" />
|
||||||
<el-form ref="credentialFormRef" :model="credentialForm" :rules="credentialRules" label-width="82px" class="credential-form">
|
<el-form ref="credentialFormRef" :model="credentialForm" :rules="credentialRules" label-width="82px" class="credential-form">
|
||||||
<el-form-item label="用户名" prop="username"><el-input v-model="credentialForm.username" autocomplete="off" /></el-form-item>
|
<el-form-item label="ONVIF 用户名" prop="onvif_username"><el-input v-model="credentialForm.onvif_username" autocomplete="off" /></el-form-item>
|
||||||
<el-form-item label="密码" prop="password"><el-input v-model="credentialForm.password" type="password" show-password autocomplete="new-password" /></el-form-item>
|
<el-form-item label="ONVIF 密码" prop="onvif_password"><el-input v-model="credentialForm.onvif_password" type="password" show-password autocomplete="new-password" /></el-form-item>
|
||||||
|
<el-form-item label-width="0"><el-checkbox v-model="credentialForm.rtsp_same_as_onvif">RTSP 与 ONVIF 使用相同账号</el-checkbox></el-form-item>
|
||||||
|
<template v-if="!credentialForm.rtsp_same_as_onvif">
|
||||||
|
<el-form-item label="RTSP 用户名" prop="rtsp_username"><el-input v-model="credentialForm.rtsp_username" autocomplete="off" /></el-form-item>
|
||||||
|
<el-form-item label="RTSP 密码" prop="rtsp_password"><el-input v-model="credentialForm.rtsp_password" type="password" show-password autocomplete="new-password" /></el-form-item>
|
||||||
|
</template>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer><el-button @click="credentialDialog = false">取消</el-button><el-button type="primary" :loading="saving" @click="saveCredential">安全保存</el-button></template>
|
<template #footer><el-button @click="credentialDialog = false">取消</el-button><el-button type="primary" :loading="saving" @click="saveCredential">安全保存</el-button></template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
@@ -54,18 +59,18 @@ const editing = ref(null), credentialTarget = ref(null), deviceFormRef = ref(),
|
|||||||
const query = reactive({ keyword: '', page: 1, page_size: 20 })
|
const query = reactive({ keyword: '', page: 1, page_size: 20 })
|
||||||
const page = reactive({ items: [], total: 0 })
|
const page = reactive({ items: [], total: 0 })
|
||||||
const deviceForm = reactive({ name: '', location: '', modality: 'video', capabilities: ['video'] })
|
const deviceForm = reactive({ name: '', location: '', modality: 'video', capabilities: ['video'] })
|
||||||
const credentialForm = reactive({ username: '', password: '' })
|
const credentialForm = reactive({ onvif_username: '', onvif_password: '', rtsp_same_as_onvif: true, rtsp_username: '', rtsp_password: '' })
|
||||||
const deviceRules = { name: [{ required: true, message: '请输入设备名称', trigger: 'blur' }], modality: [{ required: true, message: '请选择类型', trigger: 'change' }] }
|
const deviceRules = { name: [{ required: true, message: '请输入设备名称', trigger: 'blur' }], modality: [{ required: true, message: '请选择类型', trigger: 'change' }] }
|
||||||
const credentialRules = { username: [{ required: true, message: '请输入用户名', trigger: 'blur' }], password: [{ required: true, message: '请输入密码', trigger: 'blur' }] }
|
const credentialRules = { onvif_username: [{ required: true, message: '请输入 ONVIF 用户名', trigger: 'blur' }], onvif_password: [{ required: true, message: '请输入 ONVIF 密码', trigger: 'blur' }], rtsp_username: [{ validator: (_r, value, done) => !credentialForm.rtsp_same_as_onvif && !value ? done(new Error('请输入 RTSP 用户名')) : done(), trigger: 'blur' }], rtsp_password: [{ validator: (_r, value, done) => !credentialForm.rtsp_same_as_onvif && !value ? done(new Error('请输入 RTSP 密码')) : done(), trigger: 'blur' }] }
|
||||||
const canWrite = computed(() => store.getters['sense-identity/hasPermission']?.('device.write'))
|
const canWrite = computed(() => store.getters['sense-identity/hasPermission']?.('device.write'))
|
||||||
function statusLabel(value) { return ({ pending: '待接入', active: '正常', offline: '离线', disabled: '已停用' })[value] || value }
|
function statusLabel(value) { return ({ pending: '待接入', active: '正常', offline: '离线', disabled: '已停用' })[value] || value }
|
||||||
async function load() { loading.value = true; try { Object.assign(page, await listDevices(query)) } finally { loading.value = false } }
|
async function load() { loading.value = true; try { Object.assign(page, await listDevices(query)) } finally { loading.value = false } }
|
||||||
function reset() { Object.assign(query, { keyword: '', page: 1, page_size: 20 }); load() }
|
function reset() { Object.assign(query, { keyword: '', page: 1, page_size: 20 }); load() }
|
||||||
function openCreate() { editing.value = null; Object.assign(deviceForm, { name: '', location: '', modality: 'video', capabilities: ['video'] }); deviceDialog.value = true }
|
function openCreate() { editing.value = null; Object.assign(deviceForm, { name: '', location: '', modality: 'video', capabilities: ['video'] }); deviceDialog.value = true }
|
||||||
function openEdit(row) { editing.value = row; Object.assign(deviceForm, { name: row.name, location: row.location, modality: row.modality, capabilities: row.capabilities }); deviceDialog.value = true }
|
function openEdit(row) { editing.value = row; Object.assign(deviceForm, { name: row.name, location: row.location, modality: row.modality, capabilities: row.capabilities }); deviceDialog.value = true }
|
||||||
function openCredential(row) { credentialTarget.value = row; Object.assign(credentialForm, { username: '', password: '' }); credentialDialog.value = true }
|
function openCredential(row) { credentialTarget.value = row; Object.assign(credentialForm, { onvif_username: '', onvif_password: '', rtsp_same_as_onvif: row.rtsp_credential_same_as_onvif !== false, rtsp_username: '', rtsp_password: '' }); credentialDialog.value = true }
|
||||||
async function saveDevice() { const valid = await deviceFormRef.value?.validate().catch(() => false); if (!valid) return; saving.value = true; try { if (editing.value) await updateDevice(editing.value.id, { ...deviceForm, version: editing.value.version }); else await createDevice(deviceForm); ElMessage.success('设备已保存'); deviceDialog.value = false; await load() } catch (error) { ElMessage.error(error.message || '保存失败') } finally { saving.value = false } }
|
async function saveDevice() { const valid = await deviceFormRef.value?.validate().catch(() => false); if (!valid) return; saving.value = true; try { if (editing.value) await updateDevice(editing.value.id, { ...deviceForm, version: editing.value.version }); else await createDevice(deviceForm); ElMessage.success('设备已保存'); deviceDialog.value = false; await load() } catch (error) { ElMessage.error(error.message || '保存失败') } finally { saving.value = false } }
|
||||||
async function saveCredential() { const valid = await credentialFormRef.value?.validate().catch(() => false); if (!valid) return; saving.value = true; try { await updateCredential(credentialTarget.value.id, credentialForm); Object.assign(credentialForm, { username: '', password: '' }); ElMessage.success('凭据已安全更新'); credentialDialog.value = false; await load() } catch (error) { ElMessage.error(error.message || '更新失败') } finally { saving.value = false } }
|
async function saveCredential() { const valid = await credentialFormRef.value?.validate().catch(() => false); if (!valid) return; saving.value = true; try { await updateCredential(credentialTarget.value.id, credentialForm); Object.assign(credentialForm, { onvif_username: '', onvif_password: '', rtsp_same_as_onvif: true, rtsp_username: '', rtsp_password: '' }); ElMessage.success('ONVIF 与 RTSP 凭据已安全更新'); credentialDialog.value = false; await load() } catch (error) { ElMessage.error(error.message || '更新失败') } finally { saving.value = false } }
|
||||||
async function disable(row) { await ElMessageBox.confirm(`停用“${row.name}”后将停止后续接入,设备记录和审计仍保留。`, '确认停用', { type: 'warning' }); await disableDevice(row.id, row.version); ElMessage.success('设备已停用'); await load() }
|
async function disable(row) { await ElMessageBox.confirm(`停用“${row.name}”后将停止后续接入,设备记录和审计仍保留。`, '确认停用', { type: 'warning' }); await disableDevice(row.id, row.version); ElMessage.success('设备已停用'); await load() }
|
||||||
onMounted(load)
|
onMounted(load)
|
||||||
</script>
|
</script>
|
||||||
@@ -73,3 +78,4 @@ onMounted(load)
|
|||||||
<style scoped>
|
<style scoped>
|
||||||
.credential-form { margin-top: 20px; }
|
.credential-form { margin-top: 20px; }
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
const assert = require('node:assert/strict')
|
||||||
|
const test = require('node:test')
|
||||||
|
|
||||||
|
const { buildNavigation } = require('../src/layout/navigation.js')
|
||||||
|
|
||||||
|
test('selects the layout record when normalized routes contain duplicate root paths', () => {
|
||||||
|
const routes = [
|
||||||
|
{ path: '/', name: 'sense-dashboard', children: [], meta: { title: '工作台' } },
|
||||||
|
{ path: '/devices', name: 'sense-devices', children: [], meta: { title: '设备管理' } },
|
||||||
|
{
|
||||||
|
path: '/',
|
||||||
|
children: [
|
||||||
|
{ path: 'devices', meta: { title: '设备管理', permission: 'device.read', order: 10 } },
|
||||||
|
{ path: '', meta: { title: '工作台', order: 0 } },
|
||||||
|
{ path: 'users', meta: { title: '用户与权限', permission: 'identity.users.read', order: 90 } }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
assert.deepEqual(buildNavigation(routes, ['device.read']), [
|
||||||
|
{ path: '/', title: '工作台', icon: undefined, order: 0 },
|
||||||
|
{ path: '/devices', title: '设备管理', icon: undefined, order: 10 }
|
||||||
|
])
|
||||||
|
})
|
||||||
|
|
||||||
|
test('returns no unauthorized or hidden entries', () => {
|
||||||
|
const routes = [{
|
||||||
|
path: '/',
|
||||||
|
children: [
|
||||||
|
{ path: '', meta: { title: '工作台' } },
|
||||||
|
{ path: 'users', meta: { title: '用户与权限', permission: 'identity.users.read' } },
|
||||||
|
{ path: 'internal', meta: { title: '内部页', hidden: true } }
|
||||||
|
]
|
||||||
|
}]
|
||||||
|
|
||||||
|
assert.deepEqual(buildNavigation(routes), [
|
||||||
|
{ path: '/', title: '工作台', icon: undefined, order: 0 }
|
||||||
|
])
|
||||||
|
})
|
||||||
|
|
||||||
|
test('administrator receives every Sense MVP navigation entry', () => {
|
||||||
|
const entries = [
|
||||||
|
['', '工作台', null, 0],
|
||||||
|
['devices', '设备管理', 'device.read', 10],
|
||||||
|
['admission', '视频接入', 'device.write', 20],
|
||||||
|
['media', '视频服务', 'media.read', 30],
|
||||||
|
['liveview', '实时监看', 'media.read', 40],
|
||||||
|
['areas', '区域与警戒线', 'area.read', 50],
|
||||||
|
['users', '用户与权限', 'identity.users.read', 90],
|
||||||
|
['audit', '操作记录', 'identity.audit.read', 91]
|
||||||
|
]
|
||||||
|
const routes = [{ path: '/', children: entries.map(([path, title, permission, order]) => ({
|
||||||
|
path,
|
||||||
|
meta: { title, permission, order }
|
||||||
|
})) }]
|
||||||
|
const permissions = [
|
||||||
|
'device.read', 'device.write', 'media.read', 'area.read',
|
||||||
|
'identity.users.read', 'identity.audit.read'
|
||||||
|
]
|
||||||
|
|
||||||
|
assert.deepEqual(buildNavigation(routes, permissions).map((item) => item.title), [
|
||||||
|
'工作台', '设备管理', '视频接入', '视频服务', '实时监看',
|
||||||
|
'区域与警戒线', '用户与权限', '操作记录'
|
||||||
|
])
|
||||||
|
})
|
||||||
@@ -2,8 +2,8 @@
|
|||||||
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
||||||
wiki_page: Architecture-and-Code-Map
|
wiki_page: Architecture-and-Code-Map
|
||||||
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Architecture-and-Code-Map.-
|
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Architecture-and-Code-Map.-
|
||||||
wiki_revision: 1712a8053f365781aef9cbf33c576c97491f31d4
|
wiki_revision: e6fc9d8663d8e9fb5ebfacb3c33a029b2659ae85
|
||||||
synchronized_at: 2026-08-12T10:21:55Z
|
synchronized_at: 2026-08-13T04:16:00Z
|
||||||
<!-- gitea-wiki-mirror:end -->
|
<!-- gitea-wiki-mirror:end -->
|
||||||
|
|
||||||
# 架构与代码地图
|
# 架构与代码地图
|
||||||
@@ -100,8 +100,8 @@ Sense/Brain 生成事件
|
|||||||
Sense 后端功能以 `Sense/server/app/sense/` 为根,并通过 `Sense/server/cmd/sense/modules_<feature>.go` 独立注册:
|
Sense 后端功能以 `Sense/server/app/sense/` 为根,并通过 `Sense/server/cmd/sense/modules_<feature>.go` 独立注册:
|
||||||
|
|
||||||
- `identity/`:Sense 独立账户、bcrypt 密码、会话、四角色 RBAC 与统一审计;签发者和受众只属于 Sense。
|
- `identity/`:Sense 独立账户、bcrypt 密码、会话、四角色 RBAC 与统一审计;签发者和受众只属于 Sense。
|
||||||
- `device/`:Device 台账、状态、分页和 AES-256-GCM 凭据保险箱;读取模型只返回 `credential_configured`。
|
- `device/`:Device 台账、状态、分页和 AES-256-GCM 凭据保险箱;ONVIF 与 RTSP 凭据可分离或显式复用,读取模型只返回两组凭据是否已配置。
|
||||||
- `adapters/onvif/`、`adapters/rtsp/`、`admission/`:获准网卡上的受控发现、手工 ONVIF 接入、Profile/StreamUri 读取和 RTSP 验证。
|
- `adapters/onvif/`、`adapters/rtsp/`、`admission/`:获准网卡上的受控发现、手工 ONVIF 接入、Media 服务发现、Basic/Digest 认证、Profile/StreamUri 读取和 RTSP 验证。跨主机 Media 地址固定回用户已授权的 Device Service origin;跨主机 RTSP URI 只替换为授权主机并保留报告端口与路径。接入结果和脱敏 Profile 持久化到 PostgreSQL,重启后可恢复。
|
||||||
- `adapters/mediamtx/`、`media/`:外部 MediaMTX 进程所有权、localhost Control API、媒体期望态与实际态对账。
|
- `adapters/mediamtx/`、`media/`:外部 MediaMTX 进程所有权、localhost Control API、媒体期望态与实际态对账。
|
||||||
- `liveview/`:绑定当前用户、最长两分钟的单路播放会话;只投影媒体路径,不暴露源 URI 或摄像机秘密。
|
- `liveview/`:绑定当前用户、最长两分钟的单路播放会话;只投影媒体路径,不暴露源 URI 或摄像机秘密。
|
||||||
- `area/`:归一化多边形/方向警戒线、不可变版本、并发版本校验和分辨率变化后的重新校准。
|
- `area/`:归一化多边形/方向警戒线、不可变版本、并发版本校验和分辨率变化后的重新校准。
|
||||||
@@ -124,3 +124,4 @@ Sense 后端功能以 `Sense/server/app/sense/` 为根,并通过 `Sense/server
|
|||||||
|
|
||||||
Event 写入、幂等 Receipt、规则评估和 Alert 创建/关联处于同一数据库事务;规则或关联失败时不保留半成品 Event。一个 Event 可匹配多个规则,一个未关闭 Alert 可聚合相同规则与地点的多个 Event。
|
Event 写入、幂等 Receipt、规则评估和 Alert 创建/关联处于同一数据库事务;规则或关联失败时不保留半成品 Event。一个 Event 可匹配多个规则,一个未关闭 Alert 可聚合相同规则与地点的多个 Event。
|
||||||
<!-- bell-mvp:end -->
|
<!-- bell-mvp:end -->
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
||||||
wiki_page: Business-Rules-and-Glossary
|
wiki_page: Business-Rules-and-Glossary
|
||||||
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Business-Rules-and-Glossary.-
|
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Business-Rules-and-Glossary.-
|
||||||
wiki_revision: c9d47108e45f66875726e3eef79eedb2a5942514
|
wiki_revision: 351a92bd514dd5d3315201284205a5596ccd0084
|
||||||
synchronized_at: 2026-08-13T01:15:01Z
|
synchronized_at: 2026-08-13T04:16:00Z
|
||||||
<!-- gitea-wiki-mirror:end -->
|
<!-- gitea-wiki-mirror:end -->
|
||||||
|
|
||||||
# 业务规则与术语
|
# 业务规则与术语
|
||||||
@@ -73,9 +73,9 @@ synchronized_at: 2026-08-13T01:15:01Z
|
|||||||
- **Sense 账户**:只登录 Sense;不得接受 Bell JWT、Cookie 或用户数据。角色为系统管理员、实施/运维、站点管理员和只读用户,后端权限是最终边界。
|
- **Sense 账户**:只登录 Sense;不得接受 Bell JWT、Cookie 或用户数据。角色为系统管理员、实施/运维、站点管理员和只读用户,后端权限是最终边界。
|
||||||
- **安全初始化**:系统不提供默认账户、默认密码或默认签名密钥;首次管理员由仓库外一次性令牌创建。所有模式的密码仅要求至少 6 个字符,不限制字符种类并允许包含用户名。负责人已明确接受该生产密码策略的字典猜测与凭据填充风险。
|
- **安全初始化**:系统不提供默认账户、默认密码或默认签名密钥;首次管理员由仓库外一次性令牌创建。所有模式的密码仅要求至少 6 个字符,不限制字符种类并允许包含用户名。负责人已明确接受该生产密码策略的字典猜测与凭据填充风险。
|
||||||
- **Device**:设备不可变逻辑 ID 是后续 Profile、媒体和区域的内部引用。非视频适配器未实现时必须显示 `adapter_not_ready`。
|
- **Device**:设备不可变逻辑 ID 是后续 Profile、媒体和区域的内部引用。非视频适配器未实现时必须显示 `adapter_not_ready`。
|
||||||
- **摄像机凭据**:只写不读,使用仓库外 32 字节密钥加密;不得进入 URL、日志、审计、工单或响应。
|
- **摄像机凭据**:ONVIF 与 RTSP 可使用不同账号,也可显式复用;两组均只写不读,使用仓库外 32 字节密钥分别加密。密码不得进入 URL、日志、审计、工单或响应。
|
||||||
- **受控发现**:ONVIF Discovery 默认关闭,只有显式设置获准本机 IP 才能发送发现;不得扫描未授权网段。
|
- **受控发现**:ONVIF Discovery 默认关闭,只有显式设置获准本机 IP 才能发送发现;不得扫描未授权网段。
|
||||||
- **Profile**:主辅码流按分辨率分类并分别验证;认证失败、不可达、超时与校时问题使用可定位状态。
|
- **Profile**:主辅码流按分辨率分类并使用 RTSP 凭据分别验证;脱敏 Stream URI、验证状态和时间持久化,重启后保留。至少一个 Profile 验证成功后 Device 进入 `active`;认证失败、不可达、超时与校时问题使用可定位状态。
|
||||||
- **MediaMTX**:保持外部进程。Sense 只停止自己启动并持有句柄的进程,最多自动重启三次;摄像机凭据只在 localhost 控制请求中瞬时组装,不持久化、不返回。
|
- **MediaMTX**:保持外部进程。Sense 只停止自己启动并持有句柄的进程,最多自动重启三次;摄像机凭据只在 localhost 控制请求中瞬时组装,不持久化、不返回。
|
||||||
- **播放会话**:由当前 Sense 用户创建,最长两分钟;设备分页和媒体路径不以 16 路作为硬上限,页面一次只打开一路流。
|
- **播放会话**:由当前 Sense 用户创建,最长两分钟;设备分页和媒体路径不以 16 路作为硬上限,页面一次只打开一路流。
|
||||||
- **区域版本**:坐标为 0..1 归一化值,并绑定 Device、Profile、宽高。每次发布或停用形成新版本;范围、点数、自交、退化、方向和期望版本由后端校验。Profile 分辨率变化后旧版本必须标记为需要重新校准。
|
- **区域版本**:坐标为 0..1 归一化值,并绑定 Device、Profile、宽高。每次发布或停用形成新版本;范围、点数、自交、退化、方向和期望版本由后端校验。Profile 分辨率变化后旧版本必须标记为需要重新校准。
|
||||||
@@ -96,3 +96,4 @@ synchronized_at: 2026-08-13T01:15:01Z
|
|||||||
- **close**:只有处置人或管理员可以完成;必须选择“确认有危险、误报、现场正常、无法确认”之一,可附备注。相同重复请求幂等,其他改变结果的请求被拒绝。
|
- **close**:只有处置人或管理员可以完成;必须选择“确认有危险、误报、现场正常、无法确认”之一,可附备注。相同重复请求幂等,其他改变结果的请求被拒绝。
|
||||||
- **审计事实**:成功生命周期事实只追加;失败、重复和拒绝尝试写入安全审计,但不记录令牌、密码或连接密钥。
|
- **审计事实**:成功生命周期事实只追加;失败、重复和拒绝尝试写入安全审计,但不记录令牌、密码或连接密钥。
|
||||||
<!-- bell-mvp:end -->
|
<!-- bell-mvp:end -->
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
||||||
wiki_page: Local-Development-and-Verification
|
wiki_page: Local-Development-and-Verification
|
||||||
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Local-Development-and-Verification.-
|
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Local-Development-and-Verification.-
|
||||||
wiki_revision: 3bf0987ec9d7ddf543602e465faa088aead46531
|
wiki_revision: 426001a8c28bde9c336ecc8b7166924f14aa55ae
|
||||||
synchronized_at: 2026-08-12T10:22:02Z
|
synchronized_at: 2026-08-13T03:39:26Z
|
||||||
<!-- gitea-wiki-mirror:end -->
|
<!-- gitea-wiki-mirror:end -->
|
||||||
|
|
||||||
# 本地开发与验证
|
# 本地开发与验证
|
||||||
@@ -73,8 +73,8 @@ Sense/Bell 的 Go、Node 与 pnpm 基线已冻结并记录于下文;Brain 的
|
|||||||
|
|
||||||
## 测试数据与日志
|
## 测试数据与日志
|
||||||
|
|
||||||
- 只使用合成或脱敏事件、合成 RTSP 和明确授权的实验室设备。
|
- 只使用合成或脱敏事件、合成 RTSP 和明确授权的实验室设备。ONVIF 自动化测试需覆盖 Basic、Digest challenge、Media 服务发现、跨主机地址归一化、拒绝地址凭据和禁止重定向。
|
||||||
- 不提交真实视频、客户名称、地址、手机号、摄像头密码或通知凭据。
|
- 不提交真实视频、客户名称、地址、手机号、摄像头密码或通知凭据;真实设备验证只记录状态与 Profile 数量,不记录设备地址、Authorization 或 Stream URI。
|
||||||
- 日志必须可按 request/event/alert ID 追踪,但不得记录 Authorization、Cookie 或连接密钥。
|
- 日志必须可按 request/event/alert ID 追踪,但不得记录 Authorization、Cookie 或连接密钥。
|
||||||
|
|
||||||
## 完成修改前
|
## 完成修改前
|
||||||
@@ -167,7 +167,8 @@ cmd /c .\Sense\scripts\package-windows.bat
|
|||||||
Get-FileHash .\Sense\dist\sense-windows-amd64.zip -Algorithm SHA256
|
Get-FileHash .\Sense\dist\sense-windows-amd64.zip -Algorithm SHA256
|
||||||
```
|
```
|
||||||
|
|
||||||
脚本精确校验 Node 22.22.1 和 pnpm 9.15.1,冻结安装并构建前端,以 Windows amd64/CGO 关闭方式编译后端,然后生成被 Git 忽略的 `Sense\dist\sense-windows-amd64\` 和 ZIP。可重复运行只会覆盖这两个固定产物。
|
脚本精确校验 Node 22.22.1 和 pnpm 9.15.1,冻结安装并构建前端,以 Windows amd64/CGO 关闭方式编译后端,然后生成被 Git 忽略的 `Sense\dist\sense-windows-amd64\` 和 ZIP。同一运行目录重新打包时会保留已有 `config\sense.env`,但该文件不会进入 ZIP。
|
||||||
|
|
||||||
解压后运行 `start-sense.bat demo` 可做内存模式临时预览;生产运行 `start-sense.bat` 前必须从仓库和运行包外注入 PostgreSQL URL、签名密钥、引导令牌和摄像头凭据加密密钥。包内不含 PostgreSQL、MediaMTX、系统服务、客户数据或秘密。
|
解压后运行 `start-sense.bat demo` 可做内存模式临时预览。生产配置可写入运行目录的 `config\sense.env`,也可通过 Windows 进程环境注入;非空进程环境变量优先,启动器只读取 `SENSE_*` 键且不打印配置值。运行 `start-sense.bat check` 可在不连接数据库、不启动服务的情况下检查必填配置,然后用 `start-sense.bat` 启动生产模式。包内不含 PostgreSQL、MediaMTX、系统服务、客户数据或秘密,真实 `sense.env` 不得提交或重新打入交付 ZIP。
|
||||||
<!-- sense-windows-package:end -->
|
<!-- sense-windows-package:end -->
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
||||||
wiki_page: Troubleshooting
|
wiki_page: Troubleshooting
|
||||||
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Troubleshooting
|
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Troubleshooting
|
||||||
wiki_revision: a076590915040eae0d165be6254c6302f308fc5a
|
wiki_revision: 0110fbc618f77660bf447c04def347fe9098510f
|
||||||
synchronized_at: 2026-08-12T10:22:09Z
|
synchronized_at: 2026-08-13T04:16:00Z
|
||||||
<!-- gitea-wiki-mirror:end -->
|
<!-- gitea-wiki-mirror:end -->
|
||||||
|
|
||||||
# 故障排查
|
# 故障排查
|
||||||
@@ -47,9 +47,10 @@ synchronized_at: 2026-08-12T10:22:09Z
|
|||||||
|---|---|
|
|---|---|
|
||||||
| 启动提示缺少 `SENSE_DATABASE_URL` | 正式模式必须提供独立 PostgreSQL URL;只有测试/smoke 可显式使用 `memory`。 |
|
| 启动提示缺少 `SENSE_DATABASE_URL` | 正式模式必须提供独立 PostgreSQL URL;只有测试/smoke 可显式使用 `memory`。 |
|
||||||
| 登录统一提示用户名或密码错误 | 为避免枚举账户,失败响应不区分用户不存在、密码错误或账户停用;由管理员查看审计。 |
|
| 登录统一提示用户名或密码错误 | 为避免枚举账户,失败响应不区分用户不存在、密码错误或账户停用;由管理员查看审计。 |
|
||||||
|
| 管理员登录后侧栏没有模块 | 先确认 /api/v1/identity/me 返回角色与权限;若权限正常,检查前端是否从具有 children 的应用布局路由派生菜单,不得依赖重复 / 路由记录顺序。 |
|
||||||
| `adapter_not_ready` | 当前设备类型尚无适配器,不代表网络故障;首期完整支持 video。 |
|
| `adapter_not_ready` | 当前设备类型尚无适配器,不代表网络故障;首期完整支持 video。 |
|
||||||
| `discovery_unavailable` | 未设置获准的 `SENSE_ONVIF_DISCOVERY_IP`,或该 IP 不属于本机网卡。可改用手工 ONVIF 地址。 |
|
| `discovery_unavailable` | 未设置获准的 `SENSE_ONVIF_DISCOVERY_IP`,或该 IP 不属于本机网卡。可改用手工 ONVIF 地址。 |
|
||||||
| `authentication_failed` | 在设备管理中重新写入凭据后再次执行接入检查;不要把凭据写进地址。 |
|
| `authentication_failed` | 在设备管理中分别检查 ONVIF 与 RTSP 凭据,只有设备确实共用账号时才勾选“RTSP 与 ONVIF 使用相同账号”;不要把凭据写进地址。Sense 支持 ONVIF Basic 与 Digest,并会安全归一化摄像机广播的跨主机 Media/RTSP 地址。 |
|
||||||
| `clock_skew` | 校准摄像机时间后重新探测。 |
|
| `clock_skew` | 校准摄像机时间后重新探测。 |
|
||||||
| `process_failed` | 检查仓库外 `SENSE_MEDIAMTX_BINARY`、基础配置和进程退出原因;达到三次重启上限后需人工处理。 |
|
| `process_failed` | 检查仓库外 `SENSE_MEDIAMTX_BINARY`、基础配置和进程退出原因;达到三次重启上限后需人工处理。 |
|
||||||
| `apply_failed` / `unconverged` | 检查 localhost Control API 是否启用并为 v3;确认媒体路径和外部进程状态。 |
|
| `apply_failed` / `unconverged` | 检查 localhost Control API 是否启用并为 v3;确认媒体路径和外部进程状态。 |
|
||||||
@@ -65,9 +66,10 @@ synchronized_at: 2026-08-12T10:22:09Z
|
|||||||
| 现象 | 检查与处理 |
|
| 现象 | 检查与处理 |
|
||||||
|---|---|
|
|---|---|
|
||||||
| 打包提示 Go/Node/pnpm 版本不符 | 对照根 `goadmin-baseline.json` 安装精确版本,并把 Go 1.26.5 放到 `PATH` 首位;不要修改脚本绕过版本检查。 |
|
| 打包提示 Go/Node/pnpm 版本不符 | 对照根 `goadmin-baseline.json` 安装精确版本,并把 Go 1.26.5 放到 `PATH` 首位;不要修改脚本绕过版本检查。 |
|
||||||
| 生产启动提示缺少环境变量 | 在运行包外设置 `SENSE_DATABASE_URL`、`SENSE_IDENTITY_SIGNING_KEY`、`SENSE_BOOTSTRAP_TOKEN`、`SENSE_CREDENTIAL_KEY`;启动脚本不会读取示例文件。 |
|
| 生产启动提示缺少环境变量 | 确认运行目录中存在 `config\sense.env`(不是只保留 `sense.env.example`),并填写 `SENSE_DATABASE_URL`、`SENSE_IDENTITY_SIGNING_KEY`、`SENSE_BOOTSTRAP_TOKEN`、`SENSE_CREDENTIAL_KEY`;也可在进程环境中设置,非空进程环境变量优先。运行 `start-sense.bat check` 定位缺失的变量名,脚本不会打印变量值。 |
|
||||||
| 本机健康检查被代理返回空响应 | localhost 可能被 `HTTP_PROXY` 接管;测试工具应对 `127.0.0.1` 使用 no-proxy,再检查 `SENSE_HTTP_ADDRESS` 端口占用。 |
|
| 本机健康检查被代理返回空响应 | localhost 可能被 `HTTP_PROXY` 接管;测试工具应对 `127.0.0.1` 使用 no-proxy,再检查 `SENSE_HTTP_ADDRESS` 端口占用。 |
|
||||||
| 页面可打开但视频不可用 | Windows 运行包不包含 MediaMTX;按包内说明配置独立 MediaMTX 二进制、配置和 Control API。 |
|
| 页面可打开但视频不可用 | Windows 运行包不包含 MediaMTX;按包内说明配置独立 MediaMTX 二进制、配置和 Control API。 |
|
||||||
|
|
||||||
`demo` 只用于临时查看。生产数据持久性、真实设备和媒体链路不能用 demo 验证替代。
|
`demo` 只用于临时查看。生产数据持久性、真实设备和媒体链路不能用 demo 验证替代。
|
||||||
<!-- sense-windows-package:end -->
|
<!-- sense-windows-package:end -->
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
||||||
wiki_page: Delivery-Documentation-Guide
|
wiki_page: Delivery-Documentation-Guide
|
||||||
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Delivery-Documentation-Guide.-
|
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Delivery-Documentation-Guide.-
|
||||||
wiki_revision: 04d9a7f0916262c3578e7934a2e98327dae55c7a
|
wiki_revision: d4f2bfcef46493361ba019839b36957ed9947003
|
||||||
synchronized_at: 2026-08-13T01:15:15Z
|
synchronized_at: 2026-08-13T02:35:26Z
|
||||||
<!-- gitea-wiki-mirror:end -->
|
<!-- gitea-wiki-mirror:end -->
|
||||||
|
|
||||||
# 交付文档指南
|
# 交付文档指南
|
||||||
@@ -98,7 +98,7 @@ Sense 面向网管、实施人员和非技术现场人员,菜单按日常任
|
|||||||
交付对象为实施和运维人员。`sense-windows-amd64.zip` 包含后端程序、已构建前端、空值示例配置、上游许可证、启动脚本与包内说明;不包含 PostgreSQL、MediaMTX、Windows 服务、生产数据或秘密。
|
交付对象为实施和运维人员。`sense-windows-amd64.zip` 包含后端程序、已构建前端、空值示例配置、上游许可证、启动脚本与包内说明;不包含 PostgreSQL、MediaMTX、Windows 服务、生产数据或秘密。
|
||||||
|
|
||||||
- 临时查看必须显式运行 `start-sense.bat demo`,其内存数据在进程结束后丢失,不能当作生产部署。
|
- 临时查看必须显式运行 `start-sense.bat demo`,其内存数据在进程结束后丢失,不能当作生产部署。
|
||||||
- 生产启动前由运维在运行包外安全注入数据库、身份签名、初始化令牌和凭据加密配置,再运行 `start-sense.bat`。
|
- 生产配置可由运维写入解压目录的 `config\sense.env`,或通过 Windows 进程环境安全注入;进程环境优先。先运行 `start-sense.bat check` 检查必填项,再运行 `start-sense.bat`。
|
||||||
- 交付时记录 ZIP SHA-256,并至少验证 `/healthz` 与首页;真实 PostgreSQL、MediaMTX、摄像机和目标浏览器仍需在获准环境验收。
|
- 交付时记录 ZIP SHA-256,并至少验证 `/healthz` 与首页;真实 PostgreSQL、MediaMTX、摄像机和目标浏览器仍需在获准环境验收。
|
||||||
- 包内 `README-WINDOWS.md` 是现场操作入口;不得把真实连接串、密码或令牌回填进示例文件后重新分发。
|
- 包内 `README-WINDOWS.md` 是现场操作入口;真实 `config\sense.env` 只留在具体部署目录,不得提交 Git 或重新打入交付 ZIP,交付 ZIP 只保留 `sense.env.example`。
|
||||||
<!-- sense-windows-package:end -->
|
<!-- sense-windows-package:end -->
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
<!-- gitea-wiki-mirror:start -->
|
||||||
|
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
||||||
|
wiki_page: Task-44-Sense管理员侧栏模块为空修复
|
||||||
|
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Task-44-Sense%E7%AE%A1%E7%90%86%E5%91%98%E4%BE%A7%E6%A0%8F%E6%A8%A1%E5%9D%97%E4%B8%BA%E7%A9%BA%E4%BF%AE%E5%A4%8D.-
|
||||||
|
wiki_revision: 9647fffe7d8b0ede13c53746e8966fffb3555820
|
||||||
|
synchronized_at: 2026-08-13T01:31:35Z
|
||||||
|
<!-- gitea-wiki-mirror:end -->
|
||||||
|
|
||||||
|
# 44 Sense管理员侧栏模块为空修复
|
||||||
|
|
||||||
|
- 类型:缺陷
|
||||||
|
- 所属 Epic:#7
|
||||||
|
- 所属 MVP / 版本:#8
|
||||||
|
- 状态:待验收
|
||||||
|
- 日期:2026-08-13
|
||||||
|
- Gitea 工单:https://git.ilapage.cn/ila/yovision/issues/44
|
||||||
|
- Wiki 页面:Task-44-Sense管理员侧栏模块为空修复
|
||||||
|
- Wiki revision:见本地镜像头
|
||||||
|
|
||||||
|
## 背景与目标
|
||||||
|
|
||||||
|
最新 Windows 包中管理员可登录,但侧栏不显示任何模块。目标是在不放宽 RBAC 的前提下恢复 Sense MVP 导航,并防止 Vue Router 规范化记录顺序再次导致空菜单。
|
||||||
|
|
||||||
|
## 根因与最终方案
|
||||||
|
|
||||||
|
后端管理员会话正确返回 9 项权限。Vue Router `getRoutes()` 会同时返回父布局 `/` 和路径也为 `/` 的工作台子记录;原代码用首个 `path === '/'` 记录派生菜单,误选无 children 的工作台记录。
|
||||||
|
|
||||||
|
修复后只选择路径为 `/` 且具有 children 的布局记录,并在多个候选中优先 children 最完整者。权限过滤、隐藏入口过滤和排序逻辑保持不变,并提取为独立可测试函数。
|
||||||
|
|
||||||
|
## 修改文件
|
||||||
|
|
||||||
|
- `Sense/ui/src/layout/AppLayout.vue`:调用稳定的菜单派生函数。
|
||||||
|
- `Sense/ui/src/layout/navigation.js`:定位布局、按权限过滤并排序。
|
||||||
|
- `Sense/ui/tests/navigation.test.cjs`:重复根路径、权限/隐藏过滤和管理员八项导航测试。
|
||||||
|
- `Sense/ui/package.json`:增加 `test:navigation`。
|
||||||
|
- `docs/06-troubleshooting.md`:Wiki-first 排错说明。
|
||||||
|
- `wiki-docs.json`、`docs/task/44-Sense管理员侧栏模块为空修复.md`:任务归档。
|
||||||
|
|
||||||
|
## 验收结果
|
||||||
|
|
||||||
|
| 验收标准 | 结果 |
|
||||||
|
|---|---|
|
||||||
|
| 管理员显示八项 Sense MVP 导航 | 自动回归通过 |
|
||||||
|
| 不依赖重复 `/` 记录顺序 | 通过 |
|
||||||
|
| 权限不足和隐藏入口仍被过滤 | 通过 |
|
||||||
|
| 前端 test/lint/build | 通过;lint 0 error,存在既有 warning |
|
||||||
|
| Windows ZIP 重建并以管理员登录 | 通过;角色 administrator,9 项权限,新前端资源已加载 |
|
||||||
|
|
||||||
|
## 测试
|
||||||
|
|
||||||
|
- `corepack pnpm@9.15.1 test:navigation`:3 项通过。
|
||||||
|
- Vue Router 实际规范化记录探针:正确派生工作台和设备管理。
|
||||||
|
- `corepack pnpm@9.15.1 lint`:0 error,既有 warning。
|
||||||
|
- Windows 打包:通过;前端仅有既有 vendor bundle 体积警告。
|
||||||
|
- 包内运行:登录角色 administrator、权限数 9,首页引用新脚本 `js/index.25411ed5.js`。
|
||||||
|
- Harness:31 项、strict 与 Wiki 镜像检查通过。
|
||||||
|
- ZIP:7,280,825 bytes;SHA-256 `0703B397D20EAAE54BCB6B5A83170EFF6816246A8C163276495CD93EEEB72B4F`。
|
||||||
|
- **未验证部分**:未通过自动化真实浏览器截图断言侧栏 DOM;已要求用户 Ctrl+F5 后人工查看。
|
||||||
|
|
||||||
|
## 遗留问题
|
||||||
|
|
||||||
|
- 浏览器可能缓存旧前端资源,更新包后需要强制刷新。
|
||||||
|
|
||||||
|
## 相关提交
|
||||||
|
|
||||||
|
- `048a6ec` fix: restore Sense permission navigation (#44)
|
||||||
|
- `62ed5cc` docs: add Sense empty navigation troubleshooting (#44)
|
||||||
|
- `c4a799c` test: cover Sense administrator navigation (#44)
|
||||||
|
- `21624f6` docs: create task 44 acceptance archive (#44)
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
<!-- gitea-wiki-mirror:start -->
|
||||||
|
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
||||||
|
wiki_page: Task-46-Sense-Windows包内配置加载
|
||||||
|
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Task-46-Sense-Windows%E5%8C%85%E5%86%85%E9%85%8D%E7%BD%AE%E5%8A%A0%E8%BD%BD.-
|
||||||
|
wiki_revision: eab38da7cae8089d9cf7ed38e48d3e52962b68b4
|
||||||
|
synchronized_at: 2026-08-13T02:42:05Z
|
||||||
|
<!-- gitea-wiki-mirror:end -->
|
||||||
|
|
||||||
|
# 46 Sense Windows包内配置加载
|
||||||
|
|
||||||
|
- 类型:缺陷
|
||||||
|
- 所属 Epic:#7
|
||||||
|
- 所属 MVP / 版本:#8
|
||||||
|
- 状态:待验收
|
||||||
|
- 日期:2026-08-13
|
||||||
|
- Gitea 工单:https://git.ilapage.cn/ila/yovision/issues/46
|
||||||
|
- Wiki 页面:Task-46-Sense-Windows包内配置加载
|
||||||
|
- Wiki revision:见本地镜像头
|
||||||
|
|
||||||
|
## 背景与目标
|
||||||
|
|
||||||
|
Windows 打包目录已有 `config\sense.env`,但旧版 `start-sense.bat` 只读取进程环境,导致生产启动误报缺少 `SENSE_DATABASE_URL`。本工单让启动入口安全读取包内配置,同时确保真实配置不进入 Git 或交付 ZIP。
|
||||||
|
|
||||||
|
## 最终方案
|
||||||
|
|
||||||
|
- `start-sense.bat` 保持现场入口,委托同目录 `start-sense.ps1` 加载配置并启动服务。
|
||||||
|
- 加载器只接受 `SENSE_*` 键,忽略空行和 `#` 注释;不执行配置内容、不输出配置值,外部非空进程环境变量优先。
|
||||||
|
- 默认生产模式强制 PostgreSQL,验证数据库连接、身份签名、初始化令牌和凭据加密四个必填配置;`check` 模式只验证配置,不连接数据库、不启动服务。
|
||||||
|
- `demo` 仍强制内存模式;UI 路径固定为包内 `ui`。
|
||||||
|
- 重打包会安全暂存并恢复已有部署目录的 `config\sense.env`;交付 ZIP 只包含 `sense.env.example`,不包含真实配置。
|
||||||
|
|
||||||
|
## 修改文件
|
||||||
|
|
||||||
|
- `Sense/scripts/runtime/start-sense.bat`:委托 PowerShell 启动器并传递退出码。
|
||||||
|
- `Sense/scripts/runtime/start-sense.ps1`:加载、校验配置并处理 production、demo、check 模式。
|
||||||
|
- `Sense/scripts/runtime/README-WINDOWS.md`:补充包内配置、优先级和检查命令。
|
||||||
|
- `Sense/scripts/package-windows.bat`:复制 PowerShell 启动器,重打包时保留本机配置且从 ZIP 排除。
|
||||||
|
- `docs/04-local-development-and-verification.md`、`docs/06-troubleshooting.md`、`docs/delivery/README.md`:由 Gitea Wiki 同步生成的长期说明。
|
||||||
|
|
||||||
|
## 验收结果
|
||||||
|
|
||||||
|
| 验收标准 | 结果 |
|
||||||
|
|---|---|
|
||||||
|
| 包内已有 `config\sense.env` 时无需手工 `set` 即可通过生产配置检查 | 通过 |
|
||||||
|
| `check` 不连接数据库、不启动服务且不输出配置值 | 通过 |
|
||||||
|
| 外部非空进程环境优先,加载器只接受 `SENSE_*` 且不执行配置内容 | 通过(代码检查) |
|
||||||
|
| demo 强制内存模式,production 强制 PostgreSQL 和包内 UI | 通过(代码检查) |
|
||||||
|
| 重打包后原配置不变 | 通过;重建前后 SHA-256 一致 |
|
||||||
|
| ZIP 含 BAT、PowerShell 启动器、示例与说明,不含真实 `sense.env` | 通过 |
|
||||||
|
|
||||||
|
## 测试
|
||||||
|
|
||||||
|
- 执行命令:`cmd /c Sense\scripts\package-windows.bat`
|
||||||
|
- 结果:前后端打包成功,生成 Windows amd64 目录和 ZIP。
|
||||||
|
- 执行命令:`cmd /c Sense\dist\sense-windows-amd64\start-sense.bat check`
|
||||||
|
- 结果:输出 `Sense production configuration check passed.`,退出码 0。
|
||||||
|
- 执行命令:检查 ZIP 条目和 SHA-256。
|
||||||
|
- 结果:`start-sense.ps1` 与 `sense.env.example` 存在,真实 `config/sense.env` 不存在;ZIP SHA-256 为 `6311B29F1899691AF793A4758CD59096C5388D3C85214209B9EAFBCAD232BA8A`。
|
||||||
|
- 执行命令:`python dev_scripts/sync_wiki_docs.py --check`
|
||||||
|
- 结果:Wiki 镜像检查通过。
|
||||||
|
- 执行命令:`python dev_scripts/check_harness.py --strict`
|
||||||
|
- 结果:未通过;被基线中工单 #44 归档缺少“最终方案”章节阻塞,与本工单修改无关。
|
||||||
|
- **未验证部分**:未连接用户 PostgreSQL 启动生产服务;未使用真实摄像机或 MediaMTX;因本工单不修改业务服务逻辑,这些留待部署验收。
|
||||||
|
|
||||||
|
## 遗留问题
|
||||||
|
|
||||||
|
- 基线工单 #44 的任务归档需在其自身验收闭环中补齐“最终方案”章节,之后再运行严格 Harness。
|
||||||
|
|
||||||
|
## 相关提交
|
||||||
|
|
||||||
|
- `5a17898` 修复 Windows 包内配置加载。
|
||||||
|
- `6bbaa07` 更新 Wiki 镜像中的启动、排错和交付说明。
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
<!-- gitea-wiki-mirror:start -->
|
||||||
|
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
||||||
|
wiki_page: Task-48-支持ONVIF-Digest认证与安全Media地址归一化
|
||||||
|
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Task-48-%E6%94%AF%E6%8C%81ONVIF-Digest%E8%AE%A4%E8%AF%81%E4%B8%8E%E5%AE%89%E5%85%A8Media%E5%9C%B0%E5%9D%80%E5%BD%92%E4%B8%80%E5%8C%96.-
|
||||||
|
wiki_revision: 16667fcc50dac28098a3c4b5b9018bac1ff249be
|
||||||
|
synchronized_at: 2026-08-13T03:46:29Z
|
||||||
|
<!-- gitea-wiki-mirror:end -->
|
||||||
|
|
||||||
|
# 48 支持ONVIF Digest认证与安全Media地址归一化
|
||||||
|
|
||||||
|
- 类型:缺陷
|
||||||
|
- 所属 Epic:#7
|
||||||
|
- 所属 MVP / 版本:#8
|
||||||
|
- 状态:待验收
|
||||||
|
- 日期:2026-08-13
|
||||||
|
- Gitea 工单:https://git.ilapage.cn/ila/yovision/issues/48
|
||||||
|
- Wiki 页面:Task-48-支持ONVIF-Digest认证与安全Media地址归一化
|
||||||
|
- Wiki revision:见本地镜像头
|
||||||
|
|
||||||
|
## 背景与目标
|
||||||
|
|
||||||
|
真实摄像机的 Device Service 可以访问,但 Media Service 要求 Digest Authentication,并广播了当前主机无法访问的 Media 地址。旧版 Sense 只预发送 Basic,并把 GetProfiles 发往 Device Service,无法读取 Profile。本任务在不泄露设备信息的前提下兼容该设备。
|
||||||
|
|
||||||
|
## 最终方案
|
||||||
|
|
||||||
|
- 先向用户填写的 Device Service 请求 GetCapabilities,解析 Media XAddr,再向 Media Service请求 GetProfiles 与 GetStreamUri。
|
||||||
|
- 收到 Digest challenge 时仅重试一次,支持 MD5、SHA-256 和 qop=auth;拒绝缺失必填参数、不支持的算法和 qop。
|
||||||
|
- Media XAddr 与 Device Service 同主机时保留服务公布的端口;跨主机时固定回用户已授权的 Device Service scheme/host/port,仅保留 Media path/query。
|
||||||
|
- HTTP 客户端不跟随重定向,继续拒绝地址或 Stream URI 中携带凭据,不记录 Authorization。
|
||||||
|
- 保留 Basic 兼容路径。真实设备使用专用 ONVIF 凭据成功读取 2 个 Profile。
|
||||||
|
- 当前真实设备 ONVIF 与 RTSP 使用不同账号,而 Sense 每台设备只保存一组凭据,因此 RTSP 验证仍为 profile_failed;不同凭据模型不在本工单范围。
|
||||||
|
|
||||||
|
## 修改文件
|
||||||
|
|
||||||
|
- `Sense/server/app/sense/adapters/onvif/client.go`:Media 服务发现、Digest challenge-response、地址归一化和重定向禁止。
|
||||||
|
- `Sense/server/app/sense/adapters/onvif/client_test.go`:Digest、Basic 流程、安全地址和重定向测试。
|
||||||
|
- `Sense/server/app/sense/adapters/onvif/parser.go`:解析 GetCapabilities 中的 Media XAddr。
|
||||||
|
- `Sense/server/app/sense/adapters/onvif/parser_test.go`:Media 地址解析测试。
|
||||||
|
- `docs/02-architecture-and-code-map.md`、`docs/04-local-development-and-verification.md`、`docs/06-troubleshooting.md`:由 Wiki 同步的长期说明。
|
||||||
|
|
||||||
|
## 验收结果
|
||||||
|
|
||||||
|
| 验收标准 | 结果 |
|
||||||
|
|---|---|
|
||||||
|
| Digest Media Service 可完成 GetProfiles 和 GetStreamUri | 通过 |
|
||||||
|
| 用户只填写 Device Service,Sense 自动发现 Media Service | 通过 |
|
||||||
|
| 跨主机 Media XAddr 不被直接访问 | 通过 |
|
||||||
|
| 同源合法 Media XAddr 与 Basic 路径不回归 | 通过 |
|
||||||
|
| 危险地址、错误 challenge、算法/qop、重定向被拒绝 | 通过 |
|
||||||
|
| 真实设备能够读取 Profile | 通过,读取 2 个 Profile |
|
||||||
|
| 不泄露设备地址、凭据、Authorization 或 Stream URI | 通过 |
|
||||||
|
|
||||||
|
## 测试
|
||||||
|
|
||||||
|
- 执行命令:`go test ./app/sense/adapters/onvif ./app/sense/admission`
|
||||||
|
- 结果:通过。
|
||||||
|
- 执行命令:`go test ./...`
|
||||||
|
- 结果:Sense 全部 Go 测试通过。
|
||||||
|
- 执行命令:`Sense/scripts/package-windows.bat`(Go 1.26.5、Node 22.22.1、pnpm 9.15.1)
|
||||||
|
- 结果:前后端 Windows 包构建通过;只有既有 webpack 体积警告。
|
||||||
|
- 真实设备验证:通过 Sense API 使用只读 `ip_camera.env`,不输出敏感值。
|
||||||
|
- 结果:`profile_count=2`、`admission_status=profile_failed`;Profile 已读取,RTSP 因 ONVIF/RTSP 不同账号未通过。
|
||||||
|
- Windows ZIP SHA-256:`628CC85B009628C062ADB6F5125A2F89CF7501727042152D29D13A7AE6D3F888`。
|
||||||
|
- **未验证部分**:未完成真实 RTSP 播放与 MediaMTX 接入;需要每设备分离 ONVIF/RTSP 凭据后再验收。
|
||||||
|
|
||||||
|
## 遗留问题
|
||||||
|
|
||||||
|
- 真实摄像机的 ONVIF 与 RTSP 使用不同账号;Sense 当前单凭据模型无法同时验证两者,需要独立工单扩展凭据边界。
|
||||||
|
- 严格 Harness 当前仍被既有工单 #44 归档缺少“最终方案”章节阻塞,不在本工单中混入修复。
|
||||||
|
|
||||||
|
## 相关提交
|
||||||
|
|
||||||
|
- `688080c` 支持 ONVIF Digest Media 服务与安全地址归一化。
|
||||||
|
- `2a0b63c` 更新架构、验证与排错 Wiki 镜像。
|
||||||
|
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
<!-- gitea-wiki-mirror:start -->
|
||||||
|
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
|
||||||
|
wiki_page: Task-50-ONVIF与RTSP分离凭据并持久化Profile
|
||||||
|
wiki_url: https://git.ilapage.cn/ila/yovision/wiki/Task-50-ONVIF%E4%B8%8ERTSP%E5%88%86%E7%A6%BB%E5%87%AD%E6%8D%AE%E5%B9%B6%E6%8C%81%E4%B9%85%E5%8C%96Profile.-
|
||||||
|
wiki_revision: 27ac0fe8ef97f9ec835fa62713f3a8c23c077940
|
||||||
|
synchronized_at: 2026-08-13T04:18:00Z
|
||||||
|
<!-- gitea-wiki-mirror:end -->
|
||||||
|
|
||||||
|
# 50 ONVIF与RTSP分离凭据并持久化Profile
|
||||||
|
|
||||||
|
- 类型:功能
|
||||||
|
- 所属 Epic:#7
|
||||||
|
- 所属 MVP / 版本:#8
|
||||||
|
- 状态:待验收
|
||||||
|
- 日期:2026-08-13
|
||||||
|
- Gitea 工单:https://git.ilapage.cn/ila/yovision/issues/50
|
||||||
|
- Wiki 页面:Task-50-ONVIF与RTSP分离凭据并持久化Profile
|
||||||
|
- Wiki revision:见本地镜像头
|
||||||
|
|
||||||
|
## 背景与目标
|
||||||
|
|
||||||
|
真实摄像机的 ONVIF 与 RTSP 使用不同账号,旧版 Sense 每台设备只有一组凭据;接入结果还只保存在内存中。目标是分别安全保存两组凭据、持久化脱敏 Profile,并让接入成功的设备进入 active。
|
||||||
|
|
||||||
|
## 最终方案
|
||||||
|
|
||||||
|
- Device 新增独立 RTSP 密文与“复用 ONVIF”标志,旧凭据通过版本化迁移安全回填;API 只返回配置状态。
|
||||||
|
- 设备页面同时维护 ONVIF/RTSP 凭据,默认允许显式复用;审计只记录是否复用,不记录值。
|
||||||
|
- Admission 使用 ONVIF 凭据读取 Profile、RTSP 凭据验证视频;结果与脱敏 Stream URI、主/子码流、验证状态写入 PostgreSQL。
|
||||||
|
- 摄像机广播跨主机 RTSP URI 时,只把主机归一化到用户授权的 Device Service 主机,保留报告端口与路径。
|
||||||
|
- 至少一个 Profile 验证成功后 Device 进入 active;接入页切换设备时读取持久化结果。
|
||||||
|
- 真实设备使用分离凭据后 2 个 Profile 均 ready,重启 Sense 后仍可读取。
|
||||||
|
|
||||||
|
## 修改文件
|
||||||
|
|
||||||
|
- `Sense/server/app/sense/device/**`:分离凭据模型、迁移、加密读写与内部端口。
|
||||||
|
- `Sense/server/app/sense/admission/**`:Profile Store、迁移、持久化和设备状态更新。
|
||||||
|
- `Sense/server/app/sense/adapters/onvif/**`:安全归一化跨主机 RTSP URI。
|
||||||
|
- `Sense/server/cmd/sense/modules_device.go`、`modules_admission.go`:注册版本化迁移与 PostgreSQL Store。
|
||||||
|
- `Sense/ui/src/views/sense/device/Devices.vue`、`admission/Admission.vue`:分离凭据表单与持久结果恢复。
|
||||||
|
- Wiki 架构、业务规则和排错页面:记录新安全边界。
|
||||||
|
|
||||||
|
## 验收结果
|
||||||
|
|
||||||
|
| 验收标准 | 结果 |
|
||||||
|
|---|---|
|
||||||
|
| 两组凭据分别加密且只写不可读 | 通过 |
|
||||||
|
| 同凭据复用与分离凭据均受支持 | 通过 |
|
||||||
|
| Profile 重启后存在 | 通过,2 个 Profile |
|
||||||
|
| 至少一个 Profile ready 后设备 active | 通过 |
|
||||||
|
| 真实摄像机 ONVIF 与 RTSP 验证 | 通过,2/2 ready |
|
||||||
|
| 不泄露地址、密码、Authorization 或 Stream URI | 通过 |
|
||||||
|
|
||||||
|
## 测试
|
||||||
|
|
||||||
|
- `go test ./...`:通过。
|
||||||
|
- `pnpm lint`:0 error,存在基线格式 warning。
|
||||||
|
- `pnpm build`:通过,存在既有 webpack 体积 warning。
|
||||||
|
- Go 1.26.5 Windows 打包:通过。
|
||||||
|
- 真实设备脱敏验证:`admission_status=ready`、`profile_count=2`、`ready_profile_count=2`、`device_status=active`。
|
||||||
|
- 重启验证:`persisted_status=ready`、`persisted_profile_count=2`。
|
||||||
|
- **未验证部分**:MediaMTX 自动路由与实时监看属于后续工单 #51。
|
||||||
|
|
||||||
|
## 遗留问题
|
||||||
|
|
||||||
|
- 无本工单范围内遗留;自动媒体路由在 #51 实施。
|
||||||
|
- 严格 Harness 仍受既有 #44 归档缺少“最终方案”章节影响。
|
||||||
|
|
||||||
|
## 相关提交
|
||||||
|
|
||||||
|
- `1a63264` 分离凭据、持久化 Profile 和真实地址归一化。
|
||||||
|
- `032f8c5` 更新长期 Wiki 镜像。
|
||||||
|
|
||||||
@@ -123,6 +123,23 @@
|
|||||||
{
|
{
|
||||||
"page": "Task-42-Sense密码策略仅限制最短6位",
|
"page": "Task-42-Sense密码策略仅限制最短6位",
|
||||||
"path": "docs/task/42-Sense密码策略仅限制最短6位.md"
|
"path": "docs/task/42-Sense密码策略仅限制最短6位.md"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"page": "Task-44-Sense管理员侧栏模块为空修复",
|
||||||
|
"path": "docs/task/44-Sense管理员侧栏模块为空修复.md"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"page": "Task-46-Sense-Windows包内配置加载",
|
||||||
|
"path": "docs/task/46-Sense-Windows包内配置加载.md"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"page": "Task-48-支持ONVIF-Digest认证与安全Media地址归一化",
|
||||||
|
"path": "docs/task/48-支持ONVIF-Digest认证与安全Media地址归一化.md"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"page": "Task-50-ONVIF与RTSP分离凭据并持久化Profile",
|
||||||
|
"path": "docs/task/50-ONVIF与RTSP分离凭据并持久化Profile.md"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user