ruby-openid 2.1.8 → 2.2.0

data/lib/openid/extensions/ui.rb

@@ -0,0 +1,53 @@
+# An implementation of the OpenID User Interface Extension 1.0 - DRAFT 0.5
+# see: http://svn.openid.net/repos/specifications/user_interface/1.0/trunk/openid-user-interface-extension-1_0.html
+
+require 'openid/extension'
+
+module OpenID
+
+  module UI
+    NS_URI = "http://specs.openid.net/extensions/ui/1.0"
+
+    class Request < Extension
+      attr_accessor :lang, :icon, :mode, :ns_alias, :ns_uri
+      def initialize(mode = nil, icon = nil, lang = nil)
+        @ns_alias = 'ui'
+        @ns_uri = NS_URI
+        @lang = lang
+        @icon = icon
+        @mode = mode
+      end
+
+      def get_extension_args
+        ns_args = {}
+        ns_args['lang'] = @lang if @lang
+        ns_args['icon'] = @icon if @icon
+        ns_args['mode'] = @mode if @mode
+        return ns_args
+      end
+
+      # Instantiate a Request object from the arguments in a
+      # checkid_* OpenID message
+      # return nil if the extension was not requested.
+      def self.from_openid_request(oid_req)
+        oauth_req = new
+        args = oid_req.message.get_args(NS_URI)
+        if args == {}
+          return nil
+        end
+        oauth_req.parse_extension_args(args)
+        return oauth_req
+      end
+
+      # Set UI extension parameters
+      def parse_extension_args(args)
+        @lang = args["lang"]
+        @icon = args["icon"]
+        @mode = args["mode"]
+      end
+
+    end
+
+  end
+
+end

data/lib/openid/message.rb

@@ -288,7 +288,7 @@ module OpenID
       markup += ">\n"
 
       to_post_args.each { |k,v|
-        markup += "<input type='hidden' name='#{k}' value='#{v}' />\n"
+        markup += "<input type='hidden' name='#{k}' value='#{OpenID::Util.html_encode(v)}' />\n"
       }
       markup += "<input type='submit' value='#{submit_text}' />\n"
       markup += "\n</form>"

data/lib/openid/store/filesystem.rb

@@ -13,10 +13,9 @@ module OpenID
 
       # Create a Filesystem store instance, putting all data in +directory+.
       def initialize(directory)
-        p_dir = Pathname.new(directory)
-        @nonce_dir = p_dir.join('nonces')
-        @association_dir = p_dir.join('associations')
-        @temp_dir = p_dir.join('temp')
+        @nonce_dir = File.join(directory, 'nonces')
+        @association_dir = File.join(directory, 'associations')
+        @temp_dir = File.join(directory, 'temp')
 
         self.ensure_dir(@nonce_dir)
         self.ensure_dir(@association_dir)
@@ -40,7 +39,7 @@ module OpenID
           handle_hash = ''
         end
         filename = [proto,domain,url_hash,handle_hash].join('-')
-        @association_dir.join(filename)
+        File.join(@association_dir, filename)
       end
 
       # Store an association in the assoc directory
@@ -155,7 +154,7 @@ module OpenID
 
         nonce_fn = '%08x-%s-%s-%s-%s'%[timestamp, proto, domain, url_hash, salt_hash]
 
-        filename = @nonce_dir.join(nonce_fn)
+        filename = File.join(@nonce_dir, nonce_fn)
 
         begin
           fd = File.new(filename, File::CREAT | File::EXCL | File::WRONLY, 0200)
@@ -174,7 +173,7 @@ module OpenID
       end
 
       def cleanup_associations
-        association_filenames = Dir[@association_dir.join("*").to_s]
+        association_filenames = Dir[File.join(@association_dir, "*")]
         count = 0
         association_filenames.each do |af|
           begin
@@ -204,7 +203,7 @@ module OpenID
       end
 
       def cleanup_nonces
-        nonces = Dir[@nonce_dir.join("*").to_s]
+        nonces = Dir[File.join(@nonce_dir, "*")]
         now = Time.now.to_i
 
         count = 0
