MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2024-12-27 15:45:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

endpoint to debug --trust-forward-hdrs for #26

Browse Source
This commit is contained in:
Scott Lamb 2018-12-01 00:44:19 -08:00
parent d35a4592e3
commit 087fdafc61
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/web.rs
View File

@ -71,6 +71,7 @@ lazy_static! {
#[derive(Debug)] #[derive(Debug)]
enum Path { enum Path {
TopLevel, // "/api/" TopLevel, // "/api/"
Request, // "/api/request"
InitSegment([u8; 20]), // "/api/init/<sha1>.mp4" InitSegment([u8; 20]), // "/api/init/<sha1>.mp4"
Camera(Uuid), // "/api/cameras/<uuid>/" Camera(Uuid), // "/api/cameras/<uuid>/"
StreamRecordings(Uuid, db::StreamType), // "/api/cameras/<uuid>/<type>/recordings" StreamRecordings(Uuid, db::StreamType), // "/api/cameras/<uuid>/<type>/recordings"
@ -90,11 +91,12 @@ fn decode_path(path: &str) -> Path {
if path == "/" { if path == "/" {
return Path::TopLevel; return Path::TopLevel;
} }
if path == "/login" { match path {
return Path::Login; "/request" => return Path::Request,
} else if path == "/logout" { "/login" => return Path::Login,
return Path::Logout; "/logout" => return Path::Logout,
} _ => {},
};
if path.starts_with("/init/") { if path.starts_with("/init/") {
if path.len() != 50 || !path.ends_with(".mp4") { if path.len() != 50 || !path.ends_with(".mp4") {
return Path::NotFound; return Path::NotFound;
@ -482,6 +484,22 @@ impl ServiceInner {
} }
} }
fn request(&self, req: &Request<::hyper::Body>) -> ResponseResult {
let authreq = self.authreq(req);
Ok(plain_response(StatusCode::OK, format!(
"when: {}\n\
addr: {:?}\n\
user_agent: {:?}\n\
secure: {:?}",
time::at(time::Timespec{sec: authreq.when_sec.unwrap(), nsec: 0})
.strftime("%FT%T")
.map(|f| f.to_string())
.unwrap_or_else(|e| e.to_string()),
&authreq.addr,
authreq.user_agent.map(|u| String::from_utf8_lossy(&u[..]).into_owned()),
self.is_secure(req))))
}
fn is_secure(&self, req: &Request<::hyper::Body>) -> bool { fn is_secure(&self, req: &Request<::hyper::Body>) -> bool {
self.trust_forward_hdrs && self.trust_forward_hdrs &&
req.headers().get("X-Forwarded-Proto") req.headers().get("X-Forwarded-Proto")
@ -769,7 +787,7 @@ impl ::hyper::service::Service for Service {
let p = decode_path(req.uri().path()); let p = decode_path(req.uri().path());
let require_auth = self.0.require_auth && match p { let require_auth = self.0.require_auth && match p {
Path::NotFound | Path::Login | Path::Logout | Path::Static => false, Path::NotFound | Path::Request | Path::Login | Path::Logout | Path::Static => false,
_ => true, _ => true,
}; };
debug!("request on: {}: {:?}, require_auth={}", req.uri(), p, require_auth); debug!("request on: {}: {:?}, require_auth={}", req.uri(), p, require_auth);
@ -784,6 +802,7 @@ impl ::hyper::service::Service for Service {
match decode_path(req.uri().path()) { match decode_path(req.uri().path()) {
Path::InitSegment(sha1) => wrap_r(self.0.init_segment(sha1, &req)), Path::InitSegment(sha1) => wrap_r(self.0.init_segment(sha1, &req)),
Path::TopLevel => wrap_r(self.0.top_level(&req, session)), Path::TopLevel => wrap_r(self.0.top_level(&req, session)),
Path::Request => wrap_r(self.0.request(&req)),
Path::Camera(uuid) => wrap_r(self.0.camera(&req, uuid)), Path::Camera(uuid) => wrap_r(self.0.camera(&req, uuid)),
Path::StreamRecordings(uuid, type_) => { Path::StreamRecordings(uuid, type_) => {
wrap_r(self.0.stream_recordings(&req, uuid, type_)) wrap_r(self.0.stream_recordings(&req, uuid, type_))