summaryrefslogtreecommitdiffabout
path: root/lib/openid_message.cc
authorMichael Krelin <hacker@klever.net>2008-01-30 00:01:32 (UTC)
committer Michael Krelin <hacker@klever.net>2008-01-30 00:01:32 (UTC)
commit66b14d4368d661daf2248e36ac4f9a3f69f6a75a (patch) (side-by-side diff)
tree01bfef4ebeb4cd52f628a598a709a8adde971305 /lib/openid_message.cc
parentdc5dad0709ae8dd0a4be74248a22a78e47ba90e2 (diff)
downloadlibopkele-66b14d4368d661daf2248e36ac4f9a3f69f6a75a.zip
libopkele-66b14d4368d661daf2248e36ac4f9a3f69f6a75a.tar.gz
libopkele-66b14d4368d661daf2248e36ac4f9a3f69f6a75a.tar.bz2
a few changes to the infrastructure
* added mode_unknown to the mode_t enumeration * add to_keyvalues(ostream&) to openid message class * fixed openid_message_t::set_field for the case of overwriting Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'lib/openid_message.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/openid_message.cc19
1 files changed, 18 insertions, 1 deletions
diff --git a/lib/openid_message.cc b/lib/openid_message.cc
index 3b08748..905ea95 100644
--- a/lib/openid_message.cc
+++ b/lib/openid_message.cc
@@ -121,48 +121,65 @@ namespace opkele {
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) {
set_field(kv.substr(p,co-p),kv.substr(co+1));
break;
}
if(lb>co)
set_field(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 */
}
}
+ struct __om_kv_outputter : public unary_function<const string&,void> {
+ public:
+ const basic_openid_message& om;
+ ostream& os;
+
+ __om_kv_outputter(const basic_openid_message& om,ostream& os)
+ : om(om), os(os) { }
+
+ result_type operator()(argument_type f) {
+ os << f << ':' << om.get_field(f) << '\n';
+ }
+ };
+
+ void basic_openid_message::to_keyvalues(ostream& o) const {
+ for_each(fields_begin(),fields_end(),__om_kv_outputter(*this,o));
+ }
+
void basic_openid_message::add_to_signed(const string& fields) {
string::size_type fnc = fields.find_first_not_of(",");
if(fnc==string::npos)
throw bad_input(OPKELE_CP_ "Trying to add nothing in particular to the list of signed fields");
string signeds;
try {
signeds = get_field("signed");
string::size_type lnc = signeds.find_last_not_of(",");
if(lnc==string::npos)
signeds.assign(fields,fnc,fields.size()-fnc);
else{
string::size_type ss = signeds.size();
if(lnc==(ss-1)) {
signeds+= ',';
signeds.append(fields,fnc,fields.size()-fnc);
}else{
if(lnc<(ss-2))
signeds.replace(lnc+2,ss-lnc-2,
fields,fnc,fields.size()-fnc);
else
signeds.append(fields,fnc,fields.size()-fnc);
}
}
}catch(failed_lookup&) {
@@ -198,31 +215,31 @@ namespace opkele {
x.set_field(i->first,i->second);
}
bool openid_message_t::has_field(const string& n) const {
return find(n)!=end();
}
const string& openid_message_t::get_field(const string& n) const {
const_iterator i=find(n);
if(i==end())
throw failed_lookup(OPKELE_CP_ n+": no such field");
return i->second;
}
openid_message_t::fields_iterator openid_message_t::fields_begin() const {
return util::map_keys_iterator<const_iterator,string,const string&,const string*>(begin(),end());
}
openid_message_t::fields_iterator openid_message_t::fields_end() const {
return util::map_keys_iterator<const_iterator,string,const string&,const string*>(end(),end());
}
void openid_message_t::reset_fields() {
clear();
}
void openid_message_t::set_field(const string& n,const string& v) {
- insert(value_type(n,v));
+ (*this)[n]=v;
}
void openid_message_t::reset_field(const string& n) {
erase(n);
}
}