Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src-tauri/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,20 @@ pub fn get_checksum_of_files(list: Vec<String>) -> std::result::Result<Vec<Strin
let mut f =
File::open(&file).map_err(|e| format!("Failed to open file '{}': {}", file, e))?;

let mut contents = Vec::new();
f.read_to_end(&mut contents)
.map_err(|e| format!("Failed to read file '{}': {}", file, e))?;
let mut context = md5::Context::new();
let mut buffer = [0u8; 65536];

loop {
let bytes_read = f
.read(&mut buffer)
.map_err(|e| format!("Failed to read file '{}': {}", file, e))?;
if bytes_read == 0 {
break;
}
context.consume(&buffer[..bytes_read]);
}

let digest = compute(&contents);
let digest = context.compute();
let checksum_entry = format!("{}|{:x}", file, digest);
result.push(checksum_entry);
}
Expand Down
64 changes: 20 additions & 44 deletions src-tauri/src/query.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use actix_web::web::Buf;
use byteorder::{LittleEndian, ReadBytesExt};
use once_cell::sync::Lazy;
use regex::Regex;
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::io::{Cursor, Read};
Expand Down Expand Up @@ -84,50 +83,25 @@ pub struct ErrorResponse {

impl Query {
pub async fn new(addr: &str, port: i32) -> Result<Self> {
let regex = Regex::new(r"^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$")
.map_err(|e| LauncherError::Parse(format!("Invalid regex pattern: {}", e)))?;

let address = match regex.captures(addr) {
Some(_) => {
// it's valid ipv4, move on
addr.to_string()
}
None => {
let socket_addresses = lookup_host(format!("{}:{}", addr, port)).await;
match socket_addresses {
Ok(s) => {
let mut ipv4 = "".to_string();
for socket_address in s {
if socket_address.is_ipv4() {
// hostname is resolved to ipv4:port, lets split it by ":" and get ipv4 only
let ip_port = socket_address.to_string();
let vec: Vec<&str> = ip_port.split(':').collect();
if !vec.is_empty() {
ipv4 = vec[0].to_string();
break;
}
}
}
if ipv4.is_empty() {
return Err(LauncherError::NotFound(
"No IPv4 address found for hostname".to_string(),
));
}
ipv4
}
Err(e) => {
return Err(LauncherError::Network(format!(
"Failed to resolve hostname: {}",
e
)));
}
let parsed_address = if let Ok(ipv4) = addr.parse::<Ipv4Addr>() {
ipv4
} else {
let socket_addresses = lookup_host(format!("{}:{}", addr, port))
.await
.map_err(|e| LauncherError::Network(format!("Failed to resolve hostname: {}", e)))?;

let mut found_ipv4 = None;
for socket_address in socket_addresses {
if let std::net::IpAddr::V4(ipv4) = socket_address.ip() {
found_ipv4 = Some(ipv4);
break;
}
}
};

let parsed_address = address
.parse::<Ipv4Addr>()
.map_err(|e| LauncherError::InvalidInput(format!("Invalid IP address: {}", e)))?;
found_ipv4.ok_or_else(|| {
LauncherError::NotFound("No IPv4 address found for hostname".to_string())
})?
};

let socket = UdpSocket::bind("0.0.0.0:0")
.await
Expand Down Expand Up @@ -186,8 +160,10 @@ impl Query {
Err(e) => return Err(LauncherError::from(e)),
};

if amt == 0 {
return Err(LauncherError::Network("No data received".to_string()));
if amt < 11 {
return Err(LauncherError::Network(
"No data received or packet too short".to_string(),
));
}

let query_type = buf[10] as char;
Expand Down