zelo72
/
flodgatt
mirror of https://github.com/mastodon/flodgatt
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix unix socket permission issue

This commit is contained in:
Daniel Sockwell 2020-01-08 21:59:15 -05:00
parent 20b9c7b593
commit cdc30e5d74
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.rs
View File

@ -59,6 +59,7 @@ fn main() {
let websocket_routes = ws::extract_user_or_reject(pg_conn.clone())
.and(warp::ws::ws2())
.map(move |user: user::User, ws: Ws2| {
warn!("Incoming request");
let token = user.access_token.clone();
// Create a new ClientAgent
let mut client_agent = client_agent_ws.clone_with_shared_receiver();
@ -85,17 +86,23 @@ fn main() {
.allow_methods(cfg.cors.allowed_methods)
.allow_headers(cfg.cors.allowed_headers);
let server_addr = net::SocketAddr::new(*cfg.address, cfg.port.0);
let health = warp::path!("api" / "v1" / "streaming" / "health").map(|| "OK");
if let Some(socket) = &*cfg.unix_socket {
warn!("Using Unix sockets is a WIP that is currently unsupported and untested.");
std::fs::remove_file(socket).unwrap();
use std::fs;
use std::os::unix::fs::PermissionsExt;
warn!("Using Unix socket {}", socket);
use tokio::net::UnixListener;
let incoming = UnixListener::bind(socket).unwrap().incoming();
let listener = UnixListener::bind(socket).unwrap();
let new_perms = PermissionsExt::from_mode(0o666);
fs::set_permissions(socket, new_perms).unwrap();
let incoming = listener.incoming();
warp::serve(health.or(websocket_routes.or(sse_routes).with(cors))).run_incoming(incoming);
} else {
let server_addr = net::SocketAddr::new(*cfg.address, cfg.port.0);
warp::serve(health.or(websocket_routes.or(sse_routes).with(cors))).run(server_addr);
}
}