projects
/
rup.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the key file to decipher the message given as http parameter.
[rup.git]
/
src
/
main.rs
diff --git
a/src/main.rs
b/src/main.rs
index
2480260
..
6ecbb0a
100644
(file)
--- a/
src/main.rs
+++ b/
src/main.rs
@@
-29,11
+29,11
@@
pub struct Request {
m: Option<String>
}
m: Option<String>
}
-fn main_page(query: Query<Request>) -> Result<HttpResponse> {
+fn main_page(query: Query<Request>
, key: &str
) -> Result<HttpResponse> {
let m =
match &query.m {
Some(b) =>
let m =
match &query.m {
Some(b) =>
- match crypto::decrypt(
KEY
, b) {
+ match crypto::decrypt(
key
, b) {
Ok(m) => m,
Err(_e) => String::from(consts::DEFAULT_MESSAGE) // TODO: log error.
},
Ok(m) => m,
Err(_e) => String::from(consts::DEFAULT_MESSAGE) // TODO: log error.
},
@@
-72,7
+72,6
@@
fn read_key() -> String {
}
fn main() -> std::io::Result<()> {
}
fn main() -> std::io::Result<()> {
-
let key = read_key();
if process_args(&key) { return Ok(()) }
let key = read_key();
if process_args(&key) { return Ok(()) }
@@
-92,11
+91,13
@@
fn main() -> std::io::Result<()> {
let mut listenfd = ListenFd::from_env();
let mut server =
HttpServer::new(
let mut listenfd = ListenFd::from_env();
let mut server =
HttpServer::new(
- || {
+ move || {
+ let key = key.clone(); // Is this neccessary??
+
App::new()
.wrap(middleware::Compress::default())
.wrap(middleware::Logger::default())
App::new()
.wrap(middleware::Compress::default())
.wrap(middleware::Logger::default())
- .service(web::resource("/").to(m
ain_page
))
+ .service(web::resource("/").to(m
ove |query| main_page(query, &key)
))
.service(fs::Files::new("/static", "static").show_files_listing())
}
);
.service(fs::Files::new("/static", "static").show_files_listing())
}
);