author | Michael Krelin <hacker@klever.net> | 2008-01-30 00:01:32 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-01-30 00:01:32 (UTC) |
commit | 66b14d4368d661daf2248e36ac4f9a3f69f6a75a (patch) (unidiff) | |
tree | 01bfef4ebeb4cd52f628a598a709a8adde971305 | |
parent | dc5dad0709ae8dd0a4be74248a22a78e47ba90e2 (diff) | |
download | libopkele-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>
-rw-r--r-- | include/opkele/types.h | 2 | ||||
-rw-r--r-- | lib/openid_message.cc | 19 |
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 | |||
@@ -9,48 +9,49 @@ | |||
9 | #include <ostream> | 9 | #include <ostream> |
10 | #include <vector> | 10 | #include <vector> |
11 | #include <string> | 11 | #include <string> |
12 | #include <map> | 12 | #include <map> |
13 | #include <set> | 13 | #include <set> |
14 | #include <list> | 14 | #include <list> |
15 | #include <opkele/iterator.h> | 15 | #include <opkele/iterator.h> |
16 | #include <opkele/tr1-mem.h> | 16 | #include <opkele/tr1-mem.h> |
17 | 17 | ||
18 | namespace opkele { | 18 | namespace opkele { |
19 | using std::vector; | 19 | using std::vector; |
20 | using std::string; | 20 | using std::string; |
21 | using std::map; | 21 | using std::map; |
22 | using std::ostream; | 22 | using std::ostream; |
23 | using std::multimap; | 23 | using std::multimap; |
24 | using std::set; | 24 | using std::set; |
25 | using std::list; | 25 | using std::list; |
26 | using std::iterator; | 26 | using std::iterator; |
27 | using std::forward_iterator_tag; | 27 | using std::forward_iterator_tag; |
28 | 28 | ||
29 | /** | 29 | /** |
30 | * the OpenID operation mode | 30 | * the OpenID operation mode |
31 | */ | 31 | */ |
32 | typedef enum _mode_t { | 32 | typedef enum _mode_t { |
33 | mode_unknown = 0, | ||
33 | mode_associate, | 34 | mode_associate, |
34 | mode_checkid_immediate, | 35 | mode_checkid_immediate, |
35 | mode_checkid_setup, | 36 | mode_checkid_setup, |
36 | mode_check_association | 37 | mode_check_association |
37 | } mode_t; | 38 | } mode_t; |
38 | 39 | ||
39 | /** | 40 | /** |
40 | * the association secret container | 41 | * the association secret container |
41 | */ | 42 | */ |
42 | class secret_t : public vector<unsigned char> { | 43 | class secret_t : public vector<unsigned char> { |
43 | public: | 44 | public: |
44 | 45 | ||
45 | /** | 46 | /** |
46 | * xor the secret and hmac together and encode, using base64 | 47 | * xor the secret and hmac together and encode, using base64 |
47 | * @param key_d pointer to the message digest | 48 | * @param key_d pointer to the message digest |
48 | * @param rv reference to the return value | 49 | * @param rv reference to the return value |
49 | */ | 50 | */ |
50 | void enxor_to_base64(const unsigned char *key_d,string& rv) const; | 51 | void enxor_to_base64(const unsigned char *key_d,string& rv) const; |
51 | /** | 52 | /** |
52 | * decode base64-encoded secret and xor it with the message digest | 53 | * decode base64-encoded secret and xor it with the message digest |
53 | * @param key_d pointer to the message digest | 54 | * @param key_d pointer to the message digest |
54 | * @param b64 base64-encoded secret value | 55 | * @param b64 base64-encoded secret value |
55 | */ | 56 | */ |
56 | void enxor_from_base64(const unsigned char *key_d,const string& b64); | 57 | void enxor_from_base64(const unsigned char *key_d,const string& b64); |
@@ -124,48 +125,49 @@ namespace opkele { | |||
124 | > fields_iterator; | 125 | > fields_iterator; |
125 | 126 | ||
126 | basic_openid_message() { } | 127 | basic_openid_message() { } |
127 | basic_openid_message(const basic_openid_message& x); | 128 | basic_openid_message(const basic_openid_message& x); |
128 | void copy_to(basic_openid_message& x) const; | 129 | void copy_to(basic_openid_message& x) const; |
129 | 130 | ||
130 | virtual bool has_field(const string& n) const = 0; | 131 | virtual bool has_field(const string& n) const = 0; |
131 | virtual const string& get_field(const string& n) const = 0; | 132 | virtual const string& get_field(const string& n) const = 0; |
132 | 133 | ||
133 | virtual bool has_ns(const string& uri) const; | 134 | virtual bool has_ns(const string& uri) const; |
134 | virtual string get_ns(const string& uri) const; | 135 | virtual string get_ns(const string& uri) const; |
135 | 136 | ||
136 | virtual fields_iterator fields_begin() const = 0; | 137 | virtual fields_iterator fields_begin() const = 0; |
137 | virtual fields_iterator fields_end() const = 0; | 138 | virtual fields_iterator fields_end() const = 0; |
138 | 139 | ||
139 | virtual string append_query(const string& url) const; | 140 | virtual string append_query(const string& url) const; |
140 | virtual string query_string() const; | 141 | virtual string query_string() const; |
141 | 142 | ||
142 | 143 | ||
143 | virtual void reset_fields(); | 144 | virtual void reset_fields(); |
144 | virtual void set_field(const string& n,const string& v); | 145 | virtual void set_field(const string& n,const string& v); |
145 | virtual void reset_field(const string& n); | 146 | virtual void reset_field(const string& n); |
146 | 147 | ||
147 | virtual void from_keyvalues(const string& kv); | 148 | virtual void from_keyvalues(const string& kv); |
149 | virtual void to_keyvalues(ostream& o) const; | ||
148 | 150 | ||
149 | void add_to_signed(const string& fields); | 151 | void add_to_signed(const string& fields); |
150 | string find_ns(const string& uri,const char *pfx) const; | 152 | string find_ns(const string& uri,const char *pfx) const; |
151 | string allocate_ns(const string& uri,const char *pfx); | 153 | string allocate_ns(const string& uri,const char *pfx); |
152 | }; | 154 | }; |
153 | 155 | ||
154 | class openid_message_t : public basic_openid_message, public map<string,string> { | 156 | class openid_message_t : public basic_openid_message, public map<string,string> { |
155 | public: | 157 | public: |
156 | openid_message_t() { } | 158 | openid_message_t() { } |
157 | openid_message_t(const basic_openid_message& x) | 159 | openid_message_t(const basic_openid_message& x) |
158 | : basic_openid_message(x) { } | 160 | : basic_openid_message(x) { } |
159 | 161 | ||
160 | void copy_to(basic_openid_message& x) const; | 162 | void copy_to(basic_openid_message& x) const; |
161 | 163 | ||
162 | bool has_field(const string& n) const; | 164 | bool has_field(const string& n) const; |
163 | const string& get_field(const string& n) const; | 165 | const string& get_field(const string& n) const; |
164 | virtual fields_iterator fields_begin() const; | 166 | virtual fields_iterator fields_begin() const; |
165 | virtual fields_iterator fields_end() const; | 167 | virtual fields_iterator fields_end() const; |
166 | 168 | ||
167 | void reset_fields(); | 169 | void reset_fields(); |
168 | void set_field(const string& n,const string& v); | 170 | void set_field(const string& n,const string& v); |
169 | void reset_field(const string& n); | 171 | void reset_field(const string& n); |
170 | }; | 172 | }; |
171 | 173 | ||
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 { | |||
121 | break; | 121 | break; |
122 | #ifndef POSTELS_LAW | 122 | #ifndef POSTELS_LAW |
123 | string::size_type nl = kv.find('\n',co+1); | 123 | string::size_type nl = kv.find('\n',co+1); |
124 | if(nl==string::npos) | 124 | if(nl==string::npos) |
125 | throw bad_input(OPKELE_CP_ "malformed input"); | 125 | throw bad_input(OPKELE_CP_ "malformed input"); |
126 | if(nl>co) | 126 | if(nl>co) |
127 | insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1))); | 127 | insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1))); |
128 | p = nl+1; | 128 | p = nl+1; |
129 | #else /* POSTELS_LAW */ | 129 | #else /* POSTELS_LAW */ |
130 | string::size_type lb = kv.find_first_of("\r\n",co+1); | 130 | string::size_type lb = kv.find_first_of("\r\n",co+1); |
131 | if(lb==string::npos) { | 131 | if(lb==string::npos) { |
132 | set_field(kv.substr(p,co-p),kv.substr(co+1)); | 132 | set_field(kv.substr(p,co-p),kv.substr(co+1)); |
133 | break; | 133 | break; |
134 | } | 134 | } |
135 | if(lb>co) | 135 | if(lb>co) |
136 | set_field(kv.substr(p,co-p),kv.substr(co+1,lb-co-1)); | 136 | set_field(kv.substr(p,co-p),kv.substr(co+1,lb-co-1)); |
137 | string::size_type nolb = kv.find_first_not_of("\r\n",lb); | 137 | string::size_type nolb = kv.find_first_not_of("\r\n",lb); |
138 | if(nolb==string::npos) | 138 | if(nolb==string::npos) |
139 | break; | 139 | break; |
140 | p = nolb; | 140 | p = nolb; |
141 | #endif /* POSTELS_LAW */ | 141 | #endif /* POSTELS_LAW */ |
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | struct __om_kv_outputter : public unary_function<const string&,void> { | ||
146 | public: | ||
147 | const basic_openid_message& om; | ||
148 | ostream& os; | ||
149 | |||
150 | __om_kv_outputter(const basic_openid_message& om,ostream& os) | ||
151 | : om(om), os(os) { } | ||
152 | |||
153 | result_type operator()(argument_type f) { | ||
154 | os << f << ':' << om.get_field(f) << '\n'; | ||
155 | } | ||
156 | }; | ||
157 | |||
158 | void basic_openid_message::to_keyvalues(ostream& o) const { | ||
159 | for_each(fields_begin(),fields_end(),__om_kv_outputter(*this,o)); | ||
160 | } | ||
161 | |||
145 | void basic_openid_message::add_to_signed(const string& fields) { | 162 | void basic_openid_message::add_to_signed(const string& fields) { |
146 | string::size_type fnc = fields.find_first_not_of(","); | 163 | string::size_type fnc = fields.find_first_not_of(","); |
147 | if(fnc==string::npos) | 164 | if(fnc==string::npos) |
148 | throw bad_input(OPKELE_CP_ "Trying to add nothing in particular to the list of signed fields"); | 165 | throw bad_input(OPKELE_CP_ "Trying to add nothing in particular to the list of signed fields"); |
149 | string signeds; | 166 | string signeds; |
150 | try { | 167 | try { |
151 | signeds = get_field("signed"); | 168 | signeds = get_field("signed"); |
152 | string::size_type lnc = signeds.find_last_not_of(","); | 169 | string::size_type lnc = signeds.find_last_not_of(","); |
153 | if(lnc==string::npos) | 170 | if(lnc==string::npos) |
154 | signeds.assign(fields,fnc,fields.size()-fnc); | 171 | signeds.assign(fields,fnc,fields.size()-fnc); |
155 | else{ | 172 | else{ |
156 | string::size_type ss = signeds.size(); | 173 | string::size_type ss = signeds.size(); |
157 | if(lnc==(ss-1)) { | 174 | if(lnc==(ss-1)) { |
158 | signeds+= ','; | 175 | signeds+= ','; |
159 | signeds.append(fields,fnc,fields.size()-fnc); | 176 | signeds.append(fields,fnc,fields.size()-fnc); |
160 | }else{ | 177 | }else{ |
161 | if(lnc<(ss-2)) | 178 | if(lnc<(ss-2)) |
162 | signeds.replace(lnc+2,ss-lnc-2, | 179 | signeds.replace(lnc+2,ss-lnc-2, |
163 | fields,fnc,fields.size()-fnc); | 180 | fields,fnc,fields.size()-fnc); |
164 | else | 181 | else |
165 | signeds.append(fields,fnc,fields.size()-fnc); | 182 | signeds.append(fields,fnc,fields.size()-fnc); |
166 | } | 183 | } |
167 | } | 184 | } |
168 | }catch(failed_lookup&) { | 185 | }catch(failed_lookup&) { |
@@ -198,31 +215,31 @@ namespace opkele { | |||
198 | x.set_field(i->first,i->second); | 215 | x.set_field(i->first,i->second); |
199 | } | 216 | } |
200 | 217 | ||
201 | bool openid_message_t::has_field(const string& n) const { | 218 | bool openid_message_t::has_field(const string& n) const { |
202 | return find(n)!=end(); | 219 | return find(n)!=end(); |
203 | } | 220 | } |
204 | const string& openid_message_t::get_field(const string& n) const { | 221 | const string& openid_message_t::get_field(const string& n) const { |
205 | const_iterator i=find(n); | 222 | const_iterator i=find(n); |
206 | if(i==end()) | 223 | if(i==end()) |
207 | throw failed_lookup(OPKELE_CP_ n+": no such field"); | 224 | throw failed_lookup(OPKELE_CP_ n+": no such field"); |
208 | return i->second; | 225 | return i->second; |
209 | } | 226 | } |
210 | 227 | ||
211 | openid_message_t::fields_iterator openid_message_t::fields_begin() const { | 228 | openid_message_t::fields_iterator openid_message_t::fields_begin() const { |
212 | return util::map_keys_iterator<const_iterator,string,const string&,const string*>(begin(),end()); | 229 | return util::map_keys_iterator<const_iterator,string,const string&,const string*>(begin(),end()); |
213 | } | 230 | } |
214 | openid_message_t::fields_iterator openid_message_t::fields_end() const { | 231 | openid_message_t::fields_iterator openid_message_t::fields_end() const { |
215 | return util::map_keys_iterator<const_iterator,string,const string&,const string*>(end(),end()); | 232 | return util::map_keys_iterator<const_iterator,string,const string&,const string*>(end(),end()); |
216 | } | 233 | } |
217 | 234 | ||
218 | void openid_message_t::reset_fields() { | 235 | void openid_message_t::reset_fields() { |
219 | clear(); | 236 | clear(); |
220 | } | 237 | } |
221 | void openid_message_t::set_field(const string& n,const string& v) { | 238 | void openid_message_t::set_field(const string& n,const string& v) { |
222 | insert(value_type(n,v)); | 239 | (*this)[n]=v; |
223 | } | 240 | } |
224 | void openid_message_t::reset_field(const string& n) { | 241 | void openid_message_t::reset_field(const string& n) { |
225 | erase(n); | 242 | erase(n); |
226 | } | 243 | } |
227 | 244 | ||
228 | } | 245 | } |