From ea51d0b9b90bdf05fa1875d39b3eaeb4c1ec41f4 Mon Sep 17 00:00:00 2001 From: Ted Date: Fri, 26 Aug 2011 11:25:39 -0500 Subject: [PATCH] Remove validate call, as admin-installed host certs are assumed trustworthy. (cherry picked from commit 6904317c68da51aa3df3be9ee98aa8a8478fc59d) --- src/authm_mad/remotes/server/server_auth.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/authm_mad/remotes/server/server_auth.rb b/src/authm_mad/remotes/server/server_auth.rb index 441d2905e9..5fccf4eda5 100644 --- a/src/authm_mad/remotes/server/server_auth.rb +++ b/src/authm_mad/remotes/server/server_auth.rb @@ -75,7 +75,7 @@ class ServerAuth < X509Auth token_txt = "#{user}:#{user_pass}:#{expires}" token = encrypt(token_txt) - token64 = Base64::encode64(token).strip.delete("\n") + token64 = Base64::encode64(token).strip.delete("\n") login_out = "#{user}:server:#{token64}" @@ -88,20 +88,18 @@ class ServerAuth < X509Auth # auth method for auth_mad def authenticate(user, pass, signed_text) begin - # Decryption demonstrates that the user posessed the private key. + # Decryption demonstrates that the user posessed the private key. _user, user_pass, expires = decrypt(signed_text).split(':') return "User name missmatch" if user != _user return "login token expired" if Time.now.to_i >= expires.to_i - # Check an explicitly-specified DN such as for a host-signed login + # Check that the signed password matches one for the user. if !pass.split('|').include?(user_pass) - return "User password missmatch" + return "User password missmatch" end - validate - return true rescue => e return e.message