import java.sql.Timestamp;
import java.sql.Connection;
-public class Whitelist extends SqliteTable {
-
- public Whitelist(String filename) {
- super(filename,
- new String[] {
- "create table if not exists 'whitelist' (email)",
- "create table if not exists 'pending' (spamid,email,message,date)"
- },
- true,
- "pending",
- "date");
+public class Whitelist extends SqliteDB {
+
+ public Whitelist(String filename) throws SQLException {
+ super(filename);
+ SqliteTable whitelist = getTable("whitelist", "(email)");
+ whitelist.createIndex("email");
+ SqliteTable pending = getTable("pending", "(spamid,email,message,date)");
+ pending.reap("date");
+ pending.createIndex("spamid");
+ pending.createIndex("email");
}
- public synchronized boolean handleRequest(org.ibex.net.Connection c) {
+ public boolean handleRequest(org.ibex.net.Connection c) {
try {
Socket sock = c.getSocket();
BufferedReader br = new BufferedReader(new InputStreamReader(sock.getInputStream()));
} else {
url = url.substring("/whitelist/".length());
url = URLDecoder.decode(url);
+ if (url.endsWith(".txt")) url = url.substring(0, url.length()-4);
pw.print("HTTP/1.0 200 OK\r\n");
pw.print("Content-Type: text/plain\r\n");
pw.print("\r\n");
ResultSet rs = query.executeQuery();
if (!rs.next())
throw new RuntimeException("could not find messageid \""+messageid+"\"");
- do {
- addWhitelist(Address.parse(rs.getString(1)));
- Message m = Message.newMessage(new Fountain.StringFountain(rs.getString(2)));
+ HashSet<Message> hsm = new HashSet<Message>();
+ synchronized(this) {
+ do {
+ addWhitelist(Address.parse(rs.getString(1)));
+ Message m = Message.newMessage(new Fountain.StringFountain(rs.getString(2)));
+ Address a = m.headers.get("reply-to")==null ? null : Address.parse(m.headers.get("reply-to"));
+ if (a!=null) addWhitelist(a);
+ a = m.from;
+ if (a!=null) addWhitelist(a);
+ a = m.envelopeFrom;
+ if (a!=null) addWhitelist(a);
+ hsm.add(m);
+ if (m.cc != null) for(Address aa : m.cc) {
+ if (aa!= null) addWhitelist(aa);
+ }
+ } while (rs.next());
+ }
+ for(Message m : hsm)
Target.root.accept(m);
- } while (rs.next());
} catch (SQLException e) { throw new RuntimeException(e); }
}
- public synchronized void challenge(Message m) {
+ public void challenge(Message m) {
try {
+ // FIXME: don't challenge emails with binaries in them;
+ // reject them outright and have the sender send an
+ // initial message w/o a binary.
+
+ // FIXME: use Auto here!!!
+ // The challenge should refer to the message-id of the mail being challenged.
+
+ // FIXME: watch outgoing MessageID's: if something comes
+ // back with an In-Reply-To mentioning a MessageID from
+ // the last few days, auto-whitelist them.
+
+ // FIXME: important that "From" on the challenge matches
+ // RCPT TO on the original message.
+
Log.warn(Whitelist.class, "challenging message: " + m.summary());
Address to = m.headers.get("reply-to")==null ? null : Address.parse(m.headers.get("reply-to"));
"with Auto-Submitted=\""+m.headers.get("Auto-Submitted")+"\"");
return;
}
+ if (m.headers.get("List-Id") != null || m.headers.get("List-Post") != null) {
+ Log.warn(this, "refusing to send a challenge to a message with a List-Id or List-Post header");
+ return;
+ }
Address from = Address.parse("adam@megacz.com");
messageid = messageid.replace('%','_');
Log.warn(Whitelist.class, "got challenge for: " + messageid);
- String url = "http://www.megacz.com:8025/whitelist/"+URLEncoder.encode(messageid);
+ String url = "http://www.megacz.com:8025/whitelist/"+URLEncoder.encode(messageid)+".txt";
String message =
"Return-Path: <>" + "\r\n" +
"Envelope-To: " + to + "\r\n" +
"\n" +
url+"\n" +
"\n" +
- "\n" +
+ "\n"
+ /*
"About this message:\n" +
"\n" +
"NOTE: SPAMCOP DOES NOT CONSIDER THIS TO BE SPAM; see this:\n"+
" \n"+
" For more information, please see:\n"+
" \n"+
- " http://www.templetons.com/brad/spam/crgood.html\n";
-
+ " http://www.templetons.com/brad/spam/crgood.html\n"
+ */
+ ;
Message challenge = Message.newMessage(new Fountain.StringFountain(message));
- PreparedStatement query = conn.prepareStatement("select email from pending where email=?");
- query.setString(1, to.toString(false));
- ResultSet rs = query.executeQuery();
- if (rs.next()) {
- Log.warn(this, "already challenged " + to.toString(false) + "; not challenging again.");
- } else {
+ boolean send = false;
+ synchronized(this) {
+ PreparedStatement query = conn.prepareStatement("select email from pending where email=?");
+ query.setString(1, to.toString(false));
+ ResultSet rs = query.executeQuery();
+ if (rs.next()) {
+ Log.warn(this, "already challenged " + to.toString(false) + "; not challenging again.");
+ } else {
+ send = true;
+ }
+ }
+
+ if (send)
if (!SMTP.Outgoing.attempt(challenge))
throw new RuntimeException("attempted to send challenge but could not: " + m.summary());
- }
- PreparedStatement add = conn.prepareStatement("insert into pending values(?,?,?,?)");
- add.setString(1, messageid);
- add.setString(2, to.toString(false));
- add.setString(3, streamToString(m.getStream()));
- add.setTimestamp(4, new Timestamp(System.currentTimeMillis()));
- add.executeUpdate();
+ synchronized(this) {
+ PreparedStatement add = conn.prepareStatement("insert into pending values(?,?,?,?)");
+ add.setString(1, messageid);
+ add.setString(2, to.toString(false));
+ add.setString(3, SqliteDB.streamToString(m.getStream()));
+ add.setTimestamp(4, new Timestamp(System.currentTimeMillis()));
+ add.executeUpdate();
+ }
} catch (Exception e) { throw new RuntimeException(e); }
}
- private static String streamToString(Stream stream) throws Exception {
- StringBuffer b = new StringBuffer();
- for(String s = stream.readln(); s!=null; s=stream.readln())
- b.append(s+"\n");
- return b.toString();
- }
}
projects / org.ibex.mail.git / blobdiff