@@ -236,7 +235,7 @@ module OpenID
           if @@FILENAME_ALLOWED.index(c)
             filename_chunks << c
           else
-            filename_chunks << sprintf("_%02X", c[0])
+            filename_chunks << sprintf("_%02X", c.bytes.first)
           end
         end
         filename_chunks.join("")

data/lib/openid/store/memcache.rb

@@ -63,7 +63,11 @@ module OpenID
         ts = timestamp.to_s # base 10 seconds since epoch
         nonce_key = key_prefix + 'N' + server_url + '|' + ts + '|' + salt
         result = @cache_client.add(nonce_key, '', expiry(Nonce.skew + 5))
-        return !!(result =~ /^STORED/)
+        if result.is_a? String
+          return !!(result =~ /^STORED/)
+        else
+          return result == true
+        end
       end
 
       def assoc_key(server_url, assoc_handle=nil)
@@ -87,7 +91,11 @@ module OpenID
 
       def delete(key)
         result = @cache_client.delete(key)
-        return !!(result =~ /^DELETED/)
+        if result.is_a? String
+          return !!(result =~ /^DELETED/)
+        else
+          return result == true
+        end
       end
 
       def serialize(assoc)

data/lib/openid/trustroot.rb

@@ -210,6 +210,7 @@ module OpenID
         return nil if parts.nil?
 
         proto, host, port, path = parts
+        return nil if host[0] == '.'
 
         # check for URI fragment
         if path and !path.index('#').nil?

data/lib/openid/util.rb

