mojodna-oauth 0.3.1.1 → 0.3.1.2

data/Manifest.txt

@@ -6,6 +6,7 @@ Rakefile
 TODO
 bin/oauth
 lib/oauth.rb
+lib/oauth/oauth.rb
 lib/oauth/cli.rb
 lib/oauth/client.rb
 lib/oauth/client/action_controller_request.rb
@@ -40,7 +41,6 @@ script/destroy
 script/generate
 script/txt2html
 setup.rb
-specs.txt
 tasks/deployment.rake
 tasks/environment.rake
 tasks/website.rake

data/lib/oauth/cli.rb

@@ -24,29 +24,43 @@ module OAuth
       if sufficient_options? && valid_command?
         case command
         when "sign"
+          parameters = prepare_parameters
+
           request = OAuth::RequestProxy.proxy \
              "method"     => options[:method],
              "uri"        => options[:uri],
-             "parameters" => prepare_parameters
+             "parameters" => parameters
 
-          # can't pass options unless they respond to :secret, so use this alternative
-          signature = OAuth::Signature.sign \
-            request,
-            :consumer_secret => options[:oauth_consumer_secret],
-            :token_secret    => options[:oauth_token_secret] do |request|
-
-            # while we have access to the request being signed, display some internals
-            if verbose?
-              stdout.puts "Method: #{request.method}"
-              stdout.puts "URI: #{request.uri}"
-              stdout.puts "Normalized params: #{request.normalized_parameters}"
-              stdout.puts "Signature base string: #{request.signature_base_string}"
+          if verbose?
+            stdout.puts "OAuth parameters:"
+            request.oauth_parameters.each do |k,v|
+              stdout.puts "  " + [k, v] * ": "
+            end
+            stdout.puts
+
+            if request.non_oauth_parameters.any?
+              stdout.puts "Parameters:"
+              request.non_oauth_parameters.each do |k,v|
+                stdout.puts "  " + [k, v] * ": "
+              end
+              stdout.puts
             end
           end
 
+          request.sign! \
+            :consumer_secret => options[:oauth_consumer_secret],
+            :token_secret    => options[:oauth_token_secret]
+
           if verbose?
-            stdout.puts "Signature:         #{signature}"
-            stdout.puts "Escaped signature: #{OAuth::Helper.escape(signature)}"
+            stdout.puts "Method: #{request.method}"
+            stdout.puts "Base URI: #{request.uri}"
+            stdout.puts "Normalized params: #{request.normalized_parameters}"
+            stdout.puts "Signature base string: #{request.signature_base_string}"
+            stdout.puts "OAuth Request URI: #{request.signed_uri}"
+            stdout.puts "URI: #{request.signed_uri(false)}"
+            stdout.puts "Authorization header: #{request.oauth_header(:realm => options[:realm])}"
+            stdout.puts "Signature:         #{request.signature}"
+            stdout.puts "Escaped signature: #{OAuth::Helper.escape(request.signature)}"
           else
             stdout.puts signature
           end
@@ -68,7 +82,11 @@ module OAuth
         opts.banner = "Usage: #{$0} [options] <command>"
 
         # defaults
+        options[:oauth_nonce] = OAuth::Helper.generate_key
         options[:oauth_signature_method] = "HMAC-SHA1"
+        options[:oauth_timestamp] = OAuth::Helper.generate_timestamp
+        options[:oauth_version] = "1.0"
+        options[:params] = ""
 
         opts.on("--consumer-key KEY", "Specifies the consumer key to use.") do |v|
           options[:oauth_consumer_key] = v
@@ -82,6 +100,10 @@ module OAuth
           options[:method] = v
         end
 
+        opts.on("--nonce NONCE", "Specifies the none to use.") do |v|
+          options[:oauth_nonce] = v
+        end
+
         opts.on("--parameters PARAMS", "Specifies the parameters to use when signing.") do |v|
           options[:params] = v
         end
@@ -94,14 +116,30 @@ module OAuth
           options[:oauth_token_secret] = v
         end
 
+        opts.on("--timestamp TIMESTAMP", "Specifies the timestamp to use.") do |v|
+          options[:oauth_timestamp] = v
+        end
+
         opts.on("--token TOKEN", "Specifies the token to use.") do |v|
           options[:oauth_token] = v
         end
 
