}
const METADATA_MAX_LEN: usize = MAX_OVERHEAD;
+const INTERNAL_QUEUE: usize = 15; // xxx: config
-type AllClients = HashMap<ClientName, ClientHandles>;
+#[derive(Debug)]
+pub struct Global {
+ config: config::InstanceConfigGlobal,
+ all_clients: HashMap<ClientName, Client>,
+}
-struct ClientHandles {
+#[derive(Debug)]
+pub struct Client {
ic: Arc<InstanceConfig>,
- web: tokio::sync::mpsc::Sender<WebRequest>,
+ web: mpsc::Sender<WebRequest>,
+ route: mpsc::Sender<RoutedPacket>,
}
+pub type RoutedPacket = Box<[u8]>; // not MIME data
+
/// Sent from hyper worker pool task to client task
#[allow(dead_code)] // xxx
+#[derive(Debug)]
struct WebRequest {
// initial part of body
// used up to and including first 2 lines of metadata
initial_remaining: usize,
length_hint: usize,
body: hyper::body::Body,
- reply_to: tokio::sync::oneshot::Sender<WebResponse>,
+ boundary_finder: multipart::BoundaryFinder,
+ reply_to: oneshot::Sender<WebResponse>,
warnings: Warnings,
+ conn: Arc<String>,
}
/// Reply from client task to hyper worker pool task
#[allow(dead_code)] // xxx
+#[derive(Debug)]
struct WebResponse {
warnings: Warnings,
data: Result<WebResponseData, AE>,
}
-type WebResponseData = ();
+type WebResponseData = Vec<u8>;
+
+#[throws(PacketError)]
+pub async fn route_packet(global: &Global,
+ conn: &str, link: &(dyn Display + Sync),
+ packet: RoutedPacket, daddr: IpAddr)
+{
+ let c = &global.config;
+ let len = packet.len();
+ let trace = |how: &str, why: &str| {
+ trace!("{} {} {} {} {:?} len={}",
+ conn, link, how, why, daddr, len);
+ };
+
+ let (dest, why) =
+ if daddr == c.vaddr || ! c.vnetwork.iter().any(|n| n.contains(&daddr)) {
+ (None, "ipif-inbound-xxx")
+ } else if daddr == c.vrelay {
+ (None, "vrelay")
+ } else if let Some(client) = global.all_clients.get(&ClientName(daddr)) {
+ (Some(&client.route), "client")
+ } else {
+ (None, "no-client")
+ };
+
+ let dest = if let Some(d) = dest { d } else {
+ trace("discard", why); return;
+ };
+
+ match dest.send(packet).await {
+ Ok(()) => trace("forward", why),
+ Err(_) => trace("task-crashed!", why),
+ }
+}
async fn handle(
- all_clients: Arc<AllClients>,
+ conn: Arc<String>,
+ global: Arc<Global>,
req: hyper::Request<hyper::Body>
-) -> Result<hyper::Response<hyper::Body>, Void> {
+) -> Result<hyper::Response<hyper::Body>, hyper::http::Error> {
if req.method() == Method::GET {
let mut resp = hyper::Response::new(hyper::Body::from("hippotat\r\n"));
resp.headers_mut().insert(
let mut warnings: Warnings = default();
- match async {
+ async {
let get_header = |hn: &str| {
let mut values = req.headers().get_all(hn).iter();
Err(ReadLimitedError::Hyper(e)) => throw!(e),
};
- let finder = memmem::Finder::new(&boundary);
- let mut find_iter = finder.find_iter(&initial);
+ let boundary_finder = memmem::Finder::new(&boundary);
+ let mut boundary_iter = boundary_finder.find_iter(&initial);
let start = if initial.starts_with(&boundary[1..]) { boundary.len()-1 }
- else if let Some(start) = find_iter.next() { start + boundary.len() }
+ else if let Some(start) = boundary_iter.next() { start + boundary.len() }
else { throw!(anyhow!("initial boundary not found")) };
- let comp = multipart::process_component
+ let comp = multipart::process_boundary
(&mut warnings, &initial[start..], PartName::m)?
.ok_or_else(|| anyhow!(r#"no "m" component"#))?;
r#"first multipart component must be name="m""#
)) }
- let mut meta = MetadataFieldIterator::new(comp.payload_start);
+ let mut meta = MetadataFieldIterator::new(comp.payload);
let client: ClientName = meta.need_parse().context("client addr")?;
})().context("token")?;
let hmac_got = &hmac_got[0..hmac_got_l];
- let client = all_clients.get(&client);
+ let client_name = client;
+ let client = global.all_clients.get(&client_name);
// We attempt to hide whether the client exists we don't try to
// hide the hash lookup computationgs, but we do try to hide the
//dbg!(DumpHex(&hmac_exp), client.is_some());
//dbg!(DumpHex(hmac_got), hmac_ok, client_exists);
if ! bool::from(hmac_ok & client_exists) {
- throw!(anyhow!("xxx should be a 403 error"));
+ debug!("{} rejected client {}", &conn, &client_name);
+ let body = hyper::Body::from("Not authorised\r\n");
+ return Ok(
+ hyper::Response::builder()
+ .status(hyper::StatusCode::FORBIDDEN)
+ .header("Content-Type", r#"text/plain; charset="utf-8""#)
+ .body(body)
+ )
}
let client = client.unwrap();
//eprintln!("boundary={:?} start={} name={:?} client={}",
// boundary, start, &comp.name, &client.ic);
- let (reply_to, reply_recv) = tokio::sync::oneshot::channel();
+ let (reply_to, reply_recv) = oneshot::channel();
+ trace!("{} {} request, Content-Length={}",
+ &conn, &client_name, length_hint);
let wreq = WebRequest {
initial,
initial_remaining,
length_hint,
+ boundary_finder: boundary_finder.into_owned(),
body,
warnings: mem::take(&mut warnings),
- reply_to
+ reply_to,
+ conn: conn.clone(),
};
- trace!("{} request", &client.ic);
client.web.try_send(wreq)
.map_err(|_| anyhow!("client task shut down!"))?;
let reply: WebResponse = reply_recv.await?;
warnings = reply.warnings;
-
- reply.data
- }.await {
- Ok(()) => {
- },
- Err(e) => {
- eprintln!("error={}", e);
+ let data = reply.data?;
+
+ if warnings.warnings.is_empty() {
+ trace!("{} {} responding, {}",
+ &conn, &client_name, data.len());
+ } else {
+ debug!("{} {} responding, {} warnings={:?}",
+ &conn, &client_name, data.len(),
+ &warnings.warnings);
}
- }
- eprintln!("warnings={:?}", &warnings);
-
- Ok(hyper::Response::new(hyper::Body::from("Hello World")))
+ let data = hyper::Body::from(data);
+ Ok::<_,AE>(
+ hyper::Response::builder()
+ .header("Content-Type", r#"application/octet-stream"#)
+ .body(data)
+ )
+ }.await.unwrap_or_else(|e| {
+ debug!("{} error {}", &conn, &e);
+ let mut errmsg = format!("ERROR\n\n{:?}\n\n", &e);
+ for w in warnings.warnings {
+ write!(errmsg, "warning: {}\n", w).unwrap();
+ }
+ hyper::Response::builder()
+ .status(hyper::StatusCode::BAD_REQUEST)
+ .header("Content-Type", r#"text/plain; charset="utf-8""#)
+ .body(errmsg.into())
+ })
}
#[allow(unused_variables)] // xxx
-async fn run_client(_ic: Arc<InstanceConfig>,
- mut web: mpsc::Receiver<WebRequest>)
+#[allow(unused_mut)] // xxx
+async fn run_client(global: Arc<Global>,
+ ic: Arc<InstanceConfig>,
+ mut web: mpsc::Receiver<WebRequest>,
+ mut routed: mpsc::Receiver<RoutedPacket>)
-> Result<Void, AE>
{
struct Outstanding {
- reply_to: tokio::sync::oneshot::Sender<WebResponse>,
- max_requests_outstanding: u32,
+ reply_to: oneshot::Sender<WebResponse>,
+ oi: OutstandingInner,
+ }
+ #[derive(Debug)]
+ struct OutstandingInner {
+ target_requests_outstanding: u32,
}
let mut outstanding: VecDeque<Outstanding> = default();
let downbound: VecDeque<(/*xxx*/)> = default();
let try_send_response = |
- reply_to: tokio::sync::oneshot::Sender<WebResponse>,
+ reply_to: oneshot::Sender<WebResponse>,
response: WebResponse
| {
reply_to.send(response)
if ! downbound.is_empty() {
outstanding.pop_front()
} else if let Some((i,_)) = outstanding.iter().enumerate().find({
- |(_,o)| outstanding.len() > o.max_requests_outstanding.sat()
+ |(_,o)| outstanding.len() > o.oi.target_requests_outstanding.sat()
}) {
Some(outstanding.remove(i).unwrap())
} else {
}
} {
let response = WebResponse {
- data: Ok(()),
+ data: Ok(vec![ /* xxx */ ]),
warnings: default(),
};
req = web.recv() =>
{
let WebRequest {
- initial, initial_remaining, length_hint, body,
- reply_to, warnings,
+ initial, initial_remaining, length_hint, mut body,
+ boundary_finder,
+ reply_to, conn, mut warnings,
} = req.ok_or_else(|| anyhow!("webservers all shut down!"))?;
match async {
- // xxx size limit
+ let initial_used = initial.len() - initial_remaining;
- let whole_request = body.try_fold(
- initial.into_vec(),
- |mut w, by| async move { w.extend_from_slice(&by); Ok(w) },
+ let whole_request = read_limited_bytes(
+ ic.max_batch_up.sat(),
+ initial,
+ length_hint,
+ &mut body
).await.context("read request body")?;
- dbg!(whole_request.len());
-
-/*
-
- multipart::ComponentIterator::resume_mid_component(
- &initial[initial_remaining..],
- */
-
- Ok::<_,AE>(())
+ let (meta, mut comps) =
+ multipart::ComponentIterator::resume_mid_component(
+ &whole_request[initial_used..],
+ boundary_finder
+ ).context("resume parsing body, after auth checks")?;
+
+ let mut meta = MetadataFieldIterator::new(&meta);
+
+ macro_rules! meta {
+ { $v:ident, ( $( $badcmp:tt )? ), $ret:expr,
+ let $server:ident, $client:ident $($code:tt)*
+ } => {
+ let $v = (||{
+ let $server = ic.$v;
+ let $client $($code)*
+ $(
+ if $client $badcmp $server {
+ throw!(anyhow!("mismatch: client={:?} {} server={:?}",
+ $client, stringify!($badcmp), $server));
+ }
+ )?
+ Ok::<_,AE>($ret)
+ })().context(stringify!($v))?;
+ //dbg!(&$v);
+ }
+ }
+
+ meta!{
+ target_requests_outstanding, ( != ), client,
+ let server, client: u32 = meta.need_parse()?;
+ }
+
+ meta!{
+ http_timeout, ( > ), client,
+ let server, client = Duration::from_secs(meta.need_parse()?);
+ }
+
+ meta!{
+ mtu, ( != ), client,
+ let server, client: u32 = meta.parse()?.unwrap_or(server);
+ }
+
+ meta!{
+ max_batch_down, (), min(client, server),
+ let server, client: u32 = meta.parse()?.unwrap_or(server);
+ }
+
+ meta!{
+ max_batch_up, ( > ), client,
+ let server, client = meta.parse()?.unwrap_or(server);
+ }
+
+ while let Some(comp) = comps.next(&mut warnings, PartName::d)? {
+ if comp.name != PartName::d {
+ warnings.add(&format_args!("unexpected part {:?}", comp.name))?;
+ }
+ checkn(Mime2Slip, mtu, comp.payload, |header| {
+ let saddr = ip_packet_addr::<false>(header)?;
+ if saddr != ic.link.client.0 { throw!(PE::Src(saddr)) }
+ let daddr = ip_packet_addr::<true>(header)?;
+ Ok(daddr)
+ }, |(daddr,packet)| route_packet(
+ &global, &conn, &ic.link.client, daddr,packet
+ ),
+ |e| Ok::<_,SlipFramesError<_>>({ warnings.add(&e)?; })
+ ).await?;
+ }
+
+ let oi = OutstandingInner {
+ target_requests_outstanding,
+ };
+ Ok::<_,AE>(oi)
}.await {
- Ok(()) => outstanding.push_back(Outstanding {
- reply_to: reply_to,
- max_requests_outstanding: 42, // xxx
- }),
+ Ok(oi) => outstanding.push_back(Outstanding { reply_to, oi }),
Err(e) => {
try_send_response(reply_to, WebResponse {
data: Err(e),
"hippotatd", LinkEnd::Server,
&opts.config, &opts.log, |ics|
{
- let global = config::InstanceConfigGlobal::from(&ics);
- let ipif = Ipif::start(&global.ipif, None)?;
+ let global_config = config::InstanceConfigGlobal::from(&ics);
- let all_clients: AllClients = ics.into_iter().map(|ic| {
- let ic = Arc::new(ic);
+ let ipif = Ipif::start(&global_config.ipif, None)?;
- let (web_send, web_recv) = mpsc::channel(
- 5 // xxx should me max_requests_outstanding but that's
+ let ics = ics.into_iter().map(Arc::new).collect_vec();
+ let (client_handles_send, client_handles_recv) = ics.iter()
+ .map(|_ic| {
+ let (web_send, web_recv) = mpsc::channel(
+ 5 // xxx should me max_requests_outstanding but that's
// marked client-only so needs rework
- );
+ );
+ let (route_send, route_recv) = mpsc::channel(
+ INTERNAL_QUEUE
+ );
+ ((web_send, route_send), (web_recv, route_recv))
+ }).unzip::<_,_,Vec<_>,Vec<_>>();
+
+ let all_clients = izip!(
+ &ics,
+ client_handles_send,
+ ).map(|(ic, (web_send, route_send))| {
+ (ic.link.client,
+ Client {
+ ic: ic.clone(),
+ web: web_send,
+ route: route_send,
+ })
+ }).collect();
+
+ let global = Arc::new(Global {
+ config: global_config,
+ all_clients,
+ });
+ for (ic, (web_recv, route_recv)) in izip!(
+ ics,
+ client_handles_recv,
+ ) {
+ let global_ = global.clone();
let ic_ = ic.clone();
tasks.push((tokio::spawn(async move {
- run_client(ic_, web_recv).await.void_unwrap_err()
+ run_client(global_, ic_, web_recv, route_recv)
+ .await.void_unwrap_err()
}), format!("client {}", &ic)));
+ }
- (ic.link.client,
- ClientHandles {
- ic,
- web: web_send,
- })
- }).collect();
- let all_clients = Arc::new(all_clients);
-
- for addr in &global.addrs {
- let all_clients_ = all_clients.clone();
- let make_service = hyper::service::make_service_fn(move |_conn| {
- let all_clients_ = all_clients_.clone();
- async { Ok::<_, Void>( hyper::service::service_fn(move |req| {
- handle(all_clients_.clone(), req)
- }) ) } }
+ for addr in &global.config.addrs {
+ let global_ = global.clone();
+ let make_service = hyper::service::make_service_fn(
+ move |conn: &hyper::server::conn::AddrStream| {
+ let global_ = global_.clone();
+ let conn = Arc::new(format!("[{}]", conn.remote_addr()));
+ async { Ok::<_, Void>( hyper::service::service_fn(move |req| {
+ handle(conn.clone(), global_.clone(), req)
+ }) ) }
+ }
);
- let addr = SocketAddr::new(*addr, global.port);
+ let addr = SocketAddr::new(*addr, global.config.port);
let server = hyper::Server::try_bind(&addr)
.context("bind")?
.http1_preserve_header_case(true)
~ian / hippotat.git / blobdiff