Rescue from Yadis::XRI::XRIHTTPError on discovery

meineerde · meineerde · commit d4d7946ebad0 · 2017-05-15T13:55:52.000+02:00
The error is explicitly thrown on any fetch errors by
Yadis::XRI::ProxyResolve#query (including for bad URIs, network issues,
invalid responses, ...)
diff --git a/lib/openid/consumer/discovery.rb b/lib/openid/consumer/discovery.rb
@@ -450,7 +450,7 @@ def self.discover_xri(iname)
       services.each { |service_element|
         endpoints += flt.get_service_endpoints(iname, service_element)
       }
-    rescue Yadis::XRDSError => why
+    rescue Yadis::XRDSError, Yadis::XRI::XRIHTTPError => why
       Util.log('xrds error on ' + iname + ': ' + why.to_s)
     end
 

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ def self.discover_xri(iname)`
`450`	`450`	`services.each { \|service_element\|`
`451`	`451`	`endpoints += flt.get_service_endpoints(iname, service_element)`
`452`	`452`	`}`
`453`		`- rescue Yadis::XRDSError => why`
	`453`	`+ rescue Yadis::XRDSError, Yadis::XRI::XRIHTTPError => why`
`454`	`454`	`Util.log('xrds error on ' + iname + ': ' + why.to_s)`
`455`	`455`	`end`
`456`	`456`