shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Fix server_cipher client for Ruby 2.4 (crypt token must be 32bytes)

Browse Source
This commit is contained in:
Ruben S. Montero 2017-02-21 16:57:24 +01:00
parent ba40cffd61
commit 27956d9891
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/authm_mad/remotes/server_cipher/server_cipher_auth.rb
View File

@ -39,12 +39,13 @@ class OpenNebula::ServerCipherAuth
@srv_passwd = srv_passwd
if !srv_passwd.empty?
@key = Digest::SHA1.hexdigest(@srv_passwd)
# truncate token to 32-bytes for Ruby >= 2.4
@key = Digest::SHA1.hexdigest(@srv_passwd)[0..31]
else
@key = ""
end
@cipher = OpenSSL::Cipher::Cipher.new(CIPHER)
@cipher = OpenSSL::Cipher.new(CIPHER)
end
###########################################################################
@ -109,7 +110,8 @@ class OpenNebula::ServerCipherAuth
# auth method for auth_mad
def authenticate(srv_user,srv_pass, signed_text)
begin
@key = srv_pass
# truncate token to 32-bytes for Ruby >= 2.4
@key = srv_pass[0..31]
s_user, t_user, expires = decrypt(signed_text).split(':')