Don't instantly remove the user name
This commit is contained in:
2 files changed
+6
-2
No files matched your search
@@ -54,8 +54,10 @@ impl NeoMediaFactory {
|
||||
|
||||
pub(crate) fn add_permitted_roles<T: AsRef<str>>(&self, permitted_roles: &HashSet<T>) {
|
||||
for permitted_role in permitted_roles {
|
||||
let s = permitted_role.as_ref();
|
||||
log::debug!("Adding {} as permitted user", s);
|
||||
self.add_role_from_structure(
|
||||
&Structure::builder(permitted_role.as_ref())
|
||||
&Structure::builder(s)
|
||||
.field(RTSP_PERM_MEDIA_FACTORY_ACCESS, true)
|
||||
.field(RTSP_PERM_MEDIA_FACTORY_CONSTRUCT, true)
|
||||
.build(),
|
||||
|
||||
+3
-1
@@ -240,12 +240,14 @@ pub(crate) async fn main(_opt: Opt, reactor: NeoReactor) -> Result<()> {
|
||||
async fn apply_users(rtsp: &NeoRtspServer, curr_users: &HashSet<UserConfig>) -> AnyResult<()> {
|
||||
// Add those missing
|
||||
for user in curr_users.iter() {
|
||||
log::debug!("Adding user {} to rtsp server", user.name);
|
||||
rtsp.add_user(&user.name, &user.pass).await?;
|
||||
}
|
||||
// Remove unused
|
||||
let rtsp_users = rtsp.get_users().await?;
|
||||
for user in rtsp_users {
|
||||
if curr_users.iter().any(|a| a.name == user) {
|
||||
if !curr_users.iter().any(|a| a.name == user) {
|
||||
log::debug!("Removing user {} from rtsp server", user);
|
||||
rtsp.remove_user(&user).await?;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user