rhc 0.92.11 → 0.93.18

data/bin/rhc-chk

@@ -14,7 +14,6 @@ end
 require 'test/unit'
 require 'test/unit/ui/console/testrunner'
 
-
 #
 # print help
 #
@@ -64,7 +63,7 @@ if 0 != ARGV.length
 end
 
 # If provided a config path, check it
-check_cpath($opt)
+RHC::Config.check_cpath($opt)
 
 # Need to store the config information so tests can use it
 #  since they are technically new objects
@@ -168,8 +167,8 @@ module TestBase
     return response
   ensure
     $debuginfo['fetches'] ||= []
-    body = JSON.parse(response.body)
-    body['data'] = body['data'] && body['data'] != '' ? JSON.parse(body['data']) : ''
+    body = RHC::json_decode(response.body)
+    body['data'] = body['data'] && body['data'] != '' ? RHC::json_decode(body['data']) : ''
     $debuginfo['fetches'] << {url.to_s => {
       'body' => body,
       'header' => response.instance_variable_get(:@header)
@@ -243,7 +242,7 @@ class Test2_Authentication < Test::Unit::TestCase
 
     data = {'rhlogin' => $rhlogin}
     response = fetch_url_json("/broker/userinfo", data)
-    resp_json = JSON.parse(response.body)
+    resp_json = RHC::json_decode(response.body)
 
     case response.code.to_i
     when 404
@@ -256,7 +255,7 @@ class Test2_Authentication < Test::Unit::TestCase
       assert false, error_for(:_other_http, resp_json['result'])
     end
 
-    $user_info = JSON.parse(resp_json['data'].to_s)
+    $user_info = RHC::json_decode(resp_json['data'].to_s)
   end
 end
 
@@ -282,7 +281,7 @@ class Test3_SSH < Test::Unit::TestCase
     check_permissions(@libra_kfile, /[4-7]00/) # Needs to at least be readable by user and nobody else
 
     # Derive the public key from the private key
-    key_dump = `ssh-keygen -f #{@libra_kfile} -y`
+    key_dump = SSHKey.new(File.read(@libra_kfile)).ssh_public_key
     @@local_derived_ssh_pubkey = key_dump.to_s.strip.split(' ')[1]
 
     assert_not_nil @@local_derived_ssh_pubkey, error_for(:no_derive)

data/bin/rhc-create-app

@@ -4,7 +4,7 @@ require 'rhc-common'
 def p_usage(error_code = 255)
     libra_server = get_var('libra_server')
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
-    type_keys = RHC::get_cartridge_listing(nil, ', ', libra_server, @http, 'standalone', false)
+    type_keys = RHC::get_cartridge_listing(nil, ', ', libra_server, RHC::Config.default_proxy, 'standalone', false)
     puts <<USAGE
 
 Usage: #{$0}
@@ -60,7 +60,7 @@ end
 
 
 # If provided a config path, check it
-check_cpath(opt)
+RHC::Config.check_cpath(opt)
 
 # Pull in configs from files
 libra_server = get_var('libra_server')
@@ -106,7 +106,7 @@ if !password
   password = RHC::get_password
 end
 
-user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, false)
+user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, RHC::Config.default_proxy, false)
 app_info = user_info['app_info']
 
 if app_info[opt['app']]
@@ -212,8 +212,8 @@ unless opt['nogit']
 end
 
 if jenkins_app_name && !has_jenkins
-  jenkins_app = RHC::create_app(libra_server, @http, user_info, jenkins_app_name, 'jenkins-1.4', opt['rhlogin'], password, nil, false, true, true)
-  available = RHC::check_app_available(@http, jenkins_app[:app_name], jenkins_app[:fqdn], jenkins_app[:health_check_path], jenkins_app[:result], jenkins_app[:git_url], nil, true)
+  jenkins_app = RHC::create_app(libra_server, RHC::Config.default_proxy, user_info, jenkins_app_name, 'jenkins-1.4', opt['rhlogin'], password, nil, false, true, true)
+  available = RHC::check_app_available(RHC::Config.default_proxy, jenkins_app[:app_name], jenkins_app[:fqdn], jenkins_app[:health_check_path], jenkins_app[:result], jenkins_app[:git_url], nil, true)
   if !available
     puts "Unable to access your new Jenkins application."
     exit 1
