Changeset 2114058982a08f59f0f312544a16250eceab0098

Timestamp:

01/09/11 21:00:35 (17 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

cbc895b6da7a6196ef0422747bd7dec2a40551d5

Parents:

0062266a64c1492ae732d9e77d88016547e82c16

git-author:

Antti-Juhani Kaijanaho <antti-juhani@…> (01/09/11 21:00:21)

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (01/09/11 21:00:35)

Message:

#14: Support moderators with kill/mark-as-spam and resurrection powers

Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani@…>

Files:

• db/FORMAT.txt (modified) (2 diffs)
• db/db.cc (modified) (3 diffs)
• db/db.hh (modified) (2 diffs)
• db/msg.hh (modified) (4 diffs)
• db/role.cc (modified) (2 diffs)
• db/role.hh (modified) (3 diffs)
• db/user.cc (modified) (2 diffs)
• db/user.hh (modified) (4 diffs)
• http/moderate.cc (added)
• nntp/article.cc (modified) (2 diffs)
• nntp/hdr.cc (modified) (3 diffs)
• nntp/over.cc (modified) (3 diffs)
• tlate/msg_value.cc (modified) (5 diffs)

db/FORMAT.txt

@@ -69 +69 @@
 
 NOTE: The following role names are reserved: anonymous, authenticated,
-poster.  Similarly, all names starting with "subscribers:" are
-reserved.  No ROLE records may be given for "anonymous" and
-"authenticated".  ROLE records for the other reserved names are
-forbidden to include DESCRIPTION.
+poster.  Similarly, all names starting with "subscribers:" and
+"moderator:" are reserved.  No ROLE records may be given for
+"anonymous" and "authenticated".  ROLE records for the other reserved
+names are forbidden to include DESCRIPTION.
 
 
@@ -111 +111 @@
 
 
+                          MODERATION records
+
+.BEGIN <datetime>
+MODERATION <userid>
+<verb> <msgid> <reason>
+.END
+
+<verb> ::= KILL
+         | SPAM
+         | CLEAR
+
+<reason> ::= <text not containing line terminator or separator>
+
+The MODERATION line is REQUIRED and MUST NOT be repeated.  The other
+lines MAY occur multiple times.  The <userid> indicates the user who
+authorized these moderation actions.
+
+The effect of a KILL or SPAM line is to make the message disappear
+(the reason is free form text that is intended to be used as
+rationale); it will be as if it never existed.  The effect of a CLEAR
+line is to undo a previous KILL or SPAM line.

db/db.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -182 +182 @@
         }
 
