Compare commits
6
Commits
feat/visitor
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6e05e7844b | ||
|
|
43b62090c8 | ||
|
|
7a66473ab9 | ||
|
|
a30f403dc4 | ||
|
|
76833e6242 | ||
|
|
1518ab24bb |
No files matched your search
@@ -40,6 +40,10 @@ pub const MSG_ID_GET_SERVICE_PORTS: u32 = 37;
|
|||||||
pub const MSG_ID_GET_EMAIL: u32 = 42;
|
pub const MSG_ID_GET_EMAIL: u32 = 42;
|
||||||
/// Set email settings
|
/// Set email settings
|
||||||
pub const MSG_ID_SET_EMAIL: u32 = 43;
|
pub const MSG_ID_SET_EMAIL: u32 = 43;
|
||||||
|
/// Get users and general system info
|
||||||
|
pub const MSG_ID_GET_ABILITY_SUPPORT: u32 = 58;
|
||||||
|
/// Update, create and remove users
|
||||||
|
pub const MSG_ID_UPDATE_USER_LIST: u32 = 59;
|
||||||
/// Version messages have this ID
|
/// Version messages have this ID
|
||||||
pub const MSG_ID_VERSION: u32 = 80;
|
pub const MSG_ID_VERSION: u32 = 80;
|
||||||
/// Ping messages have this ID
|
/// Ping messages have this ID
|
||||||
|
|||||||
@@ -138,6 +138,9 @@ pub struct BcXml {
|
|||||||
/// EmailTask for turning the email notifications on/off
|
/// EmailTask for turning the email notifications on/off
|
||||||
#[serde(rename = "EmailTask", skip_serializing_if = "Option::is_none")]
|
#[serde(rename = "EmailTask", skip_serializing_if = "Option::is_none")]
|
||||||
pub email_task: Option<EmailTask>,
|
pub email_task: Option<EmailTask>,
|
||||||
|
/// Read and write users
|
||||||
|
#[serde(rename = "UserList", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub user_list: Option<UserList>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl BcXml {
|
impl BcXml {
|
||||||
@@ -1566,6 +1569,52 @@ pub struct Schedule {
|
|||||||
pub time_block_list: TimeBlockList,
|
pub time_block_list: TimeBlockList,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// List of users
|
||||||
|
#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)]
|
||||||
|
pub struct UserList {
|
||||||
|
/// XML Version
|
||||||
|
#[serde(rename = "@version")]
|
||||||
|
pub version: String,
|
||||||
|
/// The actual user-list
|
||||||
|
#[serde(rename = "User", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub user_list: Option<Vec<User>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A struct for reading and writing camera user records
|
||||||
|
#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)]
|
||||||
|
pub struct User {
|
||||||
|
/// The user_name is used to identify the user in the API
|
||||||
|
#[serde(rename = "userName")]
|
||||||
|
pub user_name: String,
|
||||||
|
/// The password seems to only be included when creating or modifying a user
|
||||||
|
#[serde(
|
||||||
|
rename = "password",
|
||||||
|
skip_serializing_if = "Option::is_none",
|
||||||
|
skip_deserializing
|
||||||
|
)]
|
||||||
|
pub password: Option<String>,
|
||||||
|
/// The user_id does not seem to have a purpose. It is not included when creating a user.
|
||||||
|
#[serde(rename = "userId", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub user_id: Option<u32>,
|
||||||
|
/// User type, 0 is User and 1 is Administrator
|
||||||
|
#[serde(rename = "userLevel")]
|
||||||
|
pub user_level: u8,
|
||||||
|
/// Unknown, seems to be 1 for the current API user
|
||||||
|
#[serde(rename = "loginState", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub login_state: Option<u8>,
|
||||||
|
/// The user_set_state states what will happen with a user-record. 4 different values have been
|
||||||
|
/// observed: none | add | delete | modify
|
||||||
|
///
|
||||||
|
/// | Value | Description |
|
||||||
|
/// | --- | --- |
|
||||||
|
/// | none | This is the state set when reading Users. When writing this seems to indicate that the user should not be modified |
|
||||||
|
/// | add | Indicates that a new User should be created |
|
||||||
|
/// | delete | Indicates that the user should be removed |
|
||||||
|
/// | modify | Indicates that the user should be modified. It seems like only the password can be changed. |
|
||||||
|
#[serde(rename = "userSetState")]
|
||||||
|
pub user_set_state: String,
|
||||||
|
}
|
||||||
|
|
||||||
/// Convience function to return the xml version used throughout the library
|
/// Convience function to return the xml version used throughout the library
|
||||||
pub fn xml_ver() -> String {
|
pub fn xml_ver() -> String {
|
||||||
"1.1".to_string()
|
"1.1".to_string()
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ mod support;
|
|||||||
mod talk;
|
mod talk;
|
||||||
mod time;
|
mod time;
|
||||||
mod uid;
|
mod uid;
|
||||||
|
mod users;
|
||||||
mod version;
|
mod version;
|
||||||
|
|
||||||
pub(crate) use connection::*;
|
pub(crate) use connection::*;
|
||||||
|
|||||||
@@ -0,0 +1,179 @@
|
|||||||
|
use super::{BcCamera, Error, Result};
|
||||||
|
use crate::bc::{model::*, xml::*};
|
||||||
|
|
||||||
|
impl BcCamera {
|
||||||
|
/// Returns all users configured in the camera
|
||||||
|
pub async fn get_users(&self) -> Result<UserList> {
|
||||||
|
let connection = self.get_connection();
|
||||||
|
|
||||||
|
let msg_num = self.new_message_num();
|
||||||
|
let mut sub_get = connection
|
||||||
|
.subscribe(MSG_ID_GET_ABILITY_SUPPORT, msg_num)
|
||||||
|
.await?;
|
||||||
|
let get = Bc {
|
||||||
|
meta: BcMeta {
|
||||||
|
msg_id: MSG_ID_GET_ABILITY_SUPPORT,
|
||||||
|
channel_id: self.channel_id,
|
||||||
|
msg_num,
|
||||||
|
response_code: 0,
|
||||||
|
stream_type: 0,
|
||||||
|
class: 0x6414,
|
||||||
|
},
|
||||||
|
body: BcBody::ModernMsg(ModernMsg {
|
||||||
|
extension: Some(Extension {
|
||||||
|
user_name: Some("admin".to_owned()),
|
||||||
|
..Default::default()
|
||||||
|
}),
|
||||||
|
payload: None,
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
|
||||||
|
sub_get.send(get).await?;
|
||||||
|
let msg = sub_get.recv().await?;
|
||||||
|
if msg.meta.response_code != 200 {
|
||||||
|
return Err(Error::CameraServiceUnavailable {
|
||||||
|
id: msg.meta.msg_id,
|
||||||
|
code: msg.meta.response_code,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Valid message with response_code == 200
|
||||||
|
if let BcBody::ModernMsg(ModernMsg {
|
||||||
|
payload:
|
||||||
|
Some(BcPayloads::BcXml(BcXml {
|
||||||
|
user_list: Some(user_list),
|
||||||
|
..
|
||||||
|
})),
|
||||||
|
..
|
||||||
|
}) = msg.body
|
||||||
|
{
|
||||||
|
Ok(user_list)
|
||||||
|
} else {
|
||||||
|
Err(Error::UnintelligibleReply {
|
||||||
|
reply: std::sync::Arc::new(Box::new(msg)),
|
||||||
|
why: "Expected ModernMsg payload with a user_list but it was not recieved",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add a new user
|
||||||
|
///
|
||||||
|
/// This function does not check if the user exist and the API will likely throw an error if
|
||||||
|
/// that is the case
|
||||||
|
pub async fn add_user(
|
||||||
|
&self,
|
||||||
|
user_name: String,
|
||||||
|
password: String,
|
||||||
|
user_level: u8,
|
||||||
|
) -> Result<()> {
|
||||||
|
let users = self.get_users().await;
|
||||||
|
|
||||||
|
let mut users = users?.user_list.unwrap_or(Vec::new());
|
||||||
|
if users.iter().any(|user| user.user_name == user_name) {
|
||||||
|
return Err(Error::Other("User already exists"));
|
||||||
|
}
|
||||||
|
|
||||||
|
users.push(User {
|
||||||
|
user_set_state: "add".to_owned(),
|
||||||
|
user_name,
|
||||||
|
password: Some(password),
|
||||||
|
user_level,
|
||||||
|
user_id: None,
|
||||||
|
login_state: None,
|
||||||
|
});
|
||||||
|
|
||||||
|
self.set_users(users).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Modify a user. It seems the only property of a user that is modifiable is the password.
|
||||||
|
pub async fn modify_user(&self, user_name: String, password: String) -> Result<()> {
|
||||||
|
let users = self.get_users().await;
|
||||||
|
|
||||||
|
let mut users = users?.user_list.unwrap_or(Vec::new());
|
||||||
|
|
||||||
|
if let Some(user) = users.iter_mut().find(|user| user.user_name == user_name) {
|
||||||
|
user.user_set_state = "modify".to_owned();
|
||||||
|
user.password = Some(password.clone());
|
||||||
|
} else {
|
||||||
|
return Err(Error::Other("User not found"));
|
||||||
|
}
|
||||||
|
|
||||||
|
self.set_users(users).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Remove a user. This does not check for the existence of that user and will likely return an
|
||||||
|
/// error if the user doesn't exist.
|
||||||
|
pub async fn delete_user(&self, user_name: String) -> Result<()> {
|
||||||
|
let users = self.get_users().await;
|
||||||
|
|
||||||
|
let mut users = users?.user_list.unwrap_or(Vec::new());
|
||||||
|
|
||||||
|
if let Some(user) = users.iter_mut().find(|user| user.user_name == user_name) {
|
||||||
|
user.user_set_state = "delete".to_owned();
|
||||||
|
} else {
|
||||||
|
return Err(Error::Other("User not found"));
|
||||||
|
}
|
||||||
|
|
||||||
|
self.set_users(users).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Helper method to send a UserList and wait for its success/failure.
|
||||||
|
async fn set_users(&self, users: Vec<User>) -> Result<()> {
|
||||||
|
let bcxml = BcXml {
|
||||||
|
user_list: Some(UserList {
|
||||||
|
version: "1.1".to_owned(),
|
||||||
|
user_list: Some(users),
|
||||||
|
}),
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let connection = self.get_connection();
|
||||||
|
let msg_num = self.new_message_num();
|
||||||
|
let mut sub_set = connection
|
||||||
|
.subscribe(MSG_ID_UPDATE_USER_LIST, msg_num)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let get = Bc {
|
||||||
|
meta: BcMeta {
|
||||||
|
msg_id: MSG_ID_UPDATE_USER_LIST,
|
||||||
|
channel_id: self.channel_id,
|
||||||
|
msg_num,
|
||||||
|
response_code: 0,
|
||||||
|
stream_type: 0,
|
||||||
|
class: 0x6414,
|
||||||
|
},
|
||||||
|
body: BcBody::ModernMsg(ModernMsg {
|
||||||
|
extension: None,
|
||||||
|
payload: Some(BcPayloads::BcXml(bcxml)),
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
|
||||||
|
sub_set.send(get).await?;
|
||||||
|
if let Ok(reply) =
|
||||||
|
tokio::time::timeout(tokio::time::Duration::from_millis(500), sub_set.recv()).await
|
||||||
|
{
|
||||||
|
let msg = reply?;
|
||||||
|
if msg.meta.response_code != 200 {
|
||||||
|
return Err(Error::CameraServiceUnavailable {
|
||||||
|
id: msg.meta.msg_id,
|
||||||
|
code: msg.meta.response_code,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if let BcMeta {
|
||||||
|
response_code: 200, ..
|
||||||
|
} = msg.meta
|
||||||
|
{
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(Error::UnintelligibleReply {
|
||||||
|
reply: std::sync::Arc::new(Box::new(msg)),
|
||||||
|
why: "The camera did not except the BcXmp with service data",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Some cameras seem to just not send a reply on success, so after 500ms we return Ok
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+146
-50
@@ -1267,77 +1267,173 @@ Message have zero to two payloads.
|
|||||||
```
|
```
|
||||||
|
|
||||||
- **Notes:** The passwords are not sent in some models of cameras namely
|
- **Notes:** The passwords are not sent in some models of cameras namely
|
||||||
RLC-410 4mp, RLC-410 5mp, RLC-520 (fw 200710) in these cases the passwords
|
RLC-410 4mp, RLC-410 5mp, RLC-520 (fw 200710), RLC-811A in these cases the
|
||||||
are blank. In some older cameras that do not use encryption at all these
|
passwords are blank. In some older cameras that do not use encryption at
|
||||||
passwords are completely visible to any network sniffers. Even the "encrypted"
|
all these passwords are completely visible to any network sniffers. Even
|
||||||
cameras only have weak encryption that is easily broken since the
|
the "encrypted" cameras only have weak encryption that is easily broken
|
||||||
decryption key is fixed and well-known.
|
since the decryption key is fixed and well-known.
|
||||||
|
|
||||||
- 67: `<ConfigFileInfo> (FW Upgrade)`
|
- 59: `<UserList>`
|
||||||
|
|
||||||
- Client
|
- Client
|
||||||
|
|
||||||
- Header
|
- Header: Standard header
|
||||||
|
|
||||||
| Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Payload Offset |
|
- Extension
|
||||||
| ----------- | ----------- | -------------- | ----------------- | ----------- | ------------- | -------------- |
|
|
||||||
| 0a bc de f0 | 00 00 00 43 | 00 00 01 00 | 00 00 00 00 | 00 00 | 64 14 | 00 00 00 00 |
|
|
||||||
|
|
||||||
- Extension
|
```xml
|
||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<Extension version="1.1">
|
||||||
|
<userName>admin</userName>
|
||||||
|
</Extension>
|
||||||
|
```
|
||||||
|
|
||||||
```xml
|
- Camera
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<body>
|
|
||||||
<ConfigFileInfo version="1.1">
|
|
||||||
<fileName>FIRMWAREFILE.pak</fileName>
|
|
||||||
<fileSize>SIZE_IN_BYTES</fileSize>
|
|
||||||
<updateParameter>0</updateParameter>
|
|
||||||
</ConfigFileInfo>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
- **Notes:** updateParameter refers to updating the settings. If 1 it will restore factory settings. If 0 it will keep current.
|
- Header: Standard header
|
||||||
|
|
||||||
- Camera
|
- Payload — Changing the password of testUser
|
||||||
|
|
||||||
- Header
|
```xml
|
||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<body>
|
||||||
|
<UserList version="1.1">
|
||||||
|
<User>
|
||||||
|
<userName>admin</userName>
|
||||||
|
<password>password12</password>
|
||||||
|
<userLevel>1</userLevel>
|
||||||
|
<userSetState>none</userSetState>
|
||||||
|
</User>
|
||||||
|
<User>
|
||||||
|
<userName>testUser</userName>
|
||||||
|
<password>newPass</password>
|
||||||
|
<userLevel>0</userLevel>
|
||||||
|
<userSetState>modify</userSetState>
|
||||||
|
</User>
|
||||||
|
</UserList>
|
||||||
|
</body>
|
||||||
|
```
|
||||||
|
|
||||||
| Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Payload Offset |
|
- Payload — creating a user
|
||||||
| ----------- | ----------- | -------------- | ----------------- | ----------- | ------------- | -------------- |
|
|
||||||
| 0a bc de f0 | 00 00 00 43 | 00 00 00 00 | 00 00 00 00 | c8 00 | 00 00 | 00 00 00 00 |
|
|
||||||
|
|
||||||
- Client
|
```xml
|
||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<body>
|
||||||
|
<UserList version="1.1">
|
||||||
|
<User>
|
||||||
|
<userName>admin</userName>
|
||||||
|
<password>password12</password>
|
||||||
|
<userLevel>1</userLevel>
|
||||||
|
<userSetState>none</userSetState>
|
||||||
|
</User>
|
||||||
|
<User>
|
||||||
|
<userName>testUser</userName>
|
||||||
|
<password>testPass</password>
|
||||||
|
<userLevel>0</userLevel>
|
||||||
|
<userSetState>add</userSetState>
|
||||||
|
</User>
|
||||||
|
</UserList>
|
||||||
|
</body>
|
||||||
|
```
|
||||||
|
|
||||||
- Header
|
- Payload — deleting a user
|
||||||
|
|
||||||
| Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Payload Offset |
|
```xml
|
||||||
| ----------- | ----------- | -------------- | ----------------- | ----------- | ------------- | -------------- |
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
| 0a bc de f0 | 00 00 00 43 | 00 00 94 58 | 00 00 00 00 | 00 00 | 64 14 | 00 00 00 6a |
|
<body>
|
||||||
|
<UserList version="1.1">
|
||||||
|
<User>
|
||||||
|
<userName>admin</userName>
|
||||||
|
<password>password12</password>
|
||||||
|
<userLevel>1</userLevel>
|
||||||
|
<userSetState>none</userSetState>
|
||||||
|
</User>
|
||||||
|
<User>
|
||||||
|
<userName>testUser</userName>
|
||||||
|
<password>newPass</password>
|
||||||
|
<userLevel>0</userLevel>
|
||||||
|
<userSetState>delete</userSetState>
|
||||||
|
</User>
|
||||||
|
</UserList>
|
||||||
|
</body>
|
||||||
|
```
|
||||||
|
|
||||||
- Extension
|
- **Notes:** The passwords are not sent in some models of cameras namely
|
||||||
|
RLC-410 4mp, RLC-410 5mp, RLC-520 (fw 200710), RLC-811A in these cases the
|
||||||
|
passwords are blank. In some older cameras that do not use encryption at
|
||||||
|
all these passwords are completely visible to any network sniffers. Even
|
||||||
|
the "encrypted" cameras only have weak encryption that is easily broken
|
||||||
|
since the decryption key is fixed and well-known.
|
||||||
|
- **Notes:** The password field seems to only be needed when creating a user
|
||||||
|
or changing a users password.
|
||||||
|
- **Notes:** It does not appear like userLevel is modifiable (at least on
|
||||||
|
RLC-811A)
|
||||||
|
|
||||||
```xml
|
- 67: `<ConfigFileInfo> (FW Upgrade)`
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<Extension version="1.1">
|
|
||||||
<binaryData>1</binaryData>
|
|
||||||
</Extension>
|
|
||||||
```
|
|
||||||
|
|
||||||
- Payload
|
- Client
|
||||||
|
|
||||||
This contains binary data of the file but stops once the message size reaches
|
- Header
|
||||||
38000 bytes and continues in another packet. There does not appear to
|
|
||||||
be a checksum or hash and this part contains only the raw bytes of the file.
|
|
||||||
|
|
||||||
- Camera
|
| Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Payload Offset |
|
||||||
|
| ----------- | ----------- | -------------- | ----------------- | ----------- | ------------- | -------------- |
|
||||||
|
| 0a bc de f0 | 00 00 00 43 | 00 00 01 00 | 00 00 00 00 | 00 00 | 64 14 | 00 00 00 00 |
|
||||||
|
|
||||||
- Header
|
- Extension
|
||||||
|
|
||||||
| Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Payload Offset |
|
```xml
|
||||||
| ----------- | ----------- | -------------- | ----------------- | ----------- | ------------- | -------------- |
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
| 0a bc de f0 | 00 00 00 43 | 00 00 00 00 | 00 00 00 00 | c8 00 | 00 00 | 00 00 00 00 |
|
<body>
|
||||||
|
<ConfigFileInfo version="1.1">
|
||||||
|
<fileName>FIRMWAREFILE.pak</fileName>
|
||||||
|
<fileSize>SIZE_IN_BYTES</fileSize>
|
||||||
|
<updateParameter>0</updateParameter>
|
||||||
|
</ConfigFileInfo>
|
||||||
|
</body>
|
||||||
|
```
|
||||||
|
|
||||||
- **Notes:** Last two messages repeat until all data is sent
|
- **Notes:** updateParameter refers to updating the settings. If 1 it will restore factory settings. If 0 it will keep current.
|
||||||
|
|
||||||
|
- Camera
|
||||||
|
|
||||||
|
- Header
|
||||||
|
|
||||||
|
| Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Payload Offset |
|
||||||
|
| ----------- | ----------- | -------------- | ----------------- | ----------- | ------------- | -------------- |
|
||||||
|
| 0a bc de f0 | 00 00 00 43 | 00 00 00 00 | 00 00 00 00 | c8 00 | 00 00 | 00 00 00 00 |
|
||||||
|
|
||||||
|
- Client
|
||||||
|
|
||||||
|
- Header
|
||||||
|
|
||||||
|
| Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Payload Offset |
|
||||||
|
| ----------- | ----------- | -------------- | ----------------- | ----------- | ------------- | -------------- |
|
||||||
|
| 0a bc de f0 | 00 00 00 43 | 00 00 94 58 | 00 00 00 00 | 00 00 | 64 14 | 00 00 00 6a |
|
||||||
|
|
||||||
|
- Extension
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<Extension version="1.1">
|
||||||
|
<binaryData>1</binaryData>
|
||||||
|
</Extension>
|
||||||
|
```
|
||||||
|
|
||||||
|
- Payload
|
||||||
|
|
||||||
|
This contains binary data of the file but stops once the message size reaches
|
||||||
|
38000 bytes and continues in another packet. There does not appear to
|
||||||
|
be a checksum or hash and this part contains only the raw bytes of the file.
|
||||||
|
|
||||||
|
- Camera
|
||||||
|
|
||||||
|
- Header
|
||||||
|
|
||||||
|
| Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Payload Offset |
|
||||||
|
| ----------- | ----------- | -------------- | ----------------- | ----------- | ------------- | -------------- |
|
||||||
|
| 0a bc de f0 | 00 00 00 43 | 00 00 00 00 | 00 00 00 00 | c8 00 | 00 00 | 00 00 00 00 |
|
||||||
|
|
||||||
|
- **Notes:** Last two messages repeat until all data is sent
|
||||||
|
|
||||||
- 76: `<Ip>`
|
- 76: `<Ip>`
|
||||||
|
|
||||||
|
|||||||
@@ -32,4 +32,5 @@ pub enum Command {
|
|||||||
Image(super::image::Opt),
|
Image(super::image::Opt),
|
||||||
Battery(super::battery::Opt),
|
Battery(super::battery::Opt),
|
||||||
Services(super::services::Opt),
|
Services(super::services::Opt),
|
||||||
|
Users(super::users::Opt),
|
||||||
}
|
}
|
||||||
@@ -52,6 +52,7 @@ mod services;
|
|||||||
mod statusled;
|
mod statusled;
|
||||||
#[cfg(feature = "gstreamer")]
|
#[cfg(feature = "gstreamer")]
|
||||||
mod talk;
|
mod talk;
|
||||||
|
mod users;
|
||||||
mod utils;
|
mod utils;
|
||||||
|
|
||||||
use cmdline::{Command, Opt};
|
use cmdline::{Command, Opt};
|
||||||
@@ -143,6 +144,9 @@ async fn main() -> Result<()> {
|
|||||||
Some(Command::Services(opts)) => {
|
Some(Command::Services(opts)) => {
|
||||||
services::main(opts, neo_reactor.clone()).await?;
|
services::main(opts, neo_reactor.clone()).await?;
|
||||||
}
|
}
|
||||||
|
Some(Command::Users(opts)) => {
|
||||||
|
users::main(opts, neo_reactor.clone()).await?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
use clap::{Parser, ValueEnum};
|
||||||
|
|
||||||
|
#[derive(Parser, Debug)]
|
||||||
|
pub struct Opt {
|
||||||
|
/// The name of the camera. Must be a name in the config
|
||||||
|
pub camera: String,
|
||||||
|
/// The action to perform
|
||||||
|
#[command(subcommand)]
|
||||||
|
pub cmd: UserAction,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Parser, Debug)]
|
||||||
|
pub enum UserAction {
|
||||||
|
/// List users
|
||||||
|
List,
|
||||||
|
/// Create a new user
|
||||||
|
Add {
|
||||||
|
/// The username of the new user
|
||||||
|
user_name: String,
|
||||||
|
/// The password of the new user
|
||||||
|
password: String,
|
||||||
|
/// User type
|
||||||
|
user_type: UserType,
|
||||||
|
},
|
||||||
|
Password {
|
||||||
|
/// The username of the new user
|
||||||
|
user_name: String,
|
||||||
|
/// The password of the new user
|
||||||
|
password: String,
|
||||||
|
},
|
||||||
|
Delete {
|
||||||
|
/// The username of the user to delete
|
||||||
|
user_name: String,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Parser, Debug, Clone, ValueEnum)]
|
||||||
|
pub enum UserType {
|
||||||
|
/// user_level = 0
|
||||||
|
User,
|
||||||
|
/// user_level = 1
|
||||||
|
Administrator,
|
||||||
|
}
|
||||||
@@ -0,0 +1,173 @@
|
|||||||
|
///
|
||||||
|
/// # Neolink Users
|
||||||
|
///
|
||||||
|
/// This modules handles users
|
||||||
|
///
|
||||||
|
///
|
||||||
|
/// # Usage
|
||||||
|
///
|
||||||
|
/// ```bash
|
||||||
|
/// # To list users
|
||||||
|
/// neolink --config=config.toml users CameraName list
|
||||||
|
/// # To create a a new administrator
|
||||||
|
/// neolink --config=config.toml users CameraName add newuser hunter2 administrator
|
||||||
|
/// # To delete a user
|
||||||
|
/// neolink --config=config.toml users CameraName delete newuser
|
||||||
|
/// ```
|
||||||
|
///
|
||||||
|
/// There are two types of users:
|
||||||
|
/// - administrator — Can access the device and change device settings
|
||||||
|
/// - user — Can access the device but not change device settings
|
||||||
|
///
|
||||||
|
use anyhow::{anyhow, Context, Result};
|
||||||
|
|
||||||
|
mod cmdline;
|
||||||
|
|
||||||
|
use crate::common::NeoReactor;
|
||||||
|
pub(crate) use cmdline::*;
|
||||||
|
use neolink_core::bc::xml::UserList;
|
||||||
|
|
||||||
|
/// Entry point for the users subcommand
|
||||||
|
///
|
||||||
|
/// Opt is the command line options
|
||||||
|
pub(crate) async fn main(opt: Opt, reactor: NeoReactor) -> Result<()> {
|
||||||
|
let camera = reactor.get(&opt.camera).await?;
|
||||||
|
|
||||||
|
match opt.cmd {
|
||||||
|
UserAction::List => {
|
||||||
|
let user_list = camera
|
||||||
|
.run_task(|cam| {
|
||||||
|
Box::pin(
|
||||||
|
async move { cam.get_users().await.context("Unable to list camera users") },
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
match user_list {
|
||||||
|
UserList {
|
||||||
|
user_list: Some(users),
|
||||||
|
..
|
||||||
|
} => {
|
||||||
|
println!("{:<12} {:>4} {:>16}", "Username", "ID", "User type");
|
||||||
|
for user in users {
|
||||||
|
println!(
|
||||||
|
"{:<12} {:>4} {:>16}",
|
||||||
|
user.user_name,
|
||||||
|
user.user_id
|
||||||
|
.expect("user_id should exist when reading users"),
|
||||||
|
match user.user_level {
|
||||||
|
0 => "User".to_owned(),
|
||||||
|
1 => "Administrator".to_owned(),
|
||||||
|
n => format!("Unknown ({})", n),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
eprintln!("No users were included in response");
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
UserAction::Add {
|
||||||
|
user_name,
|
||||||
|
password,
|
||||||
|
user_type,
|
||||||
|
} => {
|
||||||
|
camera
|
||||||
|
.run_task(|cam| {
|
||||||
|
Box::pin({
|
||||||
|
let user_name = user_name.clone();
|
||||||
|
let password = password.clone();
|
||||||
|
let user_type = user_type.clone();
|
||||||
|
async move {
|
||||||
|
let user_list = cam
|
||||||
|
.get_users()
|
||||||
|
.await
|
||||||
|
.context("Failed to list current users")?;
|
||||||
|
let user_exists = match user_list.user_list {
|
||||||
|
Some(users) => users.iter().any(|user| user.user_name == user_name),
|
||||||
|
_ => false,
|
||||||
|
};
|
||||||
|
if user_exists {
|
||||||
|
return Err(anyhow!("The user '{}' already exists.", user_name));
|
||||||
|
}
|
||||||
|
|
||||||
|
cam.add_user(
|
||||||
|
user_name,
|
||||||
|
password,
|
||||||
|
match user_type {
|
||||||
|
UserType::User => 0,
|
||||||
|
UserType::Administrator => 1,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.context("Unable to create user")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
println!("Successfully created user '{}'", user_name);
|
||||||
|
}
|
||||||
|
UserAction::Password {
|
||||||
|
user_name,
|
||||||
|
password,
|
||||||
|
} => {
|
||||||
|
camera
|
||||||
|
.run_task(|cam| {
|
||||||
|
Box::pin({
|
||||||
|
let user_name = user_name.clone();
|
||||||
|
let password = password.clone();
|
||||||
|
async move {
|
||||||
|
let user_list = cam
|
||||||
|
.get_users()
|
||||||
|
.await
|
||||||
|
.context("Failed to list current users")?;
|
||||||
|
let user_exists = match user_list.user_list {
|
||||||
|
Some(users) => users.iter().any(|user| user.user_name == user_name),
|
||||||
|
_ => false,
|
||||||
|
};
|
||||||
|
if !user_exists {
|
||||||
|
return Err(anyhow!("The user '{}' does not exist.", user_name));
|
||||||
|
}
|
||||||
|
|
||||||
|
cam.modify_user(user_name, password)
|
||||||
|
.await
|
||||||
|
.context("Unable to create user")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
println!("Successfully changed the password of '{}'", user_name);
|
||||||
|
}
|
||||||
|
UserAction::Delete { user_name } => {
|
||||||
|
camera
|
||||||
|
.run_task(|cam| {
|
||||||
|
Box::pin({
|
||||||
|
let user_name = user_name.clone();
|
||||||
|
async move {
|
||||||
|
let user_list = cam
|
||||||
|
.get_users()
|
||||||
|
.await
|
||||||
|
.context("Failed to list current users")?;
|
||||||
|
let user_exists = match user_list.user_list {
|
||||||
|
Some(users) => users.iter().any(|user| user.user_name == user_name),
|
||||||
|
_ => false,
|
||||||
|
};
|
||||||
|
|
||||||
|
if !user_exists {
|
||||||
|
return Err(anyhow!("The user '{}' does not exist.", user_name));
|
||||||
|
}
|
||||||
|
|
||||||
|
cam.delete_user(user_name)
|
||||||
|
.await
|
||||||
|
.context("Unable to delete user")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
println!("Successfully removed user '{}'", user_name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
Reference in new issue
Block a user