summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-12-16 22:52:51 (UTC)
committer Michael Krelin <hacker@klever.net>2007-12-17 12:09:16 (UTC)
commit24a6f9e3525b76ed1aa787f66b003b01b767af39 (patch) (unidiff)
tree87741582a2a673205b11ac0386725c0b9d8377f9
parentd4e05a6fe00ebd64546637e5873759d4e8d1b010 (diff)
downloadlibopkele-24a6f9e3525b76ed1aa787f66b003b01b767af39.zip
libopkele-24a6f9e3525b76ed1aa787f66b003b01b767af39.tar.gz
libopkele-24a6f9e3525b76ed1aa787f66b003b01b767af39.tar.bz2
made secret_t non-constant size and added params_t::query_string function
1. removed checking that secret_t is exactly 20 bytes, because its size is not so constant anymore. 2. added a query_string function that produces a query string suitable for use in GET and POST requests. I'm making use of it when performing direct request when establishing associations. Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/opkele/types.h18
-rw-r--r--lib/params.cc13
-rw-r--r--lib/secret.cc12
3 files changed, 30 insertions, 13 deletions
diff --git a/include/opkele/types.h b/include/opkele/types.h
index 520618d..ca07df5 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -35,26 +35,26 @@ namespace opkele {
35 /** 35 /**
36 * the association secret container 36 * the association secret container
37 */ 37 */
38 class secret_t : public vector<unsigned char> { 38 class secret_t : public vector<unsigned char> {
39 public: 39 public:
40 40
41 /** 41 /**
42 * xor the secret and hmac together and encode, using base64 42 * xor the secret and hmac together and encode, using base64
43 * @param key_sha1 pointer to the sha1 digest 43 * @param key_d pointer to the message digest
44 * @param rv reference to the return value 44 * @param rv reference to the return value
45 */ 45 */
46 void enxor_to_base64(const unsigned char *key_sha1,string& rv) const; 46 void enxor_to_base64(const unsigned char *key_d,string& rv) const;
47 /** 47 /**
48 * decode base64-encoded secret and xor it with the sha1 digest 48 * decode base64-encoded secret and xor it with the message digest
49 * @param key_sha1 pointer to the message digest 49 * @param key_d pointer to the message digest
50 * @param b64 base64-encoded secret value 50 * @param b64 base64-encoded secret value
51 */ 51 */
52 void enxor_from_base64(const unsigned char *key_sha1,const string& b64); 52 void enxor_from_base64(const unsigned char *key_d,const string& b64);
53 /** 53 /**
54 * plainly encode to base64 representation 54 * plainly encode to base64 representation
55 * @param rv reference to the return value 55 * @param rv reference to the return value
56 */ 56 */
57 void to_base64(string& rv) const; 57 void to_base64(string& rv) const;
58 /** 58 /**
59 * decode cleartext secret from base64 59 * decode cleartext secret from base64
60 * @param b64 base64-encoded representation of the secret value 60 * @param b64 base64-encoded representation of the secret value
@@ -156,16 +156,24 @@ namespace opkele {
156 156
157 /** 157 /**
158 * append parameters to the URL as a GET-request parameters. 158 * append parameters to the URL as a GET-request parameters.
159 * @param url the base URL 159 * @param url the base URL
160 * @param prefix the string to prepend to parameter names 160 * @param prefix the string to prepend to parameter names
161 * @return the ready-to-use location 161 * @return the ready-to-use location
162 */ 162 */
163 string append_query(const string& url,const char *prefix = "openid.") const; 163 string append_query(const string& url,const char *prefix = "openid.") const;
164
165 /**
166 * make up a query string suitable for use in GET and POST
167 * requests.
168 * @param prefix string to prened to parameter names
169 * @return query string
170 */
171 string query_string(const char *prefix = "openid.") const;
164 }; 172 };
165 173
166 /** 174 /**
167 * dump the key/value pairs for the parameters to the stream. 175 * dump the key/value pairs for the parameters to the stream.
168 * @param o output stream 176 * @param o output stream
169 * @param p the parameters 177 * @param p the parameters
170 */ 178 */
171 ostream& operator << (ostream& o,const params_t& p); 179 ostream& operator << (ostream& o,const params_t& p);
diff --git a/lib/params.cc b/lib/params.cc
index ea86d3a..7a572c1 100644
--- a/lib/params.cc
+++ b/lib/params.cc
@@ -94,15 +94,28 @@ namespace opkele {
94 rv += prefix; 94 rv += prefix;
95 rv += i->first; 95 rv += i->first;
96 rv += '='; 96 rv += '=';
97 rv += util::url_encode(i->second); 97 rv += util::url_encode(i->second);
98 } 98 }
99 return rv; 99 return rv;
100 } 100 }
101 101
102 string params_t::query_string(const char *prefix) const {
103 string rv;
104 for(const_iterator i=begin();i!=end();++i) {
105 if(!rv.empty())
106 rv += '&';
107 rv += prefix;
108 rv += i->first;
109 rv += '=';
110 rv += util::url_encode(i->second);
111 }
112 return rv;
113 }
114
102 ostream& operator << (ostream& o,const params_t& p) { 115 ostream& operator << (ostream& o,const params_t& p) {
103 for(params_t::const_iterator i=p.begin();i!=p.end();++i) 116 for(params_t::const_iterator i=p.begin();i!=p.end();++i)
104 o << i->first << ':' << i->second << '\n'; 117 o << i->first << ':' << i->second << '\n';
105 return o; 118 return o;
106 } 119 }
107 120
108} 121}
diff --git a/lib/secret.cc b/lib/secret.cc
index 632a2ca..d538890 100644
--- a/lib/secret.cc
+++ b/lib/secret.cc
@@ -9,41 +9,37 @@ namespace opkele {
9 9
10 template<class __a1,class __a2,class __r> 10 template<class __a1,class __a2,class __r>
11 struct bitwise_xor : public binary_function<__a1,__a2,__r> { 11 struct bitwise_xor : public binary_function<__a1,__a2,__r> {
12 __r operator() (const __a1& a1,const __a2& a2) const { 12 __r operator() (const __a1& a1,const __a2& a2) const {
13 return a1^a2; 13 return a1^a2;
14 } 14 }
15 }; 15 };
16 16
17 void secret_t::enxor_to_base64(const unsigned char *key_sha1,string& rv) const { 17 void secret_t::enxor_to_base64(const unsigned char *key_d,string& rv) const {
18 if(size()!=20)
19 throw bad_input(OPKELE_CP_ "wrong secret size");
20 vector<unsigned char> tmp; 18 vector<unsigned char> tmp;
21 transform( 19 transform(
22 begin(), end(), 20 begin(), end(),
23 key_sha1, 21 key_d,
24 back_insert_iterator<vector<unsigned char> >(tmp), 22 back_insert_iterator<vector<unsigned char> >(tmp),
25 bitwise_xor<unsigned char,unsigned char,unsigned char>() ); 23 bitwise_xor<unsigned char,unsigned char,unsigned char>() );
26 rv = util::encode_base64(&(tmp.front()),tmp.size()); 24 rv = util::encode_base64(&(tmp.front()),tmp.size());
27 } 25 }
28 26
29 void secret_t::enxor_from_base64(const unsigned char *key_sha1,const string& b64) { 27 void secret_t::enxor_from_base64(const unsigned char *key_d,const string& b64) {
30 clear(); 28 clear();
31 util::decode_base64(b64,*this); 29 util::decode_base64(b64,*this);
32 transform( 30 transform(
33 begin(), end(), 31 begin(), end(),
34 key_sha1, 32 key_d,
35 begin(), 33 begin(),
36 bitwise_xor<unsigned char,unsigned char,unsigned char>() ); 34 bitwise_xor<unsigned char,unsigned char,unsigned char>() );
37 } 35 }
38 36
39 void secret_t::to_base64(string& rv) const { 37 void secret_t::to_base64(string& rv) const {
40 if(size()!=20)
41 throw bad_input(OPKELE_CP_ "wrong secret size");
42 rv = util::encode_base64(&(front()),size()); 38 rv = util::encode_base64(&(front()),size());
43 } 39 }
44 40
45 void secret_t::from_base64(const string& b64) { 41 void secret_t::from_base64(const string& b64) {
46 util::decode_base64(b64,*this); 42 util::decode_base64(b64,*this);
47 } 43 }
48 44
49} 45}