meli
/
mailpot
4
Fork 0
Code Issues 7 Pull Requests 2 Releases Wiki Activity

web: add unit tests+++

axum-login-upgrade
Manos Pitsidianakis 2023-05-16 20:41:50 +03:00
parent f23d7805ca
commit 52ef646fae
Signed by: Manos Pitsidianakis
GPG Key ID: 7729C7707F7E09D0
6 changed files with 167 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mailpot-tests/for_testing.db
View File

Binary file not shown.

10
rest-http/src/routes/list.rs
View File

@ -384,7 +384,15 @@ mod tests {
assert_eq!(response.status(), StatusCode::OK);
let body = hyper::body::to_bytes(response.into_body()).await.unwrap();
let r: Vec<ListOwner> = serde_json::from_slice(&body).unwrap();
assert_eq!(&r, &[]);
assert_eq!(
&r,
&[ListOwner {
pk: 1,
list: 1,
address: "user@example.com".into(),
name: None
}]
);
// ------------------------------------------------------------
// new_list_owner()

3
web/src/auth.rs
View File

@ -158,7 +158,8 @@ pub async fn ssh_signin(
.into_response()
}
pub async fn ssh_signin_post(
#[allow(non_snake_case)]
pub async fn ssh_signin_POST(
_: LoginPath,
mut session: WritableSession,
Query(next): Query<Next>,

7
web/src/lists.rs
View File

@ -320,7 +320,8 @@ pub async fn list_edit(
))
}
pub async fn list_edit_post(
#[allow(non_snake_case)]
pub async fn list_edit_POST(
ListEditPath(id): ListEditPath,
mut session: WritableSession,
Extension(user): Extension<User>,
@ -514,7 +515,7 @@ pub enum SubscriptionPolicySettings {
}
/// Raw post page.
pub async fn post_raw(
pub async fn list_post_raw(
ListPostRawPath(id, msg_id): ListPostRawPath,
State(state): State<Arc<AppState>>,
) -> Result<String, ResponseError> {
@ -541,7 +542,7 @@ pub async fn post_raw(
}
/// .eml post page.
pub async fn post_eml(
pub async fn list_post_eml(
ListPostEmlPath(id, msg_id): ListPostEmlPath,
State(state): State<Arc<AppState>>,
) -> Result<impl IntoResponse, ResponseError> {

154
web/src/main.rs
View File

@ -54,8 +54,8 @@ fn create_app(shared_state: Arc<AppState>) -> Router {
.route("/", get(root))
.typed_get(list)
.typed_get(list_post)
.typed_get(post_raw)
.typed_get(post_eml)
.typed_get(list_post_raw)
.typed_get(list_post_eml)
.typed_get(list_edit.layer(RequireAuth::login_with_role_or_redirect(
Role::User..,
Arc::clone(&login_url),
@ -65,7 +65,7 @@ fn create_app(shared_state: Arc<AppState>) -> Router {
{
let shared_state = Arc::clone(&shared_state);
move |path, session, user, payload| {
list_edit_post(path, session, user, payload, State(shared_state))
list_edit_POST(path, session, user, payload, State(shared_state))
}
}
.layer(RequireAuth::login_with_role_or_redirect(
@ -93,7 +93,7 @@ fn create_app(shared_state: Arc<AppState>) -> Router {
.typed_post({
let shared_state = Arc::clone(&shared_state);
move |path, session, query, auth, body| {
auth::ssh_signin_post(path, session, query, auth, body, shared_state)
auth::ssh_signin_POST(path, session, query, auth, body, shared_state)
}
})
.typed_get(logout_handler)
@ -112,7 +112,7 @@ fn create_app(shared_state: Arc<AppState>) -> Router {
{
let shared_state = Arc::clone(&shared_state);
move |path, session, auth, body| {
settings_post(path, session, auth, body, shared_state)
settings_POST(path, session, auth, body, shared_state)
}
}
.layer(RequireAuth::login_or_redirect(
@ -131,7 +131,7 @@ fn create_app(shared_state: Arc<AppState>) -> Router {
{
let shared_state = Arc::clone(&shared_state);
move |session, path, user, body| {
user_list_subscription_post(session, path, user, body, shared_state)
user_list_subscription_POST(session, path, user, body, shared_state)
}
}
.layer(RequireAuth::login_with_role_or_redirect(
@ -225,6 +225,7 @@ mod tests {
};
use mailpot::{Configuration, Connection, SendMail};
use mailpot_tests::init_stderr_logging;
use percent_encoding::utf8_percent_encode;
use tempfile::TempDir;
use tower::ServiceExt;
@ -258,6 +259,11 @@ mod tests {
let db_path = tmp_dir.path().join("mpot.db");
std::fs::copy("../mailpot-tests/for_testing.db", &db_path).unwrap();
let mut perms = std::fs::metadata(&db_path).unwrap().permissions();
#[allow(clippy::permissions_set_readonly_false)]
perms.set_readonly(false);
std::fs::set_permissions(&db_path, perms).unwrap();
let config = Configuration {
send_mail: SendMail::ShellCommand("/usr/bin/false".to_string()),
db_path,
@ -284,6 +290,66 @@ mod tests {
cl(format!("/list/{}/", list.pk), state.clone()).await
);
// ------------------------------------------------------------
// list_post(), list_post_eml(), list_post_raw()
{
let msg_id = "<abcdefgh@sator.example.com>";
let res = create_app(state.clone())
.oneshot(req!(
get & format!(
"/list/{id}/posts/{msgid}/",
id = list.id,
msgid = utf8_percent_encode(msg_id, PATH_SEGMENT)
)
))
.await
.unwrap();
assert_eq!(res.status(), StatusCode::OK);
assert_eq!(
res.headers().get(http::header::CONTENT_TYPE),
Some(&http::HeaderValue::from_static("text/html; charset=utf-8"))
);
let res = create_app(state.clone())
.oneshot(req!(
get & format!(
"/list/{id}/posts/{msgid}/raw/",
id = list.id,
msgid = utf8_percent_encode(msg_id, PATH_SEGMENT)
)
))
.await
.unwrap();
assert_eq!(res.status(), StatusCode::OK);
assert_eq!(
res.headers().get(http::header::CONTENT_TYPE),
Some(&http::HeaderValue::from_static("text/plain; charset=utf-8"))
);
let res = create_app(state.clone())
.oneshot(req!(
get & format!(
"/list/{id}/posts/{msgid}/eml/",
id = list.id,
msgid = utf8_percent_encode(msg_id, PATH_SEGMENT)
)
))
.await
.unwrap();
assert_eq!(res.status(), StatusCode::OK);
assert_eq!(
res.headers().get(http::header::CONTENT_TYPE),
Some(&http::HeaderValue::from_static("application/octet-stream"))
);
assert_eq!(
res.headers().get(http::header::CONTENT_DISPOSITION),
Some(&http::HeaderValue::from_static(
"attachment; filename=\"<abcdefgh@sator.example.com>.eml\""
)),
);
}
// ------------------------------------------------------------
// help(), ssh_signin(), root()
@ -391,5 +457,81 @@ mod tests {
// ------------------------------------------------------------
// user_list_subscription_post() TODO
// ------------------------------------------------------------
// list_edit()
{
let mut request = req!(get & format!("/list/{id}/edit/", id = list.id,));
request
.headers_mut()
.insert(COOKIE, session_cookie.to_owned());
let response = login_app.clone().oneshot(request).await.unwrap();
assert_eq!(response.status(), StatusCode::OK);
}
// ------------------------------------------------------------
// list_edit_POST()
{
let mut request = req!(
post & format!("/list/{id}/edit/", id = list.id,),
crate::lists::ChangeSetting::Metadata {
name: "new name".to_string(),
id: "new-name".to_string(),
address: list.address.clone(),
description: list.description.clone(),
owner_local_part: None,
request_local_part: None,
archive_url: None,
}
);
request
.headers_mut()
.insert(COOKIE, session_cookie.to_owned());
let response = login_app.clone().oneshot(request).await.unwrap();
assert_eq!(response.status(), StatusCode::SEE_OTHER);
let list_mod = db.lists().unwrap().remove(0);
assert_eq!(&list_mod.name, "new name");
assert_eq!(&list_mod.id, "new-name");
assert_eq!(&list_mod.address, &list.address);
assert_eq!(&list_mod.description, &list.description);
}
{
let mut request = req!(post "/list/new-name/edit/",
crate::lists::ChangeSetting::SubscriptionPolicy {
send_confirmation: BoolPOST(false),
subscription_policy: crate::lists::SubscriptionPolicySettings::Custom,
}
);
request
.headers_mut()
.insert(COOKIE, session_cookie.to_owned());
let response = login_app.clone().oneshot(request).await.unwrap();
assert_eq!(response.status(), StatusCode::SEE_OTHER);
let policy = db.list_subscription_policy(list.pk()).unwrap().unwrap();
assert!(!policy.send_confirmation);
assert!(policy.custom);
}
{
let mut request = req!(post "/list/new-name/edit/",
crate::lists::ChangeSetting::PostPolicy {
delete_post_policy: None,
post_policy: crate::lists::PostPolicySettings::Custom,
}
);
request
.headers_mut()
.insert(COOKIE, session_cookie.to_owned());
let response = login_app.clone().oneshot(request).await.unwrap();
assert_eq!(response.status(), StatusCode::SEE_OTHER);
let policy = db.list_post_policy(list.pk()).unwrap().unwrap();
assert!(policy.custom);
}
}
}

6
web/src/settings.rs
View File

@ -89,7 +89,8 @@ pub enum ChangeSetting {
ChangeName { new: String },
}
pub async fn settings_post(
#[allow(non_snake_case)]
pub async fn settings_POST(
_: SettingsPath,
mut session: WritableSession,
Extension(user): Extension<User>,
@ -331,7 +332,8 @@ pub struct SubscriptionFormPayload {
pub receive_confirmation: bool,
}
pub async fn user_list_subscription_post(
#[allow(non_snake_case)]
pub async fn user_list_subscription_POST(
ListSettingsPath(id): ListSettingsPath,
mut session: WritableSession,
Extension(user): Extension<User>,