kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: tighten migration URL validation

Browse Source 
For TLS we have to parse the hostname from the given migration URL. For
that we have to make a few assumptions about the URL (e.g. it always has
a port). To catch problems early, we tighten the URL validation.

On-behalf-of: SAP sebastian.eydam@sap.com
Signed-off-by: Sebastian Eydam <sebastian.eydam@cyberus-technology.de>
This commit is contained in:
Sebastian Eydam
2026-04-15 09:53:07 +02:00
committed by Rob Bradford
parent 0ec2ae376b
commit 001bdde75f
2 changed files with 184 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
vmm/src/api/mod.rs
View File

@@ -53,7 +53,9 @@ pub use self::http::{start_http_fd_thread, start_http_path_thread};
use crate::Error as VmmError;
use crate::config::RestoreConfig;
use crate::device_tree::DeviceTree;
use crate::migration_transport::MAX_MIGRATION_CONNECTIONS;
use crate::migration_transport::{
MAX_MIGRATION_CONNECTIONS, TcpAddressParseError, tcp_address_to_server_name,
};
use crate::vm::{Error as VmError, VmState};
use crate::vm_config::{
DeviceConfig, DiskConfig, FsConfig, GenericVhostUserConfig, NetConfig, PmemConfig,
@@ -301,6 +303,11 @@ pub enum VmSendMigrationConfigError {
#[error("Error parsing send migration parameters")]
ParseError(#[source] OptionParserError),
#[error(
"Error validating send migration parameters: destination_url must use tcp:<host>:<port> or unix:<path>."
)]
InvalidDestinationUrl(#[source] TcpAddressParseError),
#[error("Error validating send migration parameters")]
ValidationError(String),
}
@@ -441,26 +448,24 @@ impl VmSendMigrationData {
}
pub fn validate(&self) -> Result<(), VmSendMigrationConfigError> {
match self.destination_url.as_str() {
url if url
.strip_prefix("tcp:")
.is_some_and(|addr| !addr.is_empty()) => {}
url if url
.strip_prefix("unix:")
.is_some_and(|path| !path.is_empty()) =>
{
if self.connections.get() > 1 {
return Err(VmSendMigrationConfigError::ValidationError(
"UNIX sockets and connections option cannot be used at the same time."
.to_string(),
));
}
}
_ => {
if let Some(addr) = self.destination_url.strip_prefix("tcp:") {
tcp_address_to_server_name(addr)
.map_err(VmSendMigrationConfigError::InvalidDestinationUrl)?;
} else if self
.destination_url
.strip_prefix("unix:")
.is_some_and(|path| !path.is_empty())
{
if self.connections.get() > 1 {
return Err(VmSendMigrationConfigError::ValidationError(
"destination_url must use tcp:<host>:<port> or unix:<path>.".to_string(),
"UNIX sockets and connections option cannot be used at the same time."
.to_string(),
));
}
} else {
return Err(VmSendMigrationConfigError::ValidationError(
"destination_url must use tcp:<host>:<port> or unix:<path>.".to_string(),
));
}
if self.connections.get() > MAX_MIGRATION_CONNECTIONS {
@@ -1782,6 +1787,14 @@ mod unit_tests {
assert_eq!(data.timeout_strategy, TimeoutStrategy::default());
assert_eq!(data.connections, VmSendMigrationData::default_connections());
let data = VmSendMigrationData::parse("destination_url=tcp:[2001:db8::1]:8080")
.expect("IPv6 migration string should parse");
assert_eq!(data.destination_url, "tcp:[2001:db8::1]:8080");
let data = VmSendMigrationData::parse("destination_url=tcp:destination.example:8080")
.expect("hostname migration string should parse");
assert_eq!(data.destination_url, "tcp:destination.example:8080");
// Missing destination_url is an error
VmSendMigrationData::parse("local=on,downtime_ms=200").unwrap_err();
@@ -1818,6 +1831,16 @@ mod unit_tests {
// Invalid destination URL scheme is rejected
VmSendMigrationData::parse("destination_url=file:///tmp/migration").unwrap_err();
assert!(matches!(
VmSendMigrationData::parse("destination_url=tcp:192.168.1.1").unwrap_err(),
VmSendMigrationConfigError::InvalidDestinationUrl(TcpAddressParseError::MissingPort)
));
assert!(matches!(
VmSendMigrationData::parse("destination_url=tcp:[2001:db8::1]").unwrap_err(),
VmSendMigrationConfigError::InvalidDestinationUrl(
TcpAddressParseError::MissingPortSeparatorAfterBracketedHost
)
));
// Local migration requires a UNIX socket destination
VmSendMigrationData::parse("destination_url=tcp:192.168.1.1:8080,local=yes").unwrap_err();