+        opts.on("--realm REALM", "Specifies the realm to use.") do |v|
+          options[:realm] = v
+        end
+
         opts.on("--uri URI", "Specifies the URI to use when signing.") do |v|
           options[:uri] = v
         end
 
+        opts.on("--version VERSION", "Specifies the OAuth version to use.") do |v|
+          options[:oauth_version] = v
+        end
+
+        opts.on("--no-version", "Omit oauth_version.") do
+          options[:oauth_version] = nil
+        end
+
         opts.on("-v", "--verbose", "Be verbose.") do
           options[:verbose] = true
         end
@@ -113,11 +151,25 @@ module OAuth
     end
 
     def prepare_parameters
+      escaped_pairs = options[:params].split("&").collect do |pair|
+        Hash[*pair.split("=")].collect do |k,v|
+          puts "k: #{k}"
+          puts "v: #{v}"
+          [CGI.escape(k), CGI.escape(v)] * "="
+        end
+      end
+
+      querystring = escaped_pairs * "&"
+      cli_params = CGI.parse(querystring)
+
       {
         "oauth_consumer_key"     => options[:oauth_consumer_key],
+        "oauth_nonce"            => options[:oauth_nonce],
+        "oauth_timestamp"        => options[:oauth_timestamp],
         "oauth_token"            => options[:oauth_token],
-        "oauth_signature_method" => options[:oauth_signature_method]
-      }.merge(CGI.parse(options[:params]))
+        "oauth_signature_method" => options[:oauth_signature_method],
+        "oauth_version"          => options[:oauth_version]
+      }.reject { |k,v| v.nil? || v == "" }.merge(cli_params)
     end
 
     def sufficient_options?

data/lib/oauth/client/helper.rb

@@ -26,10 +26,6 @@ module OAuth::Client
       options[:timestamp] ||= generate_timestamp
     end
 
-    def generate_timestamp
-      Time.now.to_i.to_s
-    end
-
     def oauth_parameters
       {
         'oauth_consumer_key'     => options[:consumer].key,

data/lib/oauth/consumer.rb

@@ -102,7 +102,7 @@ module OAuth
     #   @consumer.request(:post, '/people', @token, {}, @person.to_xml, { 'Content-Type' => 'application/xml' })
     #
     def request(http_method, path, token = nil, request_options = {}, *arguments)
-      if path = ~/^\//
+      if path =~ /^\//
         _http = http
       else
         _http = create_http(path)

data/lib/oauth/helper.rb

@@ -13,5 +13,27 @@ module OAuth
     def generate_key(size=32)
       Base64.encode64(OpenSSL::Random.random_bytes(size)).gsub(/\W/, '')
     end
+
+    def generate_timestamp
+      Time.now.to_i.to_s
+    end
+
+    def normalize(params)
+      params.sort.map do |k, values|
+
+        if values.is_a?(Array)
+          # multiple values were provided for a single key
+          values.sort.collect do |v|
+            [escape(k),escape(v)] * "="
+          end
+        else
+          [escape(k),escape(values)] * "="
+        end
+      end * "&"
+    end
+
+    def unescape(value)
+      URI.unescape(value.gsub('+', '%2B'))
+    end
   end
 end

data/lib/oauth/request_proxy/base.rb

@@ -24,10 +24,20 @@ module OAuth::RequestProxy
       parameters['oauth_consumer_key']
     end
 
+    def parameters
+      raise NotImplementedError, "Must be implemented by subclasses"
+    end
+
     def parameters_for_signature
-      p = parameters.dup
-      p.delete("oauth_signature")
-      p
+      parameters.reject { |k,v| k == "oauth_signature" }
+    end
+
+    def oauth_parameters
+      parameters.select { |k,v| OAuth::PARAMETERS.include?(k) }.reject { |k,v| v == "" }
+    end
+
+    def non_oauth_parameters
+      parameters.reject { |k,v| OAuth::PARAMETERS.include?(k) }
     end
 
     def nonce
@@ -59,17 +69,17 @@ module OAuth::RequestProxy
 
     # See 9.1.1. in specs Normalize Request Parameters
     def normalized_parameters
-      parameters_for_signature.sort.map do |k, values|
+      normalize(parameters_for_signature)
+    end
 
-        if values.is_a?(Array)
-          # multiple values were provided for a single key
-          values.sort.collect do |v|
-            [escape(k),escape(v)] * "="
-          end
-        else
-          [escape(k),escape(values)] * "="
-        end
-      end * "&"
+    def sign(options = {})
+      OAuth::Signature.sign(self, options)
+    end
+
+    def sign!(options = {})
+      parameters["oauth_signature"] = sign(options)
+      @signed = true
+      signature
     end
 
     # See 9.1 in specs
@@ -78,6 +88,34 @@ module OAuth::RequestProxy
       base.map { |v| escape(v) }.join("&")
     end
 
+    # Has this request been signed yet?
+    def signed?
+      @signed
+    end
+
+    # URI, including OAuth parameters
+    def signed_uri(with_oauth = true)
+      if signed?
+        if with_oauth
+          params = parameters
+        else
+          params = non_oauth_parameters
+        end
+
+        [uri, normalize(params)] * "?"
+      else
+        STDERR.puts "This request has not yet been signed!"
+      end
+    end
+
+    # Authorization header for OAuth
+    def oauth_header(options = {})
+      header_params_str = oauth_parameters.map { |k,v| "#{k}=\"#{escape(v)}\"" }.join(', ')
+
+      realm = "realm=\"#{options[:realm]}\", " if options[:realm]
+      "OAuth #{realm}#{header_params_str}"
+    end
+
   protected
 
     def header_params
@@ -98,9 +136,5 @@ module OAuth::RequestProxy
 
       return {}
     end
-
-    def unescape(value)
-      URI.unescape(value.gsub('+', '%2B'))
-    end
   end
 end

data/lib/oauth/server.rb

@@ -29,13 +29,14 @@ module OAuth
 
     # mainly for testing purposes
     def create_consumer
-      Consumer.new(*generate_credentials,
+      creds = generate_credentials
+      Consumer.new(creds[0], creds[1],
         {
           :site               => base_url,
           :request_token_path => request_token_path,
           :authorize_path     => authorize_path,
           :access_token_path  => access_token_path
-      })
+        })
     end
 
     def request_token_path