@@ -223,7 +223,7 @@ end
 #
 # Create remote application space
 #
-main_app = RHC::create_app(libra_server, @http, user_info, opt['app'], opt['type'], opt['rhlogin'], password, opt['repo'], opt['no-dns'], opt['nogit'], false, gear_size, opt['scaling'])
+main_app = RHC::create_app(libra_server, RHC::Config.default_proxy, user_info, opt['app'], opt['type'], opt['rhlogin'], password, opt['repo'], opt['no-dns'], opt['nogit'], false, gear_size, opt['scaling'])
 
 if !main_app
   puts "Create app failed"
@@ -232,11 +232,11 @@ end
 
 if jenkins_app_name
   puts "Now embedding the jenkins client into '#{opt['app']}'..."
-  RHC::ctl_app(libra_server, @http, opt['app'], opt['rhlogin'], password, 'configure', true, 'jenkins-client-1.4', nil, false)
+  RHC::ctl_app(libra_server, RHC::Config.default_proxy, opt['app'], opt['rhlogin'], password, 'configure', true, 'jenkins-client-1.4', nil, false)
 end
 
 unless opt['no-dns']
-  available = RHC::check_app_available(@http, main_app[:app_name], main_app[:fqdn], main_app[:health_check_path], main_app[:result], main_app[:git_url], opt['repo'], opt['nogit'])
+  available = RHC::check_app_available(RHC::Config.default_proxy, main_app[:app_name], main_app[:fqdn], main_app[:health_check_path], main_app[:result], main_app[:git_url], opt['repo'], opt['nogit'])
   if !available
     puts "Unable to access your new application."
     exit 1

data/bin/rhc-create-domain

@@ -49,7 +49,7 @@ rescue Exception => e
 end
 
 # If provided a config path, check it
-check_cpath(opt)
+RHC::Config.check_cpath(opt)
 
 # Pull in configs from files
 libra_server = get_var('libra_server')
@@ -104,84 +104,6 @@ def add_rhlogin_config(rhlogin, uuid)
     f.close
 end
 
-#
-# Check / add new host to ~/.ssh/config
-#
-def add_ssh_config_host(rhc_domain, ssh_key_file_path, ssh_config, ssh_config_d)
-  
-  puts "Checking ~/.ssh/config"
-  ssh_key_file_name = File.basename(ssh_key_file_path)
-  if ssh_key_file_path =~ /^#{ENV['HOME']}/
-    ssh_key_file_path = ssh_key_file_path[ENV['HOME'].length..-1]
-    if ssh_key_file_path =~ /^\// || ssh_key_file_path =~ /^\\/
-      ssh_key_file_path = '~' + ssh_key_file_path
-    else
-      ssh_key_file_path = '~/' + ssh_key_file_path
-    end
-  end
-  if (ssh_key_file_name != 'id_rsa')
-    found = false
-
-    begin
-        File.open(ssh_config, "r") do |sline|
-            while(line = sline.gets)
-                if line.to_s.index("Host *.#{rhc_domain}") == 0
-                    found = true
-                    break
-                end
-            end
-        end
-    rescue Errno::EACCES
-        puts "Could not read from #{ssh_config}"
-        puts "Reason: " + $!
-        puts
-        puts "Please correct this first.  Then run rerun."
-        puts
-        exit 213
-    rescue Errno::ENOENT
-        puts "Could not find #{ssh_config}.  This is ok, continuing"
-    end
-    if found
-        puts "Found #{rhc_domain} in ~/.ssh/config... No need to adjust"
-    else
-        puts "    Adding #{rhc_domain} to ~/.ssh/config"
-        begin
-            f = File.open(ssh_config, "a")
-            f.puts <<SSH
-
-# Added by rhc-create-domain on #{`date`}
-Host *.#{rhc_domain}
-    IdentityFile #{ssh_key_file_path}
-    VerifyHostKeyDNS yes
-    StrictHostKeyChecking no
-    UserKnownHostsFile ~/.ssh/libra_known_hosts
-
-SSH
-            f.close
-        rescue Errno::EACCES
-            puts "Could not write to #{ssh_config}"
-            puts "Reason: " + $!
-            puts
-            puts "Please correct this first.  Then run rerun."
-            puts
-            exit 214
-        rescue Errno::ENOENT
-            # Make directory and config if they do not exist
-            puts "Could not find directory: " + $!
-            puts "creating"
-            FileUtils.mkdir_p ssh_config_d
-            file = File.open(ssh_config, 'w')
-            file.close
-            retry
-        end
-    end
-
-    File.chmod(0700, ssh_config_d)
-    File.chmod(0600, ssh_config)
-  end
-end
-
-
 #
 # Check to see if a ssh_key_file_path exists, if not create it.
 #
