public static final DateFormat dateFormat = new SimpleDateFormat("yyyyMMDDhhmmss");
- public static class No extends RuntimeException { int code = 400; } // 4xx response codes
+ public static class No extends RuntimeException { int code = 400; } // 4xx response codes
public static class Bad extends RuntimeException { int code = 500; public Bad(String s) { super(s); } } // 5xx response codes
public static class Group {
}
public static class Article {
- public Article(int num, Message message) { this.message = message; this.num = num;}
+ public Article(int num, Message message) { this.message = message; this.num = num; }
public final int num;
public final Message message;
}
public boolean ihave(String messageid);
public Article next();
public Article last();
- public boolean post(Message m);
+ public boolean postok();
+ public void post(Message m) throws IOException;
public Article article(String messageid, boolean head, boolean body);
public Article article(int messagenum, boolean head, boolean body);
public Group[] list();
private final Mailbox root;
private Mailbox current;
private int ptr = 0;
- public MailboxWrapper(Mailbox root) { this.root = root; }
+ private boolean post;
+ public MailboxWrapper(Mailbox root) { this(root, false); }
+ public MailboxWrapper(Mailbox root, boolean post) { this.root = root; this.post = post; }
+ public boolean postok() { return post; }
+ public void post(Message m) throws IOException { current.accept(m); }
+
public Group group(String s) {
ptr = 0;
Group g = getgroup(s);
}
public boolean ihave(String messageid) { /* FEATURE */ return false; }
- public boolean post(Message m) { /* FEATURE */ return false; }
public Article next() { return article(ptr++, false, false); }
public Article last() { return article(ptr--, false, false); }
String user = null;
String pass = null;
Account account = login.anonymous();
- this.api = account == null ? null : new MailboxWrapper(account.getMailbox(NNTP.class));
+ this.api = account == null ? null : new MailboxWrapper(account.getMailbox(NNTP.class), true);
for(String line = conn.readln(); line != null; line = conn.readln()) try {
Log.warn("[nntp-read]", line);
StringTokenizer st = new StringTokenizer(line, " ");
if (command.equals("AUTHINFO")) {
// FIXME technically the RFC says we need to use this info to generate a SEnder: header...
String uop = st.nextToken().toUpperCase();
- if (uop.equals("USER")) user = st.nextToken();
- else if (uop.equals("PASS")) pass = st.nextToken();
- // FIXME error here
+ if (uop.equals("USER")) {
+ user = st.nextToken();
+ println("381 More authentication required");
+ continue;
+ } else if (uop.equals("PASS")) {
+ pass = st.nextToken();
+ account = login.login(user, pass);
+ if (account == null) { println("502 Invalid"); continue; }
+ Mailbox box = account.getMailbox(NNTP.class);
+ this.api = new MailboxWrapper(box, true);
+ println("281 Good to go");
+ continue;
+ }
+ throw new Bad("wtf are you talking about?");
}
if (this.api == null) {
if (user == null) { println("480 Authentication required"); continue; }
if (pass == null) { println("381 Password required"); continue; }
- account = login.login(user, pass);
- if (account == null) { println("502 Invalid"); continue; }
- this.api = new MailboxWrapper(account.getMailbox(NNTP.class));
- println("281 Good to go");
- continue;
}
if (command.equals("ARTICLE")) { article(st.hasMoreTokens() ? st.nextToken() : null, true, true);
} else if (command.equals("HEAD")) { article(st.hasMoreTokens() ? st.nextToken() : null, true, false);
} catch (Exception e) { Log.error(this, e); }
}
println(".");
- } else if (command.equals("LAST")) { Article a = api.last(); println("223 "+a.num+" "+a.message.messageid+" ok");
- } else if (command.equals("NEXT")) { Article a = api.next(); println("223 "+a.num+" "+a.message.messageid+" ok");
+ } else if (command.equals("LAST")) {
+ Article a = api.last(); println("223 "+a.num+" "+a.message.messageid+" ok");
+ } else if (command.equals("NEXT")) {
+ Article a = api.next(); println("223 "+a.num+" "+a.message.messageid+" ok");
} else if (command.equals("QUIT")) { println("205 Bye."); conn.close(); return;
} else if (command.equals("GROUP")) {
Group g = api.group(st.nextToken().toLowerCase());
}
} else if (command.equals("POST")) {
- // add NNTP-Posting-Host header
// FIXME
- // required headers: Newsgroups, Subject, Message-ID, Path, From, Date. No wildcars in newsgroups list
+ // add NNTP-Posting-Host header
// Path header: prepend <myname>, (any punctuation separates the list)
// Expires header: the date when expiration happens (??) should we ignore this?
- // Control header: body is the command. Inteprert posts to all.all.ctl as control messages, use Subject line if no Cntrol line
+ // Control header: body is the command. Inteprert posts to all.all.ctl as control messages,
+ // use Subject line if no Cntrol line
// "Approved" line is used for moderaion
// Xref: drop this header if you see it
// newgroup <groupname> [moderated] -- body of message is a description of the group
// rmgroup <groupname>
- /*
- boolean postok = api.post();
+ boolean postok = api.postok();
if (!postok) {
println("440 no posting allowed");
} else {
- */
- println("340 send the article");
- // FIME read the article here
- println("240 article posted ok");
- //}
+ println("340 send the article");
+ StringBuffer buf = new StringBuffer();
+ while(true) {
+ String s = conn.readln();
+ if (s == null) throw new RuntimeException("connection closed");
+ if (s.equals(".")) break;
+ if (s.startsWith(".")) s = s.substring(1);
+ buf.append(s + "\r\n");
+ }
+ String body = buf.toString();
+ try {
+ Message m = Message.newMessage(new Fountain.StringFountain(body));
+ if (m.headers.get("newsgroups")==null)
+ println("441 posted messages must have a Newsgroups header per RFC 977");
+ else if (m.headers.get("newsgroups").indexOf('*')!=-1)
+ println("441 Newsgroups header in posted messages may not contain wildcards (*) per RFC 977");
+ else if (m.headers.get("subject")==null)
+ println("441 posted messages must have a Subject header per RFC 977");
+ // else if (m.headers.get("path")==null)
+ //println("441 posted messages must have a Path header per RFC 977");
+ else if (m.headers.get("from")==null)
+ println("441 posted messages must have a From header per RFC 977");
+ else if (m.headers.get("date")==null)
+ println("441 posted messages must have a Date header per RFC 977");
+ else {
+ api.post(m);
+ println("240 article posted ok");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ println("441 posting failed: " + e);
+ }
+ }
} else if (command.equals("XROVER")) {
// equivalent to "XHDR References"
projects / org.ibex.mail.git / blobdiff