Changeset 1a970cd0640f976f152341597a5249ec22acbba7

Timestamp:

09/05/10 21:25:41 (21 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

c53e53f1cb0d542e5c931555a591d2589c033006

Parents:

e7bbf3c6b857df8ad33c4d39396d693b48a48461

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (09/05/10 21:25:41)

Message:

[msg::msg] Separate out db::msg and let msg::entity handle the rest

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

Files:

• db/db.cc (modified) (7 diffs)
• db/db.hh (modified) (5 diffs)
• db/group.cc (modified) (2 diffs)
• db/group.hh (modified) (4 diffs)
• db/msg.cc (added)
• db/msg.hh (moved) (moved from msg/msg.hh) (3 diffs)
• db/threaded.cc (modified) (2 diffs)
• db/threaded.hh (modified) (5 diffs)
• db/user.cc (modified) (1 diff)
• http/article.cc (modified) (2 diffs)
• http/article_entry.cc (modified) (5 diffs)
• http/compose.cc (modified) (10 diffs)
• http/compose.hh (modified) (3 diffs)
• http/group_feed.cc (modified) (3 diffs)
• http/thread_feed.cc (modified) (4 diffs)
• local/connection.cc (modified) (2 diffs)
• msg/entity.cc (modified) (5 diffs)
• msg/entity.hh (modified) (4 diffs)
• msg/message_entity.cc (modified) (1 diff)
• msg/msg.cc (deleted)
• msg/util.cc (modified) (3 diffs)
• msg/util.hh (modified) (2 diffs)
• nntp/article.cc (modified) (4 diffs)
• nntp/hdr.cc (modified) (6 diffs)
• nntp/last.cc (modified) (2 diffs)
• nntp/next.cc (modified) (2 diffs)
• nntp/over.cc (modified) (6 diffs)
• nntp/post.cc (modified) (2 diffs)
• smtp_client/smtp_client.cc (modified) (2 diffs)
• tlate/date_value.cc (modified) (1 diff)
• tlate/msg_value.cc (modified) (7 diffs)

db/db.cc

@@ -20 +20 @@
 #include "db.hh"
 #include "db_reader.hh"
+#include "msg.hh"
 #include "role.hh"
 #include "role_exists.hh"
@@ -27 +28 @@
 #include "../config.hh"
 #include "../logger/logline.hh"
-#include "../msg/msg.hh"
+#include "../msg/entity.hh"
+#include "../msg/util.hh"
 #include "../myassert.hh"
 #include "../util.hh"
@@ -220 +222 @@
                 
                 std::string msgstr = 
-                        msg::dot_destuff(msg::crlf_canonize(ss.str()));
+                        ::msg::dot_destuff(::msg::crlf_canonize(ss.str()));
 
                 // commit
-                boost::shared_ptr<msg::msg> message(new msg::msg(msgid,msgstr));
+                ::msg::entity::ptr entity(new ::msg::entity(msgstr));
+                msg::ptr message(new msg::msg(msgid,entity));
                 for (std::map<std::string, group::number>::const_iterator it = 
                              xref.begin();
@@ -309 +312 @@
         }
 
-        void db::file(boost::shared_ptr<msg::msg> mg,
-                      boost::asio::ip::address source,
-                      boost::shared_ptr<user> poster,
-                      server::conn_cb cb)
+        boost::shared_ptr<msg> db::file(boost::shared_ptr< ::msg::entity > ent,
+                                        boost::asio::ip::address source,
+                                        boost::shared_ptr<user> poster,
+                                        server::conn_cb cb)
         {
                 // first, perform USEPRO-14 (USEFOR-12) injector duties
 
-                mg->complete_netnews();
+                ::msg::complete_netnews(ent);
 
                 std::string server_name = 
@@ -330 +333 @@
                            << source.to_string()
                            << "\"";
-                        mg->replace_field("Injection-Info", ss.str());
-                }
-
-                std::string path = mg->get_field("Path", false);
+                        ent->replace_field("Injection-Info", ss.str());
+                }
+
+                std::string path = ent->get_field("Path", false);
                 util::strip_crlf(path);
                 if (path.empty())
@@ -349 +352 @@
                 path = server_name + 
                         " !.POSTED." + source.to_string() + " !" + path;
-                mg->replace_field("Path", path);
-
-                mg->validate_netnews();
+                ent->replace_field("Path", path);
+
+                ::msg::validate_netnews(ent);
+
+                msg::ptr mg(new msg(ent));
 
                 boost::lock_guard<boost::recursive_mutex> lg(mt);
@@ -432 +437 @@
                 }
                 dbfile << "FOLLOWS\n"
-                       << msg::dot_stuff(mg->get_entity())
+                       << ::msg::dot_stuff(mg->get_entity()->get_entity())
                        << ".END\n";
                 dbfile.close();
+                return mg;
         }
 

db/db.hh

@@ -35 +35 @@
 #include <fstream>
 
