External/qemu-display
1
0
Fork 0
mirror of https://gitlab.com/marcandre.lureau/qemu-display.git synced 2024-12-22 05:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

rdp: default to server-cert/key.pem

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2024-12-17 16:15:31 +04:00
parent 93770b989f
commit 86a3e45904
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
qemu-rdp/src/server/mod.rs
View File

@ -4,6 +4,7 @@ use ironrdp::server::{Credentials, ServerEvent, TlsIdentityCtx};
use std::path::PathBuf; use std::path::PathBuf;
use tokio::sync::{mpsc::UnboundedSender, oneshot}; use tokio::sync::{mpsc::UnboundedSender, oneshot};
use tracing::{debug, error}; use tracing::{debug, error};
use zbus::object_server::SignalEmitter;
use ironrdp::server::RdpServer; use ironrdp::server::RdpServer;
use qemu_display::{zbus, Display}; use qemu_display::{zbus, Display};
@ -39,10 +40,12 @@ impl Server {
(None, None) => { (None, None) => {
let mut config_dir = dirs::config_dir().expect("configuration directory"); let mut config_dir = dirs::config_dir().expect("configuration directory");
config_dir.push("qemu-rdp"); config_dir.push("qemu-rdp");
let cert: PathBuf = [config_dir.clone(), PathBuf::from("cert.der")] let cert: PathBuf = [config_dir.clone(), PathBuf::from("server-cert.pem")]
.iter()
.collect();
let key: PathBuf = [config_dir, PathBuf::from("server-key.pem")]
.iter() .iter()
.collect(); .collect();
let key: PathBuf = [config_dir, PathBuf::from("key.der")].iter().collect();
(cert, key) (cert, key)
} }
_ => { _ => {
@ -78,21 +81,29 @@ impl Server {
.build(); .build();
let ev = server.event_sender().clone(); let ev = server.event_sender().clone();
let dbus_ctrl = DBusCtrl { ev };
let dbus_path = "/org/qemu_display/rdp";
self.dbus.object_server().at(dbus_path, dbus_ctrl).await?;
let dbus_iface_ref = self
.dbus
.object_server()
.interface::<_, DBusCtrl>(dbus_path)
.await?;
let server_ev = server.event_sender().clone();
let proxy = dbus_display.inner_proxy().clone(); let proxy = dbus_display.inner_proxy().clone();
tokio::spawn(async move { tokio::spawn(async move {
use futures_util::StreamExt; use futures_util::StreamExt;
let mut owner_changed = proxy.receive_owner_changed().await.unwrap(); let mut owner_changed = proxy.receive_owner_changed().await.unwrap();
let _ = owner_changed.next().await; let _ = owner_changed.next().await;
ev.send(ServerEvent::Quit("org.qemu is gone".to_owned())) let dbus_emitter = dbus_iface_ref.signal_emitter();
let _ = DBusCtrl::leaving(dbus_emitter, "org.qemu is gone").await;
server_ev
.send(ServerEvent::Quit("org.qemu is gone".to_owned()))
.unwrap(); .unwrap();
}); });
let ev = server.event_sender().clone();
self.dbus
.object_server()
.at("/org/qemu_display/rdp", DBusCtrl { ev })
.await?;
self.dbus self.dbus
.request_name_with_flags("org.QemuDisplay.RDP", BitFlags::EMPTY) .request_name_with_flags("org.QemuDisplay.RDP", BitFlags::EMPTY)
.await?; .await?;
@ -136,4 +147,7 @@ impl DBusCtrl {
Err(zbus::fdo::Error::Failed("Not yet available".into())) Err(zbus::fdo::Error::Failed("Not yet available".into()))
} }
} }
#[zbus(signal)]
async fn leaving(emitter: &SignalEmitter<'_>, reason: &str) -> zbus::Result<()>;
} }