#208 fix deploying REST stuff with digest authentication

deploy/lib/MLClient.rb

@@ -72,7 +72,10 @@ def build_request_params(url, verb)
     }
   end
 
-  def go(url, verb, headers = {}, params = nil, body = nil)
+  # Parameters:
+  # - auth_method: this can be used to specify whether to use digest or basic authentication to respond to a 401
+  #   The default behavior is to digest.
+  def go(url, verb, headers = {}, params = nil, body = nil, auth_method = nil)
     password_prompt
     request_params = build_request_params(url, verb)
     # configure headers
@@ -90,6 +93,10 @@ def go(url, verb, headers = {}, params = nil, body = nil)
       request_params[:request].body = body
     end
 
+    if (auth_method)
+      request_params[:auth_method] = auth_method
+    end
+
     response = get_http.request request_params
     response.value
     response

deploy/lib/RoxyHttp.rb

@@ -23,6 +23,7 @@
 require "net/https"
 require "uri"
 require 'digest/md5'
+require 'base64'
 require 'logger'
 
 module Net
@@ -70,6 +71,12 @@ def digest_auth(user, password, response)
 
       @header['Authorization'] = header
     end
+
+    def basic_auth(user, password)
+      encoded = Base64.encode64("#{user}:#{password}").chomp
+
+      @header['Authorization'] = ["Basic #{encoded}"]
+    end
   end
 end
 
@@ -366,9 +373,13 @@ def request(request_params, &block)
           setup_streaming(request)
 
           response = @http.request(request, &block)
+
           if (response.code.to_i == 401)
-            # TODO: looks like we get this every time. Why not just use digest the first time?
-            request.digest_auth(@user_name, @password, response)
+            if request_params[:auth_method] == "basic"
+              request.basic_auth(@user_name, @password)
+            else
+              request.digest_auth(@user_name, @password, response)
+            end
             response = @http.request(request, &block)
             if (response.code.to_i == 302)
               @logger.debug("request redirected: #{response['location']}")

deploy/lib/ml_rest.rb

@@ -7,6 +7,7 @@ def initialize(options)
       if !@port or @port == ""
         @port = options[:app_port]
       end
+      @auth_method = options[:auth_method]
       @http = Roxy::Http.new({
         :logger => @logger
       })
@@ -47,7 +48,7 @@ def install_properties(path)
           url = "http://#{@hostname}:#{@port}/v1/config/properties"
 
           @logger.debug "url: #{url}"
-          r = go url, "put", headers, nil, contents
+          r = go url, "put", headers, nil, contents, @auth_method
           if (r.code.to_i < 200 && r.code.to_i > 206)
             @logger.error("code: #{r.code.to_i} body:#{r.body}")
           end
@@ -105,7 +106,7 @@ def install_extensions(path)
           @logger.debug "loading: #{d}"
 
           @logger.debug "url: #{url}"
-          r = go url, "put", headers, nil, contents
+          r = go url, "put", headers, nil, contents, @auth_method
           if (r.code.to_i < 200 && r.code.to_i > 206)
             @logger.error("code: #{r.code.to_i} body:#{r.body}")
           end
@@ -195,7 +196,7 @@ def install_transforms(path)
           @logger.debug "loading: #{d}"
 
           @logger.debug "url: #{url}"
-          r = go url, "put", headers, nil, contents
+          r = go url, "put", headers, nil, contents, @auth_method
           if (r.code.to_i < 200 && r.code.to_i > 206)
             @logger.error("code: #{r.code.to_i} body:#{r.body}")
           end

deploy/lib/server_config.rb

@@ -1047,7 +1047,8 @@ def mlRest
         :server => @hostname,
         :app_port => @properties["ml.app-port"],
         :rest_port => @properties["ml.rest-port"],
-        :logger => @logger
+        :logger => @logger,
+        :auth_method => @properties["ml.authentication-method"]
       })
     else
       @mlRest