nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Geary.Imap.FolderSession: Ensure client session is selected when accessed

Browse source 
Ensure the underlying ClientSession object is in the SELECTED state
for the correct mailbox when obtaining it.
This commit is contained in:
Michael Gratton 2020-09-23 09:11:50 +10:00 • committed by Michael James Gratton
parent 1c951f8908
commit b209f84e58
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/engine/imap/api/imap-folder-session.vala
View file

@ -38,6 +38,8 @@ private class Geary.Imap.FolderSession : Geary.Imap.SessionObject {
/** Determines if this folder accepts custom IMAP flags. */
public Trillian accepts_user_flags { get; private set; default = Trillian.UNKNOWN; }
private MailboxSpecifier mailbox;
private Quirks quirks;
private Nonblocking.Mutex cmd_mutex = new Nonblocking.Mutex();
@ -107,9 +109,9 @@ private class Geary.Imap.FolderSession : Geary.Imap.SessionObject {
session.search.connect(on_search);
session.status_response_received.connect(on_status_response);
MailboxSpecifier mailbox = session.get_mailbox_for_path(folder.path);
this.mailbox = session.get_mailbox_for_path(folder.path);
StatusResponse? response = yield session.select_async(
mailbox, cancellable
this.mailbox, cancellable
);
throw_on_not_ok(response, "SELECT " + this.folder.path.to_string());
@ -1107,8 +1109,6 @@ private class Geary.Imap.FolderSession : Geary.Imap.SessionObject {
Geary.EmailFlags? flags,
GLib.DateTime? date_received)
throws GLib.Error {
ClientSession session = claim_session();
MessageFlags? msg_flags = null;
if (flags != null) {
Imap.EmailFlags imap_flags = Imap.EmailFlags.from_api_email_flags(flags);
@ -1121,9 +1121,8 @@ private class Geary.Imap.FolderSession : Geary.Imap.SessionObject {
if (date_received != null)
internaldate = new InternalDate.from_date_time(date_received);
MailboxSpecifier mailbox = session.get_mailbox_for_path(this.folder.path);
AppendCommand cmd = new AppendCommand(
mailbox,
this.mailbox,
msg_flags,
internaldate,
message.get_rfc822_buffer(),
@ -1161,6 +1160,26 @@ private class Geary.Imap.FolderSession : Geary.Imap.SessionObject {
);
}
/**
* Returns a valid IMAP client session for use by this object.
*
* In addition to the checks made by {@link
* SessionObject.claim_session}, this method also ensures that the
* IMAP session is in the SELECTED state for the correct mailbox.
*/
protected override ClientSession claim_session()
throws ImapError {
var session = base.claim_session();
if (session.get_protocol_state() != SELECTED &&
!this.mailbox.equal_to(session.selected_mailbox)) {
throw new ImapError.NOT_CONNECTED(
"IMAP object no longer SELECTED for %s",
this.mailbox.to_string()
);
}
return session;
}
// HACK: See https://bugzilla.gnome.org/show_bug.cgi?id=714902
//
// Detect when a server has returned a BAD response to FETCH

2
src/engine/imap/api/imap-session-object.vala
View file

@ -90,7 +90,7 @@ public abstract class Geary.Imap.SessionObject : BaseObject, Logging.Source {
* or has been closed, or because the connection to the server was
* lost.
*/
protected ClientSession claim_session()
protected virtual ClientSession claim_session()
throws ImapError {
if (this.session == null ||
this.session.get_protocol_state() == NOT_CONNECTED) {