Parse headers

diff --git a/zypp-plugin/snapper_zypp_plugin.cc b/zypp-plugin/snapper_zypp_plugin.cc
index 6e363a56178da87c9cc3485448b92333fa758cb5..1865efef62ca3315b13a23663d6d23a80a30d76a 100644 (file)
--- a/zypp-plugin/snapper_zypp_plugin.cc
+++ b/zypp-plugin/snapper_zypp_plugin.cc
@@ -169,6 +169,7 @@ set<string> SnapperZyppPlugin::get_solvables(const Message& msg, bool todo) {
 
     rapidjson::Document doc;
     const char * c_body = msg.body.c_str();
+    y2deb("parsing zypp JSON: " << c_body);
     if (doc.Parse(c_body).HasParseError()) {
        y2err("parsing zypp JSON failed");
        return result;

diff --git a/zypp-plugin/zypp_plugin.cc b/zypp-plugin/zypp_plugin.cc
index 3fc9b36ac55e61d1f5d456bcd900f896213cd4ae..a933129a83e4e2515d1eeb35c5422fdb56c37dc1 100644 (file)
--- a/zypp-plugin/zypp_plugin.cc
+++ b/zypp-plugin/zypp_plugin.cc
@@ -40,7 +40,7 @@ int ZyppPlugin::main() {
                state = State::Headers;
            }
            else {
-               throw "FIXME: expected a command";
+               throw runtime_error("Plugin protocol error: expected a command. Got '" + line + "'");
            }
        }
        else if (state == State::Headers) {
@@ -53,9 +53,16 @@ int ZyppPlugin::main() {
                state = State::Start;
            }
            else {
-               //string key, value;
-               // TODO: parse the header
-               //msg.headers[key] = value;
+               static const boost::regex rx_header("([A-Za-z0-9_]+):[ \t]*(.+)");
+               boost::smatch what;
+               if (boost::regex_match(line, what, rx_header)) {
+                   string key = what[1];
+                   string value = what[2];
+                   msg.headers[key] = value;
+               }
+               else {
+                   throw runtime_error("Plugin protocol error: expected a header or new line. Got '" + line + "'");
+               }
            }
        }
     }