ruby-openid 2.2.3 → 2.3.0

data/examples/rails_openid/public/robots.txt

@@ -1 +1,5 @@
-# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-Agent: *
+# Disallow: /

data/examples/rails_openid/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/examples/rails_openid/test/performance/browsing_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class BrowsingTest < ActionDispatch::PerformanceTest
+  # Refer to the documentation for all available options
+  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+  #                          :output => 'tmp/performance', :formats => [:flat] }
+
+  def test_homepage
+    get '/'
+  end
+end

data/examples/rails_openid/test/test_helper.rb

@@ -1,28 +1,13 @@
 ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
 
-class Test::Unit::TestCase
-  # Transactional fixtures accelerate your tests by wrapping each test method
-  # in a transaction that's rolled back on completion.  This ensures that the
-  # test database remains unchanged so your fixtures don't have to be reloaded
-  # between every test method.  Fewer database queries means faster tests.
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
   #
-  # Read Mike Clark's excellent walkthrough at
-  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
-  #
-  # Every Active Record database supports transactions except MyISAM tables
-  # in MySQL.  Turn off transactional fixtures in this case; however, if you
-  # don't care one way or the other, switching from MyISAM to InnoDB tables
-  # is recommended.
-  self.use_transactional_fixtures = true
-
-  # Instantiated fixtures are slow, but give you @david where otherwise you
-  # would need people(:david).  If you don't want to migrate your existing
-  # test cases which use the @david style and don't mind the speed hit (each
-  # instantiated fixtures translates to a database query per test method),
-  # then set this back to true.
-  self.use_instantiated_fixtures  = false
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
 
   # Add more helper methods to be used by all tests here...
 end

data/lib/openid/association.rb

@@ -74,7 +74,7 @@ module OpenID
       Util.assert(data.length == FIELD_ORDER.length)
 
       pairs = FIELD_ORDER.map{|field| [field.to_s, data[field]]}
-      return Util.seq_to_kv(pairs, strict=true)
+      return Util.seq_to_kv(pairs, true)
     end
 
     # The number of seconds until this association expires

data/lib/openid/consumer/checkid_request.rb

@@ -121,7 +121,7 @@ module OpenID
           end
         end
 
-        if @assoc
+        if @assoc && (message.is_openid1 || !['checkid_setup', 'checkid_immediate'].include?(mode))
           message.set_arg(OPENID_NS, 'assoc_handle', @assoc.handle)
           assoc_log_msg = "with assocication #{@assoc.handle}"
         else

data/lib/openid/consumer/discovery.rb

@@ -489,7 +489,7 @@ module OpenID
 
   def self.discover(identifier)
     if Yadis::XRI::identifier_scheme(identifier) == :xri
-      normalized_identifier, services = discover_xri(identifier)
+      discover_xri(identifier)
     else
       return discover_uri(identifier)
     end

data/lib/openid/consumer/html_parse.rb

@@ -39,7 +39,9 @@ module OpenID
     rescue ArgumentError
       begin
         stripped = html.encode('UTF-8', 'binary', :invalid => :replace, :undef => :replace, :replace => '').gsub(REMOVED_RE,'')
-      rescue Encoding::UndefinedConversionError #needed for a problem in JRuby where it can't handle the conversion
+      rescue Encoding::UndefinedConversionError, Encoding::ConverterNotFoundError
+        # needed for a problem in JRuby where it can't handle the conversion.
+        # see details here: https://github.com/jruby/jruby/issues/829
         stripped = html.encode('UTF-8', 'ASCII', :invalid => :replace, :undef => :replace, :replace => '').gsub(REMOVED_RE,'')
       end
     end

data/lib/openid/consumer/idres.rb

@@ -296,7 +296,7 @@ module OpenID
 
         begin
           time, extra = Nonce.split_nonce(nonce)
-        rescue ArgumentError => why
+        rescue ArgumentError
           raise ProtocolError, "Malformed nonce: #{nonce.inspect}"
         end
 

data/lib/openid/extensions/ax.rb

