atom-tools 2.0.1 → 2.0.2

data/Rakefile

@@ -7,7 +7,7 @@ require "spec/rake/spectask"
 require "rake/clean"
 
 NAME = "atom-tools"
-VERS = "2.0.1"
+VERS = "2.0.2"
 
 # the following from markaby-0.5's tools/rakehelp
 def setup_tests

data/lib/atom/element.rb

@@ -288,7 +288,10 @@ module Atom # :nodoc:
 
       self.on_build do |e,x|
         if v = e.get(name)
-          e.set_atom_attrb(x, name, v.to_s)
+          unless x.namespaces[ns[0]]
+            x.add_namespace *ns
+          end
+          x.attributes["#{ns[0]}:#{name}"] = v.to_s
         end
       end
     end

data/lib/atom/http.rb

@@ -1,6 +1,7 @@
 require "net/http"
 require "net/https"
 require "uri"
+require "cgi"
 
 require "atom/cache"
 
@@ -16,7 +17,8 @@ class String # :nodoc:
 end
 
 module Atom
-  UA = "atom-tools 2.0.1"
+  TOOLS_VERSION = '2.0.2'
+  UA = "atom-tools " + TOOLS_VERSION
 
   module DigestAuth
     CNONCE = Digest::MD5.hexdigest("%x" % (Time.now.to_i + rand(65535)))
@@ -130,6 +132,8 @@ module Atom
     #
     # defaults to nil
     attr_accessor :always_auth
+    # if this is true, we tell Net::HTTP to die if it can't verify the SSL when doing https
+    attr_accessor :strict_ssl
 
     # automatically handle redirects, even for POST/PUT/DELETE requests?
     #
@@ -254,10 +258,90 @@ module Atom
       req["Authorization"] = 'WSSE profile="UsernameToken"'
     end
 
-    def authsub_authenticate req, url
+    def authsub_authenticate req, url, param_string = ""
       req["Authorization"] = %{AuthSub token="#{@token}"}
     end
 
+    # GoogleLogin support thanks to Adrian Hosey
+    def googlelogin_authenticate(req, url, param_string)
+      params_h = Hash.new
+      param_string.split(',').each do |p|
+        k, v = p.split('=')
+        # No whitespace in the key
+        k.delete!(' ')
+        # Values come wrapped in doublequotes - remove
+        v.gsub!(/^"|"$/, '')
+        params_h[k] = v
+      end
+
+      abs_url = (url + "/").to_s
+      user, pass = @get_auth_details.call(abs_url, params_h["realm"])
+      token = fetch_googlelogin_token(user, pass, params_h["realm"], params_h["service"])
+      if !token.nil?
+        req["Authorization"] = "GoogleLogin auth=#{token}"
+      end
+    end
+
+    def fetch_googlelogin_token(user, pass, url_s, service)
+      req, url = new_request(url_s, Net::HTTP::Post)
+      http_obj = Net::HTTP.new(url.host, url.port)
+      if url.scheme == "https"
+        http_obj.use_ssl = true
+        probe_for_cafile(http_obj)
+      end
+
+      body = "Email=#{CGI.escape(user)}&Passwd=#{CGI.escape(pass)}&service=#{CGI.escape(service)}"
+      body += "&accountType=GOOGLE&source=ruby-atom-tools-#{CGI.escape(TOOLS_VERSION)}"
+      res = http_obj.start do |h|
+        h.request(req, body)
+      end
+
+      retval = nil
+      case res
+      when Net::HTTPUnauthorized
+        raise Unauthorized, "Your authorization was rejected"
+      when Net::HTTPOK, Net::HTTPNonAuthoritativeInformation
+        res.body.each_line do |l|
+          k, v = l.split('=')
+          if k == "Auth"
+            retval = v.chomp
+          end
+        end
+      end
+
+      retval
+    end
+
+    # Look for a root CA file and set the relevant options on the passed-in Net::HTTP object.
+    def probe_for_cafile(http_obj)
+      ca_possibles = [
+        '/usr/share/curl/curl-ca-bundle.crt', # OS X
+        '/etc/pki/tls/certs/ca-bundle.crt', # newer Redhat
+        '/usr/share/ssl/certs/ca-bundle.crt', # older Redhat
+        '/etc/ssl/certs/ca-certificates.crt', # Ubuntu (I think)
+        # <irony>Dear LSB: Thank you for standardizing Linux</irony>
+      ]
+      cafile = nil
+      ca_possibles.each do |ca|
+        if File.exist? ca
+          cafile = ca
+          break
+        end
+      end
+      if cafile.nil?
+        if @strict_ssl
+          # set this knowing it will die, since we didn't find a good cafile
+          http_obj.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        else
+          http_obj.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+      else
+        http_obj.ca_file = cafile
+        http_obj.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        http_obj.verify_depth = 5
+      end
+    end
+
     def username_and_password_for_realm(url, realm)
       abs_url = (url + "/").to_s
       user, pass = @get_auth_details.call(abs_url, realm)
@@ -313,7 +397,10 @@ module Atom
       end
 
       http_obj = Net::HTTP.new(url.host, url.port)
-      http_obj.use_ssl = true if url.scheme == "https"
+      if url.scheme == "https"
+        http_obj.use_ssl = true
+        probe_for_cafile(http_obj)
+      end
 
       res = http_obj.start do |h|
         h.request(req, body)

data/test/test_http.rb

@@ -24,7 +24,7 @@ class AtomHTTPTest < Test::Unit::TestCase
   def test_parse_wwwauth
     # a Basic WWW-Authenticate
     header = 'realm="SokEvo"'
