Fix SSO errors in agent/server mode (#38)

* Handle include LoadError
* Fix "undefined method `empty?' for #<URI::HTTP:>"

Author: antoineco

lib/puppet/parser/functions/oracle_sso.rb

@@ -1,13 +1,17 @@
 module Puppet::Parser::Functions
-  require 'puppet_x/util.rb'
+  begin
+    require 'puppet_x/aco/util'
+  rescue LoadError
+    mod = Puppet::Module.find('oracle_java', Puppet[:environment].to_s)
+    require File.join mod.path, 'lib/puppet_x/aco/util'
+  end
 
   newfunction(:oracle_sso, :type => :rvalue) do |args|
     fileuri = args[0]
     ssousername = args[1]
     password = args[2]
 
     cookies = ['oraclelicense=accept-securebackup-cookie']
-    auth_required = false
 
     #
     # Step 1: try unauthenticated download from given URI
@@ -16,19 +20,18 @@ module Puppet::Parser::Functions
     #
 
     begin
-      response, _ = PuppetX::Util.request(fileuri, 'HEAD', cookies)
-      if response.uri.host == 'login.oracle.com'
+      uri, _, _ = PuppetX::Aco::Util.request(fileuri, 'HEAD', cookies)
+      if uri.host == 'login.oracle.com'
         debug("Authentication required for #{fileuri}")
-      elsif response.uri.request_uri.include?('AuthParam=')
+      elsif uri.query.include?('AuthParam=')
         debug("Authentication not required for #{fileuri}")
-        return response.uri.to_s
+        return uri.to_s
       else
         raise "Unknown failure while fetching #{fileuri}"
       end
     rescue Net::HTTPServerException => e
       debug("File not found at #{fileuri}")
       debug('Trying authenticated download...')
-      auth_required = true
       fileuri = fileuri.gsub!('otn-pub', 'otn')
     end
 
@@ -40,7 +43,7 @@ module Puppet::Parser::Functions
 
     # retrieve SSO form and read OAM_REQ parameter value
     debug('Retrieving Oracle.com SSO form.')
-    response, cookies = PuppetX::Util.request(fileuri, 'GET', cookies)
+    _, response, cookies = PuppetX::Aco::Util.request(fileuri, 'GET', cookies)
     matchdata = /name="OAM_REQ" value="(.+?)"/.match(response.body)
     if matchdata and !matchdata.captures.nil?
       oamreq = matchdata[1]
@@ -54,7 +57,7 @@ module Puppet::Parser::Functions
     ssouri = URI('https://login.oracle.com/oam/server/sso/auth_cred_submit')
     cookies.push('s_cc=true')
 
-    request = Net::HTTP::Post.new(ssouri, {'user-agent' => 'Mozilla/5.0 (Puppet)', 'cookie' => cookies.join('; ')})
+    request = Net::HTTP::Post.new(ssouri.request_uri, {'user-agent' => 'Mozilla/5.0 (Puppet)', 'cookie' => cookies.join('; ')})
     request.set_form_data('ssousername' => ssousername, 'password' => password)
     request.body += "&OAM_REQ=#{oamreq}"
 
@@ -79,9 +82,9 @@ module Puppet::Parser::Functions
     #
 
     begin
-      response, _ = PuppetX::Util.request(location, 'HEAD', cookies)
-      if response.uri.request_uri.include?('AuthParam=')
-        return response.uri.to_s
+      uri, _, _ = PuppetX::Aco::Util.request(location, 'HEAD', cookies)
+      if uri.query.include?('AuthParam=')
+        return uri.to_s
       else
         raise "Unknown failure while fetching #{fileuri}"
       end

lib/puppet_x/aco/util.rb

@@ -0,0 +1,45 @@
+module PuppetX
+  module Aco
+    module Util
+
+      require 'net/http'
+
+      def self.request(uri_str, method = nil, cookies = [], limit = 10)
+        raise ArgumentError, 'too many HTTP redirects' if limit == 0
+
+        uri = URI(uri_str)
+
+        case method
+        when 'POST' then
+        reqmethod = Net::HTTP::Post
+        when 'HEAD' then
+        reqmethod = Net::HTTP::Head
+        else
+        reqmethod = Net::HTTP::Get
+        end
+
+        request = reqmethod.new(uri.request_uri, {'user-agent' => 'Mozilla/5.0 (Puppet)', 'cookie' => cookies.join('; ')})
+        response = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+          http.request(request)
+        end
+
+        # cache cookies for subsequent requests
+        response_cookies = response.get_fields('set-cookie')
+        if !response_cookies.nil?
+          response_cookies.each { |c| cookies.push(c.split('; ')[0]) }
+        end
+
+        case response
+        when Net::HTTPSuccess then
+          return uri, response, cookies
+        when Net::HTTPRedirection then
+          location = response['location']
+          request(location, method = method, cookies, limit - 1)
+        else
+          return response.value, nil
+        end
+      end
+
+    end
+  end
+end