@@ -206,7 +128,7 @@ data = {'namespace' => opt['namespace'],
 if (opt['alter'])
   data[:alter] = true
   not_found_message = "A user with rhlogin '#{opt['rhlogin']}' does not have a registered domain.  Be sure to run rhc-create-domain without -a|--alter first."
-  user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, true, not_found_message)
+  user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, RHC::Config.default_proxy, true, not_found_message)
 end
 if debug
   data[:debug] = true
@@ -215,16 +137,14 @@ RHC::print_post_data(data)
 json_data = RHC::generate_json(data)
 
 url = URI.parse("https://#{libra_server}/broker/domain")
-response = RHC::http_post(@http, url, json_data, password)
+response = RHC::http_post(RHC::Config.default_proxy, url, json_data, password)
 
 if response.code == '200'
     begin
-        json_resp = JSON.parse(response.body)
+        json_resp = RHC::json_decode(response.body)
         RHC::print_response_success(json_resp)
-        json_rhlogininfo = JSON.parse(json_resp['data'])
+        json_rhlogininfo = RHC::json_decode(json_resp['data'])
         add_rhlogin_config(json_rhlogininfo['rhlogin'], json_rhlogininfo['uuid'])
-        add_ssh_config_host(json_rhlogininfo['rhc_domain'], ssh_key_file_path, ssh_config, ssh_config_d)
-    
         if opt['alter'] != ''
             puts <<EOF
 Creation successful
@@ -271,7 +191,7 @@ EOF
             puts ""
         end
         exit 0
-    rescue JSON::ParserError
+    rescue RHC::JsonError
         RHC::print_response_err(response)
     end
 else

data/bin/rhc-ctl-app

@@ -32,7 +32,7 @@ def p_embedded_list
     puts ""
     puts "List of supported embedded cartridges:"
     puts ""
-    type_keys = RHC::get_cartridge_listing(nil, ', ', libra_server, @http, 'embedded', false)
+    type_keys = RHC::get_cartridge_listing(nil, ', ', libra_server, RHC::Config.default_proxy, 'embedded', false)
     puts type_keys
     puts ""
     exit 255
@@ -63,7 +63,7 @@ rescue Exception => e
 end
 
 # If provided a config path, check it
-check_cpath(opt)
+RHC::Config.check_cpath(opt)
 
 # Pull in configs from files
 libra_server = get_var('libra_server')
@@ -165,4 +165,4 @@ else
     url = URI.parse("https://#{libra_server}/broker/cartridge")
 end
 
