Changeset 1869

Timestamp:

07/01/07 00:40:30 (1 year ago)

Author:

nahi

Message:

• added 'protocol.http.auth' option to set authentication information for both BasicAuth? and DigestAuth?. with the latest http-access2, now soap4r client can connect to DigestAuth? server. closes #345.
  

Files:

• trunk/lib/soap/httpconfigloader.rb (modified) (2 diffs)
• trunk/lib/soap/streamHandler.rb (modified) (1 diff)
• trunk/test/soap/auth (added)
• trunk/test/soap/auth/htdigest (added)
• trunk/test/soap/auth/htpasswd (added)
• trunk/test/soap/auth/test_basic.rb (added)
• trunk/test/soap/auth/test_digest.rb (added)

trunk/lib/soap/httpconfigloader.rb

@@ -41 +41 @@
-      set_basic_auth(client, basic_auth)
-    end
+    auth = options["auth"] ||= ::SOAP::Property.new
+    set_auth(client, auth)
+    auth.add_hook do |key, value|
+      set_auth(client, auth)
+    end
-    options.add_hook("connect_timeout") do |key, value|
-      client.connect_timeout = value
@@ -54 +59 @@
-  def set_basic_auth(client, basic_auth)
-    basic_auth.values.each do |ele|
-
-
-
-
-
-
+
-    end
+  end
+
+  def set_auth(client, auth)
+    auth.values.each do |ele|
+      client.set_auth(*authele_to_triplets(ele))
+    end
+  end
+
+  def authele_to_triplets(ele)
+    if ele.is_a?(::Array)
+      url, userid, passwd = ele
+    else
+      url, userid, passwd = ele[:url], ele[:userid], ele[:password]
+    end
+    return url, userid, passwd
-  end
-

trunk/lib/soap/streamHandler.rb

@@ -196 +196 @@
-    ssl_config = @options["http.ssl_config"]
-    basic_auth = @options["http.basic_auth"]
+    auth = @options["http.auth"]
-    @options["http"].lock(true)
-    ssl_config.unlock
-    basic_auth.unlock
+    auth.unlock
-  end
-