oreganoli/zhur - Change QUPSHDL6MQBVCRQPZ3O7MMG27FJYCASSOWN6LI6X5K3VOL7TCAVAC

gateway now sees incoming IP addresses

Created by oreganoli on January 11, 2021

QUPSHDL6MQBVCRQPZ3O7MMG27FJYCASSOWN6LI6X5K3VOL7TCAVAC

Dependencies

In channels

main

Change contents

Replacement in zhur_gate/src/lib.rs at line 3 [2.115]

B:BD[2.172] → [2.172:249]

use hyper::{
    Body,
    Request,
    Response,
    Server,
    service::{

[2.172]

[2.249]

use hyper::{Server, server::conn::AddrStream, service::{

Replacement in zhur_gate/src/lib.rs at line 6 [2.115]
B:BD[2.293] → [2.293:302]
```
    }
};
```
[2.293]
[2.302]
```
    }};
```

Replacement in zhur_gate/src/lib.rs at line 10 [2.115]

B:BD[2.329] → [2.329:455]

async fn handle_reqs(_req: Request<Body>) -> Result<Response<Body>, Infallible> {
    Ok(Response::new("Hi there!".into()))
}

[2.329]

[2.455]

/// HTTP request handling code.
mod handle;
use handle::{FullRequest, handle_req};

Replacement in zhur_gate/src/lib.rs at line 30 [2.115]

B:BD[2.969] → [2.969:1081]

    let make_svc = make_service_fn(|_conn| async {
        Ok::<_, Infallible>(service_fn(handle_reqs))
    });

[2.969]

[2.1081]

    let make_svc = make_service_fn(move |conn: &AddrStream| {
            let ip = conn.remote_addr().to_string();
            async move {
                Ok::<_, Infallible>(service_fn(move |req| handle_req(FullRequest{ req, ip: ip.clone() })))
            }
        }
    );

File addition: handle.rs (-rw-r--r--)

[3.19]

use hyper::{
    Body,
    Request,
    Response
};
use std::convert::Infallible;
/// All the info we need to produce a Zhur invocation from an HTTP request.
pub struct FullRequest {
    /// The request itself.
    pub req: Request<Body>,
    /// The IP address the request is coming from, represented as a string.
    pub ip: String,
}
/// Transforms an HTTP request into an HTTP response.
pub async fn handle_req(req: FullRequest) -> Result<Response<Body>, Infallible> {
    let text = format!("Hi there, {}!", req.ip);
    Ok(Response::new(text.into()))
}