+        void db::do_moderation(db_reader &dr, std::string line)
+        {
+                std::string uid = line;
+                util::strip(uid);
+                user::ptr u = users[uid];
+                if (!u) throw illformed_db("MODERATION user invalid: " + uid);
+                while (true)
+                {
+                        dr.readline(line);
+                        if (line == ".END" || line == ".END\r") break;
+                        std::string keys = util::split(line);
+                        std::string mid = util::split(line);
+                        std::string reason = line;
+                        msg::ptr m = msgid[mid];
+                        if (!m)
+                        {
+                                logger::logline ll;
+                                ll << "unknown message in MODERATION ignored: "
+                                   << keys << " " << mid;
+                                continue;
+                        }
+                        msg::moderation::kind_type key;
+                        /**/ if (keys == "KILL")  key = msg::moderation::KILL;
+                        else if (keys == "SPAM")  key = msg::moderation::SPAM;
+                        else if (keys == "CLEAR") key = msg::moderation::CLEAR;
+                        else throw illformed_db("MODERATION key error: " +
+                                                keys);
+                        m->moderate(msg::moderation(key, u, reason));
+                }
+        }
+
         void db::do_article(db_reader &dr, std::string line)
         {
@@ -272 +303 @@
                 else if (cmd == "ARTICLE")
                         do_article(dr, line);
+                else if (cmd == "MODERATION")
+                        do_moderation(dr, line);
                 else
                         throw illformed_db("unrecognized record type " + cmd);

db/db.hh

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -137 +137 @@
                 void do_article(db_reader &, std::string);
                 void do_role(db_reader &, std::string);
+                void do_moderation(db_reader &, std::string);
                 void read_record(db_reader &dr, boost::posix_time::ptime);
                 void register_role(boost::shared_ptr<role>);

db/msg.hh

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -39 +39 @@
         {
         public:
+                struct moderation
+                {
+                        const enum kind_type { CLEAR, KILL, SPAM } kind;
+                        const boost::shared_ptr<const user> u;
+                        const std::string reason;
+
+                        moderation(kind_type k,
+                                   boost::shared_ptr<const user> u,
+                                   std::string reason)
+                                : kind(k)
+                                , u(u)
+                                , reason(reason)
+                                {}
+
+                        bool is_censure() const { return kind != CLEAR; }
+                };
+
                 typedef boost::shared_ptr<msg> ptr;
                 typedef boost::shared_ptr<const msg> const_ptr;
@@ -51 +68 @@
                 explicit msg(boost::shared_ptr< ::msg::entity >,
                              boost::shared_ptr<user>);
+
+                void moderate(moderation m) { mods.push_back(m); }
+
+                bool is_censured() const 
+                        { return !mods.empty() && mods.back().is_censure(); }
+
+                boost::shared_ptr<const user> censor() const {
+                        boost::shared_ptr<const user> rv;
+                        if (!mods.empty()) rv = mods.back().u;
+                        return rv;
+                }
+
+                const std::list<moderation> &get_moderations() const
+                        { return mods; }
 
                 boost::shared_ptr<const ::msg::entity> get_entity() const
@@ -79 +110 @@
                 boost::shared_ptr< ::msg::entity > actual;
                 boost::shared_ptr<user> poster;
+                std::list<moderation> mods;
         };
         

db/role.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2010 Antti-Juhani Kaijanaho
+    Copyright © 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -19 +19 @@
 
 #include "role.hh"
+#include "../nntp/wildmat.hh"
 
 namespace db
 {
         const std::string role::subscriber_prefix = "subscribers:";
+        const std::string role::moderator_prefix = "moderator:";
+
+        bool role::is_moderator_for(std::string grn)
+        {
+                if (!is_moderator()) return false;
+                std::string mg = name.substr(moderator_prefix.length());
+                if (!nntp::is_wildmat(mg)) return false;
+                return nntp::wildmatch(mg, grn);
+        }
 }

db/role.hh

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -40 +40 @@
 
                 static const std::string subscriber_prefix;
+                static const std::string moderator_prefix;
         public:
                 typedef boost::shared_ptr<role> ptr;
@@ -50 +51 @@
                 std::string get_name() const { return name; }
                 std::string get_description() const { return name; }
+
+                bool is_moderator() {
+                        return  name.substr(0, moderator_prefix.length())
+                                ==
+                                moderator_prefix;
+                }
+                bool is_moderator_for(std::string grn);
 
                 const std::set<boost::shared_ptr<user> > &get_users() const {

db/user.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -227 +227 @@
         }
 
+        bool user::is_group_moderator(std::string grn) const
+        {
+                for (std::set<role::ptr>::const_iterator it = roles.begin();
+                     it != roles.end(); it++)
+                {
+                        role::ptr r = *it;
+                        if (r->is_moderator_for(grn)) return true;
+                }
+                return false;
+        }
+
+        bool user::is_moderator(boost::shared_ptr<const group> gr) const
+        {
+                return is_group_moderator(gr->name());
+        }
+
+        bool user::is_moderator(boost::shared_ptr<const msg> m) const
+        {
+                std::list<std::string> ngs = m->get_newsgroups();
+                for (std::list<std::string>::const_iterator it = ngs.begin();
+                     it != ngs.end(); it++)
+                {
+                        if (is_group_moderator(*it)) return true;
+                }
+                return false;
+        }
+
 }

