hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix update options without auth

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-02-17 14:33:01 +08:00
parent 4bff430fdb
commit cdf9867b5c
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/server/connection.rs
View File

@ -1092,7 +1092,8 @@ impl Connection {
async fn handle_login_request_without_validation(&mut self, lr: &LoginRequest) { async fn handle_login_request_without_validation(&mut self, lr: &LoginRequest) {
self.lr = lr.clone(); self.lr = lr.clone();
if let Some(o) = lr.option.as_ref() { if let Some(o) = lr.option.as_ref() {
self.update_option(o).await; // It may not be a good practice to update all options here.
self.update_options(o).await;
if let Some(q) = o.video_codec_state.clone().take() { if let Some(q) = o.video_codec_state.clone().take() {
scrap::codec::Encoder::update_video_encoder( scrap::codec::Encoder::update_video_encoder(
self.inner.id(), self.inner.id(),
@ -1496,7 +1497,7 @@ impl Connection {
self.chat_unanswered = true; self.chat_unanswered = true;
} }
Some(misc::Union::Option(o)) => { Some(misc::Union::Option(o)) => {
self.update_option(&o).await; self.update_options(&o).await;
} }
Some(misc::Union::RefreshVideo(r)) => { Some(misc::Union::RefreshVideo(r)) => {
if r { if r {
@ -1665,8 +1666,7 @@ impl Connection {
self.send_to_cm(Data::CloseVoiceCall("".to_owned())); self.send_to_cm(Data::CloseVoiceCall("".to_owned()));
} }
async fn update_option(&mut self, o: &OptionMessage) { async fn update_options_without_auth(&mut self, o: &OptionMessage) {
log::info!("Option update: {:?}", o);
if let Ok(q) = o.image_quality.enum_value() { if let Ok(q) = o.image_quality.enum_value() {
let image_quality; let image_quality;
if let ImageQuality::NotSet = q { if let ImageQuality::NotSet = q {
@ -1691,7 +1691,18 @@ impl Connection {
.unwrap() .unwrap()
.update_user_fps(o.custom_fps as _); .update_user_fps(o.custom_fps as _);
} }
if let Some(q) = o.video_codec_state.clone().take() {
scrap::codec::Encoder::update_video_encoder(
self.inner.id(),
scrap::codec::EncoderUpdate::State(q),
);
}
}
async fn update_options_with_auth(&mut self, o: &OptionMessage) {
if !self.authorized {
return;
}
if let Ok(q) = o.lock_after_session_end.enum_value() { if let Ok(q) = o.lock_after_session_end.enum_value() {
if q != BoolOption::NotSet { if q != BoolOption::NotSet {
self.lock_after_session_end = q == BoolOption::Yes; self.lock_after_session_end = q == BoolOption::Yes;
@ -1818,12 +1829,12 @@ impl Connection {
} }
} }
} }
if let Some(q) = o.video_codec_state.clone().take() { }
scrap::codec::Encoder::update_video_encoder(
self.inner.id(), async fn update_options(&mut self, o: &OptionMessage) {
scrap::codec::EncoderUpdate::State(q), log::info!("Option update: {:?}", o);
); self.update_options_without_auth(o);
} self.update_options_with_auth(o);
} }
async fn on_close(&mut self, reason: &str, lock: bool) { async fn on_close(&mut self, reason: &str, lock: bool) {