-RHC::ctl_app(libra_server, @http, opt['app'], opt['rhlogin'], password, action, opt['embed'], framework, opt['alias'])
+RHC::ctl_app(libra_server, RHC::Config.default_proxy, opt['app'], opt['rhlogin'], password, action, opt['embed'], framework, opt['alias'])

data/bin/rhc-ctl-domain

@@ -61,7 +61,7 @@ rescue Exception => e
 end
 
 # If provided a config path, check it
-check_cpath(opt)
+RHC::Config.check_cpath(opt)
 
 # Pull in configs from files
 libra_server = get_var('libra_server')
@@ -167,16 +167,16 @@ end
 RHC::print_post_data(data)
 json_data = RHC::generate_json(data)
 
-response = RHC::http_post(@http, url, json_data, password)
+response = RHC::http_post(RHC::Config.default_proxy, url, json_data, password)
 
 if response.code == '200'
   begin
-    json_resp = JSON.parse(response.body)
+    json_resp = RHC::json_decode(response.body)
     RHC::update_server_api_v(json_resp)
     RHC::print_response_success(json_resp)
     puts "Success"
     exit 0
-  rescue JSON::ParserError
+  rescue RHC::JsonError
     RHC::print_response_err(response)
   end
 else

data/bin/rhc-domain

@@ -43,20 +43,20 @@ end
 
 def validate_args(val_namespace=true, val_timeout=true)
   # If provided a config path, check it
-  check_cpath($opt)
-  
+  RHC::Config.check_cpath($opt)
+
   # Pull in configs from files
   $libra_server = get_var('libra_server')
   debug = get_var('debug') == 'false' ? nil : get_var('debug')
-  
+
   $opt['rhlogin'] = get_var('default_rhlogin') unless $opt['rhlogin']
   p_usage if !RHC::check_rhlogin($opt['rhlogin'])
-  
+
   p_usage if (val_namespace && !RHC::check_namespace($opt['namespace']))
 
   debug = $opt["debug"] ? true : false
   RHC::debug(debug)
-  
+
   RHC::timeout($opt["timeout"], get_var('timeout')) if val_timeout
   RHC::connect_timeout($opt["timeout"], get_var('timeout')) if val_timeout
 
@@ -65,10 +65,10 @@ end
 
 def create_or_alter_domain(alter=false)
   validate_args()
-  
+
   ssh_key_file_path = get_kfile(false)
   ssh_pub_key_file_path = get_kpfile(ssh_key_file_path, alter)
-  
+
   ssh_config = "#{ENV['HOME']}/.ssh/config"
   ssh_config_d = "#{ENV['HOME']}/.ssh/"
 
@@ -98,7 +98,7 @@ def create_or_alter_domain(alter=false)
   if alter
     data[:alter] = true
     not_found_message = "A user with rhlogin '#{$opt['rhlogin']}' does not have a registered domain.  Be sure to run 'rhc domain create' first."
-    user_info = RHC::get_user_info($libra_server, $opt['rhlogin'], $password, @http, true, not_found_message)
+    user_info = RHC::get_user_info($libra_server, $opt['rhlogin'], $password, RHC::Config.default_proxy, true, not_found_message)
   end
   if @mydebug
     data[:debug] = true
@@ -107,16 +107,14 @@ def create_or_alter_domain(alter=false)
   json_data = RHC::generate_json(data)
   
   url = URI.parse("https://#{$libra_server}/broker/domain")
-  response = RHC::http_post(@http, url, json_data, $password)
+  response = RHC::http_post(RHC::Config.default_proxy, url, json_data, $password)
   
   if response.code == '200'
       begin
-          json_resp = JSON.parse(response.body)
+          json_resp = RHC::json_decode(response.body)
           RHC::print_response_success(json_resp)
-          json_rhlogininfo = JSON.parse(json_resp['data'])
+          json_rhlogininfo = RHC::json_decode(json_resp['data'])
           add_rhlogin_config(json_rhlogininfo['rhlogin'], json_rhlogininfo['uuid'])
