feature #1700: change oneuser to work with auth changes

This commit is contained in:
Javi Fontan committed 2012-12-20 08:12:57 -06:00
1 parent 08f8d96505
commit 7196c34de8
1 file changed
+10 -10
+10 -10
View File
@@ -60,10 +60,10 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
return -1, "You have to specify the --key option"
end
require 'ssh_auth'
require 'opennebula/ssh_auth'
begin
auth = SshAuth.new(:private_key=>options[:key])
auth = OpenNebula::SshAuth.new(:private_key=>options[:key])
rescue Exception => e
return -1, e.message
end
@@ -74,11 +74,11 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
return -1, "You have to specify the --cert option"
end
require 'x509_auth'
require 'opennebula/x509_auth'
begin
cert = [File.read(options[:cert])]
auth = X509Auth.new(:certs_pem=>cert)
auth = OpenNebula::X509Auth.new(:certs_pem=>cert)
rescue Exception => e
return -1, e.message
end
@@ -92,17 +92,17 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
def self.login(username, options)
case options[:driver]
when OpenNebula::User::SSH_AUTH
require 'ssh_auth'
require 'opennebula/ssh_auth'
options[:key] ||= ENV['HOME']+'/.ssh/id_rsa'
begin
auth = SshAuth.new(:private_key=>options[:key])
auth = OpenNebula::SshAuth.new(:private_key=>options[:key])
rescue Exception => e
return -1, e.message
end
when OpenNebula::User::X509_AUTH
require 'x509_auth'
require 'opennebula/x509_auth'
options[:cert] ||= ENV['X509_USER_CERT']
options[:key] ||= ENV['X509_USER_KEY']
@@ -111,12 +111,12 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
certs = [File.read(options[:cert])]
key = File.read(options[:key])
auth = X509Auth.new(:certs_pem=>certs, :key_pem=>key)
auth = OpenNebula::X509Auth.new(:certs_pem=>certs, :key_pem=>key)
rescue Exception => e
return -1, e.message
end
when OpenNebula::User::X509_PROXY_AUTH
require 'x509_auth'
require 'opennebula/x509_auth'
options[:proxy] ||= ENV['X509_PROXY_CERT']
@@ -129,7 +129,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
rc = proxy.match(/(-+BEGIN RSA PRIVATE KEY-+\n[^-]*\n-+END RSA PRIVATE KEY-+)/)
key= rc[1]
auth = X509Auth.new(:certs_pem=>certs, :key_pem=>key)
auth = OpenNebula::X509Auth.new(:certs_pem=>certs, :key_pem=>key)
rescue => e
return -1, e.message
end