@@ -275,8 +275,7 @@ module OpenID
       def initialize
         super()
         @mode = nil
-        @data = {}
-        @data.default = []
+        @data = Hash.new { |hash, key| hash[key] = [] }
       end
 
       # Add a single value for the given attribute type to the
@@ -483,7 +482,7 @@ module OpenID
         begin
           obj.parse_extension_args(ax_args)
           return obj
-        rescue Error => e
+        rescue Error
           return nil
         end
       end

data/lib/openid/extensions/ui.rb

@@ -30,13 +30,13 @@ module OpenID
       # checkid_* OpenID message
       # return nil if the extension was not requested.
       def self.from_openid_request(oid_req)
-        oauth_req = new
+        ui_req = new
         args = oid_req.message.get_args(NS_URI)
         if args == {}
           return nil
         end
-        oauth_req.parse_extension_args(args)
-        return oauth_req
+        ui_req.parse_extension_args(args)
+        return ui_req
       end
 
       # Set UI extension parameters

data/lib/openid/extras.rb

@@ -3,11 +3,11 @@ class String
     other = other.to_s
     head = self[0, other.length]
     head == other
-  end
+  end unless ''.respond_to?(:starts_with?)
 
   def ends_with?(other)
     other = other.to_s
     tail = self[-1 * other.length, other.length]
     tail == other
-  end
+  end unless ''.respond_to?(:ends_with?)
 end

data/lib/openid/server.rb

@@ -122,7 +122,7 @@ module OpenID
         is_valid = signatory.verify(@assoc_handle, @signed)
         # Now invalidate that assoc_handle so it this checkAuth
         # message cannot be replayed.
-        signatory.invalidate(@assoc_handle, dumb=true)
+        signatory.invalidate(@assoc_handle, true)
         response = OpenIDResponse.new(self)
         valid_str = is_valid ? "true" : "false"
         response.fields.set_arg(OPENID_NS, 'is_valid', valid_str)
@@ -322,7 +322,7 @@ module OpenID
           session_type = message.get_arg(OPENID2_NS, 'session_type')
           if !session_type
             raise ProtocolError.new(message,
-                                    text="session_type missing from request")
+                                    "session_type missing from request")
           end
         end
 

data/lib/openid/store/memory.rb

@@ -9,8 +9,7 @@ module OpenID
     class Memory < Interface
 
       def initialize
-        @associations = {}
-        @associations.default = {}
+        @associations = Hash.new { |hash, key| hash[key] = {} }
         @nonces = {}
       end
 

data/lib/openid/store/nonce.rb

@@ -37,7 +37,7 @@ module OpenID
     def Nonce.check_timestamp(nonce_str, allowed_skew=nil, now=nil)
       allowed_skew = skew if allowed_skew.nil?
       begin
-        stamp, foo = split_nonce(nonce_str)
+        stamp, _ = split_nonce(nonce_str)
       rescue ArgumentError # bad timestamp
         return false
       end

data/lib/openid/trustroot.rb

@@ -173,7 +173,7 @@ module OpenID
       def TrustRoot._parse_url(url)
         begin
           url = URINorm.urinorm(url)
-        rescue URI::InvalidURIError => err
+        rescue URI::InvalidURIError
           nil
         end
 

data/lib/openid/util.rb

@@ -108,8 +108,8 @@ for (var i = 0; i < elements.length; i++) {
 
     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] }
