@@ -1,5 +1,3 @@ -require 'base64' - module Rack module Auth class AbstractRequest lib/rack/auth/abstract/request.rb @@ -45,7 +45,7 @@ module Rack end def credentials - @credentials ||= Base64.decode64(params).split(/:/, 2) + @credentials ||= params.unpack("m*").first.split(/:/, 2) end def username lib/rack/auth/basic.rb @@ -1,4 +1,3 @@ -require 'base64' require 'digest/md5' module Rack @@ -19,7 +18,7 @@ module Rack end def self.parse(string) - new(*Base64.decode64(string).split(' ', 2)) + new(*string.unpack("m*").first.split(' ', 2)) end def initialize(timestamp = Time.now, given_digest = nil) @@ -27,7 +26,7 @@ module Rack end def to_s - Base64.encode64([ @timestamp, digest ] * ' ').strip + [([ @timestamp, digest ] * ' ')].pack("m*").strip end def digest lib/rack/auth/digest/nonce.rb @@ -1,5 +1,3 @@ -require 'base64' - module Rack module Session @@ -40,7 +38,7 @@ module Rack session_data = request.cookies[@key] begin - session_data = Base64.decode64(session_data) + session_data = session_data.unpack("m*").first session_data = Marshal.load(session_data) env["rack.session"] = session_data rescue @@ -52,7 +50,7 @@ module Rack def commit_session(env, status, headers, body) session_data = Marshal.dump(env["rack.session"]) - session_data = Base64.encode64(session_data) + session_data = [session_data].pack("m*") if session_data.size > (4096 - @key.size) env["rack.errors"].puts("Warning! Rack::Session::Cookie data size exceeds 4K. Content dropped.") lib/rack/session/cookie.rb @@ -1,5 +1,4 @@ require 'test/spec' -require 'base64' require 'rack' context 'Rack::Auth::Basic' do @@ -23,7 +22,7 @@ context 'Rack::Auth::Basic' do end def request_with_basic_auth(username, password, &block) - request 'HTTP_AUTHORIZATION' => 'Basic ' + Base64.encode64("#{username}:#{password}"), &block + request 'HTTP_AUTHORIZATION' => 'Basic ' + ["#{username}:#{password}"].pack("m*"), &block end def request(headers = {}) test/spec_rack_auth_basic.rb 693dd4716a62f4545966b553f1a0926672f3a84b Christian Neukirchen chneukirchen@gmail.com http://github.com/chneukirchen/rack-mirror/commit/e6b65296a247e23742d85e47cf31582b5883918a e6b65296a247e23742d85e47cf31582b5883918a 2007-12-31T10:34:00-08:00 2007-12-31T10:34:00-08:00 Remove uses of base64 for Ruby 1.9 support darcs-hash:20071231183408-4fc50-fb75ebb4fe0ae5ad759d76499c353a1e93142955.gz 3548cc2851e0666e1b9edb47dcec022e1cd82a43 Christian Neukirchen chneukirchen@gmail.com