Compare commits
1 Commits
master
...
renovate/e
Author | SHA1 | Date | |
---|---|---|---|
83eb8497dc |
@ -27,7 +27,10 @@ impl LibVirtActor {
|
|||||||
/// Connect to hypervisor
|
/// Connect to hypervisor
|
||||||
pub async fn connect() -> anyhow::Result<Self> {
|
pub async fn connect() -> anyhow::Result<Self> {
|
||||||
let hypervisor_uri = AppConfig::get().hypervisor_uri.as_deref().unwrap_or("");
|
let hypervisor_uri = AppConfig::get().hypervisor_uri.as_deref().unwrap_or("");
|
||||||
log::info!("Will connect to hypvervisor at address '{hypervisor_uri}'",);
|
log::info!(
|
||||||
|
"Will connect to hypvervisor at address '{}'",
|
||||||
|
hypervisor_uri
|
||||||
|
);
|
||||||
let conn = Connect::open(Some(hypervisor_uri))?;
|
let conn = Connect::open(Some(hypervisor_uri))?;
|
||||||
|
|
||||||
Ok(Self { m: conn })
|
Ok(Self { m: conn })
|
||||||
@ -99,7 +102,7 @@ impl Handler<GetDomainXMLReq> for LibVirtActor {
|
|||||||
log::debug!("Get domain XML:\n{}", msg.0.as_string());
|
log::debug!("Get domain XML:\n{}", msg.0.as_string());
|
||||||
let domain = Domain::lookup_by_uuid_string(&self.m, &msg.0.as_string())?;
|
let domain = Domain::lookup_by_uuid_string(&self.m, &msg.0.as_string())?;
|
||||||
let xml = domain.get_xml_desc(VIR_DOMAIN_XML_SECURE)?;
|
let xml = domain.get_xml_desc(VIR_DOMAIN_XML_SECURE)?;
|
||||||
log::debug!("XML = {xml}");
|
log::debug!("XML = {}", xml);
|
||||||
DomainXML::parse_xml(&xml)
|
DomainXML::parse_xml(&xml)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -128,7 +131,7 @@ impl Handler<DefineDomainReq> for LibVirtActor {
|
|||||||
fn handle(&mut self, mut msg: DefineDomainReq, _ctx: &mut Self::Context) -> Self::Result {
|
fn handle(&mut self, mut msg: DefineDomainReq, _ctx: &mut Self::Context) -> Self::Result {
|
||||||
let xml = msg.1.as_xml()?;
|
let xml = msg.1.as_xml()?;
|
||||||
|
|
||||||
log::debug!("Define domain:\n{xml}");
|
log::debug!("Define domain:\n{}", xml);
|
||||||
let domain = Domain::define_xml(&self.m, &xml)?;
|
let domain = Domain::define_xml(&self.m, &xml)?;
|
||||||
let uuid = XMLUuid::parse_from_str(&domain.get_uuid_string()?)?;
|
let uuid = XMLUuid::parse_from_str(&domain.get_uuid_string()?)?;
|
||||||
|
|
||||||
@ -443,7 +446,7 @@ impl Handler<GetNetworkXMLReq> for LibVirtActor {
|
|||||||
log::debug!("Get network XML:\n{}", msg.0.as_string());
|
log::debug!("Get network XML:\n{}", msg.0.as_string());
|
||||||
let network = Network::lookup_by_uuid_string(&self.m, &msg.0.as_string())?;
|
let network = Network::lookup_by_uuid_string(&self.m, &msg.0.as_string())?;
|
||||||
let xml = network.get_xml_desc(0)?;
|
let xml = network.get_xml_desc(0)?;
|
||||||
log::debug!("XML = {xml}");
|
log::debug!("XML = {}", xml);
|
||||||
NetworkXML::parse_xml(&xml)
|
NetworkXML::parse_xml(&xml)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -599,7 +602,7 @@ impl Handler<GetNWFilterXMLReq> for LibVirtActor {
|
|||||||
log::debug!("Get network filter XML:\n{}", msg.0.as_string());
|
log::debug!("Get network filter XML:\n{}", msg.0.as_string());
|
||||||
let filter = NWFilter::lookup_by_uuid_string(&self.m, &msg.0.as_string())?;
|
let filter = NWFilter::lookup_by_uuid_string(&self.m, &msg.0.as_string())?;
|
||||||
let xml = filter.get_xml_desc(0)?;
|
let xml = filter.get_xml_desc(0)?;
|
||||||
log::debug!("XML = {xml}");
|
log::debug!("XML = {}", xml);
|
||||||
NetworkFilterXML::parse_xml(xml)
|
NetworkFilterXML::parse_xml(xml)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -614,7 +617,7 @@ impl Handler<DefineNWFilterReq> for LibVirtActor {
|
|||||||
fn handle(&mut self, mut msg: DefineNWFilterReq, _ctx: &mut Self::Context) -> Self::Result {
|
fn handle(&mut self, mut msg: DefineNWFilterReq, _ctx: &mut Self::Context) -> Self::Result {
|
||||||
let xml = msg.1.into_xml()?;
|
let xml = msg.1.into_xml()?;
|
||||||
|
|
||||||
log::debug!("Define network filter:\n{xml}");
|
log::debug!("Define network filter:\n{}", xml);
|
||||||
let filter = NWFilter::define_xml(&self.m, &xml)?;
|
let filter = NWFilter::define_xml(&self.m, &xml)?;
|
||||||
let uuid = XMLUuid::parse_from_str(&filter.get_uuid_string()?)?;
|
let uuid = XMLUuid::parse_from_str(&filter.get_uuid_string()?)?;
|
||||||
|
|
||||||
|
@ -280,7 +280,7 @@ impl AppConfig {
|
|||||||
|
|
||||||
/// Get VM vnc sockets path for domain
|
/// Get VM vnc sockets path for domain
|
||||||
pub fn vnc_socket_for_domain(&self, name: &str) -> PathBuf {
|
pub fn vnc_socket_for_domain(&self, name: &str) -> PathBuf {
|
||||||
self.vnc_sockets_path().join(format!("vnc-{name}"))
|
self.vnc_sockets_path().join(format!("vnc-{}", name))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get VM root disks storage directory
|
/// Get VM root disks storage directory
|
||||||
|
@ -34,7 +34,8 @@ pub async fn upload(MultipartForm(mut form): MultipartForm<UploadDiskImageForm>)
|
|||||||
if let Some(mime_type) = file.content_type {
|
if let Some(mime_type) = file.content_type {
|
||||||
if !constants::ALLOWED_DISK_IMAGES_MIME_TYPES.contains(&mime_type.as_ref()) {
|
if !constants::ALLOWED_DISK_IMAGES_MIME_TYPES.contains(&mime_type.as_ref()) {
|
||||||
return Ok(HttpResponse::BadRequest().json(format!(
|
return Ok(HttpResponse::BadRequest().json(format!(
|
||||||
"Unsupported file type for disk upload: {mime_type}"
|
"Unsupported file type for disk upload: {}",
|
||||||
|
mime_type
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -52,7 +52,7 @@ pub async fn upload_file(MultipartForm(mut form): MultipartForm<UploadIsoForm>)
|
|||||||
}
|
}
|
||||||
|
|
||||||
let dest_file = AppConfig::get().iso_storage_path().join(file_name);
|
let dest_file = AppConfig::get().iso_storage_path().join(file_name);
|
||||||
log::info!("Will save ISO file {dest_file:?}");
|
log::info!("Will save ISO file {:?}", dest_file);
|
||||||
|
|
||||||
if dest_file.exists() {
|
if dest_file.exists() {
|
||||||
log::error!("Conflict with uploaded iso file name!");
|
log::error!("Conflict with uploaded iso file name!");
|
||||||
|
@ -43,7 +43,7 @@ impl actix_web::error::ResponseError for HttpErr {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
fn error_response(&self) -> HttpResponse<BoxBody> {
|
fn error_response(&self) -> HttpResponse<BoxBody> {
|
||||||
log::error!("Error while processing request! {self}");
|
log::error!("Error while processing request! {}", self);
|
||||||
|
|
||||||
HttpResponse::InternalServerError().body("Failed to execute request!")
|
HttpResponse::InternalServerError().body("Failed to execute request!")
|
||||||
}
|
}
|
||||||
|
@ -109,7 +109,7 @@ fn extract_ip_mask<const V: usize>(n: Option<u8>) -> anyhow::Result<Option<u8>>
|
|||||||
fn extract_nw_filter_comment(n: &Option<String>) -> anyhow::Result<Option<String>> {
|
fn extract_nw_filter_comment(n: &Option<String>) -> anyhow::Result<Option<String>> {
|
||||||
if let Some(comment) = n {
|
if let Some(comment) = n {
|
||||||
if comment.len() > 256 || comment.contains('\"') || comment.contains('\n') {
|
if comment.len() > 256 || comment.contains('\"') || comment.contains('\n') {
|
||||||
return Err(NetworkFilterExtraction(format!("Invalid comment! {comment}")).into());
|
return Err(NetworkFilterExtraction(format!("Invalid comment! {}", comment)).into());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,7 +69,8 @@ where
|
|||||||
|
|
||||||
if !AppConfig::get().is_allowed_ip(remote_ip.0) {
|
if !AppConfig::get().is_allowed_ip(remote_ip.0) {
|
||||||
log::error!(
|
log::error!(
|
||||||
"An attempt to access VirtWeb from an unauthorized network has been intercepted! {remote_ip:?}"
|
"An attempt to access VirtWeb from an unauthorized network has been intercepted! {:?}",
|
||||||
|
remote_ip
|
||||||
);
|
);
|
||||||
return Ok(req
|
return Ok(req
|
||||||
.into_response(
|
.into_response(
|
||||||
|
@ -81,10 +81,10 @@ impl CloudInitConfig {
|
|||||||
// Process metadata
|
// Process metadata
|
||||||
let mut metadatas = vec![];
|
let mut metadatas = vec![];
|
||||||
if let Some(inst_id) = &self.instance_id {
|
if let Some(inst_id) = &self.instance_id {
|
||||||
metadatas.push(format!("instance-id: {inst_id}"));
|
metadatas.push(format!("instance-id: {}", inst_id));
|
||||||
}
|
}
|
||||||
if let Some(local_hostname) = &self.local_hostname {
|
if let Some(local_hostname) = &self.local_hostname {
|
||||||
metadatas.push(format!("local-hostname: {local_hostname}"));
|
metadatas.push(format!("local-hostname: {}", local_hostname));
|
||||||
}
|
}
|
||||||
if let Some(dsmode) = &self.dsmode {
|
if let Some(dsmode) = &self.dsmode {
|
||||||
metadatas.push(format!(
|
metadatas.push(format!(
|
||||||
|
8
virtweb_frontend/package-lock.json
generated
8
virtweb_frontend/package-lock.json
generated
@ -9,7 +9,7 @@
|
|||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.14.0",
|
"@emotion/react": "^11.14.0",
|
||||||
"@emotion/styled": "^11.14.0",
|
"@emotion/styled": "^11.14.1",
|
||||||
"@fontsource/roboto": "^5.2.6",
|
"@fontsource/roboto": "^5.2.6",
|
||||||
"@mdi/js": "^7.4.47",
|
"@mdi/js": "^7.4.47",
|
||||||
"@mdi/react": "^1.6.1",
|
"@mdi/react": "^1.6.1",
|
||||||
@ -451,9 +451,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@emotion/styled": {
|
"node_modules/@emotion/styled": {
|
||||||
"version": "11.14.0",
|
"version": "11.14.1",
|
||||||
"resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.0.tgz",
|
"resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz",
|
||||||
"integrity": "sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA==",
|
"integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/runtime": "^7.18.3",
|
"@babel/runtime": "^7.18.3",
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.14.0",
|
"@emotion/react": "^11.14.0",
|
||||||
"@emotion/styled": "^11.14.0",
|
"@emotion/styled": "^11.14.1",
|
||||||
"@fontsource/roboto": "^5.2.6",
|
"@fontsource/roboto": "^5.2.6",
|
||||||
"@mdi/js": "^7.4.47",
|
"@mdi/js": "^7.4.47",
|
||||||
"@mdi/react": "^1.6.1",
|
"@mdi/react": "^1.6.1",
|
||||||
|
Reference in New Issue
Block a user