@@ -105,6 +105,12 @@ for (var i = 0; i < elements.length; i++) {
 </html>
 "
     end
+
+    ESCAPE_TABLE = { '&' => '&amp;', '<' => '&lt;', '>' => '&gt;', '"' => '&quot;', "'" => '&#039;' }
+    # Modified from ERb's html_encode
+    def Util.html_encode(s)
+      s.to_s.gsub(/[&<>"']/) {|s| ESCAPE_TABLE[s] }
+    end
   end
 
 end

data/lib/openid/version.rb

@@ -0,0 +1,3 @@
+module OpenID
+  VERSION = "2.2.0"
+end

data/test/data/trustroot.txt

@@ -25,8 +25,8 @@ http://foo.com\/
 http://π.pi.com/
 http://lambda.com/Λ
 
- 
- 	
+
+
 5
 
 ----------------------------------------

data/test/test_accept.rb

@@ -1,5 +1,5 @@
-
 require 'test/unit'
+require 'testutil'
 require 'openid/yadis/accept'
 require 'openid/extras'
 require 'openid/util'

data/test/test_associationmanager.rb

@@ -1,3 +1,4 @@
+require "test/unit"
 require "openid/consumer/associationmanager"
 require "openid/association"
 require "openid/dh"
@@ -5,7 +6,6 @@ require "openid/util"
 require "openid/cryptutil"
 require "openid/message"
 require "openid/store/memory"
-require "test/unit"
 require "util"
 require "time"
 

data/test/test_ax.rb

@@ -1,3 +1,4 @@
+require 'test/unit'
 require 'openid/extensions/ax'
 require 'openid/message'
 require 'openid/consumer/responses'
@@ -119,7 +120,7 @@ module OpenID
       def test_invalid_count_value
         msg = FetchRequest.new
         assert_raises(Error) {
-          msg.parse_extension_args({'type.foo'=>'urn:foo', 
+          msg.parse_extension_args({'type.foo'=>'urn:foo',
                                      'count.foo' => 'bogus'})
         }
       end
@@ -216,7 +217,7 @@ module OpenID
                     'value.foo'=>'something',
                   },
                   {'urn:foo'=>['something']}
-                  )     
+                  )
       end
     end
 
@@ -371,12 +372,12 @@ module OpenID
         ax_req = FetchRequest.from_openid_request(openid_req)
         assert(ax_req.nil?)
       end
-      
+
       def test_from_openid_request_wrong_ax_mode
         uri = 'http://under.the.sea/'
         name = 'ext0'
         value = 'snarfblat'
-        
+
         message = OpenID::Message.from_openid_args({
                                                'mode' => 'id_res',
                                                'ns' => OPENID2_NS,
@@ -392,7 +393,7 @@ module OpenID
         ax_req = FetchRequest.from_openid_request(openid_req)
         assert(ax_req.nil?)
       end
-      
+
       def test_openid_update_url_verification_error
         openid_req_msg = Message.from_openid_args({
                                                     'mode' => 'checkid_setup',
@@ -404,7 +405,7 @@ module OpenID
                                                   })
         openid_req = Server::OpenIDRequest.new
         openid_req.message = openid_req_msg
-        assert_raises(Error) { 
+        assert_raises(Error) {
           FetchRequest.from_openid_request(openid_req)
         }
       end
@@ -419,7 +420,7 @@ module OpenID
                                                   })
         openid_req = Server::OpenIDRequest.new
         openid_req.message = openid_req_msg
-        assert_raises(Error) { 
+        assert_raises(Error) {
           FetchRequest.from_openid_request(openid_req)
         }
       end
@@ -486,6 +487,7 @@ module OpenID
       def setup
         @msg = FetchResponse.new
         @value_a = 'commodity'
+        @value_a1 = 'value2'
         @type_a = 'http://blood.transfusion/'
         @name_a = 'george'
         @request_update_url = 'http://some.url.that.is.awesome/'
@@ -538,12 +540,13 @@ module OpenID
         assert_equal(eargs, @msg.get_extension_args(req))
       end
 
-      def test_get_extension_args_some_request
+      def test_get_extension_args_single_value_response
+        # Single values do NOT have a count, and 
+        # do not use the array extension
         eargs = {
           'mode' => 'fetch_response',
           'type.' + @name_a => @type_a,
-          'value.' + @name_a + '.1' => @value_a,
-          'count.' + @name_a =>  '1'
+          'value.' + @name_a  => @value_a
         }
         req = FetchRequest.new
         req.add(AttrInfo.new(@type_a, @name_a))
@@ -551,6 +554,25 @@ module OpenID
         assert_equal(eargs, @msg.get_extension_args(req))
       end
 
+      def test_get_extension_args_array_value_response
+        # Multiple array values add the count, and array index
+        # to each value
+        eargs = {
+          'mode' => 'fetch_response',
+          'type.' + @name_a => @type_a,
+          'value.' + @name_a + ".1" => @value_a,
+          'value.' + @name_a + ".2" => @value_a1,
+          'count.' + @name_a => '2'
+        }
+        req = FetchRequest.new
+        # Specify that this URI should have a count of 2
+        req.add(AttrInfo.new(@type_a, @name_a, true, 2))
+        # Push both values onto the array
+        @msg.add_value(@type_a, @value_a)
+        @msg.add_value(@type_a, @value_a1)
+        assert_equal(eargs, @msg.get_extension_args(req))
+      end
+
       def test_get_extension_args_some_not_request
         req = FetchRequest.new
         @msg.add_value(@type_a, @value_a)
@@ -572,7 +594,7 @@ module OpenID
         assert_raises(Error) { @msg.get_single(@type_a) }
       end
 
-      def test_from_success_response
+      def test_from_unsigned_success_response
         uri = 'http://under.the.sea/'
         name = 'ext0'
         value = 'snarfblat'
@@ -585,7 +607,7 @@ module OpenID
                                                'ax.mode' => 'fetch_response',
                                                'ax.type.' + name => uri,
                                                'ax.count.' + name => '1',
-                                               'ax.value.' + name + '.1' => value,
+                                               'ax.value.' + name + '.1' => value
                                              })
 
         e = OpenID::OpenIDServiceEndpoint.new()
@@ -597,7 +619,55 @@ module OpenID
         assert_equal(values, [value])
       end
 
-      def test_from_success_response_empty
+      def test_from_signed_success_response
+        uri = 'http://under.the.sea/'
+        name = 'ext0'
+        value = 'snarfblat'
+        oid_fields = {
+          'mode' => 'id_res',
+          'ns' => OPENID2_NS,
+          'ns.ax' => AXMessage::NS_URI,
+          'ax.update_url' => 'http://example.com/realm/update_path',
+          'ax.mode' => 'fetch_response',
+          'ax.type.' + name => uri,
+          'ax.count.' + name => '1',
+          'ax.value.' + name + '.1' => value
+        }
+        signed_fields = oid_fields.keys.map{|f| "openid.#{f}"}
+
+        m = OpenID::Message.from_openid_args(oid_fields)
+        e = OpenID::OpenIDServiceEndpoint.new()
+        resp = OpenID::Consumer::SuccessResponse.new(e, m, signed_fields)
+
+        ax_resp = FetchResponse.from_success_response(resp, true)
+
+        values = ax_resp[uri]
+        assert_equal(values, [value])
+      end
+
+      def test_from_signed_success_response_with_unsigned_attributes
+        uri = 'http://under.the.sea/'
+        name = 'ext0'
+        value = 'snarfblat'
+
+        m = OpenID::Message.from_openid_args({
+                                               'mode' => 'id_res',
+                                               'ns' => OPENID2_NS,
+                                               'ns.ax' => AXMessage::NS_URI,
+                                               'ax.update_url' => 'http://example.com/realm/update_path',
+                                               'ax.mode' => 'fetch_response',
+                                               'ax.type.' + name => uri,
+                                               'ax.count.' + name => '1',
+                                               'ax.value.' + name + '.1' => value
+                                             })
+
+        e = OpenID::OpenIDServiceEndpoint.new()
+        resp = OpenID::Consumer::SuccessResponse.new(e, m, [])
+
+        assert_nil FetchResponse.from_success_response(resp, true)
+      end
+
+      def test_from_empty_success_response
         e = OpenID::OpenIDServiceEndpoint.new()
         m = OpenID::Message.from_openid_args({'mode' => 'id_res'})
         resp = OpenID::Consumer::SuccessResponse.new(e, m, [])
@@ -623,12 +693,12 @@ module OpenID
         }
         assert_equal(eargs, @msg.get_extension_args)
       end
-      
+
       def test_from_openid_request_wrong_ax_mode
         uri = 'http://under.the.sea/'
         name = 'ext0'
         value = 'snarfblat'
-        
+
         message = OpenID::Message.from_openid_args({
                                                'mode' => 'id_res',
                                                'ns' => OPENID2_NS,
@@ -644,7 +714,7 @@ module OpenID
         ax_req = StoreRequest.from_openid_request(openid_req)
         assert(ax_req.nil?)
       end
-      
+
       def test_get_extension_args_nonempty
         @msg.set_values(@type_a, ['foo','bar'])
         aliases = NamespaceMap.new
@@ -665,7 +735,7 @@ module OpenID
         msg = StoreResponse.new
         assert(msg.succeeded?)
         assert(!msg.error_message)
-        assert_equal({'mode' => 'store_response_success'}, 
+        assert_equal({'mode' => 'store_response_success'},
                      msg.get_extension_args)
       end
 
@@ -673,7 +743,7 @@ module OpenID
         msg = StoreResponse.new(false)
         assert(! msg.succeeded? )
         assert(! msg.error_message )
-        assert_equal({'mode' => 'store_response_failure'}, 
+        assert_equal({'mode' => 'store_response_failure'},
                      msg.get_extension_args)
       end
 
@@ -682,7 +752,7 @@ module OpenID
         msg = StoreResponse.new(false, reason)
         assert(! msg.succeeded? )
         assert_equal(reason,  msg.error_message)
-        assert_equal({'mode' => 'store_response_failure', 'error' => reason}, 
+        assert_equal({'mode' => 'store_response_failure', 'error' => reason},
                      msg.get_extension_args)
       end
     end

data/test/test_checkid_request.rb

@@ -1,6 +1,6 @@
+require "test/unit"
 require "openid/consumer/checkid_request"
 require "openid/message"
-require "test/unit"
 require "testutil"
 require "util"