YGGverse/agate
1
0
Fork 0
mirror of https://github.com/YGGverse/agate.git synced 2026-04-09 13:05:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Take port as a separate command-line argument

Browse source
This commit is contained in:
Matt Brubeck 2021-01-16 10:16:52 -08:00
parent 4e7d09204f
commit dd4be5b9f6
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -33,7 +33,9 @@ openssl req -x509 -newkey rsa:4096 -keyout key.rsa -out cert.pem \
agate --content path/to/content/ \ agate --content path/to/content/ \
--key key.rsa \ --key key.rsa \
--cert cert.pem \ --cert cert.pem \
--addr [::]:1965 \ --addr :: \
--addr 0.0.0.0 \
--port 1965 \
--hostname example.com \ --hostname example.com \
--lang en-US --lang en-US
``` ```

26
src/main.rs
View file

@ -11,6 +11,7 @@ use {
ffi::OsStr, ffi::OsStr,
fs::File, fs::File,
io::BufReader, io::BufReader,
net::{IpAddr, SocketAddr},
path::Path, path::Path,
sync::Arc, sync::Arc,
}, },
@ -28,8 +29,11 @@ fn main() -> Result {
env_logger::Builder::new().parse_filters("info").init(); env_logger::Builder::new().parse_filters("info").init();
} }
Runtime::new()?.block_on(async { Runtime::new()?.block_on(async {
let listener = TcpListener::bind(&ARGS.sock_addr).await?; let port = ARGS.port;
log::info!("Listening on {}...", ARGS.sock_addr); let sock_addrs: Vec<_> = ARGS.addrs.iter().map(|addr| SocketAddr::new(*addr, port)).collect();
let listener = TcpListener::bind(&sock_addrs[..]).await?;
log::info!("Listening on {:?}...", sock_addrs);
loop { loop {
let (stream, _) = listener.accept().await?; let (stream, _) = listener.accept().await?;
tokio::spawn(async { tokio::spawn(async {
@ -51,7 +55,8 @@ static ARGS: Lazy<Args> = Lazy::new(|| {
}); });
struct Args { struct Args {
sock_addr: String, addrs: Vec<IpAddr>,
port: u16,
content_dir: String, content_dir: String,
cert_file: String, cert_file: String,
key_file: String, key_file: String,
@ -67,7 +72,8 @@ fn args() -> Result<Args> {
opts.optopt("", "content", "Root of the content directory (default ./content)", "DIR"); opts.optopt("", "content", "Root of the content directory (default ./content)", "DIR");
opts.optopt("", "cert", "TLS certificate PEM file (default ./cert.pem)", "FILE"); opts.optopt("", "cert", "TLS certificate PEM file (default ./cert.pem)", "FILE");
opts.optopt("", "key", "PKCS8 private key file (default ./key.rsa)", "FILE"); opts.optopt("", "key", "PKCS8 private key file (default ./key.rsa)", "FILE");
opts.optopt("", "addr", "Address to listen on (default 0.0.0.0:1965)", "IP:PORT"); opts.optmulti("", "addr", "Address to listen on (default 0.0.0.0 and [::])", "IP");
opts.optopt("", "port", "Port to listen on (default 1965)", "PORT");
opts.optopt("", "hostname", "Domain name of this Gemini server (optional)", "NAME"); opts.optopt("", "hostname", "Domain name of this Gemini server (optional)", "NAME");
opts.optopt("", "lang", "RFC 4646 Language code(s) for text/gemini documents", "LANG"); opts.optopt("", "lang", "RFC 4646 Language code(s) for text/gemini documents", "LANG");
opts.optflag("s", "silent", "Disable logging output"); opts.optflag("s", "silent", "Disable logging output");
@ -83,8 +89,16 @@ fn args() -> Result<Args> {
Some(s) => Some(Host::parse(&s)?), Some(s) => Some(Host::parse(&s)?),
None => None, None => None,
}; };
let mut addrs = vec![];
for i in matches.opt_strs("addr") {
addrs.push(i.parse()?);
}
if addrs.is_empty() {
addrs = vec![ "::".parse().unwrap(), "0.0.0.0".parse().unwrap()];
}
Ok(Args { Ok(Args {
sock_addr: matches.opt_get_default("addr", "0.0.0.0:1965".into())?, addrs,
port: matches.opt_get_default("port", 1965)?,
content_dir: check_path(matches.opt_get_default("content", "content".into())?)?, content_dir: check_path(matches.opt_get_default("content", "content".into())?)?,
cert_file: check_path(matches.opt_get_default("cert", "cert.pem".into())?)?, cert_file: check_path(matches.opt_get_default("cert", "cert.pem".into())?)?,
key_file: check_path(matches.opt_get_default("key", "key.rsa".into())?)?, key_file: check_path(matches.opt_get_default("key", "key.rsa".into())?)?,
@ -166,7 +180,7 @@ async fn parse_request(stream: &mut TlsStream<TcpStream>) -> std::result::Result
} }
} }
if let Some(port) = url.port() { if let Some(port) = url.port() {
if !ARGS.sock_addr.ends_with(&format!(":{}", port)) { if port != ARGS.port {
return Err((53, "proxy request refused")); return Err((53, "proxy request refused"));
} }
} }