Skip to content

Commit

Permalink
feat: listen 0.0.0.0 by default
Browse files Browse the repository at this point in the history
  • Loading branch information
sigoden committed Jun 3, 2022
1 parent c3dd0f0 commit 9dda55b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 34 deletions.
18 changes: 8 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ Duf is a fully functional file server.
cargo install duf
```

### With docker

```
docker run -v /tmp:/tmp -p 5000:5000 --rm -it docker.io/sigoden/duf /tmp
```

### Binaries on macOS, Linux, Windows

Download from [Github Releases](https://github.com/sigoden/duf/releases), unzip and add duf to your $PATH.
Expand All @@ -50,7 +56,7 @@ OPTIONS:
--allow-delete Allow delete files/folders
--allow-symlink Allow symlink to files/folders outside root directory
--allow-upload Allow upload files/folders
-b, --bind <address> Specify bind address [default: 127.0.0.1]
-b, --bind <address> Specify bind address [default: 0.0.0.0]
--cors Enable CORS, sets `Access-Control-Allow-Origin: *`
-h, --help Print help information
-p, --port <port> Specify port to listen on [default: 5000]
Expand All @@ -76,18 +82,10 @@ duf
duf folder_name
```

Listen on all Interfaces and port 3000

```
duf -b 0.0.0.0 -p 3000
```

Allow all operations such as upload, delete

```sh
duf --allow-all
# or
duf -A
```

Only allow upload operation
Expand All @@ -102,7 +100,7 @@ Serve a single page application (SPA)
duf --render-spa
```

Serve https
Use https

```
duf --tls-cert my.crt --tls-key my.key
Expand Down
21 changes: 4 additions & 17 deletions src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fn app() -> clap::Command<'static> {
Arg::new("address")
.short('b')
.long("bind")
.default_value("127.0.0.1")
.default_value("0.0.0.0")
.help("Specify bind address")
.value_name("address"),
)
Expand Down Expand Up @@ -173,35 +173,22 @@ impl Args {
fn parse_path<P: AsRef<Path>>(path: P) -> BoxResult<PathBuf> {
let path = path.as_ref();
if !path.exists() {
bail!("error: path \"{}\" doesn't exist", path.display());
return Err(format!("Path `{}` doesn't exist", path.display()).into());
}

env::current_dir()
.and_then(|mut p| {
p.push(path); // If path is absolute, it replaces the current path.
std::fs::canonicalize(p)
})
.or_else(|err| {
bail!(
"error: failed to access path \"{}\": {}",
path.display(),
err,
)
})
.map_err(|err| format!("Failed to access path `{}`: {}", path.display(), err,).into())
}

/// Construct socket address from arguments.
pub fn address(&self) -> BoxResult<SocketAddr> {
format!("{}:{}", self.address, self.port)
.parse()
.or_else(|err| {
bail!(
"error: invalid address {}:{} : {}",
self.address,
self.port,
err,
)
})
.map_err(|_| format!("Invalid bind address `{}:{}`", self.address, self.port).into())
}
}

Expand Down
8 changes: 1 addition & 7 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
macro_rules! bail {
($($tt:tt)*) => {
return Err(From::from(format!($($tt)*)))
}
}

mod args;
mod server;

Expand All @@ -23,6 +17,6 @@ async fn run() -> BoxResult<()> {
}

fn handle_err<T>(err: Box<dyn std::error::Error>) -> T {
eprintln!("Server error: {}", err);
eprintln!("error: {}", err);
std::process::exit(1);
}

0 comments on commit 9dda55b

Please sign in to comment.