Using hashmap for permitted users throughout

This commit is contained in:
QuantumEntangledAndy committed 2020-07-14 09:57:55 +07:00
1 parent 4e16ae912d
commit 419c9561d2
3 files changed
+9 -9

No files matched your search

+1
View File
@@ -21,6 +21,7 @@ gstreamer-rtsp-server = { version = "0.15", features = ["v1_12", "v1_14"]}
lazy_static = "1.4"
log = { version = "0.4" }
indoc = "0.3"
itertools = "0.9"
md5 = "0.7"
nom = "5.1"
regex = "1"
+6 -3
View File
@@ -15,9 +15,11 @@ use gstreamer_rtsp_server::{
RTSP_TOKEN_MEDIA_FACTORY_ROLE,
};
use log::debug;
use std::collections::HashSet;
use std::fs;
use std::io;
use std::io::Write;
use itertools::Itertools;
type Result<T> = std::result::Result<T, ()>;
@@ -43,7 +45,7 @@ impl RtspServer {
&self,
paths: &[&str],
stream_format: &StreamFormat,
permitted_users: &[String],
permitted_users: &HashSet<String>,
) -> Result<MaybeAppSrc> {
let mounts = self
.server
@@ -60,7 +62,8 @@ impl RtspServer {
debug!(
"Permitting {} to access {}",
permitted_users.join(", "),
// This is hashmap or (iter) equivalent of join, it requres itertools
permitted_users.iter().cloned().intersperse(", ".to_string()).collect::<String>(),
paths.join(", ")
);
self.add_permitted_roles(&factory, permitted_users);
@@ -104,7 +107,7 @@ impl RtspServer {
Ok(maybe_app_src)
}
pub fn add_permitted_roles(&self, factory: &RTSPMediaFactory, permitted_roles: &[String]) {
pub fn add_permitted_roles(&self, factory: &RTSPMediaFactory, permitted_roles: &HashSet<String>) {
for permitted_role in permitted_roles {
factory.add_role_from_structure(&Structure::new(
permitted_role.as_str(),
+2 -6
View File
@@ -178,7 +178,7 @@ fn set_up_users(users: &Vec<UserConfig>, rtsp: &RtspServer) {
fn get_permitted_users(
users: &Vec<UserConfig>,
permitted_users: &Option<Vec<String>>,
) -> Vec<String> {
) -> HashSet<String> {
let current_permitted_users = match permitted_users {
Some(permitted_users) => permitted_users.clone().to_owned(),
None => {
@@ -209,11 +209,7 @@ fn get_permitted_users(
new_permitted_users.insert(user.to_string());
}
}
let mut result = vec![];
for user in new_permitted_users {
result.push(user);
}
result
new_permitted_users
}
fn camera_main(