author | Michael Krelin <hacker@klever.net> | 2008-02-02 11:40:56 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-02-02 11:40:56 (UTC) |
commit | 4efb668baed49ede14846c3cdac31cc561451cd1 (patch) (unidiff) | |
tree | 47f3c6570c25f083f1ff56831fc1b8c8d84af59e | |
parent | b7ce9a84f0775eb24f0a27d3816bf57b774a2927 (diff) | |
download | libopkele-4efb668baed49ede14846c3cdac31cc561451cd1.zip libopkele-4efb668baed49ede14846c3cdac31cc561451cd1.tar.gz libopkele-4efb668baed49ede14846c3cdac31cc561451cd1.tar.bz2 |
first rough cut on OP 2.0 implementation
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | include/Makefile.am | 1 | ||||
-rw-r--r-- | include/opkele/exception.h | 27 | ||||
-rw-r--r-- | lib/Makefile.am | 3 | ||||
-rw-r--r-- | lib/basic_op.cc | 320 |
4 files changed, 350 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 50fcb62..37fb961 100644 --- a/include/Makefile.am +++ b/include/Makefile.am | |||
@@ -1,32 +1,33 @@ | |||
1 | NODIST_HEADERS_ = \ | 1 | NODIST_HEADERS_ = \ |
2 | opkele/acconfig.h \ | 2 | opkele/acconfig.h \ |
3 | opkele/tr1-mem.h | 3 | opkele/tr1-mem.h |
4 | 4 | ||
5 | nobase_include_HEADERS = \ | 5 | nobase_include_HEADERS = \ |
6 | opkele/opkele-config.h \ | 6 | opkele/opkele-config.h \ |
7 | opkele/types.h \ | 7 | opkele/types.h \ |
8 | opkele/association.h \ | 8 | opkele/association.h \ |
9 | opkele/exception.h \ | 9 | opkele/exception.h \ |
10 | opkele/server.h \ | 10 | opkele/server.h \ |
11 | opkele/consumer.h \ | 11 | opkele/consumer.h \ |
12 | opkele/extension.h \ | 12 | opkele/extension.h \ |
13 | opkele/sreg.h \ | 13 | opkele/sreg.h \ |
14 | opkele/extension_chain.h \ | 14 | opkele/extension_chain.h \ |
15 | opkele/xconsumer.h \ | 15 | opkele/xconsumer.h \ |
16 | opkele/xserver.h \ | 16 | opkele/xserver.h \ |
17 | opkele/uris.h \ | 17 | opkele/uris.h \ |
18 | opkele/tr1-mem.h \ | 18 | opkele/tr1-mem.h \ |
19 | opkele/basic_rp.h \ | 19 | opkele/basic_rp.h \ |
20 | opkele/prequeue_rp.h \ | 20 | opkele/prequeue_rp.h \ |
21 | opkele/iterator.h \ | 21 | opkele/iterator.h \ |
22 | opkele/basic_op.h \ | ||
22 | ${NODIST_HEADERS_} | 23 | ${NODIST_HEADERS_} |
23 | 24 | ||
24 | noinst_HEADERS = \ | 25 | noinst_HEADERS = \ |
25 | opkele/data.h \ | 26 | opkele/data.h \ |
26 | opkele/curl.h opkele/expat.h opkele/tidy.h \ | 27 | opkele/curl.h opkele/expat.h opkele/tidy.h \ |
27 | opkele/util.h \ | 28 | opkele/util.h \ |
28 | opkele/debug.h \ | 29 | opkele/debug.h \ |
29 | opkele/discovery.h | 30 | opkele/discovery.h |
30 | 31 | ||
31 | dist-hook: | 32 | dist-hook: |
32 | rm -f $(addprefix ${distdir}/,${NODIST_HEADERS_}) | 33 | rm -f $(addprefix ${distdir}/,${NODIST_HEADERS_}) |
diff --git a/include/opkele/exception.h b/include/opkele/exception.h index ccb39d9..5c8418e 100644 --- a/include/opkele/exception.h +++ b/include/opkele/exception.h | |||
@@ -1,335 +1,362 @@ | |||
1 | #ifndef __OPKELE_EXCEPTION_H | 1 | #ifndef __OPKELE_EXCEPTION_H |
2 | #define __OPKELE_EXCEPTION_H | 2 | #define __OPKELE_EXCEPTION_H |
3 | 3 | ||
4 | /** | 4 | /** |
5 | * @file | 5 | * @file |
6 | * @brief opkele exceptions | 6 | * @brief opkele exceptions |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <curl/curl.h> | 9 | #include <curl/curl.h> |
10 | 10 | ||
11 | #include <opkele/opkele-config.h> | 11 | #include <opkele/opkele-config.h> |
12 | #ifdef OPKELE_HAVE_KONFORKA | 12 | #ifdef OPKELE_HAVE_KONFORKA |
13 | # include <konforka/exception.h> | 13 | # include <konforka/exception.h> |
14 | /** | 14 | /** |
15 | * the exception parameters declaration | 15 | * the exception parameters declaration |
16 | */ | 16 | */ |
17 | # define OPKELE_E_PARS const string& fi,const string&fu,int l,const string& w | 17 | # define OPKELE_E_PARS const string& fi,const string&fu,int l,const string& w |
18 | /** | 18 | /** |
19 | * the exception parameters list to pass to constructor | 19 | * the exception parameters list to pass to constructor |
20 | */ | 20 | */ |
21 | # define OPKELE_E_CONS_ fi,fu,l, | 21 | # define OPKELE_E_CONS_ fi,fu,l, |
22 | /** | 22 | /** |
23 | * the exception codepoint specification | 23 | * the exception codepoint specification |
24 | */ | 24 | */ |
25 | # define OPKELE_CP_ CODEPOINT, | 25 | # define OPKELE_CP_ CODEPOINT, |
26 | /** | 26 | /** |
27 | * open function-try-block | 27 | * open function-try-block |
28 | */ | 28 | */ |
29 | # define OPKELE_FUNC_TRY try | 29 | # define OPKELE_FUNC_TRY try |
30 | /** | 30 | /** |
31 | * the simple rethrow of konforka-based exception | 31 | * the simple rethrow of konforka-based exception |
32 | */ | 32 | */ |
33 | # define OPKELE_RETHROW catch(konforka::exception& e) { e.see(CODEPOINT); throw; } | 33 | # define OPKELE_RETHROW catch(konforka::exception& e) { e.see(CODEPOINT); throw; } |
34 | #else /* OPKELE_HAVE_KONFORKA */ | 34 | #else /* OPKELE_HAVE_KONFORKA */ |
35 | # include <exception> | 35 | # include <exception> |
36 | # include <string> | 36 | # include <string> |
37 | /** | 37 | /** |
38 | * the exception parameter declaration | 38 | * the exception parameter declaration |
39 | */ | 39 | */ |
40 | # define OPKELE_E_PARS const string& w | 40 | # define OPKELE_E_PARS const string& w |
41 | /** | 41 | /** |
42 | * the dummy prefix for exception parameters list to prepend in the absence of | 42 | * the dummy prefix for exception parameters list to prepend in the absence of |
43 | * konforka library | 43 | * konforka library |
44 | */ | 44 | */ |
45 | # define OPKELE_E_CONS_ | 45 | # define OPKELE_E_CONS_ |
46 | /** | 46 | /** |
47 | * the dummy placeholder for konforka exception codepoint specification | 47 | * the dummy placeholder for konforka exception codepoint specification |
48 | */ | 48 | */ |
49 | # define OPKELE_CP_ | 49 | # define OPKELE_CP_ |
50 | /** | 50 | /** |
51 | * the dummy define for the opening function-try-block | 51 | * the dummy define for the opening function-try-block |
52 | */ | 52 | */ |
53 | # define OPKELE_FUNC_TRY | 53 | # define OPKELE_FUNC_TRY |
54 | /** | 54 | /** |
55 | * the dummy define for the konforka-based rethrow of exception | 55 | * the dummy define for the konforka-based rethrow of exception |
56 | */ | 56 | */ |
57 | # define OPKELE_RETHROW | 57 | # define OPKELE_RETHROW |
58 | #endif /* OPKELE_HAVE_KONFORKA */ | 58 | #endif /* OPKELE_HAVE_KONFORKA */ |
59 | /** | 59 | /** |
60 | * the exception parameters list to pass to constructor | 60 | * the exception parameters list to pass to constructor |
61 | */ | 61 | */ |
62 | # define OPKELE_E_CONS OPKELE_E_CONS_ w | 62 | # define OPKELE_E_CONS OPKELE_E_CONS_ w |
63 | 63 | ||
64 | namespace opkele { | 64 | namespace opkele { |
65 | using std::string; | 65 | using std::string; |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * the base opkele exception class | 68 | * the base opkele exception class |
69 | */ | 69 | */ |
70 | class exception : public | 70 | class exception : public |
71 | # ifdef OPKELE_HAVE_KONFORKA | 71 | # ifdef OPKELE_HAVE_KONFORKA |
72 | konforka::exception | 72 | konforka::exception |
73 | # else | 73 | # else |
74 | std::exception | 74 | std::exception |
75 | # endif | 75 | # endif |
76 | { | 76 | { |
77 | public: | 77 | public: |
78 | # ifdef OPKELE_HAVE_KONFORKA | 78 | # ifdef OPKELE_HAVE_KONFORKA |
79 | explicit | 79 | explicit |
80 | exception(const string& fi,const string& fu,int l,const string& w); | 80 | exception(const string& fi,const string& fu,int l,const string& w); |
81 | # else /* OPKELE_HAVE_KONFORKA */ | 81 | # else /* OPKELE_HAVE_KONFORKA */ |
82 | string _what; | 82 | string _what; |
83 | explicit exception(const string& w); | 83 | explicit exception(const string& w); |
84 | virtual ~exception() throw(); | 84 | virtual ~exception() throw(); |
85 | virtual const char * what() const throw(); | 85 | virtual const char * what() const throw(); |
86 | # endif /* OPKELE_HAVE_KONFORKA */ | 86 | # endif /* OPKELE_HAVE_KONFORKA */ |
87 | }; | 87 | }; |
88 | 88 | ||
89 | /** | 89 | /** |
90 | * thrown in case of failed conversion | 90 | * thrown in case of failed conversion |
91 | */ | 91 | */ |
92 | class failed_conversion : public exception { | 92 | class failed_conversion : public exception { |
93 | public: | 93 | public: |
94 | failed_conversion(OPKELE_E_PARS) | 94 | failed_conversion(OPKELE_E_PARS) |
95 | : exception(OPKELE_E_CONS) { } | 95 | : exception(OPKELE_E_CONS) { } |
96 | }; | 96 | }; |
97 | /** | 97 | /** |
98 | * thrown in case of failed lookup (either parameter or persistent store) | 98 | * thrown in case of failed lookup (either parameter or persistent store) |
99 | */ | 99 | */ |
100 | class failed_lookup : public exception { | 100 | class failed_lookup : public exception { |
101 | public: | 101 | public: |
102 | failed_lookup(OPKELE_E_PARS) | 102 | failed_lookup(OPKELE_E_PARS) |
103 | : exception(OPKELE_E_CONS) { } | 103 | : exception(OPKELE_E_CONS) { } |
104 | }; | 104 | }; |
105 | /** | 105 | /** |
106 | * thrown in case of bad input (either local or network) | 106 | * thrown in case of bad input (either local or network) |
107 | */ | 107 | */ |
108 | class bad_input : public exception { | 108 | class bad_input : public exception { |
109 | public: | 109 | public: |
110 | bad_input(OPKELE_E_PARS) | 110 | bad_input(OPKELE_E_PARS) |
111 | : exception(OPKELE_E_CONS) { } | 111 | : exception(OPKELE_E_CONS) { } |
112 | }; | 112 | }; |
113 | 113 | ||
114 | /** | 114 | /** |
115 | * thrown on failed assertion | 115 | * thrown on failed assertion |
116 | */ | 116 | */ |
117 | class failed_assertion : public exception { | 117 | class failed_assertion : public exception { |
118 | public: | 118 | public: |
119 | failed_assertion(OPKELE_E_PARS) | 119 | failed_assertion(OPKELE_E_PARS) |
120 | : exception(OPKELE_E_CONS) { } | 120 | : exception(OPKELE_E_CONS) { } |
121 | }; | 121 | }; |
122 | 122 | ||
123 | /** | 123 | /** |
124 | * thrown if the handle being retrieved is invalid | 124 | * thrown if the handle being retrieved is invalid |
125 | */ | 125 | */ |
126 | class invalid_handle : public exception { | 126 | class invalid_handle : public exception { |
127 | public: | 127 | public: |
128 | invalid_handle(OPKELE_E_PARS) | 128 | invalid_handle(OPKELE_E_PARS) |
129 | : exception(OPKELE_E_CONS) { } | 129 | : exception(OPKELE_E_CONS) { } |
130 | }; | 130 | }; |
131 | /** | 131 | /** |
132 | * thrown if the handle passed to check_authentication request is not | 132 | * thrown if the handle passed to check_authentication request is not |
133 | * stateless | 133 | * stateless |
134 | */ | 134 | */ |
135 | class stateful_handle : public exception { | 135 | class stateful_handle : public exception { |
136 | public: | 136 | public: |
137 | stateful_handle(OPKELE_E_PARS) | 137 | stateful_handle(OPKELE_E_PARS) |
138 | : exception(OPKELE_E_CONS) { } | 138 | : exception(OPKELE_E_CONS) { } |
139 | }; | 139 | }; |
140 | 140 | ||
141 | /** | 141 | /** |
142 | * thrown if check_authentication request fails | 142 | * thrown if check_authentication request fails |
143 | */ | 143 | */ |
144 | class failed_check_authentication : public exception { | 144 | class failed_check_authentication : public exception { |
145 | public: | 145 | public: |
146 | failed_check_authentication(OPKELE_E_PARS) | 146 | failed_check_authentication(OPKELE_E_PARS) |
147 | : exception(OPKELE_E_CONS) { } | 147 | : exception(OPKELE_E_CONS) { } |
148 | }; | 148 | }; |
149 | 149 | ||
150 | /** | 150 | /** |
151 | * thrown if the id_res request result is negative | 151 | * thrown if the id_res request result is negative |
152 | */ | 152 | */ |
153 | class id_res_failed : public exception { | 153 | class id_res_failed : public exception { |
154 | public: | 154 | public: |
155 | id_res_failed(OPKELE_E_PARS) | 155 | id_res_failed(OPKELE_E_PARS) |
156 | : exception(OPKELE_E_CONS) { } | 156 | : exception(OPKELE_E_CONS) { } |
157 | }; | 157 | }; |
158 | /** | 158 | /** |
159 | * thrown if the user_setup_url is provided with negative response | 159 | * thrown if the user_setup_url is provided with negative response |
160 | */ | 160 | */ |
161 | class id_res_setup : public id_res_failed { | 161 | class id_res_setup : public id_res_failed { |
162 | public: | 162 | public: |
163 | string setup_url; | 163 | string setup_url; |
164 | id_res_setup(OPKELE_E_PARS,const string& su="") | 164 | id_res_setup(OPKELE_E_PARS,const string& su="") |
165 | : id_res_failed(OPKELE_E_CONS), setup_url(su) { } | 165 | : id_res_failed(OPKELE_E_CONS), setup_url(su) { } |
166 | ~id_res_setup() throw() { } | 166 | ~id_res_setup() throw() { } |
167 | }; | 167 | }; |
168 | /** | 168 | /** |
169 | * thrown in case of signature mismatch | 169 | * thrown in case of signature mismatch |
170 | */ | 170 | */ |
171 | class id_res_mismatch : public id_res_failed { | 171 | class id_res_mismatch : public id_res_failed { |
172 | public: | 172 | public: |
173 | id_res_mismatch(OPKELE_E_PARS) | 173 | id_res_mismatch(OPKELE_E_PARS) |
174 | : id_res_failed(OPKELE_E_CONS) { } | 174 | : id_res_failed(OPKELE_E_CONS) { } |
175 | }; | 175 | }; |
176 | 176 | ||
177 | /** | 177 | /** |
178 | * thrown if the association has expired before it could've been verified. | 178 | * thrown if the association has expired before it could've been verified. |
179 | */ | 179 | */ |
180 | class id_res_expired_on_delivery : public id_res_failed { | 180 | class id_res_expired_on_delivery : public id_res_failed { |
181 | public: | 181 | public: |
182 | id_res_expired_on_delivery(OPKELE_E_PARS) | 182 | id_res_expired_on_delivery(OPKELE_E_PARS) |
183 | : id_res_failed(OPKELE_E_CONS) { } | 183 | : id_res_failed(OPKELE_E_CONS) { } |
184 | }; | 184 | }; |
185 | 185 | ||
186 | /** | 186 | /** |
187 | * thown when the user cancelled authentication process. | 187 | * thown when the user cancelled authentication process. |
188 | */ | 188 | */ |
189 | class id_res_cancel : public id_res_failed { | 189 | class id_res_cancel : public id_res_failed { |
190 | public: | 190 | public: |
191 | id_res_cancel(OPKELE_E_PARS) | 191 | id_res_cancel(OPKELE_E_PARS) |
192 | : id_res_failed(OPKELE_E_CONS) { } | 192 | : id_res_failed(OPKELE_E_CONS) { } |
193 | }; | 193 | }; |
194 | 194 | ||
195 | /** | 195 | /** |
196 | * thrown in case of nonce reuse or otherwise imperfect nonce. | 196 | * thrown in case of nonce reuse or otherwise imperfect nonce. |
197 | */ | 197 | */ |
198 | class id_res_bad_nonce : public id_res_failed { | 198 | class id_res_bad_nonce : public id_res_failed { |
199 | public: | 199 | public: |
200 | id_res_bad_nonce(OPKELE_E_PARS) | 200 | id_res_bad_nonce(OPKELE_E_PARS) |
201 | : id_res_failed(OPKELE_E_CONS) { } | 201 | : id_res_failed(OPKELE_E_CONS) { } |
202 | }; | 202 | }; |
203 | 203 | ||
204 | /** | 204 | /** |
205 | * thrown if return_to didn't pass verification | 205 | * thrown if return_to didn't pass verification |
206 | */ | 206 | */ |
207 | class id_res_bad_return_to : public id_res_failed { | 207 | class id_res_bad_return_to : public id_res_failed { |
208 | public: | 208 | public: |
209 | id_res_bad_return_to(OPKELE_E_PARS) | 209 | id_res_bad_return_to(OPKELE_E_PARS) |
210 | : id_res_failed(OPKELE_E_CONS) { } | 210 | : id_res_failed(OPKELE_E_CONS) { } |
211 | }; | 211 | }; |
212 | 212 | ||
213 | /** | 213 | /** |
214 | * thrown if OP isn't authorized to make an assertion | 214 | * thrown if OP isn't authorized to make an assertion |
215 | */ | 215 | */ |
216 | class id_res_unauthorized : public id_res_failed { | 216 | class id_res_unauthorized : public id_res_failed { |
217 | public: | 217 | public: |
218 | id_res_unauthorized(OPKELE_E_PARS) | 218 | id_res_unauthorized(OPKELE_E_PARS) |
219 | : id_res_failed(OPKELE_E_CONS) { } | 219 | : id_res_failed(OPKELE_E_CONS) { } |
220 | }; | 220 | }; |
221 | 221 | ||
222 | /** | 222 | /** |
223 | * openssl malfunction occured | 223 | * openssl malfunction occured |
224 | */ | 224 | */ |
225 | class exception_openssl : public exception { | 225 | class exception_openssl : public exception { |
226 | public: | 226 | public: |
227 | unsigned long _error; | 227 | unsigned long _error; |
228 | string _ssl_string; | 228 | string _ssl_string; |
229 | exception_openssl(OPKELE_E_PARS); | 229 | exception_openssl(OPKELE_E_PARS); |
230 | ~exception_openssl() throw() { } | 230 | ~exception_openssl() throw() { } |
231 | }; | 231 | }; |
232 | 232 | ||
233 | /** | 233 | /** |
234 | * network operation related error occured | 234 | * network operation related error occured |
235 | */ | 235 | */ |
236 | class exception_network : public exception { | 236 | class exception_network : public exception { |
237 | public: | 237 | public: |
238 | exception_network(OPKELE_E_PARS) | 238 | exception_network(OPKELE_E_PARS) |
239 | : exception(OPKELE_E_CONS) { } | 239 | : exception(OPKELE_E_CONS) { } |
240 | }; | 240 | }; |
241 | 241 | ||
242 | /** | 242 | /** |
243 | * network operation related error occured, specifically, related to | 243 | * network operation related error occured, specifically, related to |
244 | * libcurl | 244 | * libcurl |
245 | */ | 245 | */ |
246 | class exception_curl : public exception_network { | 246 | class exception_curl : public exception_network { |
247 | public: | 247 | public: |
248 | CURLcode _error; | 248 | CURLcode _error; |
249 | string _curl_string; | 249 | string _curl_string; |
250 | exception_curl(OPKELE_E_PARS); | 250 | exception_curl(OPKELE_E_PARS); |
251 | exception_curl(OPKELE_E_PARS,CURLcode e); | 251 | exception_curl(OPKELE_E_PARS,CURLcode e); |
252 | ~exception_curl() throw() { } | 252 | ~exception_curl() throw() { } |
253 | }; | 253 | }; |
254 | 254 | ||
255 | /** | 255 | /** |
256 | * htmltidy related error occured | 256 | * htmltidy related error occured |
257 | */ | 257 | */ |
258 | class exception_tidy : public exception { | 258 | class exception_tidy : public exception { |
259 | public: | 259 | public: |
260 | int _rc; | 260 | int _rc; |
261 | exception_tidy(OPKELE_E_PARS); | 261 | exception_tidy(OPKELE_E_PARS); |
262 | exception_tidy(OPKELE_E_PARS,int r); | 262 | exception_tidy(OPKELE_E_PARS,int r); |
263 | ~exception_tidy() throw() { } | 263 | ~exception_tidy() throw() { } |
264 | }; | 264 | }; |
265 | 265 | ||
266 | /** | 266 | /** |
267 | * exception thrown in case of failed discovery | 267 | * exception thrown in case of failed discovery |
268 | */ | 268 | */ |
269 | class failed_discovery : public exception { | 269 | class failed_discovery : public exception { |
270 | public: | 270 | public: |
271 | failed_discovery(OPKELE_E_PARS) | 271 | failed_discovery(OPKELE_E_PARS) |
272 | : exception(OPKELE_E_CONS) { } | 272 | : exception(OPKELE_E_CONS) { } |
273 | }; | 273 | }; |
274 | 274 | ||
275 | /** | 275 | /** |
276 | * unsuccessfull xri resolution | 276 | * unsuccessfull xri resolution |
277 | */ | 277 | */ |
278 | class failed_xri_resolution : public failed_discovery { | 278 | class failed_xri_resolution : public failed_discovery { |
279 | public: | 279 | public: |
280 | long _code; | 280 | long _code; |
281 | failed_xri_resolution(OPKELE_E_PARS,long _c=-1) | 281 | failed_xri_resolution(OPKELE_E_PARS,long _c=-1) |
282 | : failed_discovery(OPKELE_E_CONS), _code(_c) { } | 282 | : failed_discovery(OPKELE_E_CONS), _code(_c) { } |
283 | }; | 283 | }; |
284 | 284 | ||
285 | /** | 285 | /** |
286 | * not implemented (think pure virtual) member function executed, signfies | 286 | * not implemented (think pure virtual) member function executed, signfies |
287 | * programmer error | 287 | * programmer error |
288 | */ | 288 | */ |
289 | class not_implemented : public exception { | 289 | class not_implemented : public exception { |
290 | public: | 290 | public: |
291 | not_implemented(OPKELE_E_PARS) | 291 | not_implemented(OPKELE_E_PARS) |
292 | : exception(OPKELE_E_CONS) { } | 292 | : exception(OPKELE_E_CONS) { } |
293 | }; | 293 | }; |
294 | 294 | ||
295 | /** | 295 | /** |
296 | * internal error, indicates internal libopkele problem | 296 | * internal error, indicates internal libopkele problem |
297 | */ | 297 | */ |
298 | class internal_error : public exception { | 298 | class internal_error : public exception { |
299 | public: | 299 | public: |
300 | internal_error(OPKELE_E_PARS) | 300 | internal_error(OPKELE_E_PARS) |
301 | : exception(OPKELE_E_CONS) { } | 301 | : exception(OPKELE_E_CONS) { } |
302 | }; | 302 | }; |
303 | 303 | ||
304 | /** | 304 | /** |
305 | * thrown in case of unsupported parameter encountered (e.g. unsupported | 305 | * thrown in case of unsupported parameter encountered (e.g. unsupported |
306 | * association type). | 306 | * association type). |
307 | */ | 307 | */ |
308 | class unsupported : public exception { | 308 | class unsupported : public exception { |
309 | public: | 309 | public: |
310 | unsupported(OPKELE_E_PARS) | 310 | unsupported(OPKELE_E_PARS) |
311 | : exception(OPKELE_E_CONS) { } | 311 | : exception(OPKELE_E_CONS) { } |
312 | }; | 312 | }; |
313 | 313 | ||
314 | /** | 314 | /** |
315 | * thrown by associations store related functions in case of dumb RP. | 315 | * thrown by associations store related functions in case of dumb RP. |
316 | */ | 316 | */ |
317 | class dumb_RP : public exception { | 317 | class dumb_RP : public exception { |
318 | public: | 318 | public: |
319 | dumb_RP(OPKELE_E_PARS) | 319 | dumb_RP(OPKELE_E_PARS) |
320 | : exception(OPKELE_E_CONS) { } | 320 | : exception(OPKELE_E_CONS) { } |
321 | }; | 321 | }; |
322 | 322 | ||
323 | /** | 323 | /** |
324 | * thrown by endpoint-queue related function if endpoint is being | 324 | * thrown by endpoint-queue related function if endpoint is being |
325 | * accessed but there's no endpoint available. | 325 | * accessed but there's no endpoint available. |
326 | */ | 326 | */ |
327 | class no_endpoint : public exception { | 327 | class no_endpoint : public exception { |
328 | public: | 328 | public: |
329 | no_endpoint(OPKELE_E_PARS) | 329 | no_endpoint(OPKELE_E_PARS) |
330 | : exception(OPKELE_E_CONS) { } | 330 | : exception(OPKELE_E_CONS) { } |
331 | }; | 331 | }; |
332 | 332 | ||
333 | /** | ||
334 | * thrown while processing OpenID request in OP. Signifies invalid realm | ||
335 | */ | ||
336 | class bad_realm : public exception { | ||
337 | public: | ||
338 | bad_realm(OPKELE_E_PARS) | ||
339 | : exception(OPKELE_E_CONS) { } | ||
340 | }; | ||
341 | |||
342 | /** | ||
343 | * thrown when attempting to retrieve return_to of one-way request | ||
344 | */ | ||
345 | class no_return_to : public exception { | ||
346 | public: | ||
347 | no_return_to(OPKELE_E_PARS) | ||
348 | : exception(OPKELE_E_CONS) { } | ||
349 | }; | ||
350 | |||
351 | /** | ||
352 | * thrown when querying identity of non-identity related request | ||
353 | */ | ||
354 | class non_identity : public exception { | ||
355 | public: | ||
356 | non_identity(OPKELE_E_PARS) | ||
357 | : exception(OPKELE_E_CONS) { } | ||
358 | }; | ||
359 | |||
333 | } | 360 | } |
334 | 361 | ||
335 | #endif /* __OPKELE_EXCEPTION_H */ | 362 | #endif /* __OPKELE_EXCEPTION_H */ |
diff --git a/lib/Makefile.am b/lib/Makefile.am index c58ec3f..ac312d1 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am | |||
@@ -1,34 +1,35 @@ | |||
1 | lib_LTLIBRARIES = libopkele.la | 1 | lib_LTLIBRARIES = libopkele.la |
2 | 2 | ||
3 | AM_CPPFLAGS = ${CPPFLAGS_DEBUG} | 3 | AM_CPPFLAGS = ${CPPFLAGS_DEBUG} |
4 | DEFAULT_INCLUDES = -I${top_builddir} | 4 | DEFAULT_INCLUDES = -I${top_builddir} |
5 | INCLUDES = \ | 5 | INCLUDES = \ |
6 | -I${top_builddir}/include/ -I${top_srcdir}/include/ \ | 6 | -I${top_builddir}/include/ -I${top_srcdir}/include/ \ |
7 | ${KONFORKA_CFLAGS} \ | 7 | ${KONFORKA_CFLAGS} \ |
8 | ${OPENSSL_CFLAGS} \ | 8 | ${OPENSSL_CFLAGS} \ |
9 | ${LIBCURL_CPPFLAGS} \ | 9 | ${LIBCURL_CPPFLAGS} \ |
10 | ${PCRE_CFLAGS} ${EXPAT_CFLAGS} ${TIDY_CFLAGS} | 10 | ${PCRE_CFLAGS} ${EXPAT_CFLAGS} ${TIDY_CFLAGS} |
11 | libopkele_la_LIBADD = \ | 11 | libopkele_la_LIBADD = \ |
12 | ${LIBCURL} \ | 12 | ${LIBCURL} \ |
13 | ${PCRE_LIBS} ${EXPAT_LIBS} \ | 13 | ${PCRE_LIBS} ${EXPAT_LIBS} \ |
14 | ${OPENSSL_LIBS} \ | 14 | ${OPENSSL_LIBS} \ |
15 | ${KONFORKA_LIBS} ${TIDY_LIBS} | 15 | ${KONFORKA_LIBS} ${TIDY_LIBS} |
16 | 16 | ||
17 | libopkele_la_SOURCES = \ | 17 | libopkele_la_SOURCES = \ |
18 | params.cc \ | 18 | params.cc \ |
19 | util.cc \ | 19 | util.cc \ |
20 | server.cc \ | 20 | server.cc \ |
21 | secret.cc \ | 21 | secret.cc \ |
22 | data.cc \ | 22 | data.cc \ |
23 | consumer.cc \ | 23 | consumer.cc \ |
24 | exception.cc \ | 24 | exception.cc \ |
25 | extension.cc \ | 25 | extension.cc \ |
26 | sreg.cc \ | 26 | sreg.cc \ |
27 | extension_chain.cc \ | 27 | extension_chain.cc \ |
28 | curl.cc expat.cc \ | 28 | curl.cc expat.cc \ |
29 | discovery.cc \ | 29 | discovery.cc \ |
30 | basic_rp.cc \ | 30 | basic_rp.cc \ |
31 | prequeue_rp.cc \ | 31 | prequeue_rp.cc \ |
32 | openid_message.cc | 32 | openid_message.cc \ |
33 | basic_op.cc | ||
33 | libopkele_la_LDFLAGS = \ | 34 | libopkele_la_LDFLAGS = \ |
34 | -version-info 2:0:0 | 35 | -version-info 2:0:0 |
diff --git a/lib/basic_op.cc b/lib/basic_op.cc new file mode 100644 index 0000000..22012bc --- a/dev/null +++ b/lib/basic_op.cc | |||
@@ -0,0 +1,320 @@ | |||
1 | #include <time.h> | ||
2 | #include <cassert> | ||
3 | #include <openssl/sha.h> | ||
4 | #include <openssl/hmac.h> | ||
5 | #include <opkele/data.h> | ||
6 | #include <opkele/basic_op.h> | ||
7 | #include <opkele/exception.h> | ||
8 | #include <opkele/util.h> | ||
9 | #include <opkele/uris.h> | ||
10 | |||
11 | namespace opkele { | ||
12 | |||
13 | void basic_op::reset_vars() { | ||
14 | assoc.reset(); | ||
15 | return_to.clear(); realm.clear(); | ||
16 | claimed_id.clear(); identity.clear(); | ||
17 | invalidate_handle.clear(); | ||
18 | } | ||
19 | |||
20 | bool basic_op::has_return_to() const { | ||
21 | return !return_to.empty(); | ||
22 | } | ||
23 | const string& basic_op::get_return_to() const { | ||
24 | if(return_to.empty()) | ||
25 | throw no_return_to(OPKELE_CP_ "No return_to URL provided with request"); | ||
26 | return return_to; | ||
27 | } | ||
28 | |||
29 | const string& basic_op::get_realm() const { | ||
30 | assert(!realm.empty()); | ||
31 | return realm; | ||
32 | } | ||
33 | |||
34 | bool basic_op::has_identity() const { | ||
35 | return !identity.empty(); | ||
36 | } | ||
37 | const string& basic_op::get_claimed_id() const { | ||
38 | if(claimed_id.empty()) | ||
39 | throw non_identity(OPKELE_CP_ "attempting to retrieve claimed_id of non-identity related request"); | ||
40 | assert(!identity.empty()); | ||
41 | return claimed_id; | ||
42 | } | ||
43 | const string& basic_op::get_identity() const { | ||
44 | if(identity.empty()) | ||
45 | throw non_identity(OPKELE_CP_ "attempting to retrieve identity of non-identity related request"); | ||
46 | assert(!claimed_id.empty()); | ||
47 | return identity; | ||
48 | } | ||
49 | |||
50 | bool basic_op::is_id_select() const { | ||
51 | return identity==IDURI_SELECT20; | ||
52 | } | ||
53 | |||
54 | void basic_op::select_identity(const string& c,const string& i) { | ||
55 | claimed_id = c; identity = i; | ||
56 | } | ||
57 | void basic_op::set_claimed_id(const string& c) { | ||
58 | claimed_id = c; | ||
59 | } | ||
60 | |||
61 | basic_openid_message& basic_op::associate( | ||
62 | basic_openid_message& oum, | ||
63 | const basic_openid_message& inm) try { | ||
64 | assert(inm.get_field("mode")=="associate"); | ||
65 | util::dh_t dh; | ||
66 | util::bignum_t c_pub; | ||
67 | unsigned char key_digest[SHA256_DIGEST_LENGTH]; | ||
68 | size_t d_len = 0; | ||
69 | enum { | ||
70 | sess_cleartext, sess_dh_sha1, sess_dh_sha256 | ||
71 | } st = sess_cleartext; | ||
72 | string sts = inm.get_field("session_type"); | ||
73 | string ats = inm.get_field("assoc_type"); | ||
74 | if(sts=="DH-SHA1" || sts=="DH-SHA256") { | ||
75 | if(!(dh = DH_new())) | ||
76 | throw exception_openssl(OPKELE_CP_ "failed to DH_new()"); | ||
77 | c_pub = util::base64_to_bignum(inm.get_field("dh_consumer_public")); | ||
78 | try { dh->p = util::base64_to_bignum(inm.get_field("dh_modulus")); | ||
79 | }catch(failed_lookup&) { | ||
80 | dh->p = util::dec_to_bignum(data::_default_p); } | ||
81 | try { dh->g = util::base64_to_bignum(inm.get_field("dh_gen")); | ||
82 | }catch(failed_lookup&) { | ||
83 | dh->g = util::dec_to_bignum(data::_default_g); } | ||
84 | if(!DH_generate_key(dh)) | ||
85 | throw exception_openssl(OPKELE_CP_ "failed to DH_generate_key()"); | ||
86 | vector<unsigned char> ck(DH_size(dh)+1); | ||
87 | unsigned char *ckptr = &(ck.front())+1; | ||
88 | int cklen = DH_compute_key(ckptr,c_pub,dh); | ||
89 | if(cklen<0) | ||
90 | throw exception_openssl(OPKELE_CP_ "failed to DH_compute_key()"); | ||
91 | if(cklen && (*ckptr)&0x80) { | ||
92 | (*(--ckptr)) = 0; ++cklen; } | ||
93 | if(sts=="DH-SHA1") { | ||
94 | SHA1(ckptr,cklen,key_digest); d_len = SHA_DIGEST_LENGTH; | ||
95 | }else if(sts=="DH-SHA256") { | ||
96 | SHA256(ckptr,cklen,key_digest); d_len = SHA256_DIGEST_LENGTH; | ||
97 | }else | ||
98 | throw internal_error(OPKELE_CP_ "I thought I knew the session type"); | ||
99 | }else | ||
100 | throw unsupported(OPKELE_CP_ "Unsupported session_type"); | ||
101 | assoc_t assoc; | ||
102 | if(ats=="HMAC-SHA1") | ||
103 | assoc = alloc_assoc(ats,SHA_DIGEST_LENGTH,true); | ||
104 | else if(ats=="HMAC-SHA256") | ||
105 | assoc = alloc_assoc(ats,SHA256_DIGEST_LENGTH,true); | ||
106 | else | ||
107 | throw unsupported(OPKELE_CP_ "Unsupported assoc_type"); | ||
108 | oum.reset_fields(); | ||
109 | oum.set_field("ns",OIURI_OPENID20); | ||
110 | oum.set_field("assoc_type",assoc->assoc_type()); | ||
111 | oum.set_field("assoc_handle",assoc->handle()); | ||
112 | oum.set_field("expires_in",util::long_to_string(assoc->expires_in())); | ||
113 | secret_t secret = assoc->secret(); | ||
114 | if(sts=="DH-SHA1" || sts=="DH-SHA256") { | ||
115 | if(d_len != secret.size()) | ||
116 | throw bad_input(OPKELE_CP_ "Association secret and session MAC are not of the same size"); | ||
117 | oum.set_field("session_type",sts); | ||
118 | oum.set_field("dh_server_public",util::bignum_to_base64(dh->pub_key)); | ||
119 | string b64; secret.enxor_to_base64(key_digest,b64); | ||
120 | oum.set_field("enc_mac_key",b64); | ||
121 | }else /* TODO: support cleartext over encrypted connection */ | ||
122 | throw unsupported(OPKELE_CP_ "Unsupported session type"); | ||
123 | return oum; | ||
124 | } catch(unsupported& u) { | ||
125 | oum.reset_fields(); | ||
126 | oum.set_field("ns",OIURI_OPENID20); | ||
127 | oum.set_field("error",u.what()); | ||
128 | oum.set_field("error_code","unsupported-type"); | ||
129 | oum.set_field("session_type","DH-SHA256"); | ||
130 | oum.set_field("assoc_type","HMAC-SHA256"); | ||
131 | return oum; | ||
132 | } | ||
133 | |||
134 | void basic_op::checkid_(const basic_openid_message& inm, | ||
135 | extension_t *ext) { | ||
136 | reset_vars(); | ||
137 | string mode = inm.get_field("mode"); | ||
138 | if(mode=="checkid_setup") | ||
139 | mode = mode_checkid_setup; | ||
140 | else if(mode=="checkid_immediate") | ||
141 | mode = mode_checkid_immediate; | ||
142 | else | ||
143 | throw bad_input(OPKELE_CP_ "Invalid checkid_* mode"); | ||
144 | try { | ||
145 | assoc = retrieve_assoc(invalidate_handle=inm.get_field("assoc_handle")); | ||
146 | invalidate_handle.clear(); | ||
147 | }catch(failed_lookup&) { | ||
148 | // no handle specified or no valid assoc found, go dumb | ||
149 | assoc = alloc_assoc("HMAC-SHA256",SHA256_DIGEST_LENGTH,true); | ||
150 | } | ||
151 | try { | ||
152 | openid2 = (inm.get_field("ns")==OIURI_OPENID20); | ||
153 | }catch(failed_lookup&) { openid2 = false; } | ||
154 | try { | ||
155 | return_to = inm.get_field("return_to"); | ||
156 | }catch(failed_lookup&) { } | ||
157 | if(openid2) { | ||
158 | try { | ||
159 | realm = inm.get_field("realm"); | ||
160 | }catch(failed_lookup&) { | ||
161 | try { | ||
162 | realm = inm.get_field("trust_root"); | ||
163 | }catch(failed_lookup&) { | ||
164 | if(return_to.empty()) | ||
165 | throw bad_input(OPKELE_CP_ | ||
166 | "Both realm and return_to are unset"); | ||
167 | realm = return_to; | ||
168 | } | ||
169 | } | ||
170 | }else{ | ||
171 | try { | ||
172 | realm = inm.get_field("trust_root"); | ||
173 | }catch(failed_lookup&) { | ||
174 | if(return_to.empty()) | ||
175 | throw bad_input(OPKELE_CP_ | ||
176 | "Both realm and return_to are unset"); | ||
177 | realm = return_to; | ||
178 | } | ||
179 | } | ||
180 | try { | ||
181 | identity = inm.get_field("identity"); | ||
182 | try { | ||
183 | claimed_id = inm.get_field("claimed_id"); | ||
184 | }catch(failed_lookup&) { | ||
185 | if(openid2) | ||
186 | throw bad_input(OPKELE_CP_ | ||
187 | "claimed_id and identity must be either both present or both absent"); | ||
188 | } | ||
189 | }catch(failed_lookup&) { | ||
190 | if(openid2 && inm.has_field("claimed_id")) | ||
191 | throw bad_input(OPKELE_CP_ | ||
192 | "claimed_id and identity must be either both present or both absent"); | ||
193 | } | ||
194 | verify_return_to(); | ||
195 | } | ||
196 | |||
197 | basic_openid_message& basic_op::id_res(basic_openid_message& om) { | ||
198 | assert(assoc); | ||
199 | assert(!return_to.empty()); | ||
200 | assert(!is_id_select()); | ||
201 | time_t now = time(0); | ||
202 | struct tm gmt; gmtime_r(&now,&gmt); | ||
203 | char w3timestr[24]; | ||
204 | if(!strftime(w3timestr,sizeof(w3timestr),"%Y-%m-%dT%H:%M:%SZ",&gmt)) | ||
205 | throw failed_conversion(OPKELE_CP_ | ||
206 | "Failed to build time string for nonce" ); | ||
207 | om.set_field("ns",OIURI_OPENID20); | ||
208 | om.set_field("mode","id_res"); | ||
209 | om.set_field("op_endpoint",get_op_endpoint()); | ||
210 | string ats = "ns,mode,op_endpoint,return_to,response_nonce," | ||
211 | "assoc_handle,signed"; | ||
212 | if(!identity.empty()) { | ||
213 | om.set_field("identity",identity); | ||
214 | om.set_field("claimed_id",claimed_id); | ||
215 | ats += ",identity,claimed_id"; | ||
216 | } | ||
217 | om.set_field("return_to",return_to); | ||
218 | string nonce = w3timestr; | ||
219 | om.set_field("response_nonce",alloc_nonce(nonce,assoc->stateless())); | ||
220 | if(!invalidate_handle.empty()) { | ||
221 | om.set_field("invalidate_handle",invalidate_handle); | ||
222 | ats += ",invalidate_handle"; | ||
223 | } | ||
224 | om.set_field("assoc_handle",assoc->handle()); | ||
225 | om.add_to_signed(ats); | ||
226 | om.set_field("sig",util::base64_signature(assoc,om)); | ||
227 | return om; | ||
228 | } | ||
229 | |||
230 | basic_openid_message& basic_op::cancel(basic_openid_message& om) { | ||
231 | assert(!return_to.empty()); | ||
232 | om.set_field("ns",OIURI_OPENID20); | ||
233 | om.set_field("mode","cancel"); | ||
234 | return om; | ||
235 | } | ||
236 | |||
237 | basic_openid_message& basic_op::error(basic_openid_message& om, | ||
238 | const string& error,const string& contact, | ||
239 | const string& reference ) { | ||
240 | assert(!return_to.empty()); | ||
241 | om.set_field("ns",OIURI_OPENID20); | ||
242 | om.set_field("mode","error"); | ||
243 | om.set_field("error",error); | ||
244 | om.set_field("contact",contact); | ||
245 | om.set_field("reference",reference); | ||
246 | return om; | ||
247 | } | ||
248 | |||
249 | basic_openid_message& basic_op::setup_needed( | ||
250 | basic_openid_message& oum,const basic_openid_message& inm) { | ||
251 | assert(mode==mode_checkid_immediate); | ||
252 | assert(!return_to.empty()); | ||
253 | if(openid2) { | ||
254 | oum.set_field("ns",OIURI_OPENID20); | ||
255 | oum.set_field("mode","setup_needed"); | ||
256 | }else{ | ||
257 | oum.set_field("mode","id_res"); | ||
258 | static const string setupmode = "checkid_setup"; | ||
259 | oum.set_field("user_setup_url", | ||
260 | util::change_mode_message_proxy(inm,setupmode) | ||
261 | .append_query(get_op_endpoint())); | ||
262 | } | ||
263 | return oum; | ||
264 | } | ||
265 | |||
266 | basic_openid_message& basic_op::check_authentication( | ||
267 | basic_openid_message& oum, | ||
268 | const basic_openid_message& inm) try { | ||
269 | assert(inm.get_field("mode")=="check_authentication"); | ||
270 | oum.reset_fields(); | ||
271 | oum.set_field("ns",OIURI_OPENID20); | ||
272 | bool o2; | ||
273 | try { | ||
274 | o2 = (inm.get_field("ns")==OIURI_OPENID20); | ||
275 | }catch(failed_lookup&) { o2 = false; } | ||
276 | string nonce; | ||
277 | if(o2) { | ||
278 | try { | ||
279 | if(!check_nonce(nonce = inm.get_field("response_nonce"))) | ||
280 | throw failed_check_authentication(OPKELE_CP_ "Invalid nonce"); | ||
281 | }catch(failed_lookup&) { | ||
282 | throw failed_check_authentication(OPKELE_CP_ "No nonce provided with check_authentication request"); | ||
283 | } | ||
284 | } | ||
285 | try { | ||
286 | assoc = retrieve_assoc(inm.get_field("assoc_handle")); | ||
287 | if(!assoc->stateless()) | ||
288 | throw failed_check_authentication(OPKELE_CP_ "Will not do check_authentication on a stateful handle"); | ||
289 | }catch(failed_lookup&) { | ||
290 | throw failed_check_authentication(OPKELE_CP_ "No assoc_handle or invalid assoc_handle specified with check_authentication request"); | ||
291 | } | ||
292 | static const string idresmode = "id_res"; | ||
293 | try { | ||
294 | if(util::base64_signature(assoc,util::change_mode_message_proxy(inm,idresmode))!=inm.get_field("sig")) | ||
295 | throw failed_check_authentication(OPKELE_CP_ "Signature mismatch"); | ||
296 | }catch(failed_lookup&) { | ||
297 | throw failed_check_authentication(OPKELE_CP_ "failed to calculate signature"); | ||
298 | } | ||
299 | oum.set_field("is_valid","true"); | ||
300 | try { | ||
301 | string h = inm.get_field("invalidate_handle"); | ||
302 | try { | ||
303 | assoc_t ih = retrieve_assoc(h); | ||
304 | }catch(invalid_handle& ih) { | ||
305 | oum.set_field("invalidate_handle",h); | ||
306 | }catch(failed_lookup& ih) { | ||
307 | oum.set_field("invalidate_handle",h); | ||
308 | } | ||
309 | }catch(failed_lookup&) { } | ||
310 | if(o2) { | ||
311 | assert(!nonce.empty()); | ||
312 | invalidate_nonce(nonce); | ||
313 | } | ||
314 | return oum; | ||
315 | }catch(failed_check_authentication& ) { | ||
316 | oum.set_field("is_valid","false"); | ||
317 | return oum; | ||
318 | } | ||
319 | |||
320 | } | ||