X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2Fprotocol%2FIMAP.java;h=5b981052a0cc87a938d69526dce680e5390c87c0;hb=4ff26332350edaa3c6ebfa29408c61412a6a2e40;hp=346f007499530401afaf751f4ef82120fa4cc4e0;hpb=c099a298576b1083c6be3259442900056032f0b1;p=org.ibex.mail.git diff --git a/src/org/ibex/mail/protocol/IMAP.java b/src/org/ibex/mail/protocol/IMAP.java index 346f007..5b98105 100644 --- a/src/org/ibex/mail/protocol/IMAP.java +++ b/src/org/ibex/mail/protocol/IMAP.java @@ -1,8 +1,11 @@ +// Copyright 2000-2005 the Contributors, as shown in the revision logs. +// Licensed under the Apache Public Source License 2.0 ("the License"). +// You may not use this file except in compliance with the License. + package org.ibex.mail.protocol; import org.ibex.io.*; +import org.ibex.crypto.*; import org.ibex.jinetd.Listener; -import org.ibex.jinetd.Worker; -import org.ibex.net.*; import org.ibex.mail.*; import org.ibex.util.*; import org.ibex.mail.target.*; @@ -36,7 +39,14 @@ import java.io.*; public class IMAP { public IMAP() { } - public static final float version = (float)0.1; + public static final float version = (float)0.2; + + // FIXME this is evil + public static String getBodyString(Message m) { + StringBuffer sb = new StringBuffer(); + m.getBody().getStream().transcribe(sb); + return sb.toString(); + } // API Class ////////////////////////////////////////////////////////////////////////////// @@ -47,10 +57,10 @@ public class IMAP { } public static interface Server { + public void setClient(IMAP.Client client); public String[] capability(); public Hashtable id(Hashtable clientId); public void copy(Query q, String to); - public void login(String u, String p); public void logout(); public void unselect(); public void delete(String m); @@ -61,9 +71,11 @@ public class IMAP { public void close(); public void subscribe(String mailbox); public void unsubscribe(String mailbox); - public int seen(String mailbox); + public int unseen(String mailbox); public int recent(String mailbox); public int count(String mailbox); + public int count(); + public int maxuid(); public int uidNext(String mailbox); public int uidValidity(String mailbox); public int[] search(Query q, boolean uid); @@ -76,7 +88,6 @@ public class IMAP { public void fetch(Query q, int spec, String[] headers, int start, int end, boolean uid); public void lsub(String start, String ref); public void list(String start, String ref); - public static interface Authenticator { public abstract Mailbox authenticate(String user, String pass); } public static class Exn extends MailException { public Exn(String s) { super(s); } } public static class Bad extends Exn { public Bad(String s) { super(s); } } public static class No extends Exn { public No(String s) { super(s); } } @@ -94,16 +105,21 @@ public class IMAP { Mailbox selected = null; Mailbox root = null; Mailbox selected() { if (selected == null) throw new Bad("no mailbox selected"); return selected; } - final Server.Authenticator auth; + final Login auth; final Client client; - public MailboxWrapper(Server.Authenticator auth, Client c) { this.auth=auth; this.client=c;} + public MailboxWrapper(Login auth, Client c) { this.auth=auth; this.client=c;} + public void setClient(IMAP.Client client) { } - private Mailbox mailbox(String name, boolean create) { + private Mailbox mailbox(String name, boolean create) { return mailbox(name, create, true); } + private Mailbox mailbox(String name, boolean create, boolean throwexn) { if (name.equalsIgnoreCase("inbox")) return inbox; Mailbox m = root; for(StringTokenizer st = new StringTokenizer(name, sep + ""); st.hasMoreTokens();) - if ((m = m.slash(st.nextToken(), create)) == null) throw new Server.No("no such mailbox " + name); + if ((m = m.slash(st.nextToken(), create)) == null) { + if (throwexn) throw new Server.No("no such mailbox " + name); + return null; + } return m; } @@ -111,25 +127,33 @@ public class IMAP { public void lsub(String start, String ref) { list(start, ref, true); } public void list(String start, String ref) { list(start, ref, false); } public void list(String start, String ref, boolean lsub) { + + // FIXME this might be wrong + if (ref.equalsIgnoreCase("inbox")) { client.list(sep,"inbox",lsub,false); return; } + if (ref.length() == 0) { client.list(sep, start, lsub, false); return; } while (start.endsWith(""+sep)) start = start.substring(0, start.length() - 1); if (ref.endsWith("%")) ref = ref + sep; String[] children = (start.length() == 0 ? root : mailbox(start, false)).children(); for(int i=0; i 0 ? sep+"" : "") + s; - boolean phantom = mailbox(kid, false).phantom(); - while(true) { - if (pre.length() == 0) { - if (s.length() == 0) client.list(sep, kid, lsub, phantom); - } else switch(pre.charAt(0)) { - case sep: if (s.length() == 0) list(kid, pre.substring(1), lsub); break; - case '%': client.list(sep,kid,lsub,phantom);pre=pre.substring(1); s = ""; continue; - case '*': client.list(sep,kid,lsub,phantom);list(kid,pre,lsub);pre=pre.substring(1); break; - default: if (s.length()==0) break; - if (s.charAt(0) != pre.charAt(0)) break; - s = s.substring(1); pre = pre.substring(1); continue; + if (mailbox(kid, false) == null) continue; + Mailbox phant = mailbox(kid, false, false); + if (phant != null) { + boolean phantom = phant.phantom(); + while(true) { + if (pre.length() == 0) { + if (s.length() == 0) client.list(sep, kid, lsub, phantom); + } else switch(pre.charAt(0)) { + case sep: if (s.length() == 0) list(kid, pre.substring(1), lsub); break; + case '%': client.list(sep,kid,lsub,phantom);pre=pre.substring(1); s = ""; continue; + case '*': client.list(sep,kid,lsub,phantom);list(kid,pre,lsub);pre=pre.substring(1); break; + default: if (s.length()==0) break; + if (s.charAt(0) != pre.charAt(0)) break; + s = s.substring(1); pre = pre.substring(1); continue; + } + break; } - break; } } } @@ -150,16 +174,12 @@ public class IMAP { /* */ void copy(Query q, Mailbox to) { for(Mailbox.Iterator it=selected().iterator(q);it.next();) to.add(it.cur(), it.flags() | Mailbox.Flag.RECENT); } - public void login(String u, String p) { - if ((root = auth.authenticate(u,p)) == null) throw new No("Login failed."); - inbox = mailbox("INBOX", false); // FEATURE: ?? - } public void unselect() { selected = null; } public void delete(String m0) { delete(mailbox(m0,false)); } public void delete(Mailbox m) { if (!m.equals(inbox)) m.destroy(false); else throw new Bad("can't delete inbox"); } - public void create(String m) { mailbox(m, true); } + public void create(String m) { mailbox(m, true, false); } public void append(String m,int f,Date a,String b) { try { - mailbox(m,false).add(new Message(null,null,b,a),f|Mailbox.Flag.RECENT); + mailbox(m,false).add(Message.newMessage(new Fountain.StringFountain(b)),f|Mailbox.Flag.RECENT); } catch (Message.Malformed e) { throw new No(e.getMessage()); } } public void check() { } public void noop() { } @@ -169,19 +189,25 @@ public class IMAP { public void expunge(Mailbox.Iterator it) { client.expunge(it.uid()); it.delete(); } public void subscribe(String mailbox) { } public void unsubscribe(String mailbox) { } - public int seen(String mailbox) { return mailbox(mailbox, false).count(Query.seen()); } + public int maxuid() { + int ret = 0; + Mailbox mb = selected(); + if (mb == null) return 0; + for(Mailbox.Iterator it = mb.iterator(); it.next(); ) ret = it.uid(); + return ret; + } + public int unseen(String mailbox) { return mailbox(mailbox, false).count(Query.not(Query.seen())); } public int recent(String mailbox) { return mailbox(mailbox, false).count(Query.recent()); } public int count(String mailbox) { return mailbox(mailbox, false).count(Query.all()); } + public int count() { return selected().count(Query.all()); } public int uidNext(String mailbox) { return mailbox(mailbox, false).uidNext(); } - public int uidValidity(String mailbox) { return mailbox(mailbox, false).uidValidity(); } - public void select(String mailbox, boolean examineOnly) { - selected = mailbox(mailbox, false); - } + public int uidValidity(String mailbox) { return Math.abs(mailbox(mailbox, false).uidValidity()); } + public void select(String mailbox, boolean examineOnly) { selected = mailbox(mailbox, false); } public int[] search(Query q, boolean uid) { Vec.Int vec = new Vec.Int(); for(Mailbox.Iterator it = selected().iterator(q); it.next();) { - vec.addElement(uid ? it.uid() : it.num()); + vec.addElement(uid ? it.uid() : it.imapNumber()); it.recent(false); } return vec.dump(); @@ -194,12 +220,12 @@ public class IMAP { private void doFlags(Query q, int flags, boolean uid, int style, boolean silent) { for(Mailbox.Iterator it = selected().iterator(q);it.next();) { boolean recent = it.recent(); + try { throw new Exception("flags " + flags); } catch (Exception e) { Log.error(this, e); } if (style == -1) it.removeFlags(flags); else if (style == 0) it.setFlags(flags); else if (style == 1) it.addFlags(flags); it.recent(recent); - // FIXME - //if (!silent) client.fetch(it.num(), it.flags(), -1, null, it.uid()); + if (!silent) client.fetch(it.imapNumber(), it.flags(), -1, null, it.uid()); } } public void rename(String from0, String to) { @@ -212,8 +238,8 @@ public class IMAP { for(Mailbox.Iterator it = selected().iterator(q); it.next(); ) { Message message = ((spec & (BODYSTRUCTURE | ENVELOPE | INTERNALDATE | FIELDS | FIELDSNOT | RFC822 | RFC822TEXT | RFC822SIZE | HEADERNOT | HEADER)) != 0) ? it.cur() : null; - int size = message == null ? 0 : message.size(); - client.fetch(it.num(), it.flags(), size, message, it.uid()); + int size = message == null ? 0 : message.getLength(); + client.fetch(it.imapNumber(), it.flags(), size, message, it.uid()); it.recent(false); } } @@ -223,24 +249,42 @@ public class IMAP { // Single Session Handler ////////////////////////////////////////////////////////////////////////////// /** takes an IMAP.Server and exposes it to the world as an IMAP server on a TCP socket */ - public static class Listener implements Worker, Client { + public static class Listener implements Client { String selectedName = null; Mailbox inbox = null, root = null; Server api; Parser parser = null; Connection conn = null; - public Listener() { } + Login auth; + public Listener(Login auth) { api = new IMAP.MailboxWrapper(this.auth = auth, this); } Parser.Token token() { return parser.token(); } void println(String s) { conn.println(s); } void newline() { parser.newline(); } - Query query() { return parser.query(); } + Query query(int max) { return parser.query(max, maxn(true)); } + + public void login(String u, String p) { + Object ret; + if ((ret = auth.login(u,p,IMAP.class)) == null) throw new Server.No("Login failed."); + if (ret instanceof IMAP.Server) { + api = (IMAP.Server)ret; + api.setClient(this); + } else { + Account account = (Account)ret; + ((MailboxWrapper)api).root = root = account.getMailbox(IMAP.class); + Log.warn(this, "logged in, root="+root); + ((MailboxWrapper)api).inbox = inbox = root.slash("INBOX", false); + if (inbox == null) ((MailboxWrapper)api).inbox = inbox = root; + } + } + + private int maxn(boolean uid) { return uid ? api.maxuid() : api.count(); } + public void handleRequest(Connection conn) { this.conn = conn; parser = new Parser(conn); - api = new IMAP.MailboxWrapper(new Main.BogusAuthenticator(), this); conn.setTimeout(30 * 60 * 1000); println("* OK " + conn.vhost + " " + IMAP.class.getName() + " IMAP4rev1 [RFC3501] v" + version + " server ready"); - for(String tag = null;; newline()) try { + for(String tag = null;;) try { conn.flush(); boolean uid = false; tag = null; Parser.Token tok = token(); if (tok == null) return; tag = tok.astring(); @@ -248,16 +292,15 @@ public class IMAP { if (command.equalsIgnoreCase("UID")) { uid = true; command = token().atom(); } int commandKey = ((Integer)commands.get(command.toUpperCase())).intValue(); switch(commandKey) { - case LOGIN: api.login(token().astring(), token().astring()); break; + case LOGIN: login(token().astring(), token().astring()); break; case CAPABILITY: println("* CAPABILITY " + Printer.join(" ", api.capability())); break; case AUTHENTICATE: throw new Server.No("AUTHENTICATE not supported"); case LOGOUT: api.logout(); println("* BYE"); conn.close(); return; - case LIST: api.list(token().q(), token().q()); break; + case LIST: api.list(token().q(), token().astring()); break; /*astring is a hack for EUDORA*/ case LSUB: api.lsub(token().q(), token().q()); break; case SUBSCRIBE: api.subscribe(token().astring()); break; case UNSUBSCRIBE: api.unsubscribe(token().astring()); break; case RENAME: api.rename(token().astring(), token().astring()); break; - case COPY: selected(); api.copy(Query.set(uid, token().set()), token().astring()); break; case DELETE: api.delete(token().atom()); break; case CHECK: selected(); api.check(); break; case NOOP: api.noop(); break; @@ -265,9 +308,19 @@ public class IMAP { case EXPUNGE: selected(); api.expunge(); break; case UNSELECT: selected(); api.unselect(); selected = false; break; case CREATE: api.create(token().astring()); break; - case FETCH: selected(); fetch(Query.set(lastuid=uid, token().set()), + case FETCH: selected(); fetch(((lastuid=uid) + ? Query.uid(token().set(maxn(uid))) + : Query.imapNumber(token().set(maxn(uid)))), lastfetch=token().lx(), 0, 0, 0, uid, 0); break; - case SEARCH: selected(); println("* SEARCH " + Printer.join(api.search(query(), uid))); break; + case COPY: selected(); api.copy(uid + ? Query.uid(token().set(maxn(uid))) + : Query.imapNumber(token().set(maxn(uid))), token().astring()); break; + case SEARCH: { + selected(); + int[] result = api.search(query(maxn(uid)), uid); + /*if (result.length > 0)*/ println("* SEARCH " + Printer.join(result)); + break; + } case EXAMINE: case SELECT: { String mailbox = token().astring(); @@ -275,9 +328,10 @@ public class IMAP { println("* FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"); println("* " + api.count(mailbox) + " EXISTS"); println("* " + api.recent(mailbox) + " RECENT"); + println("* OK [UNSEEN " + api.unseen(mailbox) + "]"); println("* OK [UIDVALIDITY " + api.uidValidity(mailbox) + "] UIDs valid"); println("* OK [UIDNEXT " + api.uidNext(mailbox) + "]"); - println("* OK [PERMANENTFLAGS (\\Seen \\Draft \\Answered \\Deleted)]"); + println("* OK [PERMANENTFLAGS (\\Seen)]"); selected = true; break; } case STATUS: { @@ -286,27 +340,28 @@ public class IMAP { String response = ""; for(int i=0; i0) response += " "; if (s.equals("MESSAGES")) response += "MESSAGES " + api.count(mailbox); - if (s.equals("RECENT")) response += "RECENT " + api.seen(mailbox); - if (s.equals("UIDNEXT")) response += "UNSEEN " + api.recent(mailbox); + if (s.equals("RECENT")) response += "RECENT " + api.recent(mailbox); + if (s.equals("UIDNEXT")) response += "UIDNEXT " + api.uidNext(mailbox); if (s.equals("UIDVALIDITY")) response += "UIDVALIDITY " + api.uidValidity(mailbox); - if (s.equals("UNSEEN")) response += "UIDNEXT " + api.uidNext(mailbox); + if (s.equals("UNSEEN")) response += "UNSEEN " + api.unseen(mailbox); } - println("* STATUS " + selectedName + " (" + response + ")"); + println("* STATUS " + mailbox + " (" + response + ")"); break; } case APPEND: { - String m = token().atom(); + String m = token().astring(); int flags = 0; - Date arrival = null; + Date arrival = new Date(); Parser.Token t = token(); if (t.type == t.LIST) { flags = t.flags(); t = token(); } - if (t.type == t.QUOTED) { arrival = t.datetime(); t = token(); } - api.append(m, flags, arrival, token().q()); + if (t.type != t.QUOTED) { arrival = t.datetime(); t = token(); } + api.append(m, flags, arrival, t.q()); break; } case STORE: { selected(); - Query q = uid ? Query.uid(token().set()) : Query.num(token().set()); + Query q = uid ? Query.uid(token().set(maxn(uid))) : Query.imapNumber(token().set(maxn(uid))); String s = token().atom().toUpperCase(); int flags = token().flags(); if (s.equals("FLAGS")) api.setFlags(q, flags, uid, false); @@ -321,6 +376,12 @@ public class IMAP { } println(tag+" OK "+command+" Completed. " + (commandKey == LOGIN ? ("[CAPABILITY "+Printer.join(" ", api.capability())+"]") : "")); + try { + newline(); + } catch (Stream.EOF e) { + Log.info(this, "connection closed"); + return; + } } catch (Server.Bad b) { println(tag==null ? "* BAD Invalid tag":(tag + " Bad " + b.toString())); Log.warn(this,b); } catch (Server.No n) { println(tag==null?"* BAD Invalid tag":(tag+" No " + n.toString())); Log.warn(this,n); } } @@ -346,16 +407,22 @@ public class IMAP { * - emit a fetch reply for the parsed spec with respect to message m */ private void fetch(Object o, Parser.Token[] t, int num, int flags, int size, boolean uid, int muid) { - Query q = o instanceof Query ? (Query)o : null; - Message m = o instanceof Message ? (Message)o : null; + Query q = o == null ? null : o instanceof Query ? (Query)o : null; + Message m = o == null ? null : o instanceof Message ? (Message)o : null; boolean e = q == null; + // asynchronous flags update + if (size == -1) { + println("* " + num + " FETCH (FLAGS " + Printer.flags(flags) + (uid?(" UID "+muid):"") + ")"); + return; + } + lastfetch = t; int spec = 0; // spec; see constants for flags String[] headers = null; int start = -1, end = -1; StringBuffer r = new StringBuffer(); - if (e) { r.append(uid ? muid : num); r.append(" FETCH ("); } + if (e) { r.append(num); r.append(" FETCH ("); } int initlen = r.length(); if (uid) { boolean good = false; @@ -390,14 +457,14 @@ public class IMAP { } else if (s.equals("FLAGS")) { spec|=FLAGS; if(e){r.append(" ");r.append(Printer.flags(flags));} } else if (s.equals("INTERNALDATE")) { spec|=INTERNALDATE; if(e){r.append(" ");r.append(Printer.date(m.arrival));} } else if (s.equals("RFC822")) { spec|=RFC822; if(e){r.append(" ");r.append(Printer.message(m));} - } else if (s.equals("RFC822.TEXT")) { spec|=RFC822TEXT; if(e){r.append(" ");r.append(Printer.qq(m.body));} - } else if (s.equals("RFC822.HEADER")){ spec|=HEADER;if(e){r.append(" ");r.append(Printer.qq(m.allHeaders+"\r\n"));} - } else if (s.equals("RFC822.SIZE")) { spec|=RFC822SIZE; if(e){r.append(" ");r.append(m.size());} + } else if (s.equals("RFC822.TEXT")) { spec|=RFC822TEXT; if(e){r.append(" ");r.append(Printer.qq(getBodyString(m)));} + } else if (s.equals("RFC822.HEADER")){ spec|=HEADER;if(e){r.append(" ");r.append(Printer.qq(m.headers.getString()+"\r\n"));} + } else if (s.equals("RFC822.SIZE")) { spec|=RFC822SIZE; if(e){r.append(" ");r.append(m.getLength());} } else if (s.equals("UID")) { spec|=UID; if(e){r.append(" ");r.append(muid); } } else if (!(s.equals("BODY.PEEK") || s.equals("BODY"))) { throw new Server.No("unknown fetch argument: " + s); } else { if (s.equalsIgnoreCase("BODY.PEEK")) spec |= PEEK; - //else if (e) api.addFlags(Query.num(new int[] { num, num }), Mailbox.Flag.SEEN, false, false); + //else if (e) api.addFlags(Query.imapNumber(new int[] { num, num }), Mailbox.Flag.SEEN, false, false); if (i >= t.length - 1 || t[i+1].type != Parser.Token.LIST) { spec |= BODYSTRUCTURE; if (e) { r.append(" "); r.append(Printer.bodystructure(m)); } continue; @@ -408,10 +475,10 @@ public class IMAP { Parser.Token[] list = t[++i].l(); s = list.length == 0 ? "" : list[0].s.toUpperCase(); r.append(s); - if (list.length == 0) { spec |= RFC822TEXT; if(e) payload = m.allHeaders+"\r\n"+m.body; } - else if (s.equals("")) { spec |= RFC822TEXT; if(e) payload = m.allHeaders+"\r\n"+m.body; } - else if (s.equals("TEXT")) { spec |= RFC822TEXT; if(e) payload = m.body; } - else if (s.equals("HEADER")) { spec |= HEADER; if(e) payload = m.allHeaders+"\r\n"; } + if (list.length == 0) { spec |= RFC822TEXT; if(e) payload = m.headers.getString()+"\r\n"+getBodyString(m); } + else if (s.equals("") || s.equals("1")) { spec |= RFC822TEXT; if(e) payload = m.headers.getString()+"\r\n"+getBodyString(m); } + else if (s.equals("TEXT")) { spec |= RFC822TEXT; if(e) payload = getBodyString(m); } + else if (s.equals("HEADER")) { spec |= HEADER; if(e) payload = m.headers.getString()+"\r\n"; } else if (s.equals("HEADER.FIELDS")) { spec |= FIELDS; payload=headers(r,t[i].l()[1].sl(),false,m,e); } else if (s.equals("HEADER.FIELDS.NOT")) { spec |= FIELDSNOT; payload=headers(r,t[i].l()[1].sl(),true,m,e); } else if (s.equals("MIME")) { throw new Server.Bad("MIME not supported"); } @@ -491,49 +558,53 @@ public class IMAP { private Stream stream; public Parser(Stream from) { this.stream = from; } public Token token(String s) { return new Token(s); } - protected Query query() { + protected Query query(int max, int maxuid) { String s = null; boolean not = false; Query q = null; + Query ret = null; while(true) { Parser.Token t = token(false); if (t == null) break; if (t.type == t.LIST) throw new Server.No("nested queries not yet supported FIXME"); - else if (t.type == t.SET) return Query.num(t.set()); + else if (t.type == t.SET) return Query.imapNumber(t.set(max)); s = t.atom().toUpperCase(); - if (s.equals("NOT")) { not = true; continue; } - if (s.equals("OR")) return Query.or(query(), query()); // FIXME parse rest of list - if (s.equals("AND")) return Query.and(query(), query()); + if (s.equals("NOT")) return Query.not(query(max, maxuid)); + if (s.equals("OR")) return Query.or(query(max, maxuid), query(max, maxuid)); // FIXME parse rest of list + if (s.equals("AND")) return Query.and(query(max, maxuid), query(max, maxuid)); + + if (s.startsWith("UN")) { not = true; s = s.substring(2); } + if (s.equals("ANSWERED")) q = Query.answered(); + else if (s.equals("DELETED")) q = Query.deleted(); + else if (s.equals("ALL")) q = Query.all(); + else if (s.equals("DRAFT")) q = Query.draft(); + else if (s.equals("FLAGGED")) q = Query.flagged(); + else if (s.equals("RECENT")) q = Query.recent(); + else if (s.equals("SEEN")) q = Query.seen(); + else if (s.equals("OLD")) { not = true; q = Query.recent(); } + else if (s.equals("NEW")) q = Query.and(Query.recent(), Query.not(Query.seen())); + else if (s.equals("KEYWORD")) q = Query.header("keyword", token().flag()); + else if (s.equals("HEADER")) q = Query.header(token().astring(), token().astring()); + else if (s.equals("BCC")) q = Query.header("bcc", token().astring()); + else if (s.equals("CC")) q = Query.header("cc", token().astring()); + else if (s.equals("FROM")) q = Query.header("from", token().astring()); + else if (s.equals("TO")) q = Query.header("to", token().astring()); + else if (s.equals("SUBJECT")) q = Query.header("subject", token().astring()); + else if (s.equals("LARGER")) q = Query.size(token().n(), Integer.MAX_VALUE); + else if (s.equals("SMALLER")) q = Query.size(Integer.MIN_VALUE, token().n()); + else if (s.equals("BODY")) q = Query.body(token().astring()); + else if (s.equals("TEXT")) q = Query.full(token().astring()); + else if (s.equals("BEFORE")) q = Query.arrival(new Date(0), token().date()); + else if (s.equals("SINCE")) q = Query.arrival(token().date(), new Date(Long.MAX_VALUE)); + else if (s.equals("ON")) { Date d = token().date(); q = Query.arrival(d, new Date(d.getTime() + 24 * 60 * 60)); } + else if (s.equals("SENTBEFORE")) q = Query.sent(new Date(0), token().date()); + else if (s.equals("SENTSINCE")) q = Query.sent(token().date(), new Date(Long.MAX_VALUE)); + else if (s.equals("SENTON")) { Date d = token().date(); q = Query.sent(d, new Date(d.getTime() + 24 * 60 * 60)); } + else if (s.equals("UID")) q = Query.uid(token().set(max)); + q = not ? Query.not(q) : q; + ret = ret == null ? q : Query.and(ret, q); } - if (s.startsWith("UN")) { not = true; s = s.substring(2); } - if (s.equals("ANSWERED")) q = Query.answered(); - else if (s.equals("DELETED")) q = Query.deleted(); - else if (s.equals("ALL")) q = Query.all(); - else if (s.equals("DRAFT")) q = Query.draft(); - else if (s.equals("FLAGGED")) q = Query.flagged(); - else if (s.equals("RECENT")) q = Query.recent(); - else if (s.equals("SEEN")) q = Query.seen(); - else if (s.equals("OLD")) { not = true; q = Query.recent(); } - else if (s.equals("NEW")) q = Query.and(Query.recent(), Query.not(Query.seen())); - else if (s.equals("KEYWORD")) q = Query.header("keyword", token().flag()); - else if (s.equals("HEADER")) q = Query.header(token().astring(), token().astring()); - else if (s.equals("BCC")) q = Query.header("bcc", token().astring()); - else if (s.equals("CC")) q = Query.header("cc", token().astring()); - else if (s.equals("FROM")) q = Query.header("from", token().astring()); - else if (s.equals("TO")) q = Query.header("to", token().astring()); - else if (s.equals("SUBJECT")) q = Query.header("subject", token().astring()); - else if (s.equals("LARGER")) q = Query.size(token().n(), Integer.MAX_VALUE); - else if (s.equals("SMALLER")) q = Query.size(Integer.MIN_VALUE, token().n()); - else if (s.equals("BODY")) q = Query.body(token().astring()); - else if (s.equals("TEXT")) q = Query.full(token().astring()); - else if (s.equals("BEFORE")) q = Query.arrival(new Date(0), token().date()); - else if (s.equals("SINCE")) q = Query.arrival(token().date(), new Date(Long.MAX_VALUE)); - else if (s.equals("ON")) { Date d = token().date(); q = Query.arrival(d, new Date(d.getTime() + 24 * 60 * 60)); } - else if (s.equals("SENTBEFORE")) q = Query.sent(new Date(0), token().date()); - else if (s.equals("SENTSINCE")) q = Query.sent(token().date(), new Date(Long.MAX_VALUE)); - else if (s.equals("SENTON")) { Date d = token().date(); q = Query.sent(d, new Date(d.getTime() + 24 * 60 * 60)); } - else if (s.equals("UID")) q = Query.uid(token().set()); - return q; + return ret; } private static void bad(String s) { throw new Server.Bad(s); } @@ -546,7 +617,7 @@ public class IMAP { public Token() { this.s = null; n = 0; l = null; type = NIL; } public Token(String s) { this(s, false); } public Token(String s, boolean quoted) { this.s = s; n = 0; l = null; type = quoted ? QUOTED : ATOM; } - public Token(Parser.Token[] list) { this.s = null; n = 0; l = list; type = LIST; } + public Token(Parser.Token[] list) { this.s = null; n = 0; l = list; type = LIST; } public Token(int number) { this.s = null; n = number; l = null; type = NUMBER; } public String flag() { if (type != ATOM) bad("expected a flag"); return s; } @@ -593,30 +664,27 @@ public class IMAP { } return ret; } - public int[] set() { + public int[] set(int largest) { if (type != ATOM) bad("expected a messageid set"); Vec.Int ids = new Vec.Int(); StringTokenizer st = new StringTokenizer(s, ","); while(st.hasMoreTokens()) { String s = st.nextToken(); if (s.indexOf(':') == -1) { - if (s.equals("*")) { - ids.addElement(0); - ids.addElement(Integer.MAX_VALUE); - } else { - ids.addElement(Integer.parseInt(s)); - ids.addElement(Integer.parseInt(s)); - } - continue; } + if (s.equals("*")) { + ids.addElement(largest); + ids.addElement(largest); + } else { + ids.addElement(Integer.parseInt(s)); + ids.addElement(Integer.parseInt(s)); + } + continue; } int start = Integer.parseInt(s.substring(0, s.indexOf(':'))); String end_s = s.substring(s.indexOf(':')+1); - if (end_s.equals("*")) { ids.addElement(start); ids.addElement(Integer.MAX_VALUE); } - else { - int end = Integer.parseInt(end_s); - for(int j=Math.min(start,end); j<=Math.max(start,end); j++) { - ids.addElement(j); - ids.addElement(j); - } + int end = end_s.equals("*") ? largest : Integer.parseInt(end_s); + for(int j=Math.min(start,end); j<=Math.max(start,end); j++) { + ids.addElement(j); + ids.addElement(j); } } return ids.dump(); @@ -642,12 +710,7 @@ public class IMAP { } } - public void newline() { - while (stream.peekc() == '\r' || stream.peekc() == '\n' || stream.peekc() == ' ') { - for(char c = stream.peekc(); c == ' ';) { stream.getc(); c = stream.peekc(); }; - for(char c = stream.peekc(); c == '\r' || c == '\n';) { stream.getc(); c = stream.peekc(); }; - } - } + public void newline() { stream.readln(); } public Token token() { return token(true); } public Token token(boolean freak) { @@ -657,12 +720,18 @@ public class IMAP { if (c == '\r' || c == '\n') { if (freak) bad("unexpected end of line"); return null; } else if (c == '{') { while(stream.peekc() != '}') sb.append(stream.getc()); + stream.getc(); stream.println("+ Ready when you are..."); int octets = Integer.parseInt(sb.toString()); while(stream.peekc() == ' ') stream.getc(); // whitespace - while (stream.getc() != '\n' && stream.getc() != '\r') { } + while(stream.peekc() == '\n' || stream.peekc() == '\r') stream.getc(); byte[] bytes = new byte[octets]; - stream.read(bytes, 0, bytes.length); + int numread = 0; + while(numread < bytes.length) { + int n = stream.read(bytes, numread, bytes.length - numread); + if (n == -1) bad("end of stream while reading IMAP qstring"); + numread += n; + } return new Token(new String(bytes), true); } else if (c == '\"') { while(true) { @@ -703,6 +772,7 @@ public class IMAP { public static String addressList(Object a) { if (a == null) return "NIL"; if (a instanceof Address) return "("+address((Address)a)+")"; + if (a instanceof String) return "("+address(Address.parse((String)a))+")"; Address[] aa = (Address[])a; StringBuffer ret = new StringBuffer(); ret.append("("); @@ -732,10 +802,10 @@ public class IMAP { } static String bodystructure(Message m) { // FIXME - return "(\"TEXT\" \"PLAIN\" (\"CHARSET\" \"ISO-8859-1\") NIL NIL \"7BIT\" "+m.size()+" "+m.lines+")"; + return "(\"TEXT\" \"PLAIN\" (\"CHARSET\" \"ISO-8859-1\") NIL NIL \"7BIT\" "+m.getLength()+" "+m.getNumLines()+")"; } static String message(Message m) { return m.toString(); } - static String date(Date d) { return d.toString(); } + static String date(Date d) { return "\""+d.toString()+"\""; } static String envelope(Message m) { return "(" + quotify(m.arrival.toString()) + @@ -754,7 +824,7 @@ public class IMAP { public static String qq(String s) { StringBuffer ret = new StringBuffer(); ret.append('{'); - ret.append(s.length()); + ret.append(s.getBytes().length); ret.append('}'); ret.append('\r'); ret.append('\n'); @@ -783,19 +853,8 @@ public class IMAP { // Main ////////////////////////////////////////////////////////////////////////////// - /** simple listener for testing purposes */ - public static void main(String[] args) throws Exception { - ServerSocket ss = new ServerSocket(143); - for(;;) { - final Socket s = ss.accept(); - new Thread() { public void run() { try { - final Mailbox root = FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT+File.separatorChar+"imap", true); - new Listener(); - } catch (Exception e) { e.printStackTrace(); } } }.start(); - } - } - public static final int PEEK=0x1, BODYSTRUCTURE=0x2, ENVELOPE=0x4, FLAGS=0x8, INTERNALDATE=0x10, FIELDS=0x800, FIELDSNOT=0x1000, RFC822=0x20, RFC822TEXT=0x40, RFC822SIZE=0x80, HEADERNOT=0x100, UID=0x200, HEADER=0x400; + }