+    def Util.html_encode(str)
+      str.to_s.gsub(/[&<>"']/) {|s| ESCAPE_TABLE[s] }
     end
   end
 

data/lib/openid/version.rb

@@ -1,3 +1,3 @@
 module OpenID
-  VERSION = "2.2.3"
+  VERSION = "2.3.0"
 end

data/lib/openid/yadis/xrds.rb

@@ -95,7 +95,7 @@ module OpenID
 
         begin
           d = REXML::Document.new(text)
-        rescue RuntimeError => why
+        rescue RuntimeError
           raise XRDSError.new("Not an XRDS document. Failed to parse XML.")
         end
 

data/test/test_accept.rb

@@ -94,7 +94,6 @@ module OpenID
       lines = getTestData()
       chunks = chunk(lines)
       data_sets = chunks.collect { |chunk| parseLines(chunk) }
-      cases = []
       data_sets.each { |data|
         lnos = []
         lno, header = data['accept']
@@ -117,7 +116,7 @@ module OpenID
           raise
         end
 
-        descr = sprintf('MatchAcceptTest for lines %s', lnos)
+        sprintf('MatchAcceptTest for lines %s', lnos)
 
         # Test:
         accepted = Yadis.parse_accept_header(header)
@@ -134,25 +133,25 @@ module OpenID
       # for it.
 
       # Form: [input_array, expected_header_string]
-      cases = [
-               # Empty input list
-               [[], ""],
-               # Content type name only; no q value
-               [["test"], "test"],
-               # q = 1.0 should be omitted from the header
-               [[["test", 1.0]], "test"],
-               # Test conversion of float to string
-               [["test", ["with_q", 0.8]], "with_q; q=0.8, test"],
-               # Allow string q values, too
-               [["test", ["with_q_str", "0.7"]], "with_q_str; q=0.7, test"],
-               # Test q values out of bounds
-               [[["test", -1.0]], nil],
-               [[["test", 1.1]], nil],
-               # Test sorting of types by q value
-               [[["middle", 0.5], ["min", 0.1], "max"],
-                "min; q=0.1, middle; q=0.5, max"],
-
-              ].each { |input, expected_header|
+      [
+       # Empty input list
+       [[], ""],
+       # Content type name only; no q value
+       [["test"], "test"],
+       # q = 1.0 should be omitted from the header
+       [[["test", 1.0]], "test"],
+       # Test conversion of float to string
+       [["test", ["with_q", 0.8]], "with_q; q=0.8, test"],
+       # Allow string q values, too
+       [["test", ["with_q_str", "0.7"]], "with_q_str; q=0.7, test"],
+       # Test q values out of bounds
+       [[["test", -1.0]], nil],
+       [[["test", 1.1]], nil],
+       # Test sorting of types by q value
+       [[["middle", 0.5], ["min", 0.1], "max"],
+        "min; q=0.1, middle; q=0.5, max"],
+
+      ].each { |input, expected_header|
 
         if expected_header.nil?
           assert_raise(ArgumentError) {

data/test/test_association.rb

@@ -71,16 +71,12 @@ module OpenID
       pairs = [['key1', 'value1'],
                ['key2', 'value2']]
 
-      [['HMAC-SHA256', "\xfd\xaa\xfe;\xac\xfc*\x988\xad\x05d6-"\
-                       "\xeaVy\xd5\xa5Z.<\xa9\xed\x18\x82\\$"\
-                       "\x95x\x1c&"],
-       ['HMAC-SHA1', "\xe0\x1bv\x04\xf1G\xc0\xbb\x7f\x9a\x8b"\
-                     "\xe9\xbc\xee}\\\xe5\xbb7*"],
+      [['HMAC-SHA256', "\xfd\xaa\xfe;\xac\xfc*\x988\xad\x05d6-\xeaVy\xd5\xa5Z.<\xa9\xed\x18\x82\\$\x95x\x1c&"],
+       ['HMAC-SHA1', "\xe0\x1bv\x04\xf1G\xc0\xbb\x7f\x9a\x8b\xe9\xbc\xee}\\\xe5\xbb7*"],
       ].each do |assoc_type, expected|
-        assoc = Association.from_expires_in(3600, "handle", 'very_secret',
-                                            assoc_type)
+        assoc = Association.from_expires_in(3600, "handle", 'very_secret', assoc_type)
         sig = assoc.sign(pairs)
-        assert_equal(sig, expected)
+        assert_equal(expected.force_encoding("UTF-8"), sig.force_encoding("UTF-8"))
 
         m = Message.new(OPENID2_NS)
         pairs.each { |k, v|

data/test/test_associationmanager.rb

@@ -750,7 +750,7 @@ module OpenID
     end
 
     def setup_dh
-      sess, message = @assoc_manager.send(:create_associate_request,
+      sess, _ = @assoc_manager.send(:create_associate_request,
                                           'HMAC-SHA1', 'DH-SHA1')
 
       server_dh = DiffieHellman.new

data/test/test_ax.rb

@@ -580,7 +580,6 @@ module OpenID
       end
 
       def test_get_single_success
-        req = FetchRequest.new
         @msg.add_value(@type_a, @value_a)
         assert_equal(@value_a, @msg.get_single(@type_a))
       end

data/test/test_checkid_request.rb

@@ -93,14 +93,6 @@ module OpenID
           assert_openid_key_absent(msg, 'assoc_handle')
         end
 
-        def test_check_with_assoc_handle
-          msg = assert_log_matches("Generated checkid") {
-            @checkid_req.get_message(@realm, @return_to, immediate)
-          }
-
-          assert_openid_value_equal(msg, 'assoc_handle', @assoc.handle)
-        end
-
         def test_add_extension_arg
           @checkid_req.add_extension_arg('bag:', 'color', 'brown')
           @checkid_req.add_extension_arg('bag:', 'material', 'paper')
@@ -206,6 +198,13 @@ module OpenID
           assert_has_required_fields(msg)
           assert_has_identifiers(msg, IDENTIFIER_SELECT, IDENTIFIER_SELECT)
         end
+
+        def test_no_assoc_handle
+          msg = assert_log_matches("Generated checkid") {
+            @checkid_req.get_message(@realm, @return_to, immediate)
+          }
+          assert_openid_key_absent(msg, 'assoc_handle')
+        end
       end
 
       class TestCheckIDRequestOpenID1 < Test::Unit::TestCase

data/test/test_dh.rb

@@ -27,7 +27,7 @@ module OpenID
        ["\xff",   "\x0f",   "\xf0"  ],
       ].each do |input1, input2, expected|
         actual = DiffieHellmanExposed.strxor_for_testing(input1, input2)
-        assert_equal(expected, actual)
+        assert_equal(expected.force_encoding("UTF-8"), actual.force_encoding("UTF-8"))
       end
     end
 

data/test/test_discover.rb

@@ -382,9 +382,9 @@ module OpenID
     end
 
     def test_yadisEmpty
-      services = _discover('application/xrds+xml',
-                           read_data_file('test_discover/yadis_0entries.xml', false),
-                           0)
+      _discover('application/xrds+xml',
+                read_data_file('test_discover/yadis_0entries.xml', false),
+                0)
     end
 
     def test_htmlEmptyYadis
@@ -517,7 +517,6 @@ module OpenID
       @fetchlog << [url, body, headers]
 
       u = URI::parse(url)
-      proxy_host = u.host
       xri = u.path
       query = u.query
 
@@ -562,7 +561,7 @@ module OpenID
     end
 
     def test_xri
-      user_xri, services = OpenID.discover_xri('=smoker')
+      _, services = OpenID.discover_xri('=smoker')
 
       _checkService(services[0],
                     "http://www.myopenid.com/server",
@@ -584,7 +583,7 @@ module OpenID
     end
 
     def test_xri_normalize
-      user_xri, services = OpenID.discover_xri('xri://=smoker')
+      _, services = OpenID.discover_xri('xri://=smoker')
 
       _checkService(services[0],
                     "http://www.myopenid.com/server",
@@ -607,7 +606,7 @@ module OpenID
 
     def test_xriNoCanonicalID
       silence_logging {
-        user_xri, services = OpenID.discover_xri('=smoker*bad')
+        _, services = OpenID.discover_xri('=smoker*bad')
         assert(services.empty?)
       }
     end
@@ -635,7 +634,7 @@ module OpenID
     end
 
     def test_xri
-      user_xri, services = OpenID.discover_xri('=smoker')
+      _, services = OpenID.discover_xri('=smoker')
       assert(!services.empty?, "Expected services, got zero")
       assert_equal(services[0].server_url,
                    "http://www.livejournal.com/openid/server.bml")