diff options
| author | Bryan Newbold <bnewbold@archive.org> | 2020-08-24 21:31:58 -0700 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@archive.org> | 2020-08-24 21:31:58 -0700 |
| commit | ae6aafc3d936e7e5211cf117ee581298ed74c8de (patch) | |
| tree | d6c25e13da7f7dc9d4cd47100866b7b9d4045c96 | |
| parent | f06449b68574bf141c1727fb02d13c1f0aeef406 (diff) | |
| download | es-public-proxy-ae6aafc3d936e7e5211cf117ee581298ed74c8de.tar.gz es-public-proxy-ae6aafc3d936e7e5211cf117ee581298ed74c8de.zip | |
validation progress
| -rw-r--r-- | src/lib.rs | 96 | ||||
| -rw-r--r-- | src/main.rs | 30 |
2 files changed, 112 insertions, 14 deletions
@@ -1,10 +1,14 @@ +use hyper::{Request, Body, Method, Uri}; +use http::request; use serde::{Serialize, Deserialize}; use std::collections::HashMap; + #[derive(Default, Deserialize, Debug, Clone)] pub struct ProxyConfig { - pub bind_addr: Option<String>, + pub bind_addr: Option<String>, // 127.0.0.1:9292 + pub upstream_addr: Option<String>, // 127.0.0.1:9200 pub index: Vec<IndexConfig> } @@ -13,6 +17,18 @@ pub struct IndexConfig { pub name: String, } +impl ProxyConfig { + + pub fn allow_index(&self, name: &str) -> bool { + for index in &self.index { + if index.name == name { + return true + } + } + false + } +} + #[derive(Serialize, Deserialize, Debug)] pub struct ApiRequest { pub method: String, @@ -251,3 +267,81 @@ pub struct InnerHits { sort: Option<Vec<SortElement>>, name: Option<String>, } + +#[derive(Debug)] +pub enum ParsedRequest { + Malformed(String), + ParseError(String), + NotAllowed(String), + NotSupported(String), + NotFound(String), + Allowed(Request<Body>), +} + +pub fn parse_request(req: Request<Body>, config: &ProxyConfig) -> ParsedRequest { + let (parts, body) = req.into_parts(); + + // split path into at most 3 chunks + let mut req_path = parts.uri.path(); + if req_path.starts_with("/") { + req_path = &req_path[1..]; + } + let path_chunks: Vec<&str> = req_path.split("/").collect(); + if path_chunks.len() > 3 { + return ParsedRequest::NotSupported("only request paths with up to three segments allowed".to_string()) + } + + println!("{:?}", path_chunks); + + // this is sort of like a router + match (&parts.method, path_chunks.as_slice()) { + (&Method::GET, [""]) | (&Method::HEAD, [""]) => { + parse_request_basic("", &parts, config) + }, + (&Method::POST, ["_search", "scroll"]) | (&Method::DELETE, ["_search", "scroll"]) => { + parse_request_scroll(None, &parts, body, config) + }, + (&Method::POST, ["_search", "scroll", key]) | (&Method::DELETE, ["_search", "scroll", key]) => { + parse_request_scroll(Some(key), &parts, body, config) + }, + (&Method::GET, [index, "_search"]) | (&Method::POST, [index, "_search"]) => { + parse_request_search(index, &parts, body, config) + }, + //(Method::GET, [index, "_count"]) => { + // parse_request_count(index, "_count", None, &parts, body, config) + //}, + (&Method::GET, [index, "_doc", key]) | (&Method::GET, [index, "_source", key]) => { + parse_request_read(index, path_chunks[1], key, &parts, body, config) + }, + _ => ParsedRequest::NotSupported("unknown endpoint".to_string()), + } +} + +pub fn parse_request_basic(endpoint: &str, parts: &request::Parts, config: &ProxyConfig) -> ParsedRequest { + // XXX: partial + let upstream_uri = Uri::builder() + .scheme("http") + .authority(config.upstream_addr.as_ref().unwrap_or(&"localhost:9200".to_string()).as_str()) + .path_and_query(format!("/{}", endpoint).as_str()) + .build() + .unwrap(); + println!("{:?}", upstream_uri); + let upstream_req = Request::builder() + .uri(upstream_uri) + .method(&parts.method) + .body(Body::empty()) + .unwrap(); + ParsedRequest::Allowed(upstream_req) +} + +pub fn parse_request_scroll(key: Option<&str>, parts: &request::Parts, body: Body, config: &ProxyConfig) -> ParsedRequest { + ParsedRequest::NotSupported("not yet implemented".to_string()) +} + +pub fn parse_request_search(index: &str, parts: &request::Parts, body: Body, config: &ProxyConfig) -> ParsedRequest { + ParsedRequest::NotSupported("not yet implemented".to_string()) +} + +pub fn parse_request_read(index: &str, endpoint: &str, key: &str, parts: &request::Parts, body: Body, config: &ProxyConfig) -> ParsedRequest { + ParsedRequest::NotSupported("not yet implemented".to_string()) +} diff --git a/src/main.rs b/src/main.rs index 62cfd37..017b8c8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,25 +1,29 @@ use hyper::service::{make_service_fn, service_fn}; -use hyper::{Body, Client, Request, Response, Server, Uri}; +use hyper::{Body, Client, Request, Response, Server, Uri, StatusCode}; use std::net::SocketAddr; use std::env; use toml; -use es_public_proxy::ProxyConfig; +use es_public_proxy::{ProxyConfig, ParsedRequest, parse_request}; -async fn upstream_req(req: Request<Body>, _config: ProxyConfig) -> Result<Response<Body>, hyper::Error> { +async fn upstream_req(req: Request<Body>, config: ProxyConfig) -> Result<Response<Body>, hyper::Error> { println!("hit: {}", req.uri()); - let req_uri = req.uri(); - let upstream_uri = Uri::builder() - .scheme("http") - .authority("localhost:9200") - .path_and_query(req_uri.path_and_query().unwrap().as_str()) - .build() - .unwrap(); - - let res = Client::new().get(upstream_uri).await?; + let parsed = parse_request(req, &config); + let resp = match parsed { + ParsedRequest::Allowed(upstream_req) => { + println!("sending request..."); + Client::new().request(upstream_req).await? + } + other => { + Response::builder() + .status(StatusCode::NOT_FOUND) + .body(format!("oh noooo! {:?}", other).into()) + .unwrap() + }, + }; println!("resp!"); - Ok(res) + Ok(resp) } async fn shutdown_signal() { |