data/lib/oauth/version.rb

@@ -1,3 +1,3 @@
 module OAuth #:nodoc:
-  VERSION = '0.3.1.1'
+  VERSION = '0.3.1.2'
 end

data/lib/oauth.rb

@@ -1,3 +1,4 @@
+require 'oauth/oauth'
 require 'oauth/client/helper'
 require 'oauth/signature/hmac/sha1'
 require 'oauth/request_proxy/mock_request'

data/oauth.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth}
-  s.version = "0.3.1.1"
+  s.version = "0.3.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pelle Braendgaard", "Blaine Cook", "Larry Halff", "Jesse Clark", "Jon Crosby", "Seth Fitzsimmons"]
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.description = %q{OAuth Core Ruby implementation}
   s.email = %q{pelleb@gmail.com}
   s.executables = ["oauth"]
-  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.rdoc", "specs.txt", "website/index.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.rdoc", "Rakefile", "TODO", "bin/oauth", "lib/oauth.rb", "lib/oauth/cli.rb", "lib/oauth/client.rb", "lib/oauth/client/action_controller_request.rb", "lib/oauth/client/helper.rb", "lib/oauth/client/net_http.rb", "lib/oauth/consumer.rb", "lib/oauth/helper.rb", "lib/oauth/oauth_test_helper.rb", "lib/oauth/request_proxy.rb", "lib/oauth/request_proxy/action_controller_request.rb", "lib/oauth/request_proxy/base.rb", "lib/oauth/request_proxy/jabber_request.rb", "lib/oauth/request_proxy/mock_request.rb", "lib/oauth/request_proxy/net_http.rb", "lib/oauth/request_proxy/rack_request.rb", "lib/oauth/server.rb", "lib/oauth/signature.rb", "lib/oauth/signature/base.rb", "lib/oauth/signature/hmac/base.rb", "lib/oauth/signature/hmac/md5.rb", "lib/oauth/signature/hmac/rmd160.rb", "lib/oauth/signature/hmac/sha1.rb", "lib/oauth/signature/hmac/sha2.rb", "lib/oauth/signature/md5.rb", "lib/oauth/signature/plaintext.rb", "lib/oauth/signature/rsa/sha1.rb", "lib/oauth/signature/sha1.rb", "lib/oauth/token.rb", "lib/oauth/version.rb", "oauth.gemspec", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "specs.txt", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "test/cases/oauth_case.rb", "test/cases/spec/1_0-final/test_construct_request_url.rb", "test/cases/spec/1_0-final/test_normalize_request_parameters.rb", "test/cases/spec/1_0-final/test_parameter_encodings.rb", "test/cases/spec/1_0-final/test_signature_base_strings.rb", "test/keys/rsa.cert", "test/keys/rsa.pem", "test/test_action_controller_request_proxy.rb", "test/test_consumer.rb", "test/test_helper.rb", "test/test_hmac_sha1.rb", "test/test_net_http_client.rb", "test/test_net_http_request_proxy.rb", "test/test_rack_request_proxy.rb", "test/test_rsa_sha1.rb", "test/test_server.rb", "test/test_signature.rb", "test/test_signature_base.rb", "test/test_signature_plain_text.rb", "test/test_token.rb", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.rhtml"]
+  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.rdoc", "website/index.txt"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.rdoc", "Rakefile", "TODO", "bin/oauth", "lib/oauth.rb", "lib/oauth/cli.rb", "lib/oauth/client.rb", "lib/oauth/client/action_controller_request.rb", "lib/oauth/client/helper.rb", "lib/oauth/client/net_http.rb", "lib/oauth/consumer.rb", "lib/oauth/helper.rb", "lib/oauth/oauth_test_helper.rb", "lib/oauth/request_proxy.rb", "lib/oauth/request_proxy/action_controller_request.rb", "lib/oauth/request_proxy/base.rb", "lib/oauth/request_proxy/jabber_request.rb", "lib/oauth/request_proxy/mock_request.rb", "lib/oauth/request_proxy/net_http.rb", "lib/oauth/request_proxy/rack_request.rb", "lib/oauth/server.rb", "lib/oauth/signature.rb", "lib/oauth/signature/base.rb", "lib/oauth/signature/hmac/base.rb", "lib/oauth/signature/hmac/md5.rb", "lib/oauth/signature/hmac/rmd160.rb", "lib/oauth/signature/hmac/sha1.rb", "lib/oauth/signature/hmac/sha2.rb", "lib/oauth/signature/md5.rb", "lib/oauth/signature/plaintext.rb", "lib/oauth/signature/rsa/sha1.rb", "lib/oauth/signature/sha1.rb", "lib/oauth/token.rb", "lib/oauth/version.rb", "oauth.gemspec", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "test/cases/oauth_case.rb", "test/cases/spec/1_0-final/test_construct_request_url.rb", "test/cases/spec/1_0-final/test_normalize_request_parameters.rb", "test/cases/spec/1_0-final/test_parameter_encodings.rb", "test/cases/spec/1_0-final/test_signature_base_strings.rb", "test/keys/rsa.cert", "test/keys/rsa.pem", "test/test_action_controller_request_proxy.rb", "test/test_consumer.rb", "test/test_helper.rb", "test/test_hmac_sha1.rb", "test/test_net_http_client.rb", "test/test_net_http_request_proxy.rb", "test/test_rack_request_proxy.rb", "test/test_rsa_sha1.rb", "test/test_server.rb", "test/test_signature.rb", "test/test_signature_base.rb", "test/test_signature_plain_text.rb", "test/test_token.rb", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.rhtml"]
   s.has_rdoc = true
   s.homepage = %q{http://oauth.rubyforge.org}
   s.rdoc_options = ["--main", "README.rdoc"]

data/test/test_consumer.rb

@@ -1,5 +1,4 @@
-require 'rubygems'
-require 'test/unit'
+require File.dirname(__FILE__) + '/test_helper'
 require 'oauth/consumer'
 require 'oauth/signature/rsa/sha1'
 

data/test/test_server.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require File.dirname(__FILE__) + '/test_helper'
 require 'oauth/server'
 class ServerTest < Test::Unit::TestCase
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-oauth
 version: !ruby/object:Gem::Version 
-  version: 0.3.1.1
+  version: 0.3.1.2
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -55,7 +55,6 @@ extra_rdoc_files:
 - License.txt
 - Manifest.txt
 - README.rdoc
-- specs.txt
 - website/index.txt
 files: 
 - History.txt
@@ -100,7 +99,6 @@ files:
 - script/generate
 - script/txt2html
 - setup.rb
-- specs.txt
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/website.rake