summaryrefslogtreecommitdiffabout
path: root/lib
authorMichael Krelin <hacker@klever.net>2007-06-18 21:38:12 (UTC)
committer Michael Krelin <hacker@klever.net>2007-06-18 21:38:12 (UTC)
commit3b404dd029a2aba05efc2edadcc7f67c59746cf7 (patch) (unidiff)
treea972e6f7ab320927409cf773977b4ee58ce5cf68 /lib
parente4873a10430d012943d2712b5b9c3363e8c74cb5 (diff)
downloadlibopkele-3b404dd029a2aba05efc2edadcc7f67c59746cf7.zip
libopkele-3b404dd029a2aba05efc2edadcc7f67c59746cf7.tar.gz
libopkele-3b404dd029a2aba05efc2edadcc7f67c59746cf7.tar.bz2
Adhere to Postel's Law.
That is, be liberal when parsing key/value parameters from remote. Along with configure switch to disable it.
Diffstat (limited to 'lib') (more/less context) (show whitespace changes)
-rw-r--r--lib/params.cc16
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
@@ -4,6 +4,8 @@
4#include <openssl/sha.h> 4#include <openssl/sha.h>
5#include <openssl/hmac.h> 5#include <openssl/hmac.h>
6 6
7#include "config.h"
8
7namespace opkele { 9namespace opkele {
8 using namespace std; 10 using namespace std;
9 11
@@ -30,12 +32,26 @@ namespace opkele {
30 string::size_type co = kv.find(':',p); 32 string::size_type co = kv.find(':',p);
31 if(co==string::npos) 33 if(co==string::npos)
32 break; 34 break;
35#ifndef POSTELS_LAW
33 string::size_type nl = kv.find('\n',co+1); 36 string::size_type nl = kv.find('\n',co+1);
34 if(nl==string::npos) 37 if(nl==string::npos)
35 throw bad_input(OPKELE_CP_ "malformed input"); 38 throw bad_input(OPKELE_CP_ "malformed input");
36 if(nl>co) 39 if(nl>co)
37 insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1))); 40 insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1)));
38 p = nl+1; 41 p = nl+1;
42#else /* POSTELS_LAW */
43 string::size_type lb = kv.find_first_of("\r\n",co+1);
44 if(lb==string::npos) {
45 insert(value_type(kv.substr(p,co-p),kv.substr(co+1)));
46 break;
47 }
48 if(lb>co)
49 insert(value_type(kv.substr(p,co-p),kv.substr(co+1,lb-co-1)));
50 string::size_type nolb = kv.find_first_not_of("\r\n",lb);
51 if(nolb==string::npos)
52 break;
53 p = nolb;
54#endif /* POSTELS_LAW */
39 } 55 }
40 } 56 }
41 57