Deuxfleurs/aerogramme
15
0
Fork 1
Code Issues 33 Pull requests 1 Projects 11 Releases 5 Wiki Activity

Authenticated state works

Browse source
This commit is contained in:
Quentin 2022-06-22 16:52:38 +02:00
parent 98f55be730
commit 50b1972987
Signed by: quentin
GPG key ID: E9602264D639FF68
2 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/imap/command/authenticated.rs
View file

@ -1,5 +1,5 @@
use anyhow::{Result, Error};
use anyhow::{Result, Error, anyhow};
use boitalettres::proto::Response;
use imap_codec::types::command::CommandBody;
use imap_codec::types::core::Tag;
@ -8,11 +8,11 @@ use imap_codec::types::response::{Code, Data, Response as ImapRes, Status};
use crate::imap::command::anonymous;
use crate::imap::session::InnerContext;
use crate::imap::flow::User;
use crate::imap::flow;
use crate::mailbox::Mailbox;
/*pub async fn dispatch<'a>(inner: &'a mut InnerContext<'a>, user: &'a User) -> Result<Response> {
let ctx = StateContext { inner, user, tag: &inner.req.tag };
pub async fn dispatch<'a>(inner: InnerContext<'a>, user: &'a flow::User) -> Result<(Response, flow::Transition)> {
let ctx = StateContext { user, tag: &inner.req.tag, inner };
match &ctx.inner.req.body {
CommandBody::Lsub { reference, mailbox_wildcard, } => ctx.lsub(reference.clone(), mailbox_wildcard.clone()).await,
@ -20,14 +20,14 @@ use crate::mailbox::Mailbox;
CommandBody::Select { mailbox } => ctx.select(mailbox.clone()).await,
_ => anonymous::dispatch(ctx.inner).await,
}
}*/
}
// --- PRIVATE ---
/*
struct StateContext<'a> {
inner: &'a mut InnerContext<'a>,
user: &'a User,
inner: InnerContext<'a>,
user: &'a flow::User,
tag: &'a Tag,
}
@ -36,20 +36,20 @@ impl<'a> StateContext<'a> {
&self,
reference: MailboxCodec,
mailbox_wildcard: ListMailbox,
) -> Result<Response> {
Ok(vec![ImapRes::Status(
) -> Result<(Response, flow::Transition)> {
Ok((vec![ImapRes::Status(
Status::bad(Some(self.tag.clone()), None, "Not implemented").map_err(Error::msg)?,
)])
)], flow::Transition::No))
}
async fn list(
&self,
reference: MailboxCodec,
mailbox_wildcard: ListMailbox,
) -> Result<Response> {
Ok(vec![
) -> Result<(Response, flow::Transition)> {
Ok((vec![
ImapRes::Status(Status::bad(Some(self.tag.clone()), None, "Not implemented").map_err(Error::msg)?),
])
], flow::Transition::No))
}
/*
@ -68,36 +68,35 @@ impl<'a> StateContext<'a> {
* TRACE END ---
*/
async fn select(&self, mailbox: MailboxCodec) -> Result<Response> {
async fn select(&self, mailbox: MailboxCodec) -> Result<(Response, flow::Transition)> {
let name = String::try_from(mailbox)?;
let mut mb = Mailbox::new(&self.user.creds, name.clone())?;
tracing::info!(username=%self.user.name, mailbox=%name, "mailbox.selected");
let sum = mb.summary().await?;
tracing::trace!(summary=%sum, "mailbox.summary");
let body = vec![Data::Exists(sum.exists.try_into()?), Data::Recent(0)];
self.inner.state.select(mb)?;
let tr = flow::Transition::Select(mb);
let r_unseen = Status::ok(None, Some(Code::Unseen(std::num::NonZeroU32::new(1)?)), "").map_err(Error::msg)?;
let r_unseen = Status::ok(None, Some(Code::Unseen(std::num::NonZeroU32::new(1).ok_or(anyhow!("Invalid message identifier"))?)), "First unseen UID").map_err(Error::msg)?;
//let r_permanentflags = Status::ok(None, Some(Code::
Ok(vec![
Ok((vec![
ImapRes::Data(Data::Exists(0)),
ImapRes::Data(Data::Recent(0)),
ImapRes::Data(Data::Flags(vec![])),
/*ImapRes::Status(),
ImapRes::Status(),
ImapRes::Status(),*/
Status::ok(
ImapRes::Status(Status::ok(
Some(self.tag.clone()),
Some(Code::ReadWrite),
"Select completed",
)
.map_err(Error::msg)?,
])
).map_err(Error::msg)?),
], tr))
}
}
*/

4
src/imap/session.rs
View file

@ -125,8 +125,8 @@ impl Instance {
// on the State.
let ctrl = match &self.state {
flow::State::NotAuthenticated => anonymous::dispatch(ctx).await,
/*flow::State::Authenticated(user) => authenticated::dispatch(ctx, user).await,
flow::State::Selected(user, mailbox) => selected::dispatch(ctx, user, mailbox).await,*/
flow::State::Authenticated(user) => authenticated::dispatch(ctx, user).await,
/*flow::State::Selected(user, mailbox) => selected::dispatch(ctx, user, mailbox).await,*/
_ => Status::bad(Some(ctx.req.tag.clone()), None, "No commands are allowed in the LOGOUT state.")
.map(|s| (vec![ImapRes::Status(s)], flow::Transition::No))
.map_err(Error::msg),