1 files changed, 2 insertions, 3 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc
index df95b64..7f31d52 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -297,102 +297,101 @@ namespace opkele {
            invalidate_assoc(server,pp.get_param("invalidate_handle"));
        if(pp.has_param("is_valid")) {
            if(pp.get_param("is_valid")=="true")
                return;
        }else if(pp.has_param("lifetime")) {
            if(util::string_to_long(pp.get_param("lifetime")))
                return;
        }
        throw failed_check_authentication(OPKELE_CP_ "failed to verify response");
    }
    void consumer_t::retrieve_links(const string& url,string& server,string& delegate) {
        server.erase();
        delegate.erase();
        curl_t curl = curl_easy_init();
        if(!curl)
            throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
        string html;
        CURLcode r;
        (r=curl_misc_sets(curl))
        || (r=curl_easy_setopt(curl,CURLOPT_URL,url.c_str()))
        || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))
        || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&html))
        ;
        if(r)
            throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
        r = curl_easy_perform(curl);
        if(r && r!=CURLE_WRITE_ERROR)
            throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
        static const char *re_bre = "<\\s*body\\b", *re_hdre = "<\\s*head[^>]*>",
                     *re_lre = "<\\s*link\\b([^>]+)>",
                     *re_rre = "\\brel\\s*=\\s*['\"]\\s*([^'\"\\s]+)\\s*['\"]",
                     *re_hre = "\\bhref\\s*=\\s*['\"]\\s*([^'\"\\s]+)\\s*['\"]";
        pcre_matches_t m1(3), m2(3);
        pcre_t bre(re_bre,PCRE_CASELESS);
        if(bre.exec(html,m1)>0)
            html.erase(m1.begin(0));
        pcre_t hdre(re_hdre,PCRE_CASELESS);
        if(hdre.exec(html,m1)<=0)
            throw bad_input(OPKELE_CP_ "failed to find <head>");
        html.erase(0,m1.end(0)+1);
        pcre_t lre(re_lre,PCRE_CASELESS), rre(re_rre,PCRE_CASELESS), hre(re_hre,PCRE_CASELESS);
        while(lre.exec(html,m1)>=2) {
            string attrs(html,m1.begin(1),m1.length(1));
            html.erase(0,m1.end(0)+1);
            if(!( rre.exec(attrs,m1)>=2 && hre.exec(attrs,m2)>=2 ))
                continue;
            string rel(attrs,m1.begin(1),m1.length(1));
-            string href(attrs,m2.begin(1),m2.length(1));
            if(rel=="openid.server") {
-                server = href;
+                server.assign(attrs,m2.begin(1),m2.length(1));
                if(!delegate.empty()) break;
            }else if(rel=="openid.delegate") {
-                delegate = href;
+                delegate.assign(attrs,m2.begin(1),m2.length(1));
                if(!server.empty()) break;
            }
        }
        if(server.empty())
            throw failed_assertion(OPKELE_CP_ "The location has no openid.server declaration");
    }
    assoc_t consumer_t::find_assoc(const string& server) {
        throw failed_lookup(OPKELE_CP_ "no find_assoc() provided");
    }
    string consumer_t::normalize(const string& url) {
        string rv = url;
        // strip leading and trailing spaces
        string::size_type i = rv.find_first_not_of(" \t\r\n");
        if(i==string::npos)
            throw bad_input(OPKELE_CP_ "empty URL");
        if(i)
            rv.erase(0,i);
        i = rv.find_last_not_of(" \t\r\n");
        assert(i!=string::npos);
        if(i<(rv.length()-1))
            rv.erase(i+1);
        // add missing http://
        i = rv.find("://");
        if(i==string::npos) { // primitive. but do we need more?
            rv.insert(0,"http://");
            i = sizeof("http://")-1;
        }else{
            i += sizeof("://")-1;
        }
        string::size_type qm = rv.find('?',i);
        string::size_type sl = rv.find('/',i);
        if(qm!=string::npos) {
            if(sl==string::npos || sl>qm)
                rv.insert(qm,1,'/');
        }else{
            if(sl==string::npos)
                rv += '/';
        }
        return rv;
    }
    string consumer_t::canonicalize(const string& url) {
        string rv = normalize(url);
        curl_t curl = curl_easy_init();
        if(!curl)
            throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");