| -rw-r--r-- | lib/consumer.cc | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index bd76b61..cbe0769 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc @@ -138,5 +138,5 @@ namespace opkele { else throw bad_input(OPKELE_CP_ "unknown checkid_* mode"); - string iurl = util::canonicalize_url(identity); + string iurl = canonicalize(identity); string server, delegate; retrieve_links(iurl,server,delegate); @@ -161,5 +161,5 @@ namespace opkele { throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); string server,delegate; - retrieve_links(identity.empty()?pin.get_param("openid.identity"):util::canonicalize_url(identity),server,delegate); + retrieve_links(identity.empty()?pin.get_param("openid.identity"):canonicalize(identity),server,delegate); try { assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle")); @@ -314,3 +314,28 @@ namespace opkele { } + string consumer_t::canonicalize(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; + } + if(rv.find('/',i)==string::npos) + rv += '/'; + return rv; + } + } |