-          add_ssh_config_host(json_rhlogininfo['rhc_domain'], ssh_key_file_path, ssh_config, ssh_config_d)
-      
           if !alter
                         puts <<EOF
 Creation successful
@@ -163,7 +161,7 @@ EOF
               puts ""
           end
           exit 0
-      rescue JSON::ParserError
+      rescue RHC::JsonError
           RHC::print_response_err(response)
       end
   else
@@ -184,16 +182,16 @@ def destroy_domain()
   RHC::print_post_data(data)
   json_data = RHC::generate_json(data)
   
-  response = RHC::http_post(@http, url, json_data, $password)
+  response = RHC::http_post(RHC::Config.default_proxy, url, json_data, $password)
   
   if response.code == '200'
     begin
-      json_resp = JSON.parse(response.body)
+      json_resp = RHC::json_decode(response.body)
       RHC::update_server_api_v(json_resp)
       RHC::print_response_success(json_resp)
       puts "Success"
       exit 0
-    rescue JSON::ParserError
+    rescue RHC::JsonError
       RHC::print_response_err(response)
     end
   else
@@ -206,7 +204,7 @@ end
 def show_domain_info()
   validate_args(false, true)
   
-  user_info = RHC::get_user_info($libra_server, $opt['rhlogin'], $password, @http, true)
+  user_info = RHC::get_user_info($libra_server, $opt['rhlogin'], $password, RHC::Config.default_proxy, true)
   
   domains = user_info['user_info']['domains']
   num_domains = domains.length

data/bin/rhc-domain-info

@@ -45,7 +45,7 @@ rescue Exception => e
 end
 
 # If provided a config path, check it
-check_cpath(opt)
+RHC::Config.check_cpath(opt)
 
 # Pull in configs from files
 libra_server = get_var('libra_server')
@@ -74,10 +74,10 @@ if !password
 end
 
 opt['apps'] = true if not opt['info'] and not opt['apps']
-user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, true)
+user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, RHC::Config.default_proxy, true)
 
 if opt['info']
-    ssh_keys = RHC::get_ssh_keys(libra_server, opt['rhlogin'], password, @http)
+    ssh_keys = RHC::get_ssh_keys(libra_server, opt['rhlogin'], password, RHC::Config.default_proxy)
 
     domains = user_info['user_info']['domains']
     num_domains = domains.length

data/bin/rhc-port-forward

@@ -43,7 +43,7 @@ rescue Exception => e
 end
 
 # If provided a config path, check it
-check_cpath(opt)
+RHC::Config.check_cpath(opt)
 
 # Pull in configs from files
 libra_server = get_var('libra_server')
@@ -71,7 +71,7 @@ if !password
   password = RHC::get_password
 end
 
-user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, false)
+user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, RHC::Config.default_proxy, false)
 
 app_name = opt['app']
 
@@ -83,41 +83,144 @@ unless user_info['app_info'][app_name]
     exit 101
 end
 
+
+# mock for windows
+if defined?(UNIXServer) != 'constant' or UNIXServer.class != Class
+  class UNIXServer; end 
+end
+
 app_uuid = user_info['app_info'][app_name]['uuid']
 namespace = user_info['user_info']['domains'][0]['namespace']
 rhc_domain = user_info['user_info']['rhc_domain']
+ssh_host = "#{app_name}-#{namespace}.#{rhc_domain}"
 
 puts "Checking available ports..."
 
