minhttpd/server
1
0
Fork 0
Code Issues Pull requests Wiki Activity
105 commits 1 branch 0 tags 389 KiB
Commit graph

65 commits

Author SHA1 Message Date
Дамјан Георгиевски
106b67742e clippy: single-character string constant used as pattern 
https://rust-lang.github.io/rust-clippy/master/index.html#single_char_pattern
 2022-09-09 15:03:27 +02:00
Дамјан Георгиевски
84599e5d82 cargo fmt 2022-03-01 14:40:41 +01:00
Дамјан Георгиевски
24ee4f3f09
Actix v4 (#11) 
Updated to:
* actix-web 4.0.0
* actix-files 0.6.0
* clap 3.1.0
* rust edition 2021
 2022-03-01 14:33:21 +01:00
Дамјан Георгиевски
d3fd28461c stream_tar_in_thread will take a Path now 
it's more common for functions to receive the immutable Path as input argument,
as opposed to a PathBuf
 2020-09-20 19:11:49 +02:00
Дамјан Георгиевски
9ce64f88fa test for directory name + .tar, not just directory name 2020-09-20 18:58:53 +02:00
Дамјан Георгиевски
67195c4b11 add a newline to 404 body, looks better in curl 2020-09-20 18:58:08 +02:00
Дамјан Георгиевски
2281406f98 let's use longer names :) 2020-09-20 18:57:16 +02:00
Дамјан Георгиевски
ed16068909 recreate the old directory listing 
using nice tables with links to the .tar archives
 2020-09-20 02:39:52 +02:00
Дамјан Георгиевски
375d8aa62b silence some warnings about unchecked Result/Err 
alternatively I should find a way to propagate the errors back to the
writter
 2020-09-20 01:43:30 +02:00
Дамјан Георгиевски
d33810da52 fix some clippy warnings 2020-09-20 01:37:00 +02:00
Дамјан Георгиевски
a671e47edf rename to src/directory_listing.rs 2020-09-20 00:53:31 +02:00
Дамјан Георгиевски
98fbec274c enable the .tar handler 2020-09-14 23:44:00 +02:00
Дамјан Георгиевски
070a878c75 re-implement io::Write for StreamWriter 
since the `.wait()` has been removed from futures 0.1 sink::Sink trait,
use futures 0.3 `executor::block_on` function to run an async block in
the sync environment of `write`.

https://docs.rs/futures/0.1.29/futures/sink/trait.Sink.html#method.wait
https://docs.rs/futures/0.3.5/futures/executor/fn.block_on.html
 2020-09-14 23:37:25 +02:00
Дамјан Георгиевски
cce8560bd5 Begin port to actix-web 3.0 
* actix-files is quite easy to use now
* uses futures 0.3 now, and async/await. the streaming archiver is not
  ported yet.

0.11.x versions will be dev versions until the port is done
 2020-09-12 04:28:20 +02:00
Дамјан Георгиевски
da69d3de6f clippy and rustfmt anoyances 2019-09-21 21:24:44 +02:00
Дамјан Георгиевски
c68cf3a3e8 improve cli help text 
and add a `-w` as short for `--chdir`
 2019-09-21 21:24:41 +02:00
Дамјан Георгиевски
9c6ff4eddf rename channel to threaded_archiver 
I think that reflects its purpose much better
 2019-09-21 21:17:39 +02:00
Дамјан Георгиевски
6fbe1b22ea update percent-encoding and htmlescape 
* percent-encoding 1.0 to 2.0
* actualy move from htmlescape to v_htmlescape

code updated for some api changes too
 2019-08-28 19:44:22 +02:00
Дамјан Георгиевски
acedfa2a6c remove some actix_web:: prefixes 2019-06-16 18:03:26 +02:00
Дамјан Георгиевски
85f1df81a1 refactor with actix-web 1.0.0 
* actix-web 1.0.0 brought some changes in how associated data is accessed, and how
handlers are written.
* static files are now a separate crate `actix-files`.
* web::run now creates the App and the Server and runs the server. they really want to
  have HttpServer::new and App::new in the same scope
  (I couldn't find a proper signature for the create_app function)
* replace .trim_right_matches (depreceated in rust 1.33) with .trim_end_matches

https://github.com/actix/actix-web/blob/web-v1.0.0/MIGRATION.md
 2019-06-16 17:27:09 +02:00
Damjan Georgievski
cba32451b3 some more "edition 2018" updates 
`extern crate` and `#[macro_use]` are no longer needed
 2019-01-18 00:24:42 +01:00
Damjan Georgievski
0596f72c8d rust 1.32 now defaults to the system allocator 
https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html#jemalloc-is-removed-by-default
 2019-01-18 00:14:16 +01:00
Дамјан Георгиевски
09cba55dc8 use rust language edition 2018 (introduced in 1.31) 2018-12-06 20:08:26 +01:00
Дамјан Георгиевски
2742a39aaa update for a change after actix-web 0.7.8 
somewhere between 0.7.8 and 0.7.12 `web::create_app` started returning a
`Result`.
 2018-10-20 15:04:13 +02:00
Дамјан Георгиевски
7a0572de80 use system alocator instead of jmalloc 
Rust 1.28 feature. saves 300kb in executable size
 2018-08-03 15:41:00 +02:00
Дамјан Георгиевски
4346b5d559 since actix-web 0.7.2 this is the default log format 2018-07-26 18:53:04 +02:00
Damjan Georgievski
306c545151 let's return a Result from create_app 
with the possibility that any errors could be reported/handled by the
caller. the lambda in server::new(|| ...) doesn't care though
 2018-07-23 00:32:59 +02:00
Damjan Georgievski
d2f9578b68 add some headers to the favicon 
* content-type to image/png
* cache control for 24h
 2018-07-22 17:45:28 +02:00
Damjan Georgievski
1aeb2c1bf6 smaller font in footer 2018-07-22 17:27:40 +02:00
Damjan Georgievski
b139b6113a return error instead of expect() 
expect() is an unwrap() with a message. use the ? macro to just return
the error from main for a cleaner output
 2018-07-22 17:14:01 +02:00
Damjan Georgievski
bd1429ebb6 explain why these won't panic 2018-07-22 17:09:53 +02:00
Damjan Georgievski
71482ffacd don't panic on r.metadata() 
use unwrap_or() instead of unwrap() to avoid panics if metadata can't be
read from a direntry.

optimistic_is_dir will just return false in that case (same as non
directory)
 2018-07-22 17:08:21 +02:00
Damjan Georgievski
625bbcc0b9 replace the unwrap with a error return 
don't panic on std::fs::read_dir error (although permission errors are
returned as 404 responses)
 2018-07-22 07:41:05 +02:00
Damjan Georgievski
9058452d93 set_current_dir: don't unwrap, return error 
the difference is a panic vs a clean error
 2018-07-22 07:25:07 +02:00
Damjan Georgievski
01f0001594 dark style, footer, homepage 2018-07-22 06:55:58 +02:00
Damjan Georgievski
592ea53524 many improvements to the html generated 
- css is now in src/style.css - included in the executable at compile time
- use writeln!/write! macros instead of push_str + format!
- properly generate the link to the .tar for the current directory

v0.6
 2018-07-22 05:51:55 +02:00
Damjan Georgievski
1a12b3aa30 canonicalized root directory is now also an App state 
- used to setup the StaticFiles handler
- also for the .tar file handler

additionally, PathBuf::from_param is used to forbid certain paths, see:
https://actix.rs/api/actix-web/stable/actix_web/dev/trait.FromParam.html
 2018-07-22 05:39:32 +02:00
Damjan Georgievski
8a86739f14 don't overwrite RUST_LOG if it exists 2018-07-22 03:53:39 +02:00
Damjan Georgievski
06e5cd47eb this can be expressed in a single filter_map 2018-07-21 21:27:57 +02:00
Damjan Georgievski
a9c0e1ec81 use r#" "# string literals so to not escape the " 2018-07-21 20:27:03 +02:00
Damjan Georgievski
ac3627179f insignificant changes 
still experimenting with *my* rust style
 2018-07-21 20:22:40 +02:00
Damjan Georgievski
a3a95e66c3 also chdir to destination directory 2018-07-21 20:13:14 +02:00
Damjan Georgievski
6ad16f8dcf r.get() is a shortcut for r.method(Method::GET) 2018-07-21 20:01:28 +02:00
Damjan Georgievski
9373a1cb9c upercase PORT in usage 2018-07-21 19:31:43 +02:00
Damjan Georgievski
e707d1a05e log shared directory 2018-07-21 19:12:59 +02:00
Damjan Georgievski
0967442fcd add a favicon 
- fixes #6
- the image is embeded in the executable with the include_bytes! macro
- I choose a simple share image
 2018-07-21 18:41:02 +02:00
Damjan Georgievski
e400d6e1d3 implement cli arguments with clap 
* add clap dependency https://docs.rs/clap/
* updated README with the real USAGE
* the web App now takes a directory to server files from
 2018-07-21 17:45:24 +02:00
Damjan Georgievski
933b53b2b1 remove the println! since the logger already prints the listener 2018-07-21 15:14:01 +02:00
Damjan Georgievski
091f203317 use a non default logger that doesn't log the timestamp 
the env_logger already adds the timestamp, so it was redundant

before:
`INFO 2018-07-21T12:57:49Z: actix_web::middleware::logger: 127.0.0.1:42112 [21/Jul/2018:14:57:49 +0200] "GET / HTTP/1.1" 200 858 "-" "curl/7.61.0" 0.000686`

after:
`INFO 2018-07-21T13:03:20Z: actix_web::middleware::logger: 127.0.0.1:42154 "GET / HTTP/1.1" 200 858 "-" "curl/7.61.0" 0.000367`
 2018-07-21 15:13:30 +02:00
Damjan Georgievski
a6a3d707d6 implement a default logger 
I've snuck some renames of variables too
 2018-07-21 14:59:47 +02:00