author | Michael Krelin <hacker@klever.net> | 2007-12-26 21:55:00 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-01-04 18:16:31 (UTC) |
commit | e63de16a9885641b5070ec834225cb562bc2042f (patch) (unidiff) | |
tree | b50a7c202aaa6953dd47402fc60f53ac4a57cf62 | |
parent | ac9e3ddb4277e5696d789ad6b3ea7aa820a5e76a (diff) | |
download | libopkele-e63de16a9885641b5070ec834225cb562bc2042f.zip libopkele-e63de16a9885641b5070ec834225cb562bc2042f.tar.gz libopkele-e63de16a9885641b5070ec834225cb562bc2042f.tar.bz2 |
fix the xrds_location being cleared before it gets used.
The xrds_location should not be cleared when doing pure xrd discovery.
Otherwise it may get overwritten before curl actually uses it. Previously it
was cleared twice, which is a waste of cpu cycles, anyway.
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | lib/discovery.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/discovery.cc b/lib/discovery.cc index 9503b5d..ea53786 100644 --- a/lib/discovery.cc +++ b/lib/discovery.cc | |||
@@ -99,97 +99,97 @@ namespace opkele { | |||
99 | /* TODO: further canonicalize xri identity? Like folding case or whatever... */ | 99 | /* TODO: further canonicalize xri identity? Like folding case or whatever... */ |
100 | discover_at( | 100 | discover_at( |
101 | result, | 101 | result, |
102 | xri_proxy + util::url_encode(id)+ | 102 | xri_proxy + util::url_encode(id)+ |
103 | "?_xrd_r=application/xrd+xml;sep=false", xmode_xrd); | 103 | "?_xrd_r=application/xrd+xml;sep=false", xmode_xrd); |
104 | if(status_code!=100) | 104 | if(status_code!=100) |
105 | throw failed_xri_resolution(OPKELE_CP_ | 105 | throw failed_xri_resolution(OPKELE_CP_ |
106 | "XRI resolution failed with '"+status_string+"' message",status_code); | 106 | "XRI resolution failed with '"+status_string+"' message",status_code); |
107 | if(result.xrd.canonical_ids.empty()) | 107 | if(result.xrd.canonical_ids.empty()) |
108 | throw opkele::failed_discovery(OPKELE_CP_ "No CanonicalID for XRI identity found"); | 108 | throw opkele::failed_discovery(OPKELE_CP_ "No CanonicalID for XRI identity found"); |
109 | }else{ | 109 | }else{ |
110 | result.xri_identity = false; | 110 | result.xri_identity = false; |
111 | if(id.find("://")==string::npos) | 111 | if(id.find("://")==string::npos) |
112 | id.insert(0,"http://"); | 112 | id.insert(0,"http://"); |
113 | string::size_type fp = id.find('#'); | 113 | string::size_type fp = id.find('#'); |
114 | if(fp!=string::npos) { | 114 | if(fp!=string::npos) { |
115 | string::size_type qp = id.find('?'); | 115 | string::size_type qp = id.find('?'); |
116 | if(qp==string::npos || qp<fp) | 116 | if(qp==string::npos || qp<fp) |
117 | id.erase(fp); | 117 | id.erase(fp); |
118 | else if(qp>fp) | 118 | else if(qp>fp) |
119 | id.erase(fp,qp-fp); | 119 | id.erase(fp,qp-fp); |
120 | } | 120 | } |
121 | result.normalized_id = util::rfc_3986_normalize_uri(id); | 121 | result.normalized_id = util::rfc_3986_normalize_uri(id); |
122 | discover_at(result,id,xmode_html|xmode_xrd); | 122 | discover_at(result,id,xmode_html|xmode_xrd); |
123 | const char * eu = 0; | 123 | const char * eu = 0; |
124 | CURLcode r = easy_getinfo(CURLINFO_EFFECTIVE_URL,&eu); | 124 | CURLcode r = easy_getinfo(CURLINFO_EFFECTIVE_URL,&eu); |
125 | if(r) | 125 | if(r) |
126 | throw exception_curl(OPKELE_CP_ "failed to get CURLINFO_EFFECTIVE_URL",r); | 126 | throw exception_curl(OPKELE_CP_ "failed to get CURLINFO_EFFECTIVE_URL",r); |
127 | result.canonicalized_id = util::rfc_3986_normalize_uri(eu); /* XXX: strip fragment part? */ | 127 | result.canonicalized_id = util::rfc_3986_normalize_uri(eu); /* XXX: strip fragment part? */ |
128 | if(xrds_location.empty()) { | 128 | if(xrds_location.empty()) { |
129 | html2xrd(result.xrd); | 129 | html2xrd(result.xrd); |
130 | }else{ | 130 | }else{ |
131 | discover_at(result,xrds_location,xmode_xrd); | 131 | discover_at(result,xrds_location,xmode_xrd); |
132 | if(result.xrd.empty()) | 132 | if(result.xrd.empty()) |
133 | html2xrd(result.xrd); | 133 | html2xrd(result.xrd); |
134 | } | 134 | } |
135 | } | 135 | } |
136 | } | 136 | } |
137 | 137 | ||
138 | void discover_at(idiscovery_t& result,const string& url,int xm) { | 138 | void discover_at(idiscovery_t& result,const string& url,int xm) { |
139 | CURLcode r = easy_setopt(CURLOPT_URL,url.c_str()); | 139 | CURLcode r = easy_setopt(CURLOPT_URL,url.c_str()); |
140 | if(r) | 140 | if(r) |
141 | throw exception_curl(OPKELE_CP_ "failed to set culry urlie",r); | 141 | throw exception_curl(OPKELE_CP_ "failed to set culry urlie",r); |
142 | 142 | ||
143 | (*(expat_t*)this) = parser_create_ns(); | 143 | (*(expat_t*)this) = parser_create_ns(); |
144 | set_user_data(); set_element_handler(); | 144 | set_user_data(); set_element_handler(); |
145 | set_character_data_handler(); | 145 | set_character_data_handler(); |
146 | 146 | ||
147 | xrds_location.clear(); http_content_type.clear(); | 147 | http_content_type.clear(); |
148 | xmode = xm; | 148 | xmode = xm; |
149 | if(xmode&xmode_html) { | 149 | if(xmode&xmode_html) { |
150 | xrds_location.clear(); | 150 | xrds_location.clear(); |
151 | html_openid1.clear(); html_openid2.clear(); | 151 | html_openid1.clear(); html_openid2.clear(); |
152 | } | 152 | } |
153 | xrd = &result.xrd; | 153 | xrd = &result.xrd; |
154 | cdata = 0; xrd_service = 0; skipping = 0; | 154 | cdata = 0; xrd_service = 0; skipping = 0; |
155 | status_code = 100; status_string.clear(); | 155 | status_code = 100; status_string.clear(); |
156 | 156 | ||
157 | r = easy_perform(); | 157 | r = easy_perform(); |
158 | if(r && r!=CURLE_WRITE_ERROR) | 158 | if(r && r!=CURLE_WRITE_ERROR) |
159 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); | 159 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); |
160 | 160 | ||
161 | parse(0,0,true); | 161 | parse(0,0,true); |
162 | } | 162 | } |
163 | 163 | ||
164 | void html2xrd(XRD_t& x) { | 164 | void html2xrd(XRD_t& x) { |
165 | if(!html_openid1.uris.empty()) { | 165 | if(!html_openid1.uris.empty()) { |
166 | html_openid1.types.insert(STURI_OPENID11); | 166 | html_openid1.types.insert(STURI_OPENID11); |
167 | x.services.add(-1,html_openid1); | 167 | x.services.add(-1,html_openid1); |
168 | } | 168 | } |
169 | if(!html_openid2.uris.empty()) { | 169 | if(!html_openid2.uris.empty()) { |
170 | html_openid2.types.insert(STURI_OPENID20); | 170 | html_openid2.types.insert(STURI_OPENID20); |
171 | x.services.add(-1,html_openid2); | 171 | x.services.add(-1,html_openid2); |
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | size_t write(void *p,size_t s,size_t nm) { | 175 | size_t write(void *p,size_t s,size_t nm) { |
176 | if(skipping<0) return 0; | 176 | if(skipping<0) return 0; |
177 | /* TODO: limit total size */ | 177 | /* TODO: limit total size */ |
178 | size_t bytes = s*nm; | 178 | size_t bytes = s*nm; |
179 | parse((const char *)p,bytes,false); | 179 | parse((const char *)p,bytes,false); |
180 | return bytes; | 180 | return bytes; |
181 | } | 181 | } |
182 | size_t header(void *p,size_t s,size_t nm) { | 182 | size_t header(void *p,size_t s,size_t nm) { |
183 | size_t bytes = s*nm; | 183 | size_t bytes = s*nm; |
184 | const char *h = (const char*)p; | 184 | const char *h = (const char*)p; |
185 | const char *colon = (const char*)memchr(p,':',bytes); | 185 | const char *colon = (const char*)memchr(p,':',bytes); |
186 | const char *space = (const char*)memchr(p,' ',bytes); | 186 | const char *space = (const char*)memchr(p,' ',bytes); |
187 | if(space && ( (!colon) || space<colon ) ) { | 187 | if(space && ( (!colon) || space<colon ) ) { |
188 | xrds_location.clear(); http_content_type.clear(); | 188 | xrds_location.clear(); http_content_type.clear(); |
189 | }else if(colon) { | 189 | }else if(colon) { |
190 | const char *hv = ++colon; | 190 | const char *hv = ++colon; |
191 | int hnl = colon-h; | 191 | int hnl = colon-h; |
192 | int rb; | 192 | int rb; |
193 | for(rb = bytes-hnl-1;rb>0 && isspace(*hv);++hv,--rb); | 193 | for(rb = bytes-hnl-1;rb>0 && isspace(*hv);++hv,--rb); |
194 | while(rb>0 && isspace(hv[rb-1])) --rb; | 194 | while(rb>0 && isspace(hv[rb-1])) --rb; |
195 | if(rb) { | 195 | if(rb) { |