Skip to content

Commit

Permalink
GH-744: Finished all urgent comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@Syther007
Syther007 committed Nov 25, 2024
1 parent 3d4f552 commit 4de72c8
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 71 deletions.
25 changes: 0 additions & 25 deletions node/src/neighborhood/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2627,31 +2627,6 @@ mod tests {
assert_eq!(result, None);
}

#[test]
fn route_query_responds_with_none_when_wildcard_ip_is_requested() {
init_test_logging();
let test_name = "route_query_responds_with_none_when_wildcard_ip_is_requested";
let system = System::new(test_name);
let mut subject = make_standard_subject();
subject.logger = Logger::new(test_name);
let addr: Addr<Neighborhood> = subject.start();
let sub: Recipient<RouteQueryMessage> = addr.recipient::<RouteQueryMessage>();

let future = sub.send(RouteQueryMessage::data_indefinite_route_request(
Some("0.0.0.0".to_string()),
430,
));

System::current().stop_with_code(0);
system.run();
let result = future.wait().unwrap();
assert_eq!(result, None);
TestLogHandler::new().exists_log_containing(&format!(
"ERROR: {}: Request to wildcard IP detected 0.0.0.0. Most likely because Blockchain Service URL is not set",
test_name
));
}

#[test]
fn route_query_works_when_node_is_set_for_one_hop_and_no_consuming_wallet() {
let cryptde = main_cryptde();
Expand Down
118 changes: 72 additions & 46 deletions node/src/proxy_server/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1068,25 +1068,13 @@ impl IBCDHelper for IBCDHelperReal {
let timestamp = msg.timestamp;
let payload = match proxy.make_payload(msg, &stream_key) {
Ok(payload) => {
// todo!("Hit me");
debug!(Logger::new("test"), "*url: {:?}", payload.target_hostname);
let mut error_message_opt = None;
if let Some(host_name) = &payload.target_hostname {
error_message_opt = match IpAddr::from_str(host_name) {
Ok(ip_addr) => match ip_addr {
IpAddr::V4(ipv4addr) => validate4(ipv4addr),
IpAddr::V6(ipv6addr) => validate6(ipv6addr)
},
Err(_) => validate_name(host_name)
};
}
debug!(Logger::new("test"), "*Error message: {:?}", error_message_opt);

match error_message_opt {
None => payload,
Some(e) => return Err(format!("Request to wildcard IP detected - {} (Most likely because Blockchain Service URL is not set)", e))
if let Some(hostname) = &payload.target_hostname {
if let Err(e) = Hostname::new(hostname).is_valid() {
return Err(format!("Request to wildcard IP detected - {} (Most likely because Blockchain Service URL is not set)", e));
}
}
},
payload
}
Err(e) => return Err(e),
};

Expand Down Expand Up @@ -1233,7 +1221,6 @@ struct Hostname {
}

impl Hostname {
#[allow(dead_code)]
fn new(raw_url: &str) -> Self {
let regex = Regex::new(
r"^((http[s]?|ftp):/)?/?([^:/\s]+)((/\w+)*/)([\w\-.]+[^#?\s]+)(.*)?(#[\w\-]+)?$",
Expand All @@ -1248,38 +1235,43 @@ impl Hostname {
};
Self { hostname }
}
}

fn validate4(addr: Ipv4Addr) -> Option<String> {
return if addr.octets() == [0, 0, 0, 0] {
Some("0.0.0.0".to_string())
}
else if addr.octets() == [127, 0, 0, 1] {
Some("127.0.0.1".to_string())
}
else {
None
fn is_valid(&self) -> Result<(), String> {
match IpAddr::from_str(&self.hostname) {
Ok(ip_addr) => match ip_addr {
IpAddr::V4(ipv4addr) => Self::validate_ipv4(ipv4addr),
IpAddr::V6(ipv6addr) => Self::validate_ipv6(ipv6addr),
},
Err(_) => Self::validate_raw_string(&self.hostname),
}
}
}

fn validate6(addr: Ipv6Addr) -> Option<String> {
return if addr.segments() == [0, 0, 0, 0, 0, 0, 0, 0] {
Some("::".to_string())
}
else if addr.segments() == [0, 0, 0, 0, 0, 0, 0, 1] {
Some("::1".to_string())
}
else {
None
fn validate_ipv4(addr: Ipv4Addr) -> Result<(), String> {
if addr.octets() == [0, 0, 0, 0] {
Err("0.0.0.0".to_string())
} else if addr.octets() == [127, 0, 0, 1] {
Err("127.0.0.1".to_string())
} else {
Ok(())
}
}
}

fn validate_name(name: &str) -> Option<String> {
return if name == "localhost" {
Some("localhost".to_string())
fn validate_ipv6(addr: Ipv6Addr) -> Result<(), String> {
if addr.segments() == [0, 0, 0, 0, 0, 0, 0, 0] {
Err("::".to_string())
} else if addr.segments() == [0, 0, 0, 0, 0, 0, 0, 1] {
Err("::1".to_string())
} else {
Ok(())
}
}
else {
None

fn validate_raw_string(name: &str) -> Result<(), String> {
if name == "localhost" {
Err("localhost".to_string())
} else {
Ok(())
}
}
}

Expand Down Expand Up @@ -2594,7 +2586,7 @@ mod tests {
let test_name = "proxy_server_sends_a_message_with_error_when_quad_zeros_are_detected";
let cryptde = main_cryptde();
let http_request = b"GET /index.html HTTP/1.1\r\nHost: 0.0.0.0\r\n\r\n";
let (proxy_server_mock, _, proxy_server_recording_arc) = make_recorder();
let (proxy_server_mock, _, _) = make_recorder();
let route_query_response = None;
let (neighborhood_mock, _, _) = make_recorder();
let neighborhood_mock =
Expand Down Expand Up @@ -6024,6 +6016,40 @@ mod tests {
assert_eq!(expected_result, clean_hostname);
}

#[test]
fn hostname_is_valid_works() {
// IPv4
assert_eq!(
Hostname::new("0.0.0.0").is_valid(),
Err("0.0.0.0".to_string())
);
assert_eq!(
Hostname::new("127.0.0.1").is_valid(),
Err("127.0.0.1".to_string())
);
assert_eq!(Hostname::new("192.168.1.158").is_valid(), Ok(()));
// IPv6
assert_eq!(
Hostname::new("0:0:0:0:0:0:0:0").is_valid(),
Err("::".to_string())
);
assert_eq!(
Hostname::new("0:0:0:0:0:0:0:1").is_valid(),
Err("::1".to_string())
);
assert_eq!(
Hostname::new("2001:0db8:85a3:0000:0000:8a2e:0370:7334").is_valid(),
Ok(())
);
// Hostname
assert_eq!(
Hostname::new("localhost").is_valid(),
Err("localhost".to_string())
);
assert_eq!(Hostname::new("example.com").is_valid(), Ok(()));
assert_eq!(Hostname::new("https://example.com").is_valid(), Ok(()));
}

#[test]
#[should_panic(
expected = "ProxyServer should never get ShutdownStreamMsg about clandestine stream"
Expand Down

0 comments on commit 4de72c8

Please sign in to comment.