Merge branch 'bug-847'

This commit is contained in:
Ruben S. Montero committed 2011-10-28 16:57:46 +02:00
commit fadb85bc29
3 files changed
+10 -4

No files matched your search

+4
View File
@@ -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)
+4 -2
View File
@@ -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
+2 -2
View File
@@ -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)