db/user.hh

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -33 +33 @@
 {
         class db;
+        class group;
+        class msg;
         class role;
 
@@ -52 +54 @@
 
                 std::set<std::string> read_msgids;
+
+                bool is_group_moderator(std::string) const;
 
                 friend class db;
@@ -108 +112 @@
                 void unmark_read(std::string msgid);
 
+                bool is_moderator(boost::shared_ptr<const group> gr) const;
+                bool is_moderator(boost::shared_ptr<const msg> m) const;
+
                 static std::string passwd_problems(std::string pw) {
                         std::string err;

nntp/article.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -140 +140 @@
                 }
 
+                if (message->is_censured())
+                {
+                        switch (state) {
+                        case NUMBER:
+                                c.send_line("423 no such article");
+                                break;
+                        case MSGID:
+                                c.send_line("430 no such article");
+                                break;
+                        case NONE:
+                                if (c.current_article() == 0)
+                                        c.send_line("420 no such article");
+                                else
+                                        c.send_line("423 no such article");
+                                break;
+                        }
+                        return c.dispatch();
+                }
+
                 std::string msgparm = msgnum + " " + message->msgid();
 

nntp/hdr.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -84 +84 @@
                                         return c.dispatch();
                                 }
+                                if (m->is_censured())
+                                {
+                                        c.send_line("430 no such article");
+                                        return c.dispatch();
+                                }
+
 
                                 c.send_line("221 " + hname + " follows:");
@@ -133 +139 @@
                 if (!m->reading_authz(c.identity()))
                         return;
+                if (m->is_censured()) return;
 
                 std::string hn = util::to_lower(hname);

nntp/over.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -85 +85 @@
                                         return c.dispatch();
                                 }
+                                if (m->is_censured())
+                                {
+                                        c.send_line("430 no such article");
+                                        return c.dispatch();
+                                }
                                 c.send_line("221 overview follows:");
                                 write_article_line(c, 0, m);
@@ -139 +144 @@
                 if (!m->reading_authz(c.identity()))
                         return;
+                if (m->is_censured()) return;
                 std::ostringstream os;
                 os << artnum;

tlate/msg_value.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -135 +135 @@
                 std::string msgid = tn->get_msgid();
                 bool rauthz = m ? m->reading_authz(u) : false;
+                bool show = rauthz && !m->is_censured();
                 bool authn = u;
                 value::const_ptr rv;
@@ -151 +152 @@
                                               uri::percent_encode(msgid),
                                               false)));
-                else if (var == "followup-allowed" && m->posting_authz(u))
+                else if (var == "followup-allowed" &&
+                         m->posting_authz(u) && show)
                         rv.reset(new sv(http::compose::get_followup_uri(m)));
-                else if (var == "followup-uri")
+                else if (var == "followup-uri" && show)
                         rv.reset(new sv(http::compose::get_followup_uri(m)));
                 else if (!rauthz && var == "restricted")
                         rv.reset(new empty_value);
-                else if (rauthz && m && var == "from")
+                else if (show && m && var == "from")
                         rv.reset(new sv(quote(decode_unstructured
                                               (e->get_field("From", false)),
                                               !authn)));
-                else if (rauthz && m && var == "subject")
+                else if (show && m && var == "subject")
                         rv.reset(new sv(quote(decode_unstructured
                                               (e->get_field("Subject", false)),
@@ -171 +173 @@
                         rv.reset(new date_value((tn->get_latest_date())));
                                                 
-                else if (rauthz && m && var == "header")
+                else if (show && m && var == "header")
                         rv.reset(new header_value(e,!u));
-                else if (rauthz && m && var == "body")
+                else if (show && m && var == "body")
                         rv = e->get_tlate_value(authn);
                 else if (rauthz && m && var == "xref")
@@ -203 +205 @@
                 else if (u && var == "marked_read" && u->has_read(msgid))
                         rv.reset(new empty_value);
-                else if (u && rauthz && m && var == "poster" && m->get_poster())
+                else if (u && show && m && var == "poster" && m->get_poster())
                         rv.reset(new user_value(m->get_poster()));
+                else if (u && rauthz && m && var == "own" &&
+                         m->get_poster() == u)
+                        rv.reset(new empty_value);
+                else if (rauthz && m->is_censured() && var == "moderated")
+                        rv.reset(new empty_value);
+                else if (rauthz && m && var == "moderator")
+                {
+                        db::user::const_ptr u = m->censor();
+                        if (u) rv.reset(new user_value(u));
+                }
+                else if (u && m && var == "mod-uri" && u->is_moderator(m))
+                        rv.reset(new sv(quote("/mod", false)));
                 return rv;
         }