GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-03-15 07:26:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(rtsp): 修复清空用户名后仍触发认证导致 401 的问题

Browse Source
This commit is contained in:
mofeng-git
2026-02-11 20:55:20 +08:00
parent 6ed1cf5bef
commit ccaf4d1205
1 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/rtsp/service.rs
View File

@@ -246,15 +246,7 @@ async fn handle_client(
shared: SharedRtspState,
) -> Result<()> {
let cfg_snapshot = config.read().await.clone();
let auth_enabled = cfg_snapshot
.username
.as_ref()
.is_some_and(|u| !u.is_empty())
|| cfg_snapshot
.password
.as_ref()
.is_some_and(|p| !p.is_empty());
let expected_auth = rtsp_auth_credentials(&cfg_snapshot);
if cfg_snapshot.allow_one_client {
let mut active_guard = shared.active_client.lock().await;
@@ -301,11 +293,9 @@ async fn handle_client(
continue;
}
if auth_enabled {
let expected_user = cfg_snapshot.username.clone().unwrap_or_default();
let expected_pass = cfg_snapshot.password.clone().unwrap_or_default();
if let Some((expected_user, expected_pass)) = expected_auth.as_ref() {
let ok = extract_basic_auth(&req)
.map(|(u, p)| u == expected_user && p == expected_pass)
.map(|(u, p)| u == expected_user.as_str() && p == expected_pass.as_str())
.unwrap_or(false);
if !ok {
send_response(
@@ -747,6 +737,18 @@ fn extract_basic_auth(req: &RtspRequest) -> Option<(String, String)> {
Some((user.to_string(), pass.to_string()))
}
fn rtsp_auth_credentials(config: &RtspConfig) -> Option<(String, String)> {
let username = config.username.as_ref()?.trim();
if username.is_empty() {
return None;
}
Some((
username.to_string(),
config.password.clone().unwrap_or_default(),
))
}
fn parse_interleaved_channel(transport: &str) -> Option<u8> {
let lower = transport.to_ascii_lowercase();
if let Some((_, v)) = lower.split_once("interleaved=") {
@@ -1320,4 +1322,22 @@ mod tests {
assert!(fmtp_value.contains("sprop-sps="));
assert!(fmtp_value.contains("sprop-pps="));
}
#[test]
fn rtsp_auth_requires_non_empty_username() {
let mut config = RtspConfig::default();
config.password = Some("secret".to_string());
assert!(rtsp_auth_credentials(&config).is_none());
config.username = Some("".to_string());
assert!(rtsp_auth_credentials(&config).is_none());
config.username = Some("user".to_string());
let credentials = rtsp_auth_credentials(&config).expect("expected credentials");
assert_eq!(credentials, ("user".to_string(), "secret".to_string()));
config.password = None;
let credentials = rtsp_auth_credentials(&config).expect("expected credentials");
assert_eq!(credentials, ("user".to_string(), "".to_string()));
}
}