Changeset e7bbf3c6b857df8ad33c4d39396d693b48a48461

Timestamp:

09/02/10 22:19:15 (17 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

1a970cd0640f976f152341597a5249ec22acbba7

Parents:

c504199e7e127458fff243397776ee854e62b7a3

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (09/02/10 22:19:15)

Message:

Add support for message/rfc822

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

Files:

• msg/entity.cc (modified) (7 diffs)
• msg/entity.hh (modified) (3 diffs)
• msg/message_entity.cc (added)
• msg/message_entity.hh (added)
• msg/msg.cc (modified) (1 diff)
• tlate/field_value.cc (added)
• tlate/field_value.hh (added)
• tlate/header_value.hh (added)
• tlate/msg_value.cc (modified) (3 diffs)

msg/entity.cc

@@ -20 +20 @@
 #include "content_type.hh"
 #include "entity.hh"
-#include "format_violation.hh"
+#include "message_entity.hh"
 #include "multipart.hh"
 #include "text_plain.hh"
@@ -81 +81 @@
         void entity::parse_headers(std::string msgstr)
         {
-                typedef format_violation fv;
-
                 size_t inx = 0;
                 size_t name_start = 0;
@@ -90 +88 @@
         FIELD_NAME:
                 if (inx >= msgstr.length())
-                        throw fv("message ends in the middle of a header name");
+                {
+                        errors +=
+                                "message ends in the middle of a header name\n";
+                        goto HEADER_END;
+                }
+
                 if (is_ftext(msgstr[inx]))
                 {
@@ -96 +99 @@
                         goto FIELD_NAME;
                 }
-                if (msgstr[inx] != ':') {
-                        throw fv(boost::str(boost::format
-                                            ("invalid character (0x%02x) "
-                                             "in header field name")
-                                            % (unsigned)msgstr[inx]));
+                if (msgstr[inx] != ':')
+                {
+                        errors += boost::str(boost::format
+                                             ("invalid character (0x%02x) "
+                                              "in header field name\n")
+                                             % (unsigned)msgstr[inx]);
                 }
                 field_name = msgstr.substr(name_start, inx - name_start);
                 inx++;
                 if (inx >= msgstr.length() || msgstr[inx] != ' ')
-                        throw fv("header field '" + field_name + "' "
-                                 "is missing the mandatory space after colon");
+                {
+                        errors += "header field '" + field_name + "' "
+                                "is missing the mandatory space after colon\n";
+                }
                 inx++;
                 body_start = inx;
@@ -113 +119 @@
         FIELD_BODY:
                 if (inx >= msgstr.length())
-                        throw fv("header field '" + field_name + "' "
-                                 "terminates abruptly");
+                {
+                        errors += "header field '" + field_name + "' "
+                                "terminates abruptly\n";
+                        goto HEADER_END;
+                }
                 if (is_vchar(msgstr[inx]) || is_wsp(msgstr[inx]))
                 {
@@ -121 +130 @@
                 }
                 if (msgstr[inx] != '\r') 
-                        throw fv("header field '" + field_name + "' "
-                                 "contains a character that is not allowed");
+                {
+                        errors += "header field '" + field_name + "' "
+                                "contains a character that is not allowed\n";
+                }
                 inx++;
                 if (inx >= msgstr.length() || msgstr[inx] != '\n') 
-                        throw fv("header field '" + field_name + "' "
-                                 "contains a stray CR");
+                {
+                        errors += "header field '" + field_name + "' "
+                                "contains a stray CR\n";
+                }
                 assert(inx  < msgstr.length());
-                assert(msgstr[inx] == '\n');
                 inx++;
                 if (inx < msgstr.length() && is_wsp(msgstr[inx]))
@@ -244 +256 @@
                 switch (ct.get_type())
                 {
+                case content_type::MESSAGE:
+                        rv.reset(new message_entity(*this));
+                        break;
                 case content_type::MULTIPART:
                         rv.reset(new multipart(*this));

msg/entity.hh

@@ -21 +21 @@
 #define GUARD_MSG_ENTITY_HH
 
+#include "format_violation.hh"
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/shared_ptr.hpp>
@@ -34 +35 @@
         class entity
         {
+                std::string errors;
+
         public:
                 typedef boost::shared_ptr<entity> ptr;
@@ -44 +47 @@
 
                 virtual ~entity() {}
+
+                void validate_format() {
+                        if (!errors.empty()) throw format_violation(errors);
+                }
 
                 field_iterator fields_begin() const {

msg/msg.cc

@@ -215 +215 @@
         void msg::validate_imf() 
         {
+                validate_format();
                 check_present("From");                
                 check_present("Date");                

tlate/msg_value.cc

@@ -21 +21 @@
 #include "empty_value.hh"
 #include "group_value.hh"
+#include "header_value.hh"
 #include "lazy_structured_value.hh"
 #include "list_value.hh"
@@ -98 +99 @@
         };
 
-        class fld_value : public structured_value
-        {
-                std::string fld;
-                db::user::const_ptr u;
-        public:
-                fld_value(std::string fld, db::user::const_ptr u)
-                        : fld(fld), u(u)
-                        {}
-                value::const_ptr get(std::string var) const {
-                        size_t col = fld.find(':');
-                        value::ptr rv;
-                        /**/ if (var == "name")
-                                rv.reset(new string_value
-                                         (quote(fld.substr(0,col), false)));
-                        else if (var == "body")
-                        {
-                                std::string s = fld.substr(col+1);
-                                s = decode_unstructured(s);
-                                rv.reset(new string_value(quote(s, !u)));
-                        }
-                        return rv;
-                }
-        };
-
-        class hdr_seq : public sequential_value
-        {
-                msg::msg::const_ptr m;
-                db::user::const_ptr u;
-
-                class vit : public virtual_iterator
-                {
-                        msg::msg::field_iterator it;
-                        mutable value::const_ptr cur;
-                        db::user::const_ptr u;
- 
-                        vit(msg::msg::field_iterator it, value::const_ptr cur,
-                            db::user::const_ptr u)
-                                : it(it)
-                                , cur(cur)
-                                , u(u)
-                                {}
-               public:
-                        vit(msg::msg::field_iterator it, db::user::const_ptr u)
-                                : it(it)
-                                , u(u)
-                                {}
-                        virtual_iterator *clone() const {
-                                return new vit(it, cur, u);
-                        }
-                        value::const_ptr get() const {
-                                if (!cur) cur.reset(new fld_value(*it, u));
-                                return cur;
-                        }
-                        void next() {
-                                it++;
-                                cur.reset();
-                        }
-                        bool eq(const virtual_iterator &o_) const {
-                                const vit *o = dynamic_cast<const vit *>(&o_);
-                                return o ? it == o->it : false;
-                        }
-                };
-
-        public:
-                hdr_seq(msg::msg::const_ptr m, db::user::const_ptr u)
-                        : m(m)
-                        , u(u)
-                        {}
-                const_iterator begin() const {
-                        return const_iterator
-                                (new vit(m->fields_begin(), u));
-                }
-                const_iterator end() const {
-                        return const_iterator
-                                (new vit(m->fields_end(), u));
-                }
-        };
 
         value::ptr mk_msg_value(db::thread_node::const_ptr tr,
@@ -246 +170 @@
                                                 
                 else if (rauthz && m && var == "header")
-                        rv.reset(new hdr_seq(m,u)); // FIXME -> seqval
+                        rv.reset(new header_value(m,!u));
                 else if (rauthz && m && var == "body")
                 {