net_dav 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/bin/dav

@@ -36,9 +36,21 @@ else
   url = URI.parse $*[1]
 end
 
-enable_curl = !ENV['DISABLE_CURL']
+enable_curl = !(ENV['DISABLE_CURL'] && ENV['DISABLE_CURL'] != "0")
 
-res = Net::DAV.start(url, :curl => enable_curl ) { |dav|
+dav = Net::DAV.new(url, :curl => enable_curl)
+
+if (url.scheme == 'https')
+  dav.verify_callback = lambda do |preverify_ok, x509_store|
+    puts "preverify = #{preverify_ok}" if $DEBUG
+    puts "cert = #{x509_store.current_cert.inspect}" if $DEBUG
+    preverify_ok
+  end
+
+  dav.verify_server = false
+end
+
+res = dav.start { |dav|
   dav.credentials(dav_user, dav_pass) if dav_user
   case cmd
   when 'put'

data/lib/net/dav.rb

@@ -15,13 +15,23 @@ module Net #:nodoc:
     class NetHttpHandler
       attr_writer :user, :pass
 
+      def verify_callback=(callback)
+	@http.verify_callback = callback
+      end
+
+      def verify_server=(value)
+	@http.verify_mode = value ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+      end
+
       def initialize(uri)
 	@uri = uri
 	case @uri.scheme
 	when "http"
 	  @http = Net::HTTP.new(@uri.host, @uri.port)
 	when "https"
-	  @http = Net::HTTPS.new(@uri.host, @uri.port)
+	  @http = Net::HTTP.new(@uri.host, @uri.port)
+	  @http.use_ssl = true
+	  self.verify_server = true
 	else
 	  raise "unknown uri scheme"
 	end
@@ -158,6 +168,19 @@ module Net #:nodoc:
 
 
     class CurlHandler < NetHttpHandler
+      def verify_callback=(callback)
+	super
+	curl = make_curl
+	$stderr.puts "verify_callback not implemented in Curl::Easy"
+      end
+
+      def verify_server=(value)
+	super
+	curl = make_curl
+	curl.ssl_verify_peer = value
+	curl.ssl_verify_host = value
+      end
+
       def make_curl
 	unless @curl
 	  @curl = Curl::Easy.new
@@ -357,5 +380,13 @@ module Net #:nodoc:
       res.body
     end
 
+    def verify_callback=(callback)
+      @handler.verify_callback = callback
+    end
+
+    def verify_server=(value)
+      @handler.verify_server = value
+    end
+
   end
 end

data/net_dav.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{net_dav}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Miron Cuperman"]
-  s.date = %q{2009-10-31}
+  s.date = %q{2009-11-01}
   s.default_executable = %q{dav}
   s.description = %q{WebDAV client library in the style of Net::HTTP}
   s.email = %q{c1.github@niftybox.net}
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/net/dav.rb",
      "lib/net/dav/item.rb",
      "net_dav.gemspec",
+     "script/multi-test",
      "spec/net_dav_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",

data/script/multi-test

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+
+require 'zlib'
+require 'uri'
+require 'rubygems'
+require 'net/dav'
+
+url = URI.parse $*[0]
+
+items = []
+reps = 10
+nthreads = 10
+use_curl = true
+use_curl = false if ENV['DISABLE_CURL']
+
+Net::DAV.start(url, :curl => use_curl) do |dav|
+  dav.find(url.path) do |item|
+    items << item
+  end
+end
+
+curindex = 0
+nitems = items.size / nthreads + 1
+nitems = 1 if nitems < 1
+threads = []
+(1..nthreads).each do |tind|
+  next if curindex >= items.size
+  titems = items[curindex, nitems]
+  curindex += nitems
+  threads << Thread.new(tind, titems) do |tind, titems|
+    Net::DAV.start(url, :curl => use_curl) do |dav|
+      Thread.current.abort_on_exception = true
+      crcs = {}
+      (1..reps).each do
+	titems.each do |item|
+	  total_size = 0
+	  crc = 0
+	  dav.get(item.uri.path) do |str|
+	    #puts "get #{item.uri} #{total_size}"
+	    total_size += str.length 
+	    crc = Zlib.crc32(str, crc)
+	  end
+	  puts "[#{tind}] new crc for #{item.uri}" if (crcs[item.uri].nil?)
+	  crcs[item.uri] = crc if (crcs[item.uri].nil?)
+	  raise "crc mismatch #{item} #{crc} #{crcs[item.uri]}" if (crc != crcs[item.uri])
+	  raise "size mismatch #{item} #{item.size} #{total_size}" if (total_size != item.size)
+	  puts "[#{tind}] good #{item.uri} #{item.size} #{crc}"
+	end
+      end
+    end
+  end
+end
+
+threads.each { |thread| thread.join }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net_dav
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Miron Cuperman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-31 00:00:00 -07:00
+date: 2009-11-01 00:00:00 -07:00
 default_executable: dav
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
 - lib/net/dav.rb
 - lib/net/dav/item.rb
 - net_dav.gemspec
+- script/multi-test
 - spec/net_dav_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb