-rw-r--r-- | lib/openid_message.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/openid_message.cc b/lib/openid_message.cc index fdb4b04..521ea85 100644 --- a/lib/openid_message.cc +++ b/lib/openid_message.cc | |||
@@ -2,126 +2,126 @@ | |||
2 | #include <opkele/types.h> | 2 | #include <opkele/types.h> |
3 | #include <opkele/exception.h> | 3 | #include <opkele/exception.h> |
4 | #include <opkele/util.h> | 4 | #include <opkele/util.h> |
5 | #include <opkele/debug.h> | 5 | #include <opkele/debug.h> |
6 | 6 | ||
7 | #include "config.h" | 7 | #include "config.h" |
8 | 8 | ||
9 | namespace opkele { | 9 | namespace opkele { |
10 | using std::input_iterator_tag; | 10 | using std::input_iterator_tag; |
11 | using std::unary_function; | 11 | using std::unary_function; |
12 | 12 | ||
13 | struct __om_copier : public unary_function<const string&,void> { | 13 | struct __om_copier : public unary_function<const string&,void> { |
14 | public: | 14 | public: |
15 | const basic_openid_message& from; | 15 | const basic_openid_message& from; |
16 | basic_openid_message& to; | 16 | basic_openid_message& to; |
17 | 17 | ||
18 | __om_copier(basic_openid_message& to,const basic_openid_message& from) | 18 | __om_copier(basic_openid_message& t,const basic_openid_message& f) |
19 | : from(from), to(to) { | 19 | : from(f), to(t) { |
20 | to.reset_fields(); | 20 | to.reset_fields(); |
21 | } | 21 | } |
22 | 22 | ||
23 | result_type operator()(argument_type f) { | 23 | result_type operator()(argument_type f) { |
24 | to.set_field(f,from.get_field(f)); } | 24 | to.set_field(f,from.get_field(f)); } |
25 | }; | 25 | }; |
26 | 26 | ||
27 | basic_openid_message::basic_openid_message(const basic_openid_message& x) { | 27 | basic_openid_message::basic_openid_message(const basic_openid_message& x) { |
28 | x.copy_to(*this); | 28 | x.copy_to(*this); |
29 | } | 29 | } |
30 | void basic_openid_message::copy_to(basic_openid_message& x) const { | 30 | void basic_openid_message::copy_to(basic_openid_message& x) const { |
31 | for_each(fields_begin(),fields_end(), | 31 | for_each(fields_begin(),fields_end(), |
32 | __om_copier(x,*this) ); | 32 | __om_copier(x,*this) ); |
33 | } | 33 | } |
34 | 34 | ||
35 | struct __om_ns_finder : public unary_function<const string&,bool> { | 35 | struct __om_ns_finder : public unary_function<const string&,bool> { |
36 | public: | 36 | public: |
37 | const basic_openid_message& om; | 37 | const basic_openid_message& om; |
38 | const string& uri; | 38 | const string& uri; |
39 | 39 | ||
40 | __om_ns_finder(const basic_openid_message& om, | 40 | __om_ns_finder(const basic_openid_message& m, |
41 | const string& uri) : om(om), uri(uri) { } | 41 | const string& u) : om(m), uri(u) { } |
42 | 42 | ||
43 | result_type operator()(argument_type f) { | 43 | result_type operator()(argument_type f) { |
44 | return | 44 | return |
45 | (!strncmp(f.c_str(),"ns.",sizeof("ns.")-1)) | 45 | (!strncmp(f.c_str(),"ns.",sizeof("ns.")-1)) |
46 | && om.get_field(f)==uri ; | 46 | && om.get_field(f)==uri ; |
47 | } | 47 | } |
48 | }; | 48 | }; |
49 | 49 | ||
50 | bool basic_openid_message::has_ns(const string& uri) const { | 50 | bool basic_openid_message::has_ns(const string& uri) const { |
51 | fields_iterator ei = fields_end(); | 51 | fields_iterator ei = fields_end(); |
52 | fields_iterator i = find_if(fields_begin(),fields_end(), | 52 | fields_iterator i = find_if(fields_begin(),fields_end(), |
53 | __om_ns_finder(*this,uri)); | 53 | __om_ns_finder(*this,uri)); |
54 | return !(i==ei); | 54 | return !(i==ei); |
55 | } | 55 | } |
56 | string basic_openid_message::get_ns(const string& uri) const { | 56 | string basic_openid_message::get_ns(const string& uri) const { |
57 | fields_iterator ei = fields_end(); | 57 | fields_iterator ei = fields_end(); |
58 | fields_iterator i = find_if(fields_begin(),fields_end(), | 58 | fields_iterator i = find_if(fields_begin(),fields_end(), |
59 | __om_ns_finder(*this,uri)); | 59 | __om_ns_finder(*this,uri)); |
60 | if(i==ei) | 60 | if(i==ei) |
61 | throw failed_lookup(OPKELE_CP_ string("failed to find namespace ")+uri); | 61 | throw failed_lookup(OPKELE_CP_ string("failed to find namespace ")+uri); |
62 | return i->substr(3); | 62 | return i->substr(3); |
63 | } | 63 | } |
64 | 64 | ||
65 | struct __om_query_builder : public unary_function<const string&,void> { | 65 | struct __om_query_builder : public unary_function<const string&,void> { |
66 | public: | 66 | public: |
67 | const basic_openid_message& om; | 67 | const basic_openid_message& om; |
68 | string& rv; | ||
69 | bool first; | 68 | bool first; |
69 | string& rv; | ||
70 | 70 | ||
71 | __om_query_builder(string& rv,const basic_openid_message& om) | 71 | __om_query_builder(string& r,const basic_openid_message& m) |
72 | : om(om), first(true), rv(rv) { | 72 | : om(m), first(true), rv(r) { |
73 | for_each(om.fields_begin(),om.fields_end(),*this); | 73 | for_each(om.fields_begin(),om.fields_end(),*this); |
74 | } | 74 | } |
75 | __om_query_builder(string& rv,const basic_openid_message& om,const string& url) | 75 | __om_query_builder(string& r,const basic_openid_message& m,const string& u) |
76 | : om(om), first(true), rv(rv) { | 76 | : om(m), first(true), rv(r) { |
77 | rv = url; | 77 | rv = u; |
78 | if(rv.find('?')==string::npos) | 78 | if(rv.find('?')==string::npos) |
79 | rv += '?'; | 79 | rv += '?'; |
80 | else | 80 | else |
81 | first = false; | 81 | first = false; |
82 | for_each(om.fields_begin(),om.fields_end(),*this); | 82 | for_each(om.fields_begin(),om.fields_end(),*this); |
83 | } | 83 | } |
84 | 84 | ||
85 | result_type operator()(argument_type f) { | 85 | result_type operator()(argument_type f) { |
86 | if(first) | 86 | if(first) |
87 | first = false; | 87 | first = false; |
88 | else | 88 | else |
89 | rv += '&'; | 89 | rv += '&'; |
90 | rv += "openid."; rv+= f; | 90 | rv += "openid."; rv+= f; |
91 | rv += '='; | 91 | rv += '='; |
92 | rv += util::url_encode(om.get_field(f)); | 92 | rv += util::url_encode(om.get_field(f)); |
93 | } | 93 | } |
94 | }; | 94 | }; |
95 | 95 | ||
96 | string basic_openid_message::append_query(const string& url) const { | 96 | string basic_openid_message::append_query(const string& url) const { |
97 | string rv; | 97 | string rv; |
98 | return __om_query_builder(rv,*this,url).rv; | 98 | return __om_query_builder(rv,*this,url).rv; |
99 | } | 99 | } |
100 | string basic_openid_message::query_string() const { | 100 | string basic_openid_message::query_string() const { |
101 | string rv; | 101 | string rv; |
102 | return __om_query_builder(rv,*this).rv; | 102 | return __om_query_builder(rv,*this).rv; |
103 | } | 103 | } |
104 | 104 | ||
105 | void basic_openid_message::reset_fields() { | 105 | void basic_openid_message::reset_fields() { |
106 | throw not_implemented(OPKELE_CP_ "reset_fields() not implemented"); | 106 | throw not_implemented(OPKELE_CP_ "reset_fields() not implemented"); |
107 | } | 107 | } |
108 | void basic_openid_message::set_field(const string& n,const string& v) { | 108 | void basic_openid_message::set_field(const string&,const string&) { |
109 | throw not_implemented(OPKELE_CP_ "set_field() not implemented"); | 109 | throw not_implemented(OPKELE_CP_ "set_field() not implemented"); |
110 | } | 110 | } |
111 | void basic_openid_message::reset_field(const string& n) { | 111 | void basic_openid_message::reset_field(const string&) { |
112 | throw not_implemented(OPKELE_CP_ "reset_field() not implemented"); | 112 | throw not_implemented(OPKELE_CP_ "reset_field() not implemented"); |
113 | } | 113 | } |
114 | 114 | ||
115 | void basic_openid_message::from_keyvalues(const string& kv) { | 115 | void basic_openid_message::from_keyvalues(const string& kv) { |
116 | reset_fields(); | 116 | reset_fields(); |
117 | string::size_type p = 0; | 117 | string::size_type p = 0; |
118 | while(true) { | 118 | while(true) { |
119 | string::size_type co = kv.find(':',p); | 119 | string::size_type co = kv.find(':',p); |
120 | if(co==string::npos) | 120 | if(co==string::npos) |
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))); |
@@ -134,51 +134,51 @@ namespace opkele { | |||
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> { | 145 | struct __om_kv_outputter : public unary_function<const string&,void> { |
146 | public: | 146 | public: |
147 | const basic_openid_message& om; | 147 | const basic_openid_message& om; |
148 | ostream& os; | 148 | ostream& os; |
149 | 149 | ||
150 | __om_kv_outputter(const basic_openid_message& om,ostream& os) | 150 | __om_kv_outputter(const basic_openid_message& m,ostream& s) |
151 | : om(om), os(os) { } | 151 | : om(m), os(s) { } |
152 | 152 | ||
153 | result_type operator()(argument_type f) { | 153 | result_type operator()(argument_type f) { |
154 | os << f << ':' << om.get_field(f) << '\n'; | 154 | os << f << ':' << om.get_field(f) << '\n'; |
155 | } | 155 | } |
156 | }; | 156 | }; |
157 | 157 | ||
158 | void basic_openid_message::to_keyvalues(ostream& o) const { | 158 | void basic_openid_message::to_keyvalues(ostream& o) const { |
159 | for_each(fields_begin(),fields_end(),__om_kv_outputter(*this,o)); | 159 | for_each(fields_begin(),fields_end(),__om_kv_outputter(*this,o)); |
160 | } | 160 | } |
161 | 161 | ||
162 | struct __om_html_outputter : public unary_function<const string&,void> { | 162 | struct __om_html_outputter : public unary_function<const string&,void> { |
163 | public: | 163 | public: |
164 | const basic_openid_message& om; | 164 | const basic_openid_message& om; |
165 | ostream& os; | 165 | ostream& os; |
166 | 166 | ||
167 | __om_html_outputter(const basic_openid_message& om,ostream& os) | 167 | __om_html_outputter(const basic_openid_message& m,ostream& s) |
168 | : om(om), os(os) { } | 168 | : om(m), os(s) { } |
169 | 169 | ||
170 | result_type operator()(argument_type f) { | 170 | result_type operator()(argument_type f) { |
171 | os << | 171 | os << |
172 | "<input type=\"hidden\"" | 172 | "<input type=\"hidden\"" |
173 | " name=\"" << util::attr_escape(f) << "\"" | 173 | " name=\"" << util::attr_escape(f) << "\"" |
174 | " value=\"" << util::attr_escape(om.get_field(f)) << "\" />"; | 174 | " value=\"" << util::attr_escape(om.get_field(f)) << "\" />"; |
175 | } | 175 | } |
176 | }; | 176 | }; |
177 | 177 | ||
178 | void basic_openid_message::to_htmlhiddens(ostream& o) const { | 178 | void basic_openid_message::to_htmlhiddens(ostream& o) const { |
179 | for_each(fields_begin(),fields_end(),__om_html_outputter(*this,o)); | 179 | for_each(fields_begin(),fields_end(),__om_html_outputter(*this,o)); |
180 | } | 180 | } |
181 | 181 | ||
182 | void basic_openid_message::add_to_signed(const string& fields) { | 182 | void basic_openid_message::add_to_signed(const string& fields) { |
183 | string::size_type fnc = fields.find_first_not_of(","); | 183 | string::size_type fnc = fields.find_first_not_of(","); |
184 | if(fnc==string::npos) | 184 | if(fnc==string::npos) |