Adhere to Postel's Law.

That is, be liberal when parsing key/value parameters from remote.
Along with configure switch to disable it.

1 files changed, 16 insertions, 0 deletions

diff --git a/lib/params.cc b/lib/params.cc
index b181811..ea86d3a 100644
--- a/lib/params.cc
+++ b/lib/params.cc
@@ -1,54 +1,70 @@
 #include <opkele/types.h>
 #include <opkele/exception.h>
 #include <opkele/util.h>
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
 
+#include "config.h"
+
 namespace opkele {
     using namespace std;
 
     bool params_t::has_param(const string& n) const {
         return find(n)!=end();
     }
     const string& params_t::get_param(const string& n) const {
         const_iterator i = find(n);
         if(i==end())
             throw failed_lookup(OPKELE_CP_ n+": no such parameter");
         return i->second;
     }
     string& params_t::get_param(const string& n) {
         iterator i = find(n);
         if(i==end())
             throw failed_lookup(OPKELE_CP_ n+": no such parameter");
         return i->second;
     }
 
     void params_t::parse_keyvalues(const string& kv) {
         clear();
         string::size_type p = 0;
         while(true) {
             string::size_type co = kv.find(':',p);
             if(co==string::npos)
                 break;
+#ifndef POSTELS_LAW
             string::size_type nl = kv.find('\n',co+1);
             if(nl==string::npos)
                 throw bad_input(OPKELE_CP_ "malformed input");
             if(nl>co)
                 insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1)));
             p = nl+1;
+#else /* POSTELS_LAW */
+            string::size_type lb = kv.find_first_of("\r\n",co+1);
+            if(lb==string::npos) {
+                insert(value_type(kv.substr(p,co-p),kv.substr(co+1)));
+                break;
+            }
+            if(lb>co)
+                insert(value_type(kv.substr(p,co-p),kv.substr(co+1,lb-co-1)));
+            string::size_type nolb = kv.find_first_not_of("\r\n",lb);
+            if(nolb==string::npos)
+                break;
+            p = nolb;
+#endif /* POSTELS_LAW */
         }
     }
 
     void params_t::sign(secret_t secret,string& sig,const string& slist,const char *prefix) const {
         string kv;
         string::size_type p = 0;
         while(true) {
             string::size_type co = slist.find(',',p);
             string f = (co==string::npos)?slist.substr(p):slist.substr(p,co-p);
             kv += f;
             kv += ':';
             if(prefix) f.insert(0,prefix);
             kv += get_param(f);
             kv += '\n';
             if(co==string::npos)
                 break;