author | Michael Krelin <hacker@klever.net> | 2007-12-04 19:02:15 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-12-04 19:02:15 (UTC) |
commit | 7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa (patch) (unidiff) | |
tree | 42a2983bd4fdbba0b49d9a5329e5f819ad73d5ec /include/opkele | |
parent | 206de587733c5dbde280fb6e9f1eab2f02de7f54 (diff) | |
download | libopkele-7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa.zip libopkele-7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa.tar.gz libopkele-7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa.tar.bz2 |
Minor improvements
- almost irrelevant documentation updates
- introduced id_res_expired_on_delivery exception to be thrown if the
association has expired right before it could've been used for signature
verification.
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | include/opkele/consumer.h | 6 | ||||
-rw-r--r-- | include/opkele/exception.h | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/opkele/consumer.h b/include/opkele/consumer.h index 50ff692..c463787 100644 --- a/include/opkele/consumer.h +++ b/include/opkele/consumer.h | |||
@@ -54,32 +54,37 @@ namespace opkele { | |||
54 | * invalidate stored association. The function should be overridden | 54 | * invalidate stored association. The function should be overridden |
55 | * in the real implementation of the consumer. | 55 | * in the real implementation of the consumer. |
56 | * @param server the OpenID server | 56 | * @param server the OpenID server |
57 | * @param handle association handle | 57 | * @param handle association handle |
58 | */ | 58 | */ |
59 | virtual void invalidate_assoc(const string& server,const string& handle) = 0; | 59 | virtual void invalidate_assoc(const string& server,const string& handle) = 0; |
60 | /** | 60 | /** |
61 | * retrieve any unexpired association for the server. If the | 61 | * retrieve any unexpired association for the server. If the |
62 | * function is not overridden in the real implementation, the new | 62 | * function is not overridden in the real implementation, the new |
63 | * association will be established for each request. | 63 | * association will be established for each request. |
64 | * | 64 | * |
65 | * @note | 65 | * @note |
66 | * The user is responsible for handling associations and this | 66 | * The user is responsible for handling associations and this |
67 | * function should never return an expired or invalidated | 67 | * function should never return an expired or invalidated |
68 | * association. | 68 | * association. |
69 | * | 69 | * |
70 | * @note | ||
71 | * It may be a good idea to pre-expire associations shortly before | ||
72 | * their time is really up to avoid association expiry in the | ||
73 | * middle of negotiations. | ||
74 | * | ||
70 | * @param server the OpenID server | 75 | * @param server the OpenID server |
71 | * @return the auto_ptr<> for the newly allocated association_t object | 76 | * @return the auto_ptr<> for the newly allocated association_t object |
72 | * @throw failed_lookup in case of absence of the handle | 77 | * @throw failed_lookup in case of absence of the handle |
73 | */ | 78 | */ |
74 | virtual assoc_t find_assoc(const string& server); | 79 | virtual assoc_t find_assoc(const string& server); |
75 | 80 | ||
76 | /** | 81 | /** |
77 | * retrieve the metainformation contained in link tags from the | 82 | * retrieve the metainformation contained in link tags from the |
78 | * page pointed by url. the function may implement caching of the | 83 | * page pointed by url. the function may implement caching of the |
79 | * information. | 84 | * information. |
80 | * @param url url to harvest for link tags | 85 | * @param url url to harvest for link tags |
81 | * @param server reference to the string object where to put | 86 | * @param server reference to the string object where to put |
82 | * openid.server value | 87 | * openid.server value |
83 | * @param delegate reference to the string object where to put the | 88 | * @param delegate reference to the string object where to put the |
84 | * openid.delegate value (if any) | 89 | * openid.delegate value (if any) |
85 | */ | 90 | */ |
@@ -124,32 +129,33 @@ namespace opkele { | |||
124 | * @param trust_root the trust root to advertise with the request | 129 | * @param trust_root the trust root to advertise with the request |
125 | * @param ext pointer to an extension(s) hooks object | 130 | * @param ext pointer to an extension(s) hooks object |
126 | * @return the location string | 131 | * @return the location string |
127 | * @throw exception in case of error | 132 | * @throw exception in case of error |
128 | */ | 133 | */ |
129 | virtual string checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root="",extension_t *ext=0); | 134 | virtual string checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root="",extension_t *ext=0); |
130 | /** | 135 | /** |
131 | * verify the id_res response | 136 | * verify the id_res response |
132 | * @param pin the response parameters | 137 | * @param pin the response parameters |
133 | * @param identity the identity being checked (if not specified, | 138 | * @param identity the identity being checked (if not specified, |
134 | * @param ext pointer to an extension(s) hooks object | 139 | * @param ext pointer to an extension(s) hooks object |
135 | * extracted from the openid.identity parameter | 140 | * extracted from the openid.identity parameter |
136 | * @throw id_res_mismatch in case of signature mismatch | 141 | * @throw id_res_mismatch in case of signature mismatch |
137 | * @throw id_res_setup in case of openid.user_setup_url failure | 142 | * @throw id_res_setup in case of openid.user_setup_url failure |
138 | * (supposedly checkid_immediate only) | 143 | * (supposedly checkid_immediate only) |
139 | * @throw id_res_failed in case of failure | 144 | * @throw id_res_failed in case of failure |
145 | * @throw id_res_expired_on_delivery if the association expired before it could've been verified | ||
140 | * @throw exception in case of other failures | 146 | * @throw exception in case of other failures |
141 | */ | 147 | */ |
142 | virtual void id_res(const params_t& pin,const string& identity="",extension_t *ext=0); | 148 | virtual void id_res(const params_t& pin,const string& identity="",extension_t *ext=0); |
143 | /** | 149 | /** |
144 | * perform a check_authentication request. | 150 | * perform a check_authentication request. |
145 | * @param server the OpenID server | 151 | * @param server the OpenID server |
146 | * @param p request parameters | 152 | * @param p request parameters |
147 | */ | 153 | */ |
148 | void check_authentication(const string& server,const params_t& p); | 154 | void check_authentication(const string& server,const params_t& p); |
149 | 155 | ||
150 | /** | 156 | /** |
151 | * normalize URL by adding http:// and trailing slash if needed. | 157 | * normalize URL by adding http:// and trailing slash if needed. |
152 | * @param url | 158 | * @param url |
153 | * @return normalized url | 159 | * @return normalized url |
154 | */ | 160 | */ |
155 | static string normalize(const string& url); | 161 | static string normalize(const string& url); |
diff --git a/include/opkele/exception.h b/include/opkele/exception.h index 753a818..2ff44b7 100644 --- a/include/opkele/exception.h +++ b/include/opkele/exception.h | |||
@@ -157,32 +157,41 @@ namespace opkele { | |||
157 | public: | 157 | public: |
158 | string setup_url; | 158 | string setup_url; |
159 | id_res_setup(OPKELE_E_PARS,const string& su) | 159 | id_res_setup(OPKELE_E_PARS,const string& su) |
160 | : id_res_failed(OPKELE_E_CONS), setup_url(su) { } | 160 | : id_res_failed(OPKELE_E_CONS), setup_url(su) { } |
161 | ~id_res_setup() throw() { } | 161 | ~id_res_setup() throw() { } |
162 | }; | 162 | }; |
163 | /** | 163 | /** |
164 | * thrown in case of signature mismatch | 164 | * thrown in case of signature mismatch |
165 | */ | 165 | */ |
166 | class id_res_mismatch : public id_res_failed { | 166 | class id_res_mismatch : public id_res_failed { |
167 | public: | 167 | public: |
168 | id_res_mismatch(OPKELE_E_PARS) | 168 | id_res_mismatch(OPKELE_E_PARS) |
169 | : id_res_failed(OPKELE_E_CONS) { } | 169 | : id_res_failed(OPKELE_E_CONS) { } |
170 | }; | 170 | }; |
171 | 171 | ||
172 | /** | 172 | /** |
173 | * thrown if the association has expired before it could've been verified. | ||
174 | */ | ||
175 | class id_res_expired_on_delivery : public id_res_failed { | ||
176 | public: | ||
177 | id_res_expired_on_delivery(OPKELE_E_PARS) | ||
178 | : id_res_failed(OPKELE_E_CONS) { } | ||
179 | }; | ||
180 | |||
181 | /** | ||
173 | * openssl malfunction occured | 182 | * openssl malfunction occured |
174 | */ | 183 | */ |
175 | class exception_openssl : public exception { | 184 | class exception_openssl : public exception { |
176 | public: | 185 | public: |
177 | unsigned long _error; | 186 | unsigned long _error; |
178 | string _ssl_string; | 187 | string _ssl_string; |
179 | exception_openssl(OPKELE_E_PARS); | 188 | exception_openssl(OPKELE_E_PARS); |
180 | ~exception_openssl() throw() { } | 189 | ~exception_openssl() throw() { } |
181 | }; | 190 | }; |
182 | 191 | ||
183 | /** | 192 | /** |
184 | * network operation related error occured | 193 | * network operation related error occured |
185 | */ | 194 | */ |
186 | class exception_network : public exception { | 195 | class exception_network : public exception { |
187 | public: | 196 | public: |
188 | exception_network(OPKELE_E_PARS) | 197 | exception_network(OPKELE_E_PARS) |