3 files changed, 38 insertions, 5 deletions

diff --git a/lib/basic_rp.cc b/lib/basic_rp.cc
index 3cad71c..9c7113b 100644
--- a/lib/basic_rp.cc
+++ b/lib/basic_rp.cc
@@ -209,25 +209,26 @@ namespace opkele {
                     p[""] = u.substr(q,eq-q);
                 }else{
                     p[u.substr(q,eq-q)] = u.substr(eq+1,am-eq-1);
                 }
                 q = ++am;
             }
         }
     }
 
     void basic_RP::id_res(const basic_openid_message& om,extension_t *ext) {
         reset_vars();
         bool o2 = om.has_field("ns")
-            && om.get_field("ns")==OIURI_OPENID20;
+            && om.get_field("ns")==OIURI_OPENID20
+            && om.has_field("op_endpoint") && !om.get_field("op_endpoint").empty();
         if( (!o2) && om.has_field("user_setup_url"))
             throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",
                     om.get_field("user_setup_url"));
         string m = om.get_field("mode");
         if(o2 && m=="setup_needed")
             throw id_res_setup(OPKELE_CP_ "setup needed, no setup url provided");
         if(m=="cancel")
             throw id_res_cancel(OPKELE_CP_ "authentication cancelled");
         bool go_dumb=false;
         try {
             string OP = o2
                 ?om.get_field("op_endpoint")
diff --git a/lib/discovery.cc b/lib/discovery.cc
index bd1f917..b4ed3b6 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -274,24 +274,25 @@ namespace opkele {
                             throw exception_tidy(OPKELE_CP_ "tidy failed to save buffer");
                         prepare_to_parse();
                         parse(tide.c_str(),tide.size(),true);
                     }catch(exception_tidy& et) { }
                 }
                 save_html.clear();
             }
 
             void prepare_to_parse() {
                 (*(expat_t*)this) = parser_create_ns();
                 set_user_data(); set_element_handler();
                 set_character_data_handler();
+                set_unknown_encoding_handler();
 
                 if(xmode&xmode_html) {
                     html_openid1.clear(); html_openid2.clear();
                     parser_choked = false;
                 }
 
                 cdata = 0; xrd_service = 0; skipping = 0;
                 pt_stack.clear();
                 status_code = 100; status_string.clear();
             }
 
             void html2xrd(endpoint_discovery_iterator& oi,idiscovery_t& id) {
@@ -444,43 +445,58 @@ namespace opkele {
                         html_start_element(n,a);
                     }else{
                         skipping = 1;
                     }
                 }
             }
             void end_element(const XML_Char *n) {
                 if(skipping<0) return;
                 if(skipping) {
                     --skipping; return;
                 }
                 if(is_qelement(n,NSURI_XRD "\tType")) {
-                    assert(xrd); assert(xrd_service); assert(cdata==&cdata_buf);
+                    if(xrd && xrd_service) {
+                        assert(cdata==&cdata_buf);
                     xrd_service->types.insert(cdata_buf);
+                    }
                 }else if(is_qelement(n,NSURI_XRD "\tService")) {
-                    assert(xrd); assert(xrd_service);
+                    if(!(xrd && xrd_service)) {
+                        skipping = -1;
+                    }else{
                     assert(!pt_stack.empty());
                     assert(pt_stack.back()==(NSURI_XRD "\tService"));
                     pt_stack.pop_back();
                     xrd_service = 0;
+                    }
                 }else if(is_qelement(n,NSURI_XRD "\tStatus")) {
-                    assert(xrd);
+                    if(!xrd) {
+                        skipping=-1;
+                    }else{
                     if(is_qelement(pt_stack.back().c_str(),n)) {
                         assert(cdata==&status_string);
                         pt_stack.pop_back();
                         if(status_code!=100)
                             skipping = -1;
                     }
+                    }
                 }else if(is_qelement(n,NSURI_XRD "\tExpires")) {
-                    assert(xrd);
+                    if(!xrd) {
+                        skipping=-1;
+                    }else{
                     xrd->expires = util::w3c_to_time(cdata_buf);
+                    }
+                }else if(is_qelement(n,NSURI_XRD "\tXRD")) {
+                    assert(!pt_stack.empty());
+                    assert(pt_stack.back()==(NSURI_XRD "\tXRD"));
+                    pt_stack.pop_back();
                 }else if((xmode&xmode_html) && is_element(n,"head")) {
                     skipping = -1;
                 }
                 cdata = 0;
             }
             void character_data(const XML_Char *s,int l) {
                 if(skipping) return;
                 if(cdata) cdata->append(s,l);
             }
 
             void html_start_element(const XML_Char *n,const XML_Char **a) {
                 if(is_element(n,"meta")) {
@@ -560,24 +576,31 @@ namespace opkele {
                             }else{
                                 for(xrd::local_ids_t::const_iterator ilid=svc.local_ids.begin();
                                         ilid!=svc.local_ids.end(); ++ilid) {
                                     ep.local_id = ilid->second;
                                     *(oi++) = ep;
                                 }
                             }
                         }
                     }
                 }
             }
 
+            int unknown_encoding(const XML_Char* /* n */,XML_Encoding *i) {
+                for(unsigned int ii=0;ii < sizeof(i->map)/sizeof(i->map[0]);++ii)
+                    i->map[ii] = ii;
+                i->convert = 0; i->release = 0;
+                return XML_STATUS_OK;
+            }
+
     };
 
     string idiscover(endpoint_discovery_iterator oi,const string& identity) {
         idigger_t idigger;
         return idigger.discover(oi,identity);
     }
 
     void yadiscover(endpoint_discovery_iterator oi,const string& yurl,const char **types,bool redirs) try {
         idigger_t idigger;
         idigger.yadiscover(oi,yurl,types,redirs);
     }catch(exception_curl& ec) {
         if(redirs || ec._error!=CURLE_TOO_MANY_REDIRECTS)
diff --git a/lib/expat.cc b/lib/expat.cc
index c4dab7e..fb58a9a 100644
--- a/lib/expat.cc
+++ b/lib/expat.cc
@@ -83,15 +83,24 @@ namespace opkele {
         static void _start_namespace_decl(void *ud,const XML_Char *p,const XML_Char *u) {
             ((expat_t*)ud)->start_namespace_decl(p,u);
         }
         static void _end_namespace_decl(void *ud,const XML_Char *p) {
             ((expat_t*)ud)->end_namespace_decl(p);
         }
 
         void expat_t::set_namespace_decl_handler() {
             assert(_x);
             XML_SetNamespaceDeclHandler(_x,_start_namespace_decl,_end_namespace_decl);
         }
 
+        static int _unknown_encoding(void *ehd,const XML_Char *n,XML_Encoding *i) {
+            return ((expat_t*)ehd)->unknown_encoding(n,i);
+        }
+
+        void expat_t::set_unknown_encoding_handler() {
+            assert(_x);
+            XML_SetUnknownEncodingHandler(_x,_unknown_encoding,this);
+        }
+
     }
 
 }