const METADATA_MAX_LEN: usize = MAX_OVERHEAD;
+type AllClients = HashMap<ClientName, ClientHandles>;
+
+struct ClientHandles {
+ ic: Arc<InstanceConfig>,
+ web: tokio::sync::mpsc::Sender<WebRequest>,
+}
+
+struct WebRequest {
+ reply: tokio::sync::oneshot::Sender<()>,
+}
+
async fn handle(
-// context: (),
-// addr: SocketAddr,
- req: hyper::Request<hyper::Body>
-) -> Result<hyper::Response<hyper::Body>, Infallible> {
+ all_clients: Arc<AllClients>,
+ req: hyper::Request<hyper::Body>
+) -> Result<hyper::Response<hyper::Body>, Void> {
if req.method() == Method::GET {
let mut resp = hyper::Response::new(hyper::Body::from("hippotat\r\n"));
resp.headers_mut().insert(
r#"first multipart component must be name="m""#
)) }
- let nl = memchr::memchr2(b'\r', b'\n', comp.payload_start)
- .ok_or_else(|| anyhow!("no newline in first metadata line?"))?;
-
- let client = &comp.payload_start[0..nl];
- let client = str::from_utf8(client).context("client addr utf-8")?;
- let client: IpAddr = client.parse().context("client address")?;
+ let mut meta = MetadataFieldIterator::new(comp.payload_start);
+
+ let client: ClientName = meta.need_parse().context("client addr")?;
+
+ let (client_time, hmac_got) = (||{
+ let token: &str = meta.need_next().context(r#"find in "m""#)?;
+ let (time_t, hmac_got) = token.split_once(' ')
+ .ok_or_else(|| anyhow!("split"))?;
+ let time_t: u64 = time_t.parse().context("parse time_t")?;
+ Ok::<_,AE>((time_t, hmac_got))
+ })().context("token")?;
+
+ let client = all_clients.get(&client);
+
+ // 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
+ // HMAC computation by always doing it. We hope that the compiler
+ // doesn't produce a specialised implementation for the dummy
+ // secret value.
+ let client_exists = subtle::Choice::from(client.is_some() as u8);
+ let secret = client.map(|c| c.ic.secret.0.as_bytes());
+ let secret = secret.unwrap_or(&[0x55; HMAC_B][..]);
+ let client_time_s = format!("{:x}", client_time);
+ let hmac_exp = token_hmac(secret, client_time_s.as_bytes());
+ // We also definitely want a consttime memeq for the hmac value
+ let hmac_ok = hmac_got.as_bytes().ct_eq(&hmac_exp);
+ if ! bool::from(hmac_ok & client_exists) {
+ throw!(anyhow!("xxx should be a 403 error"));
+ }
+ let client = client.unwrap();
+ let now = time_t_now();
+ let chk_skew = |a: u64, b: u64, c_ahead_behind| {
+ if let Some(a_ahead) = a.checked_sub(b) {
+ if a_ahead > client.ic.max_clock_skew.as_secs() {
+ throw!(anyhow!("too much clock skew (client {} by {})",
+ c_ahead_behind, a_ahead));
+ }
+ }
+ Ok::<_,AE>(())
+ };
+ chk_skew(client_time, now, "ahead")?;
+ chk_skew(now, client_time, "behind")?;
+
eprintln!("boundary={:?} start={} name={:?} client={}",
- boundary, start, &comp.name, client);
+ boundary, start, &comp.name, &client.ic);
Ok::<_,AE>(())
}.await {
Ok(hyper::Response::new(hyper::Body::from("Hello World")))
}
+async fn run_client(_ic: Arc<InstanceConfig>, _web: mpsc::Receiver<WebRequest>)
+ -> Result<Void, AE>
+{
+ tokio::time::sleep(Duration::from_secs(1_000_000_000)).await;
+ Err(anyhow!("xxx"))
+}
#[tokio::main]
async fn main() {
let opts = Opts::from_args();
- let mut hservers = vec![];
- let (ics, global,ipif) = config::startup(
+ let mut tasks: Vec<(
+ JoinHandle<AE>,
+ String,
+ )> = vec![];
+
+ let (global, ipif) = config::startup(
"hippotatd", LinkEnd::Server,
&opts.config, &opts.log, |ics|
{
let global = config::InstanceConfigGlobal::from(&ics);
let ipif = Ipif::start(&global.ipif, None)?;
- let make_service = hyper::service::make_service_fn(|_conn| async {
- Ok::<_, Infallible>(hyper::service::service_fn(handle))
- });
+ let all_clients: AllClients = ics.into_iter().map(|ic| {
+ let ic = Arc::new(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 ic_ = ic.clone();
+ tasks.push((tokio::spawn(async move {
+ run_client(ic_, web_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)
+ }) ) } }
+ );
+
let addr = SocketAddr::new(*addr, global.port);
let server = hyper::Server::try_bind(&addr)
.context("bind")?
.http1_preserve_header_case(true)
.serve(make_service);
info!("listening on {}", &addr);
- let task = tokio::task::spawn(server);
- hservers.push(task);
+ let task = tokio::task::spawn(async move {
+ match server.await {
+ Ok(()) => anyhow!("shut down?!"),
+ Err(e) => e.into(),
+ }
+ });
+ tasks.push((task, format!("http server {}", addr)));
}
-
- Ok((ics, global, ipif))
+
+ Ok((global, ipif))
});
- let x = future::select_all(&mut hservers).await;
- error!("xxx hserver {:?}", &x);
+ let died = future::select_all(
+ tasks.iter_mut().map(|e| &mut e.0)
+ ).await;
+ error!("xxx {:?}", &died);
ipif.quitting(None).await;
- dbg!(ics, global);
+ dbg!(global);
}
~ian / hippotat.git / blobdiff