ruby-yadis 0.2 → 0.2.1

data/examples/openid.rb

@@ -2,6 +2,10 @@
 
 require 'yadis'
 
+# Want to verify server certificates for https?
+# Visit http://curl.haxx.se/docs/caextract.html and uncomment:
+# YADIS.ca_path = '/path/to/cacert.pem'
+
 yadis = YADIS.discover('http://brian.myopenid.com/')
 if yadis.nil? or yadis.openid_servers.length == 0
   p 'No XRDS found'

data/lib/yadis/fetcher.rb

@@ -1,20 +1,14 @@
 require "uri"
-
-begin
-  require "net/https"
-rescue LoadError # no openssl
-  require "net/http" 
-  HAS_OPENSSL = false
-  STDERR.puts("No openssl found, won't be able to fetch https URIs.")
-else
-  HAS_OPENSSL = true
-end
+require "net/https"
 
 class NetHTTPFetcher
     
+  attr_accessor :ca_path
+  
   def initialize(read_timeout=20, open_timeout=20)
     @read_timeout = read_timeout
     @open_timeout = open_timeout
+    @ca_path = nil
   end
     
   def get(url, params = nil)    
@@ -36,11 +30,13 @@ class NetHTTPFetcher
       http.open_timeout = @open_timeout
 
       if uri.scheme == 'https'
-        if HAS_OPENSSL
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        http.use_ssl = true
+        if @ca_path
+          http.ca_file = @ca_path
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
         else
-          STDERR.puts("Cannot fetch https url without openssl installed: #{uri.to_s}")
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          STDERR.puts("Warning: fetching over https without verifying server certificate")
         end
       end
 

data/lib/yadis/yadis.rb

@@ -6,29 +6,50 @@ class YADISParseError < StandardError; end
 class YADISHTTPError < StandardError; end
 
 class YADIS
-  
-  attr_reader :uri, :xrds_uri, :xrds
+
+  @@ca_path = nil
+  attr_accessor :uri, :xrds_uri, :xrds
 
   # Discover services for a given URI.  Please note that no normalization 
   # will be done to the passed in URI, it should be valid before calling
   # discover.
   #
-  # Returns nil if no XRDS was found, or a YADIS object on success.
+  # Returns nil if no XRDS was found, or a YADIS object on success.  This
+  # method is essentially the same as YADIS.new, but does not raise any
+  # exceptions.
   def YADIS.discover(uri)
+    return nil unless uri
     begin
-      return YADIS.discover_verbose(uri)
+      return YADIS.new(uri)
     rescue
       return nil
     end
   end
 
-  # same as YADIS.discover, but raises YADISParseError or YADISHTTPError
-  # when bad things happen.
-  def YADIS.discover_verbose(uri)
-    return nil unless uri
+  # Set the path to a certificate authority pem file, for verifying
+  # server certificates of HTTPS pages.  If you are interested in verifying
+  # certs like the mozilla web browser, have a look at the files here:
+  #
+  # http://curl.haxx.se/docs/caextract.html
+  def YADIS.ca_path=(ca_path)
+    ca_path = ca_path.to_s
+    if File.exists?(ca_path)
+      @@ca_path = ca_path
+    else
+      raise ArgumentError, "#{ca_path} is not a valid file path"
+    end
+  end
 
+  # Discover services for a URI using the Yadis protocol.  +uri+ should
+  # be a valid URI represented as a string.  This method may raise
+  # YADISParseError in the case of an invalid or unparsable XRDS file,
+  # or YADISHTTPError is the URI cannot be fetched.
+  def initialize(uri)
+    http = NetHTTPFetcher.new
+    http.ca_path = @@ca_path if @@ca_path
+    
     headers = {'Accept' => 'application/xrds+xml'}
-    response = NetHTTPFetcher.new.get(uri, headers)
+    response = http.get(uri, headers)
     raise YADISHTTPError, "Could not fetch #{uri}" if response.nil?
 
     uri, resp_payload = response
@@ -39,7 +60,7 @@ class YADIS
 
     if header
       xrds_uri = header
-      response = NetHTTPFetcher.new.get(xrds_uri)
+      response = http.get(xrds_uri)
       raise YADISHTTPError, "Could not fetch XRDS #{xrds_uri}" if response.nil?
       resp_payload = response[1]
     end
@@ -47,17 +68,13 @@ class YADIS
     unless resp_payload['content-type'] == 'application/xrds+xml'
       loc = html_yadis_location(resp_payload.body)
       unless loc.nil?
-        xrds_uri, resp_payload = NetHTTPFetcher.new.get(loc)
+        xrds_uri, resp_payload = http.get(loc)
       end
     end
 
     xrds = XRDS.parse(resp_payload.body)
     raise YADISParseError, "Bad XRDS" if xrds.nil?
 
-    return new(uri, xrds_uri, xrds)
-  end
-
-  def initialize(uri, xrds_uri, xrds)
     @uri = uri
     @xrds_uri = xrds_uri
     @xrds = xrds

data/test/test_yadis.rb

@@ -12,7 +12,10 @@ class YADISTestCase < Test::Unit::TestCase
 
       uri = 'http://brian.myopenid.com/'
       xrds_uri = 'http://brian.myopenid.com/xrds'
-      y = YADIS.new(uri, xrds_uri, xrds)
+      y = YADIS.new(uri)
+      y.uri = uri
+      y.xrds_uri = xrds_uri
+      y.xrds_uri = xrds
       
       servers = y.openid_servers
       assert_equal(servers.length, 1)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-yadis
 version: !ruby/object:Gem::Version 
-  version: "0.2"
-date: 2006-03-16 00:00:00 -08:00
+  version: 0.2.1
+date: 2006-03-22 00:00:00 -08:00
 summary: A library for performing Yadis service discovery
 require_paths: 
 - lib