-namespace msg { class msg; }
+namespace msg { class entity; }
 
 namespace db
 {
+        class msg;
         class user;
         class password_handler;
@@ -52 +53 @@
                 typedef std::map<std::string,boost::shared_ptr<group> >
                 ::const_iterator  group_iterator;
-                typedef std::map<std::string,boost::shared_ptr<msg::msg> >
+                typedef std::map<std::string,boost::shared_ptr<msg> >
                 ::const_iterator  msgid_iterator;
 
@@ -67 +68 @@
                 msgid_iterator msgids_end() const { return msgid.end(); }
 
-                boost::shared_ptr<msg::msg> lookup_msgid(std::string s)  {
+                boost::shared_ptr<msg> lookup_msgid(std::string s)  {
                         boost::lock_guard<boost::recursive_mutex> lg(mt);
                         msgid_iterator it = msgid.find(s);
@@ -81 +82 @@
                 }
 
-                void file(boost::shared_ptr<msg::msg> mg,
-                          boost::asio::ip::address source,
-                          boost::shared_ptr<user> poster,
-                          server::conn_cb);
+                boost::shared_ptr<msg> file(boost::shared_ptr< ::msg::entity >,
+                                            boost::asio::ip::address source,
+                                            boost::shared_ptr<user> poster,
+                                            server::conn_cb);
 
                 const threaded &get_threaded() {
@@ -120 +121 @@
                 std::map<std::string, boost::shared_ptr<role> > roles;
                 std::map<std::string, boost::shared_ptr<group> > groups;
-                std::map<std::string, boost::shared_ptr<msg::msg> > msgid;
+                std::map<std::string, boost::shared_ptr<msg> > msgid;
 
                 std::string dbname;

db/group.cc

@@ -24 +24 @@
 
 #include "../config.hh"
-#include "../msg/msg.hh"
+#include "../msg/entity.hh"
 #include "../smtp_client/smtp_client.hh"
 
@@ -69 +69 @@
                 if (recv.empty()) return rv;
 
-                msg::msg::ptr nm(new msg::msg(*m));
+                ::msg::entity::ptr nm(new ::msg::entity(*m->get_entity()));
                 {
                         std::string subject = nm->get_field("subject", false);

db/group.hh

@@ -34 +34 @@
 #include <vector>
 
-namespace msg { class msg; }
-
 namespace db
 {
         class db;
+        class msg;
         class role;
         class threaded_group;
@@ -72 +71 @@
                 bool is_article(number n) const { return retrieve(n); }
 
-                boost::shared_ptr<msg::msg> get_article(number n) const {
-                        boost::shared_ptr<msg::msg> rv = retrieve(n);
+                boost::shared_ptr<msg> get_article(number n) const {
+                        boost::shared_ptr<msg> rv = retrieve(n);
                         if (!rv) throw no_such_article();
                         return rv;
                 }
 
-                number file(boost::shared_ptr<msg::msg> m, server::conn_cb);
+                number file(boost::shared_ptr<msg> m, server::conn_cb);
 
-                void file(boost::shared_ptr<msg::msg> m, number n);
+                void file(boost::shared_ptr<msg> m, number n);
 
                 number get_count() const { return count; }
@@ -114 +113 @@
                 
                 size_t displacement;
-                std::vector<boost::shared_ptr<msg::msg> > msgs;
+                std::vector<boost::shared_ptr<msg> > msgs;
 
                 std::set<boost::shared_ptr<role> > readers;
@@ -122 +121 @@
                                   const std::set<boost::shared_ptr<role> > &);
 
-                boost::shared_ptr<msg::msg> retrieve(number n) const {
-                        static boost::shared_ptr<msg::msg> null;
+                boost::shared_ptr<msg> retrieve(number n) const {
+                        static boost::shared_ptr<msg> null;
                         if (n < displacement) return null;
                         if (n - displacement >= msgs.size()) return null;

db/msg.hh

@@ -21 +21 @@
 #define GUARD_MSG_MSG_HH
 
-#include "entity.hh"
-
 #include "../db/article_number_type.hh"
 #include "../util.hh"
@@ -28 +26 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/tuple/tuple.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include <list>
+#include <map>
 
-namespace db { class group; class user; class thread_node; }
+namespace msg { class entity; }
 
-namespace msg
+namespace db
 {
-        std::string crlf_canonize(std::string);
-        std::string dot_stuff(std::string);
-        std::string dot_destuff(std::string);
-        boost::posix_time::ptime parse_date(std::string date);
 
-        class msg : public entity
+        class group; class user; class thread_node;
+
+        class msg
         {
         public:
@@ -45 +42 @@
                 typedef boost::shared_ptr<const msg> const_ptr;
 
-                typedef std::map<boost::shared_ptr<db::group>, 
-                                 db::article_number_type>
+                typedef std::map<boost::shared_ptr<group>, 
+                                 article_number_type>
                 xref_type;
 
-                msg(std::string msgid, std::string msgstr);
-                msg(std::string msgstr);
+                explicit msg(std::string msgid,
+                             boost::shared_ptr< ::msg::entity >);
+                explicit msg(boost::shared_ptr< ::msg::entity >);
 
-                void complete_mime();
-                void complete_netnews();
-                void complete_imf();
-                void validate_netnews();
-                void validate_imf();
-
-                boost::posix_time::ptime parsed_date() const {
-                        return the_date;
-                }
+                boost::shared_ptr<const ::msg::entity> get_entity() const
+                        { return actual; }
 
                 std::list<std::string> get_newsgroups() const;
 
-                void replace_field(std::string name, std::string body);
-
                 const xref_type &get_xref() const
-                        { return the_xref; } 
+                        { return the_xref; }
 
                 std::string get_xref_field(bool full) const;
 
                 std::string msgid() const { return the_msgid; }
-                void set_msgid();
 
-                void xref(boost::shared_ptr<db::group> gr, 
-                          db::article_number_type n)
+                void xref(boost::shared_ptr<group> gr, 
+                          article_number_type n)
                         { the_xref[gr] = n; }
 
-                bool reading_authz(boost::shared_ptr<const db::user> u) const;
-                bool posting_authz(boost::shared_ptr<const db::user> u) const;
+                bool reading_authz(boost::shared_ptr<const user> u) const;
+                bool posting_authz(boost::shared_ptr<const user> u) const;
         private:
                 std::string the_msgid;
-                boost::posix_time::ptime the_date;
                 xref_type the_xref;
-                
-                void check_present(std::string hdr);
-                void check_absent(std::string hdr);
+                boost::shared_ptr< ::msg::entity > actual;
         };
         

db/threaded.cc

@@ -20 +20 @@
 #include "threaded.hh"
 
+#include "../msg/entity.hh"
 #include "../msg/lexutils.hh"
-#include "../msg/msg.hh"
 #include "../html/util.hh"
 #include "../tlate/sequential_value.hh"
@@ -159 +159 @@
                 grinx = grinx_;
                 art = art_;
-                my_date = art->parsed_date();
+                my_date = art->get_entity()->parsed_date();
                 if (latest_date < my_date)
                         latest_date = my_date;
-                std::string refss = art->get_field("references", false);
+                std::string refss =
+                        art->get_entity()->get_field("references", false);
                 ptr prev;
                 while (!refss.empty())
                 {
-                        std::string ref = msg::get_msgid(refss);
+                        std::string ref = ::msg::get_msgid(refss);
                         if (ref.empty()) continue;
                         ptr &tn = msgids[ref];

db/threaded.hh

@@ -22 +22 @@
 
 #include "group.hh"
+#include "msg.hh"
 
-#include "../msg/msg.hh"
 #include "../tlate/tlate.hh"
 
@@ -42 +42 @@
                 std::string msgid;
                 group::number grinx;
-                boost::shared_ptr<msg::msg> art;
+                boost::shared_ptr<msg> art;
                 boost::posix_time::ptime my_date, latest_date;
                 std::list<ptr> children;
@@ -77 +77 @@
 
                 void add_msg(group::number grinx,
-                             boost::shared_ptr<msg::msg> art);
+                             boost::shared_ptr<msg> art);
                 void prune();
                 bool has_descendant(ptr);
@@ -90 +90 @@
                 }
                 const std::list<ptr> &get_children() const { return children; }
-                boost::shared_ptr<msg::msg> get_article() const { return art; }
+                boost::shared_ptr<msg> get_article() const { return art; }
                 template <typename Cmp>
                 void sort_children(Cmp cmp) {
@@ -146 +146 @@
 
                 void add_msg(group::number grinx, 
-                             boost::shared_ptr<msg::msg> art);
+                             boost::shared_ptr<msg> art);
                 const std::list<thread_node::ptr> &get_threads() const
                         { return root->get_children(); }

db/user.cc

@@ -151 +151 @@
                 mam->insert("from", from);
                 mam->insert("to",
-                            msg::make_phrase(ton) + " <" + to + ">");
+                            ::msg::make_phrase(ton) + " <" + to + ">");
                 mam->insert("userid", userid);
                 mam->insert("link", link.str());

http/article.cc

@@ -25 +25 @@
 
 #include "../db/db.hh"
+#include "../db/msg.hh"
 #include "../db/threaded.hh"
 #include "../html/util.hh"
 #include "../msg/content_type.hh"
 #include "../msg/lexutils.hh"
-#include "../msg/msg.hh"
 #include "../msg/text_plain.hh"
 #include "../server.hh"
@@ -56 +56 @@
                                      tlate::data_model::ptr am)
         {
-                boost::shared_ptr<msg::msg> art;
+                boost::shared_ptr<db::msg> art;
                 bool is_single;
                 try

http/article_entry.cc

@@ -21 +21 @@
 
 #include "../config.hh"
+#include "../msg/entity.hh"
 #include "../msg/lexutils.hh"
 #include "../uri.hh"
@@ -50 +51 @@
         std::string article_entry::get_author() const
         {
-                msg::msg::const_ptr m = tn->get_article();
-                std::string rv = m->get_field("From", false);
+                db::msg::const_ptr m = tn->get_article();
+                std::string rv = m->get_entity()->get_field("From", false);
                 util::strip_crlf(rv);
                 return rv;
@@ -57 +58 @@
         std::string article_entry::get_title() const
         {
-                msg::msg::const_ptr m = tn->get_article();
+                db::msg::const_ptr m = tn->get_article();
                 std::string rv = msg::decode_unstructured
-                        (m->get_field("Subject", false));
+                        (m->get_entity()->get_field("Subject", false));
                 util::strip_crlf(rv);
                 return rv;
@@ -67 +68 @@
         article_entry::get_content() const
         {
-                msg::msg::const_ptr m = tn->get_article();
-                return m->get_mime_entity();
+                db::msg::const_ptr m = tn->get_article();
+                return m->get_entity()->get_mime_entity();
         }
 
@@ -83 +84 @@
         boost::posix_time::ptime article_entry::get_date() const
         {
-                msg::msg::const_ptr m = tn->get_article();
-                return m->parsed_date();
+                db::msg::const_ptr m = tn->get_article();
+                return m->get_entity()->parsed_date();
         }
         boost::posix_time::ptime article_entry::get_updated() const
         {
-                msg::msg::const_ptr m = tn->get_article();
-                return m->parsed_date();
+                db::msg::const_ptr m = tn->get_article();
+                return m->get_entity()->parsed_date();
         }
 }

http/compose.cc

@@ -28 +28 @@
 
 #include "../db/db.hh"
+#include "../db/msg.hh"
 #include "../db/threaded.hh"
 #include "../html/util.hh"
 #include "../logger/logline.hh"
+#include "../msg/entity.hh"
 #include "../msg/lexutils.hh"
-#include "../msg/msg.hh"
 #include "../msg/text_plain.hh"
+#include "../msg/util.hh"
 #include "../server.hh"
 #include "../tlate/empty_value.hh"
@@ -88 +90 @@
         }
 
-        std::string compose::get_followup_uri(msg::msg::const_ptr m)
+        std::string compose::get_followup_uri(db::msg::const_ptr m)
         {
                 return std::string("/compose?precursor=") +
@@ -223 +225 @@
                    << "\r\n";
 
-                boost::shared_ptr<msg::msg> m;
+                db::msg::ptr m;
                 try
                 {
-                        m.reset(new msg::msg(os.str()));
-                        m->complete_mime();
-                        cb.dbase().file(m, req->get_peer(), usr, cb);
+                        msg::entity::ptr e(new msg::entity(os.str()));
+                        msg::complete_mime(e);
+                        m = cb.dbase().file(e, req->get_peer(), usr, cb);
                 }
                 catch (std::exception &e)
@@ -291 +293 @@
                 if (req->has_form_field("precursor"))
                 {
-                        boost::shared_ptr<msg::msg> art;
+                        boost::shared_ptr<db::msg> art;
                         std::string pre = req->get_form_field("precursor");
                         try
@@ -312 +314 @@
         void compose::followup(boost::shared_ptr<request> req,
                                tlate::data_model::ptr am,
-                               boost::shared_ptr<msg::msg> precursor)
+                               boost::shared_ptr<db::msg> precursor)
         {
                 std::string (*const q)(std::string,bool) = html::quote;
@@ -318 +320 @@
 
                 std::string subject = 
-                        precursor->get_field("Subject", false);
+                        precursor->get_entity()->get_field("Subject", false);
                 util::strip_crlf(subject);
                 if (subject.substr(0, 4) != "Re: ")
@@ -324 +326 @@
                 am->insert("subject", subject);
 
-                std::string fups = precursor->get_field
+                std::string fups = precursor->get_entity()->get_field
                         ("Followup-To", false);
                 util::strip(fups);
                 if (fups.empty() || fups == "poster") // FIXME
                 {
-                        fups = precursor->get_field("Newsgroups", false);
+                        fups = precursor->get_entity()->get_field("Newsgroups", false);
                         util::strip(fups);
                 }
@@ -336 +338 @@
 
 #if 0
-                std::string distrib = precursor->get_field
+                std::string distrib = precursor->get_entity()->get_field
                         ("Distribution", false);
                 util::strip_crlf(distrib);
@@ -343 +345 @@
 #endif
 
-                std::string refs = precursor->get_field
+                std::string refs = precursor->get_entity()->get_field
                         ("References", false);
                 util::strip_crlf(refs);
@@ -375 +377 @@
                 std::ostringstream body;
 
-                std::string from = precursor->get_field("From", false);
+                std::string from =
+                        precursor->get_entity()->get_field("From", false);
                 util::strip_crlf(from);
                 body << from << " wrote: \n\n";
 
-                msg::text_plain tp(*precursor);
+                msg::text_plain tp(*precursor->get_entity());
 
                 for (size_t i = 0; i < tp.num_paras(); i++)

http/compose.hh

@@ -26 +26 @@
 #include "../tlate/tlate.hh"
 
-namespace msg { class msg; }
-namespace db { class group; }
+namespace db { class msg; class group; }
 
 namespace http
@@ -51 +50 @@
                 void followup(boost::shared_ptr<request>,
                               tlate::data_model::ptr,
-                              boost::shared_ptr<msg::msg>);        
+                              boost::shared_ptr<db::msg>);        
         public:
                 compose(server::conn_cb cb) 
@@ -60 +59 @@
                 (boost::shared_ptr<const db::group>);
                 static std::string get_followup_uri
-                (boost::shared_ptr<const msg::msg>);
+                (boost::shared_ptr<const db::msg>);
         protected:
                 void set_attributes(boost::shared_ptr<request>,

http/group_feed.cc

@@ -26 +26 @@
 #include "../config.hh"
 #include "../db/db.hh"
-#include "../msg/msg.hh"
+#include "../msg/entity.hh"
 #include "../uri.hh"
 
@@ -82 +82 @@
                         if (entries.size() > 20) break;
                         if (!gr->is_article(i)) continue;
-                        msg::msg::const_ptr art = gr->get_article(i);
+                        db::msg::const_ptr art = gr->get_article(i);
                         db::thread_node::const_ptr tn =
                                 cb.dbase().get_threaded().lookup_msgid
@@ -88 +88 @@
                         article_entry::ptr ae(new article_entry(tn,u));
                         entries.push_back(ae);
-                        boost::posix_time::ptime date = art->parsed_date();
+                        boost::posix_time::ptime date =
+                                art->get_entity()->parsed_date();
                         if (latest < date) latest = date;
                 }

http/thread_feed.cc

@@ -27 +27 @@
 #include "../db/db.hh"
 #include "../db/threaded.hh"
+#include "../msg/entity.hh"
 #include "../msg/lexutils.hh"
-#include "../msg/msg.hh"
 #include "../uri.hh"
 
@@ -56 +56 @@
         {
                 db::user::const_ptr u = req->get_user();
-                msg::msg::const_ptr m = art->get_article();
+                db::msg::const_ptr m = art->get_article();
                 if (m && !m->reading_authz(u))
                 {
@@ -71 +71 @@
                                   db::user::const_ptr u)
         {
-                msg::msg::const_ptr art = m->get_article();
+                db::msg::const_ptr art = m->get_article();
                 if (art && art->reading_authz(u)) {
                         article_entry::ptr e(new article_entry(m, u));
                         entries.push_front(e);
-                        boost::posix_time::ptime date = art->parsed_date();
+                        boost::posix_time::ptime date =
+                                art->get_entity()->parsed_date();
                         if (latest < date) latest = date;
                 }
@@ -141 +142 @@
         std::string thread_feed::get_title() const
         {
-                msg::msg::const_ptr m = art->get_article();
+                db::msg::const_ptr m = art->get_article();
                 if (art) {
                         return std::string("Thread about ") + 
-                                msg::decode_unstructured(m->get_field("Subject",
-                                                                      false));
+                                msg::decode_unstructured
+                                (m->get_entity()->get_field("Subject", false));
                 } else {
                         return "untitled thread";

local/connection.cc

@@ -27 +27 @@
 #include "../logger/logline.hh"
 #include "../msg/format_violation.hh"
-#include "../msg/msg.hh"
+#include "../msg/entity.hh"
 
 #include <ios>
@@ -113 +113 @@
                         }
 
-                        msg::msg::ptr m(new msg::msg(ms));
+                        msg::entity::ptr m(new msg::entity(ms));
 
                         // identify action

msg/entity.cc

@@ -23 +23 @@
 #include "multipart.hh"
 #include "text_plain.hh"
+#include "util.hh"
 
 #include "../util.hh"
@@ -60 +61 @@
                 , field_content(ent.field_content)
                 , body(ent.body)
+                , the_date(boost::posix_time::not_a_date_time)
         {
                 for (std::list<std::string>::iterator it=field_content.begin();
@@ -75 +77 @@
                        std::string default_ct)
                 : default_ct(default_ct)
+                , the_date(boost::posix_time::not_a_date_time)
         {
                 parse_headers(msgstr);
@@ -163 +166 @@
         HEADER_END:
                 body = msgstr.substr(inx);
+        }
+
+        boost::posix_time::ptime entity::parsed_date() const
+        {
+                if (the_date == boost::posix_time::not_a_date_time)
+                        the_date = parse_date(get_field("Date", false));
+                return the_date;
         }
 
@@ -241 +251 @@
                         *it->second = fld;
                 }
+                if (name == "date")
+                        the_date = boost::posix_time::not_a_date_time;
         }
 

msg/entity.hh

@@ -23 +23 @@
 #include "format_violation.hh"
 #include <boost/algorithm/string/case_conv.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/shared_ptr.hpp>
 #include <list>
@@ -45 +46 @@
                                 std::string default_ct = 
                                 "text/plain; charset=\"US-ASCII\"");
+                explicit entity(const entity &);
 
                 virtual ~entity() {}
 
-                void validate_format() {
+                boost::posix_time::ptime parsed_date() const;
+
+                void validate_format() const {
                         if (!errors.empty()) throw format_violation(errors);
                 }
@@ -87 +91 @@
                 boost::shared_ptr<mime_entity> get_mime_entity() const;
 
-        protected:
-                explicit entity(const entity &);
-
         private:
                 std::string default_ct;
@@ -97 +98 @@
                 std::map<std::string, std::list<std::string>::iterator> fields;
                 std::string body;
+                mutable boost::posix_time::ptime the_date;
 
                 void parse_headers(std::string);

msg/message_entity.cc

@@ -20 +20 @@
 #include "lexutils.hh"
 #include "message_entity.hh"
-#include "msg.hh"
+#include "util.hh"
 #include "../html/util.hh"
 #include "../tlate/data_model.hh"

msg/util.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -18 +18 @@
  */
 
+#include "entity.hh"
+#include "format_violation.hh"
+#include "lexutils.hh"
 #include "util.hh"
+
+#include "../config.hh"
+#include "../util.hh"
+
+#include <boost/nondet_random.hpp>
+
+namespace
+{
+        void check_present(msg::entity::const_ptr e, std::string hdr)
+        {
+                if (!e->has_field(hdr))
+                        throw msg::format_violation(std::string("The '") +
+                                                    hdr +
+                                                    "' header field is missing"
+                                );
+        }
+
+        void check_absent(msg::entity::const_ptr e, std::string hdr)
+        {
+                if (e->has_field(hdr))
+                        throw msg::format_violation(std::string("The '") +
+                                                    hdr +
+                                                    "' header field is not"
+                                                    " allowed in this context");
+        }
+}
 
 namespace msg
@@ -42 +71 @@
                 return rv;
         }
+
+        std::string crlf_canonize(std::string body)
+        {
+                if (!body.empty() && body[body.length()-1] != '\n')
+                        body += '\n';
+                std::string res;
+                for (size_t i = 0; i < body.length(); i++)
+                {
+                        switch (body[i])
+                        {
+                        case '\r':
+                                if (i + 1 == body.length() || body[i+1] != '\n')
+                                {
+                                        res += "\r\n";
+                                        continue;
+                                }
+                                break;
+                        case '\n':
+                                if (i == 0 || body[i-1] != '\r')
+                                {
+                                        res += "\r\n";
+                                        continue;
+                                }
+                                break;
+                        default:
+                                ;
+                        }
+                        res += body[i];
+                }
+                return res;
+        }
+
+        std::string dot_stuff(std::string body)
+        {
+                std::string rv;
+                for (size_t i = 0; i < body.length(); i++)
+                {
+                        if (body[i] == '.' && (i == 0 || body[i-1] == '\n'))
+                                rv += "..";
+                        else
+                                rv += body[i];
+                }
+                return rv;
+        }
+
+        std::string dot_destuff(std::string s)
+        {
+                std::string rv;
+                for (size_t i = 0; i < s.length(); i++)
+                {
+                        if (s[i] == '.' && (i == 0 || s[i-1] == '\n'))
+                                continue;
+                        else
+                                rv += s[i];
+                }
+                return rv;
+        }
+
+        boost::posix_time::ptime parse_date(std::string date)
+        {
+                if (date.empty()) return boost::posix_time::ptime();
+                skip_cfws(date);
+                std::string weekday = get_atom(date, false);
+                skip_cfws(date);
+                std::string day;
+                if (eat_literal(date, ",")) {
+                        date.erase(0, 1);
+                        skip_cfws(date);
+                        day = get_atom(date, false);
+                } else {
+                        day = weekday;
+                        weekday = "";
+                }
+                skip_cfws(date);
+                std::string month = util::to_lower(get_atom(date, false));
+                skip_cfws(date);
+                std::string year = get_atom(date, false);
+                skip_cfws(date);
+                std::string hour = get_atom(date, false);
+                eat_literal(date, ":");
+                std::string minute = get_atom(date, false);
+                eat_literal(date, ":");
+                std::string second = get_atom(date, false);
+                skip_cfws(date);
+                std::string tz = "-0000";
+                if (eat_literal(date, "GMT", false)) {
+                        tz = "+0000";
+                } else if (!date.empty()) {
+                        tz = get_atom(date, false);
+                }
+                /* corrections - month */
+                /**/ if (month == "jan") month = "01";
+                else if (month == "feb") month = "02";
+                else if (month == "mar") month = "03";
+                else if (month == "apr") month = "04";
+                else if (month == "may") month = "05";
+                else if (month == "jun") month = "06";
+                else if (month == "jul") month = "07";
+                else if (month == "aug") month = "08";
+                else if (month == "sep") month = "09";
+                else if (month == "oct") month = "10";
+                else if (month == "nov") month = "11";
+                else if (month == "dec") month = "12";
+                /* other corrections */
+                if (day.length() == 1) day = "0" + day;
+                if (hour.length() == 1) hour = "0" + hour;
+                if (minute.length() == 1) minute = "0" + minute;
+                if (second.length() == 1) second = "0" + second;
+                if (year.length() == 2) year = "19" + year;
+                if (year.length() == 3) year = "20" + year.substr(1);
+                /* conversion */
+                std::string str =
+                        year + "-" + month + "-" + day + " " +
+                        hour + ":" + minute + ":" + second;
+                boost::posix_time::ptime rv;
+                try {
+                        rv =  boost::posix_time::time_from_string(str);
+                } catch (std::exception &e) {
+                        throw format_violation("bad date");
+                }
+                int tz_h = tz.length() > 2 
+                        ? (tz[1] - '0') * 10 + (tz[2] - '0') : 0;
+                int tz_m = tz.length() > 4 
+                        ? (tz[3] - '0') * 10 + (tz[4] - '0') : 0;
+                if (tz.length() > 0 && tz[0] == '-') {
+                        rv += boost::posix_time::hours(tz_h);
+                        rv += boost::posix_time::minutes(tz_m);
+                } else {
+                        rv -= boost::posix_time::hours(tz_h);
+                        rv -= boost::posix_time::minutes(tz_m);
+                }
+                return rv;
+        }
+
+        void complete_netnews(entity::ptr e)
+        {
+                check_absent(e, "Injection-Info");
+                check_absent(e, "Xref");
+
+                if (!e->has_field("Injection-Date") &&
+                    (!e->has_field("Date") || !e->has_field("Message-ID")))
+                {
+                        e->replace_field("Injection-Date",
+                                         util::current_imf_date());
+                }
+
+                complete_imf(e);
+        }
+
+        void complete_imf(entity::ptr e)
+        {
+                if (!e->has_field("Date"))
+                {
+                        e->replace_field("Date", util::current_imf_date());
+                }
+
+                if (!e->has_field("Message-ID"))
+                {
+                        boost::random_device urand;
+                        std::ostringstream ss;
+                        ss << "<alue."
+                           << std::hex
+                           << urand()
+                           << "."
+                           << urand()
+                           << "."
+                           << urand()
+                           << "@" 
+                           << config["canonical-name"].as<std::string>()
+                           << ">";
+                        e->replace_field("Message-ID", ss.str());
+                }
+        }
+
+        void validate_netnews(entity::const_ptr e)
+        {
+                validate_imf(e);
+                check_present(e, "Message-ID");
+                check_present(e, "Newsgroups");
+                check_present(e, "Path");
+                check_present(e, "Subject");
+        }
+        
+        void validate_imf(entity::const_ptr e) 
+        {
+                e->validate_format();
+                check_present(e, "From");                
+                check_present(e, "Date");                
+        }
+
+        void complete_mime(entity::ptr e)
+        {
+                if (!e->has_field("MIME-Version")) 
+                        e->replace_field("MIME-Version", "1.0");
+
+                bool sevenbit = true;
+                std::string body = e->get_body();
+                for (size_t i = 0; i < body.length(); i++)
+                        if (unsigned(body[i]) >= 0x80)
+                        {
+                                sevenbit = false;
+                                break;
+                        }
+
+                if (!e->has_field("Content-Type"))
+                        e->replace_field("Content-Type",
+                                         std::string("text/plain; charset=") +
+                                         (sevenbit ? "us-ascii" : "utf-8"));
+
+                if (!e->has_field("Content-Transfer-Encoding"))
+                        e->replace_field("Content-Transfer-Encoding",
+                                         sevenbit ? "7bit" : "8bit");
+        }
 }

msg/util.hh

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -21 +21 @@
 #define GUARD_MSG_UTIL_HH
 
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/shared_ptr.hpp>
 #include <string>
 
 namespace msg
 {
+        class entity;
+
         std::string quote(std::string s);
+
+        std::string crlf_canonize(std::string);
+        std::string dot_stuff(std::string);
+        std::string dot_destuff(std::string);
+        boost::posix_time::ptime parse_date(std::string date);
+
+        void complete_mime(boost::shared_ptr<entity>);
+        void complete_netnews(boost::shared_ptr<entity>);
+        void complete_imf(boost::shared_ptr<entity>);
+        void validate_netnews(boost::shared_ptr<const entity>);
+        void validate_imf(boost::shared_ptr<const entity>);
 }
 

nntp/article.cc

@@ -22 +22 @@
 
 #include "../db/db.hh"
+#include "../db/msg.hh"
 #include "../db/user.hh"
-#include "../msg/msg.hh"
+#include "../msg/entity.hh"
+#include "../msg/util.hh"
 
 namespace nntp
@@ -76 +78 @@
 
 
-                boost::shared_ptr<msg::msg> message;
+                boost::shared_ptr<db::msg> message;
                 std::string msgnum = "0";
                 try {
@@ -160 +162 @@
                 if (cmd == HEAD || cmd == ARTICLE)
                 {
-                        std::string head = message->get_header();
+                        std::string head = message->get_entity()->get_header();
                         c.send_raw(head.begin(), head.end());
                         c.send_line(message->get_xref_field(true));
@@ -167 +169 @@
                 if (cmd == ARTICLE || cmd == BODY)
                 {
-                        std::string b = msg::dot_stuff(message->get_body());
+                        std::string b = msg::dot_stuff
+                                (message->get_entity()->get_body());
                         c.send_raw(b.begin(), b.end());
                 }

nntp/hdr.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -23 +23 @@
 
 #include "../db/db.hh"
-#include "../msg/msg.hh"
+#include "../db/msg.hh"
+#include "../msg/entity.hh"
 
 namespace nntp
@@ -47 +48 @@
                                         std::string hname,
                                         db::group::number,
-                                        boost::shared_ptr<msg::msg> m) const;
+                                        boost::shared_ptr<db::msg> m) const;
 
                 cmd_type cmd;
@@ -67 +68 @@
                         if (args[1][0] == '<')
                         {
-                                boost::shared_ptr<msg::msg> m;
+                                boost::shared_ptr<db::msg> m;
                                 try
                                 {
@@ -127 +128 @@
                                      std::string hname,
                                      db::group::number artnum,
-                                     boost::shared_ptr<msg::msg> m)
+                                     boost::shared_ptr<db::msg> m)
                 const
         {
@@ -140 +141 @@
                 if (hn == "lines" || hn == ":lines")
                         s = boost::lexical_cast<std::string>
-                                (m->get_body_lines());
+                                (m->get_entity()->get_body_lines());
                 else if (hn == "bytes" || hn == ":bytes")
                         s = boost::lexical_cast<std::string>
-                                (m->get_size() +
+                                (m->get_entity()->get_size() +
                                  m->get_xref_field(true).length() + 2);
                 else
-                        s = m->get_field(hname, false);
+                        s = m->get_entity()->get_field(hname, false);
                 over_output_header(os, s);
                 c.send_line(os.str());

nntp/last.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -21 +21 @@
 
 #include "../db/group.hh"
-#include "../msg/msg.hh"
+#include "../db/msg.hh"
 
 namespace nntp

nntp/next.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -21 +21 @@
 
 #include "../db/group.hh"
-#include "../msg/msg.hh"
+#include "../db/msg.hh"
 
 namespace nntp

nntp/over.cc

@@ -23 +23 @@
 
 #include "../db/db.hh"
-#include "../msg/msg.hh"
+#include "../db/msg.hh"
+#include "../msg/entity.hh"
 
 namespace nntp
@@ -46 +47 @@
                 void write_article_line(connection::cb,
                                         db::group::number,
-                                        boost::shared_ptr<msg::msg> m) const;
+                                        boost::shared_ptr<db::msg> m) const;
 
                 cmd_type cmd;
@@ -68 +69 @@
                         if (args[0][0] == '<')
                         {
-                                boost::shared_ptr<msg::msg> m;
+                                boost::shared_ptr<db::msg> m;
                                 try
                                 {
@@ -133 +134 @@
         void over::write_article_line(connection::cb c,
                                       db::group::number artnum,
-                                      boost::shared_ptr<msg::msg> m)
+                                      boost::shared_ptr<db::msg> m)
                 const
         {
@@ -151 +152 @@
                                 if (full) s = hname + ": ";
                                 s += boost::lexical_cast<std::string>
-                                        (m->get_body_lines());
+                                        (m->get_entity()->get_body_lines());
                         }
                         else if (hn == "bytes" || hn == ":bytes")
@@ -157 +158 @@
                                 if (full) s = hname + ": ";
                                 s += boost::lexical_cast<std::string>
-                                        (m->get_size());
+                                        (m->get_entity()->get_size());
                         }
                         else
-                                s = m->get_field(hname, full);
+                                s = m->get_entity()->get_field(hname, full);
 
                         over_output_header(os, s);

nntp/post.cc

@@ -21 +21 @@
 
 #include "../db/db.hh"
+#include "../db/msg.hh"
 #include "../logger/logline.hh"
-#include "../msg/msg.hh"
+#include "../msg/entity.hh"
+#include "../msg/util.hh"
 
 namespace
@@ -37 +39 @@
         connection::continuation::ptr read_handler::operator()(std::string data)
         {
-                boost::shared_ptr<msg::msg> m;
+                db::msg::ptr m;
                 try {
-                        m.reset(new msg::msg(msg::dot_destuff(data)));
-                        c.dbase().file(m, c.peer(), c.identity(), c.srv_cb());
+                        msg::entity::ptr e
+                                (new msg::entity(msg::dot_destuff(data)));
+                        m = c.dbase().file(e, c.peer(), c.identity(),
+                                           c.srv_cb());
                 } catch (std::exception &e) {
                         std::ostringstream ss;

smtp_client/smtp_client.cc

@@ -22 +22 @@
 #include "../config.hh"
 #include "../logger/logline.hh"
-#include "../msg/msg.hh"
+#include "../msg/entity.hh"
+#include "../msg/util.hh"
+#include "../util.hh"
 
 #include <boost/algorithm/string/case_conv.hpp>
@@ -37 +39 @@
         {
                 message = msg::crlf_canonize(message);
-                boost::shared_ptr<msg::msg> msg
-                        (new msg::msg(msg::dot_destuff(message)));
-                msg->complete_imf();
-                msg->complete_mime();
+                msg::entity::ptr msg
+                        (new msg::entity(msg::dot_destuff(message)));
+                msg::complete_imf(msg);
+                msg::complete_mime(msg);
                 message = msg::dot_stuff(msg->get_entity());
 

tlate/date_value.cc

@@ -30 +30 @@
 #include "../msg/lexutils.hh"
 #include "../msg/mime_entity.hh"
-#include "../msg/msg.hh"
 #include "../uri.hh"
 

tlate/msg_value.cc

@@ -28 +28 @@
 
 #include "../db/threaded.hh"
+#include "../db/msg.hh"
 #include "../html/util.hh"
 #include "../http/compose.hh"
+#include "../msg/entity.hh"
 #include "../msg/lexutils.hh"
 #include "../msg/mime_entity.hh"
-#include "../msg/msg.hh"
 #include "../uri.hh"
 
@@ -44 +45 @@
         class xref_seq : public sequential_value
         {
-                msg::msg::const_ptr m;
+                db::msg::const_ptr m;
                 db::user::const_ptr u;
 
                 class vit : public virtual_iterator
                 {
-                        msg::msg::xref_type::const_iterator it;
+                        db::msg::xref_type::const_iterator it;
                         mutable value::const_ptr cur;
                         db::user::const_ptr u;
  
-                        vit(msg::msg::xref_type::const_iterator it,
+                        vit(db::msg::xref_type::const_iterator it,
                             value::const_ptr cur,
                             db::user::const_ptr u)
@@ -61 +62 @@
                                 {}
                public:
-                        vit(msg::msg::xref_type::const_iterator it,
+                        vit(db::msg::xref_type::const_iterator it,
                             db::user::const_ptr u)
                                 : it(it)
@@ -85 +86 @@
 
         public:
-                xref_seq(msg::msg::const_ptr m, db::user::const_ptr u)
+                xref_seq(db::msg::const_ptr m, db::user::const_ptr u)
                         : m(m)
                         , u(u)
@@ -130 +131 @@
                 using html::quote;
                 typedef string_value sv;
-                msg::msg::const_ptr m = tn->get_article();
+                db::msg::const_ptr m = tn->get_article();
+                msg::entity::const_ptr e = m->get_entity();
                 std::string msgid = tn->get_msgid();
                 bool rauthz = m ? m->reading_authz(u) : false;
@@ -157 +159 @@
                 else if (rauthz && m && var == "from")
                         rv.reset(new sv(quote(decode_unstructured
-                                              (m->get_field("From", false)),
+                                              (e->get_field("From", false)),
                                               !authn)));
                 else if (rauthz && m && var == "subject")
                         rv.reset(new sv(quote(decode_unstructured
-                                              (m->get_field("Subject", false)),
+                                              (e->get_field("Subject", false)),
                                               !authn)));
                 else if (rauthz && m && var == "date")
-                        rv.reset(new date_value(m->parsed_date()));
+                        rv.reset(new date_value(e->parsed_date()));
                 else if (rauthz && var == "latest-date" &&
                          !tn->get_latest_date().is_special())
@@ -170 +172 @@
                                                 
                 else if (rauthz && m && var == "header")
-                        rv.reset(new header_value(m,!u));
+                        rv.reset(new header_value(e,!u));
                 else if (rauthz && m && var == "body")
                 {
-                        msg::mime_entity::const_ptr me = m->get_mime_entity();
+                        msg::mime_entity::const_ptr me = e->get_mime_entity();
                         rv = me->get_tlate_value(authn);
                 }