From 26e313a1544dff2eaf83bde0551db88614415937 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 28 Oct 2011 15:10:00 +0200 Subject: [PATCH 1/2] bug #847: Delete spaces from password, if x509 driver --- src/cli/one_helper/oneuser_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index e2c052441d..48b87abead 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -40,6 +40,10 @@ class OneUserHelper < OpenNebulaHelper::OneHelper password = arg end + if options[:driver] == OpenNebula::User::X509_AUTH + password.delete!("\s") + end + if options[:sha1] require 'digest/sha1' password = Digest::SHA1.hexdigest(password) From f9f20fc9a9de892c5e8510ae0033602ef93a51b6 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 28 Oct 2011 16:00:41 +0200 Subject: [PATCH 2/2] bug #847: Fix EC2 signature version 1 --- src/cloud/common/CloudAuth/EC2CloudAuth.rb | 6 ++++-- src/cloud/ec2/lib/econe-server.rb | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cloud/common/CloudAuth/EC2CloudAuth.rb b/src/cloud/common/CloudAuth/EC2CloudAuth.rb index 32b021e39e..e60f653648 100644 --- a/src/cloud/common/CloudAuth/EC2CloudAuth.rb +++ b/src/cloud/common/CloudAuth/EC2CloudAuth.rb @@ -42,6 +42,8 @@ module EC2CloudAuth # Calculates signature version 1 def signature_v1(params, secret_key, digest='sha1') params.delete('Signature') + params.delete('econe_host') + params.delete('econe_port') req_desc = params.sort {|x,y| x[0].downcase <=> y[0].downcase}.to_s digest_generator = OpenSSL::Digest::Digest.new(digest) @@ -55,8 +57,8 @@ module EC2CloudAuth params.delete('Signature') params.delete('file') - server_host = params.delete(:econe_host) - server_port = params.delete(:econe_port) + server_host = params.delete('econe_host') + server_port = params.delete('econe_port') if include_port server_str = "#{server_host}:#{server_port}" else diff --git a/src/cloud/ec2/lib/econe-server.rb b/src/cloud/ec2/lib/econe-server.rb index 6337c228e4..a7013d2902 100644 --- a/src/cloud/ec2/lib/econe-server.rb +++ b/src/cloud/ec2/lib/econe-server.rb @@ -102,8 +102,8 @@ set :econe_port, econe_port before do begin - params[:econe_host] = settings.econe_host - params[:econe_port] = settings.econe_port + params['econe_host'] = settings.econe_host + params['econe_port'] = settings.econe_port username = settings.cloud_auth.auth(request.env, params) rescue Exception => e error 500, error_xml("AuthFailure", 0)