httpi 0.9.7 → 1.0.0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.0 (2012-06-07)
+
+* Feature: [#48](https://github.com/rubiii/httpi/pull/48) @jheiss added support
+  for HTTP Negotiate/SPNEGO authentication (curb-specific).
+
+* Fix: [#53](https://github.com/rubiii/httpi/issues/53) fixed an issue where
+  `HTTPI.log_level` did not do anything at all.
+
 ## 0.9.7 (2012-04-26)
 
 * Fix: Merged [pull request 49](https://github.com/rubiii/httpi/pull/49) so that cert

data/README.md

@@ -167,13 +167,16 @@ request.read_timeout = 30 # sec
 HTTPI::Auth
 -----------
 
-`HTTPI::Auth` supports HTTP basic and digest authentication.
+`HTTPI::Auth` supports HTTP basic, digest and Negotiate/SPNEGO authentication.
 
 ``` ruby
 request.auth.basic("username", "password")   # HTTP basic auth credentials
 request.auth.digest("username", "password")  # HTTP digest auth credentials
+request.auth.gssnegotiate                    # HTTP Negotiate/SPNEGO (aka Kerberos)
 ```
 
+HTTP Negotiate only works when using Curb.
+
 For experimental NTLM authentication, please use the [httpi-ntlm](rubygems.org/gems/httpi-ntml)
 gem and provide feedback.
 

data/lib/httpi.rb

@@ -162,10 +162,9 @@ module HTTPI
       @log_level ||= DEFAULT_LOG_LEVEL
     end
 
-    # Logs given +messages+.
-    def log(*messages)
-      level = Symbol === messages.first ? messages.shift : log_level
-      logger.send level, messages.join(" ") if log?
+    # Logs a given +message+.
+    def log(message)
+      logger.send(log_level, message) if log?
     end
 
     # Reset the default config.
@@ -190,7 +189,7 @@ module HTTPI
     def with_adapter(method, request, adapter)
       adapter, adapter_class = Adapter.load adapter
 
-      log :debug, "HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter"
+      log "HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter"
       yield adapter_class.new(request)
     end
 

data/lib/httpi/adapter/curb.rb

@@ -58,6 +58,7 @@ module HTTPI
       def setup_client(request)
         basic_setup request
         setup_http_auth request if request.auth.http?
+        setup_gssnegotiate_auth request if request.auth.gssnegotiate?
         setup_ssl_auth request.auth.ssl if request.auth.ssl?
       end
 
@@ -75,6 +76,14 @@ module HTTPI
         client.username, client.password = *request.auth.credentials
       end
 
+      def setup_gssnegotiate_auth(request)
+        client.http_auth_types = request.auth.type
+        # The curl man page (http://curl.haxx.se/docs/manpage.html) says that
+        # you have to specify a fake username when using Negotiate auth, and
+        # they use ':' in their example.
+        client.username = ':'
+      end
+
       def setup_ssl_auth(ssl)
         client.cert_key = ssl.cert_key_file
         client.cert = ssl.cert_file

data/lib/httpi/auth/config.rb

@@ -5,12 +5,12 @@ module HTTPI
 
     # = HTTPI::Auth::Config
     #
-    # Manages HTTP and SSL auth configuration. Currently supports HTTP basic/digest
-    # and SSL client authentication.
+    # Manages HTTP and SSL auth configuration. Currently supports HTTP basic/digest,
+    # Negotiate/SPNEGO, and SSL client authentication.
     class Config
 
       # Supported authentication types.
-      TYPES = [:basic, :digest, :ssl]
+      TYPES = [:basic, :digest, :gssnegotiate, :ssl]
 
       # Accessor for the HTTP basic auth credentials.
       def basic(*args)
@@ -38,6 +38,16 @@ module HTTPI
         type == :digest
       end
 
+      # Enable HTTP Negotiate/SPNEGO authentication.
+      def gssnegotiate
+        self.type = :gssnegotiate
+      end
+
+      # Returns whether to use HTTP Negotiate/SPNEGO auth.
+      def gssnegotiate?
+        type == :gssnegotiate
+      end
+
       # Returns whether to use HTTP basic or dihest auth.
       def http?
         type == :basic || type == :digest

data/lib/httpi/version.rb

@@ -1,5 +1,5 @@
 module HTTPI
 
-  VERSION = "0.9.7"
+  VERSION = "1.0.0"
 
 end

data/spec/httpi/adapter/curb_spec.rb

@@ -169,6 +169,13 @@ unless RUBY_PLATFORM =~ /java/
           curb.expects(:http_auth_types=).with(:digest)
           adapter.get(request)
         end
+
+        it "is set to :gssnegotiate for HTTP Negotiate auth" do
+          request = basic_request { |request| request.auth.gssnegotiate }
+
+          curb.expects(:http_auth_types=).with(:gssnegotiate)
+          adapter.get(request)
+        end
       end
 
       describe "username and password" do

data/spec/httpi/auth/config_spec.rb

@@ -60,6 +60,24 @@ describe HTTPI::Auth::Config do
     end
   end
 
+  describe "#gssnegotiate" do
+    it "sets the authentication type to :gssnegotiate" do
+      auth.gssnegotiate
+      auth.type.should == :gssnegotiate
+    end
+  end
+
+  describe "#gssnegotiate?" do
+    it "defaults to return false" do
+      auth.should_not be_gssnegotiate
+    end
+
+    it "returns true for HTTP Negotiate auth" do
+      auth.gssnegotiate
+      auth.should be_gssnegotiate
+    end
+  end
+
   describe "#http?" do
     it "defaults to return false" do
       auth.should_not be_http

data/spec/httpi/httpi_spec.rb

@@ -233,7 +233,7 @@ describe HTTPI do
           before { opts[:class].any_instance.expects(method) }
 
           it "logs that we're executing a request" do
-            HTTPI.expects(:log).with(:debug, "HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter")
+            HTTPI.expects(:log).with("HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter")
             client.request method, request, adapter
           end
 
@@ -274,9 +274,9 @@ describe HTTPI do
 
     describe ".log" do
       it "logs the given messages" do
-        HTTPI.log_level = :debug
-        HTTPI.logger.expects(:debug).with("Log this")
-        HTTPI.log "Log", "this"
+        HTTPI.log_level = :info
+        HTTPI.logger.expects(:info).with("Log this")
+        HTTPI.log "Log this"
       end
     end
   end

metadata

@@ -1,135 +1,139 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: httpi
-version: !ruby/object:Gem::Version
-  version: 0.9.7
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
-authors:
+authors: 
 - Daniel Harrington
 - Martin Tepper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-06-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rack
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 7
+        version: "2.7"
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 9
+        - 9
         version: 0.9.9
+  name: mocha
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.9
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
         version: 1.4.0
+  name: webmock
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: autotest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 4
+        - 5
+        - 0
         version: 4.5.0
+  name: ZenTest
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.5.0
+  requirement: *id007
 description: HTTPI provides a common interface for Ruby HTTP libraries.
 email: me@rubiii.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -173,26 +177,36 @@ files:
 - spec/support/matchers.rb
 homepage: http://github.com/rubiii/httpi
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: httpi
-rubygems_version: 1.8.20
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Interface for Ruby HTTP libraries
 test_files: []
+