forked from
oppi.li/at-advent
this repo has no description
you wouldn't... upload a car
+212
-9
+27
Cargo.lock
+27
Cargo.lock
···
319
319
"matchit",
320
320
"memchr",
321
321
"mime",
322
+
"multer",
322
323
"percent-encoding",
323
324
"pin-project-lite",
324
325
"rustversion",
···
911
912
"sec1",
912
913
"subtle",
913
914
"zeroize",
915
+
]
916
+
917
+
[[package]]
918
+
name = "encoding_rs"
919
+
version = "0.8.35"
920
+
source = "registry+https://github.com/rust-lang/crates.io-index"
921
+
checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
922
+
dependencies = [
923
+
"cfg-if",
914
924
]
915
925
916
926
[[package]]
···
1953
1963
"tagptr",
1954
1964
"thiserror 1.0.69",
1955
1965
"uuid",
1966
+
]
1967
+
1968
+
[[package]]
1969
+
name = "multer"
1970
+
version = "3.1.0"
1971
+
source = "registry+https://github.com/rust-lang/crates.io-index"
1972
+
checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b"
1973
+
dependencies = [
1974
+
"bytes",
1975
+
"encoding_rs",
1976
+
"futures-util",
1977
+
"http",
1978
+
"httparse",
1979
+
"memchr",
1980
+
"mime",
1981
+
"spin",
1982
+
"version_check",
1956
1983
]
1957
1984
1958
1985
[[package]]
+1
-1
Cargo.toml
+1
-1
Cargo.toml
+120
web/src/handlers/custom/day_three.rs
+120
web/src/handlers/custom/day_three.rs
···
1
+
use crate::{AppState, error_response, session::AxumSessionStore};
2
+
use axum::{
3
+
extract::{Multipart, State},
4
+
http::StatusCode,
5
+
response::{IntoResponse, Redirect, Response},
6
+
};
7
+
use crate::session::{FlashMessage, set_flash_message};
8
+
use shared::advent::challenges::day_three::DayThree;
9
+
use shared::advent::{AdventChallenge, CompletionStatus};
10
+
use super::log_and_respond;
11
+
12
+
pub async fn inspect_car(
13
+
state: State<AppState>,
14
+
mut session: AxumSessionStore,
15
+
mut multipart: Multipart,
16
+
) -> Result<impl IntoResponse, Response> {
17
+
let did = session.get_did().ok_or_else(|| {
18
+
error_response(StatusCode::FORBIDDEN, "You need to be logged in")
19
+
})?;
20
+
21
+
// Extract the uploaded file from the multipart form
22
+
let mut car_bytes: Option<Vec<u8>> = None;
23
+
while let Some(field) = multipart.next_field().await.map_err(
24
+
log_and_respond(StatusCode::BAD_REQUEST, "Invalid multipart data")
25
+
)? {
26
+
if field.name() == Some("car_file") {
27
+
car_bytes = Some(
28
+
field
29
+
.bytes()
30
+
.await
31
+
.map_err(log_and_respond(StatusCode::BAD_REQUEST, "Failed to read upload"))?
32
+
.to_vec()
33
+
);
34
+
break;
35
+
}
36
+
}
37
+
38
+
let Some(car_bytes) = car_bytes else {
39
+
return Err(error_response(StatusCode::BAD_REQUEST, "No car_file field in upload"))
40
+
};
41
+
42
+
// Check that part one is done and part two is in progress
43
+
let challenge = DayThree {
44
+
pool: state.postgres_pool.clone(),
45
+
oauth_client: None,
46
+
};
47
+
48
+
let status = challenge
49
+
.get_completed_status(Some(did.clone()))
50
+
.await
51
+
.map_err(log_and_respond(StatusCode::INTERNAL_SERVER_ERROR, "Error checking status"))?;
52
+
53
+
if status != CompletionStatus::PartOne {
54
+
return Err(error_response(StatusCode::BAD_REQUEST, "Complete part one first"));
55
+
}
56
+
57
+
// Get the expected verification code for part two
58
+
let progress = challenge
59
+
.get_days_challenge(&did)
60
+
.await
61
+
.map_err(log_and_respond(StatusCode::INTERNAL_SERVER_ERROR, "Error loading challenge"))?
62
+
.ok_or_else(|| error_response(StatusCode::BAD_REQUEST, "Challenge not started"))?;
63
+
64
+
let expected_code = progress.verification_code_two
65
+
.ok_or_else(|| error_response(StatusCode::BAD_REQUEST, "Part two not started"))?;
66
+
67
+
let res = shared::advent::challenges::day_three::repo::inspect_car(
68
+
&car_bytes,
69
+
&("codes.advent.challenge.day".parse().unwrap()),
70
+
&("3".parse().unwrap()),
71
+
)
72
+
.await;
73
+
74
+
let record = match res {
75
+
Ok(r) => r,
76
+
Err(e) => {
77
+
log::warn!("bad uploaded car? {e}");
78
+
set_flash_message(
79
+
&mut session,
80
+
"part_two_result",
81
+
FlashMessage::Error(
82
+
"Sorry, but your car failed inspection.".into()
83
+
),
84
+
)
85
+
.await
86
+
.map_err(log_and_respond(StatusCode::INTERNAL_SERVER_ERROR, "Session error"))?;
87
+
88
+
return Ok(Redirect::to("/day/3#part_two"));
89
+
}
90
+
};
91
+
92
+
if !record.verification_code.eq_ignore_ascii_case(&expected_code) {
93
+
set_flash_message(
94
+
&mut session,
95
+
"part_two_result",
96
+
FlashMessage::Error("Your CAR looks nice! But not that verification code...".into()),
97
+
)
98
+
.await
99
+
.map_err(log_and_respond(StatusCode::INTERNAL_SERVER_ERROR, "Session error"))?;
100
+
101
+
return Ok(Redirect::to("/day/3#part_two"));
102
+
}
103
+
104
+
challenge
105
+
.complete_part_two(did)
106
+
.await
107
+
.map_err(log_and_respond(StatusCode::INTERNAL_SERVER_ERROR, "Error completing"))?;
108
+
109
+
set_flash_message(
110
+
&mut session,
111
+
"part_two_result",
112
+
FlashMessage::Success("You built a valid CAR file! Part 2 complete.".into()),
113
+
)
114
+
.await
115
+
.map_err(log_and_respond(StatusCode::INTERNAL_SERVER_ERROR, "Session error"))?;
116
+
117
+
// TODO: do something with their joke answer, if submitted
118
+
119
+
Ok(Redirect::to("/day/3#part_two"))
120
+
}
+1
web/src/handlers/custom/mod.rs
+1
web/src/handlers/custom/mod.rs
+2
-2
web/src/handlers/day.rs
+2
-2
web/src/handlers/day.rs
···
88
88
}
89
89
}
90
90
91
-
pub(super) fn log_and_respond<E: std::fmt::Display>(
91
+
pub(super) fn log_and_respond<E: std::fmt::Debug>(
92
92
status: StatusCode,
93
93
context: &'static str,
94
94
) -> impl FnOnce(E) -> Response {
95
95
move |err| {
96
-
log::error!("{context}: {err}");
96
+
log::error!("{context}: {err:?}");
97
97
error_response(status, context)
98
98
}
99
99
}