-   
+
     params = @http.send :parse_quoted_wwwauth, header
     assert_equal "SokEvo", params[:realm]
 
@@ -272,29 +272,6 @@ class AtomHTTPTest < Test::Unit::TestCase
     assert_authenticates
   end
 
-  def test_https
-    require 'webrick/https'
-
-    @s = WEBrick::HTTPServer.new(
-          :Port            => (@port + 1),
-          :DocumentRoot    => Dir::pwd + "/htdocs",
-          :Logger => WEBrick::Log.new($stderr, WEBrick::Log::FATAL), 
-          :AccessLog => [],
-          :SSLEnable       => true,
-          :SSLVerifyClient => ::OpenSSL::SSL::VERIFY_NONE,
-          :SSLCertName => [ ["C","CA"], ["O","localhost"], ["CN", "WWW"] ]
-       )
-
-    mount_one_shot do |req,res|
-      res.body = SECRET_DATA
-    end
-
-    res = @http.get("https://localhost:#{@port + 1}/")
-
-    assert_equal "200", res.code
-    assert_equal SECRET_DATA, res.body
-  end
-
   # mount a block on the test server, shutting the server down after a
   # single request
   def mount_one_shot &block
@@ -309,8 +286,8 @@ class AtomHTTPTest < Test::Unit::TestCase
   # test that we authenticated properly
   def assert_authenticates
     get_root
-    assert_equal "200", @res.code 
-    assert_equal SECRET_DATA, @res.body 
+    assert_equal "200", @res.code
+    assert_equal SECRET_DATA, @res.body
   end
 
   # performs a GET on the test server

data/test/test_protocol.rb

@@ -2,6 +2,9 @@ require "test/unit"
 
 require "atom/service"
 
+# needed for hpricot
+require "rubygems"
+
 class FakeHTTP
   Response = Struct.new(:body, :code, :content_type)
 
@@ -25,6 +28,17 @@ class FakeHTTP
 end
 
 class AtomProtocolTest < Test::Unit::TestCase
+  attr_reader :have_hpricot
+
+  def initialize *args
+    super
+
+    require "hpricot"
+    @have_hpricot = true
+  rescue LoadError
+    puts "skipping hpricot tests"
+  end
+
   def test_introspection
     doc = <<END
 <service xmlns="http://www.w3.org/2007/app"
@@ -123,6 +137,8 @@ END
   end
 
   def test_autodiscover_service_link
+    return unless have_hpricot
+
     http = FakeHTTP.new \
       'http://example.org/' => [ 'text/html', '<html><link rel="service" href="svc">' ],
       'http://example.org/xhtml' => [ 'text/html', '<html><head><link rel="service" href="svc"/></head></html>' ],
@@ -136,6 +152,8 @@ END
   end
 
   def test_autodiscover_rsd
+    return unless have_hpricot
+
     http = FakeHTTP.new \
       'http://example.org/' => [ 'text/html', '<html><link rel="EditURI" href="rsd">' ],
       'http://example.org/svc' => [ 'application/atomsvc+xml', '<service xmlns="http://www.w3.org/2007/app"/>' ],
@@ -154,6 +172,8 @@ END
   end
 
   def test_cant_autodiscover
+    return unless have_hpricot
+
     http = FakeHTTP.new 'http://example.org/h' => [ 'text/html', '<html>' ],
                        'http://example.org/t' => [ 'text/plain', 'no joy.' ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: atom-tools
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Brendan Taylor
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-13 00:00:00 -06:00
+date: 2009-05-01 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,6 @@ files:
 - setup.rb
 - bin/atom-grep
 - bin/atom-post
-- bin/atom-show
 - bin/atom-purge
 - bin/atom-cp
 - test/test_constructs.rb
@@ -76,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ibes
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Tools for working with Atom Entries, Feeds and Collections

data/bin/atom-show

@@ -1,70 +0,0 @@
-#!/usr/bin/ruby
-
-=begin
-Usage: atom-show [options] source
-    displays a feed human-readably
-
-    'source' can be a path on the local filesystem, the
-  URL of an Atom Collection or '-' for stdin.
-=end
-
-require 'atom/tools'
-include Atom::Tools
-
-def parse_options
-  options = { }
-
-  opts = OptionParser.new do |opts|
-    opts.banner = <<END
-Usage: #{$0} [options] [source]
-    displays a feed human-readably
-
-    'source' can be a path on the local filesystem, the
-  URL of an Atom Collection or '-' for stdin.
-END
-
-    opts.on('-c', '--complete', "Follow previous and next links in the source feed to obtain the entire logical feed") do
-     options[:complete] = true
-    end
-
-    opts.on('-n', '--content [MAX-LENGTH]', "Display max-length words of each entry's content") do |length|
-      options[:content] = length ? length.to_i : 0
-    end
-
-    atom_options opts, options
-  end
-
-  opts.parse!(ARGV)
-
-  if ARGV.length > 1
-    puts opts
-    exit
-  end
-
-  options
-end
-
-if __FILE__ == $0
-  require 'optparse'
-
-  options = parse_options
-
-  source = ARGV[0]
-  source ||= '-'
-
-  entries = parse_input source, options
-
-  entries.each do |e|
-    puts e.title
-
-    if options[:content]
-      if options[:content].zero?
-        puts e.content.to_s
-      else
-        puts e.content.to_s.split(' ')[0,options[:content]].join(' ')
-      end
-    end
-
-    puts
-  end
-end