diff options
author | ja-frog <31773963+ja-frog@users.noreply.github.com> | 2018-05-05 20:29:17 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-05 20:29:17 -0500 |
commit | 8ed00a428fd173a3766a4c17e88adb3899e25380 (patch) | |
tree | ac38592f4b3edf888bf162a862f5b968f92fd366 /lib | |
parent | 72a4fb26446f74903e69b75a69c45d58500d6d19 (diff) | |
parent | 0fa29774f677fbfba532703d1947fcf018ef3705 (diff) |
Merge pull request #1 from wk/pr-1266
refactor login in ssh.rb
Diffstat (limited to 'lib')
-rw-r--r-- | lib/oxidized/input/ssh.rb | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb index d84b349..4b4d87c 100644 --- a/lib/oxidized/input/ssh.rb +++ b/lib/oxidized/input/ssh.rb @@ -117,19 +117,13 @@ module Oxidized # some models have SSH auth or terminal auth based on version of code # if SSH is configured for terminal auth, we'll still try to detect prompt def login - if @username - match = expect username, @node.prompt - if match == username - cmd @node.auth[:username], password - cmd @node.auth[:password] - end - elsif @password - match = expect password, @node.prompt - if match == password - cmd @node.auth[:password] - end - else - expect @node.prompt + match_re = [ @node.prompt ] + match_re << @username if @username + match_re << @password if @password + until (match=expect(match_re)) == @node.prompt + cmd(@node.auth[:username], nil) if match == @username + cmd(@node.auth[:password], nil) if match == @password + match_re.delete match end end |