summaryrefslogtreecommitdiffabout
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
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 (more/less context) (ignore whitespace changes)
-rw-r--r--include/opkele/types.h2
-rw-r--r--lib/openid_message.cc19
2 files changed, 20 insertions, 1 deletions
diff --git a/include/opkele/types.h b/include/opkele/types.h
index d5ad258..842a722 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -25,16 +25,17 @@ namespace opkele {
using std::list;
using std::iterator;
using std::forward_iterator_tag;
/**
* the OpenID operation mode
*/
typedef enum _mode_t {
+ mode_unknown = 0,
mode_associate,
mode_checkid_immediate,
mode_checkid_setup,
mode_check_association
} mode_t;
/**
* the association secret container
@@ -140,16 +141,17 @@ namespace opkele {
virtual string query_string() const;
virtual void reset_fields();
virtual void set_field(const string& n,const string& v);
virtual void reset_field(const string& n);
virtual void from_keyvalues(const string& kv);
+ virtual void to_keyvalues(ostream& o) const;
void add_to_signed(const string& fields);
string find_ns(const string& uri,const char *pfx) const;
string allocate_ns(const string& uri,const char *pfx);
};
class openid_message_t : public basic_openid_message, public map<string,string> {
public:
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
@@ -137,16 +137,33 @@ namespace opkele {
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(",");
@@ -214,15 +231,15 @@ namespace opkele {
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);
}
}