-hosts_and_ports, hosts_and_ports_descriptions = RHC::list_ports(rhc_domain, namespace, app_name, app_uuid, debug)
+ip_and_port_simple_regex = /[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\:[0-9]{1,5}/
 
-if hosts_and_ports.length == 0
-  puts
-  puts "No available ports to forward"
-  exit 102
-end
+hosts_and_ports = []
+hosts_and_ports_descriptions = []
+scaled_uuids = []
 
-puts
+puts "Using #{app_uuid}@#{ssh_host}..." if debug
 
-hosts_and_ports_descriptions.each { |description| puts "Binding #{description}..." }
+Net::SSH.start(ssh_host, app_uuid) do |ssh|
 
-ssh_cmd = "ssh -N "
-hosts_and_ports.each { |port| ssh_cmd << "-L #{port}:#{port} " }
-ssh_cmd << "#{app_uuid}@#{app_name}-#{namespace}.#{rhc_domain}"
+  ssh.exec! "rhc-list-ports" do |channel, stream, data|
 
-puts ssh_cmd if debug
-puts
-puts "Use ctl + c to stop"
+    # data comes from a linux server so it is a one-line string for windows, we need to split \n manually
+    if RHC::Helpers.windows? 
+      data = data.split /\n/
+    end
+
+    if stream == :stderr
+
+      data.each { |line|
+        line = line.chomp
+
+        if line.downcase =~ /permission denied/
+          puts line
+          exit 1
+        end
+        
+        if line.index(ip_and_port_simple_regex)
+          hosts_and_ports_descriptions << line
+        end
+      }
+
+    else
+
+      data.each { |line|
+        line = line.chomp
+
+        if line.downcase =~ /scale/
+          scaled_uuid = line[5..-1]
+          scaled_uuids << scaled_uuid
+
+        else
+          if ip_and_port_simple_regex.match(line)
+            hosts_and_ports << line
+          end
+        end
+      }
+
+    end
+
+  end
+
+  scaled_uuids.each { |scaled_uuid|
+    
+    puts "Using #{scaled_uuid}@#{ssh_host} (scaled instance)..." if debug
+
+    Net::SSH.start(ssh_host, scaled_uuid) do |ssh|
+
+      ssh.exec! "rhc-list-ports" do |channel, stream, data|
+        # data comes from a linux server so it is a one-line string for windows, we need to split \n manually
+        if RHC::Helpers.windows?
+          data = data.split /\n/
+        end
+        if stream == :stderr
+          data.each { |line|
+            line = line.chomp
+            if line.downcase =~ /permission denied/
+              puts line
+              exit 1
+            end
+            if line.index(ip_and_port_simple_regex)
+              hosts_and_ports_descriptions << line
+            end
+          }
+        else
+          data.each { |line|
+            line = line.chomp
+            if ip_and_port_simple_regex.match(line)
+              hosts_and_ports << line
+            end
+          }
+        end
+      end
+    end
+  }
+
+  if hosts_and_ports.length == 0
+    puts
+    puts "No available ports to forward"
+    exit 102
+  end
 
-begin
-  exec ssh_cmd
-rescue SystemCallError
-  puts
-  puts "Error trying to forward ports.  You can try to forward manually by running:"
-  puts
-  puts ssh_cmd
   puts
-  exit 1
+
+  hosts_and_ports_descriptions.each { |description| puts "Binding #{description}..." }
+
+  begin
+
+    Net::SSH.start(ssh_host, app_uuid) do |ssh|
+      puts "Use ctl + c to stop"
+      hosts_and_ports.each do |host_and_port|
+        host, port = host_and_port.split(/:/)
+        ssh.forward.local(host, port.to_i, host, port.to_i)
+      end
+      ssh.loop { true }
+    end
+  
+  rescue Interrupt
+    puts
+    puts "Terminating..."
+    exit 0
+    
+  rescue Exception => e
+    puts
+    puts e.message if debug
+    puts "Error trying to forward ports. You can try to forward manually by running:"
+    ssh_cmd = "ssh -N "
+    hosts_and_ports.each { |port| ssh_cmd << "-L #{port}:#{port} " }
+    ssh_cmd << "#{app_uuid}@#{app_name}-#{namespace}.#{rhc_domain}"
+    puts
+    puts ssh_cmd
+    puts
+    exit 1
+  end
+
 end
 
 # never