diff --git a/modules/auxiliary/scanner/ssh/fortinet_backdoor.rb b/modules/auxiliary/scanner/ssh/fortinet_backdoor.rb index 797f299efc66..1ab5c7d0f563 100644 --- a/modules/auxiliary/scanner/ssh/fortinet_backdoor.rb +++ b/modules/auxiliary/scanner/ssh/fortinet_backdoor.rb @@ -48,15 +48,15 @@ def run_host(ip) factory = ssh_socket_factory ssh_opts = { - :port => rport, + port: rport, # The auth method is converted into a class name for instantiation, # so fortinet-backdoor here becomes FortinetBackdoor from the mixin - :auth_methods => ['fortinet-backdoor'], - :non_interactive => true, - :config => false, - :use_agent => false, - :proxy => factory, - :verify_host_key => :never + auth_methods: ['fortinet-backdoor'], + non_interactive: true, + config: false, + use_agent: false, + verify_host_key: :never, + proxy: factory } ssh_opts.merge!(verbose: :debug) if datastore['SSH_DEBUG'] diff --git a/modules/auxiliary/scanner/ssh/ssh_enumusers.rb b/modules/auxiliary/scanner/ssh/ssh_enumusers.rb index b7cd1a95dae5..6bfdbabc2a0a 100644 --- a/modules/auxiliary/scanner/ssh/ssh_enumusers.rb +++ b/modules/auxiliary/scanner/ssh/ssh_enumusers.rb @@ -80,12 +80,12 @@ def check_user(ip, user, port) pass = Rex::Text.rand_text_alphanumeric(64_000) factory = ssh_socket_factory opt_hash = { - :auth_methods => ['password', 'keyboard-interactive'], - :port => port, - :use_agent => false, - :password => pass, - :config => false, - :proxy => factory, + :auth_methods => ['password', 'keyboard-interactive'], + :port => port, + :use_agent => false, + :password => pass, + :config => false, + :proxy => factory, :non_interactive => true, :verify_host_key => :never } diff --git a/modules/exploits/linux/ssh/ceragon_fibeair_known_privkey.rb b/modules/exploits/linux/ssh/ceragon_fibeair_known_privkey.rb index aef937ea99c1..9e35f8c97408 100644 --- a/modules/exploits/linux/ssh/ceragon_fibeair_known_privkey.rb +++ b/modules/exploits/linux/ssh/ceragon_fibeair_known_privkey.rb @@ -74,14 +74,14 @@ def rport def do_login(user) factory = Rex::Socket::SSHFactory.new(framework,self, datastore['Proxies']) opt_hash = { - :auth_methods => ['publickey'], - :port => rport, - :key_data => [ key_data ], - :use_agent => false, - :config => false, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['publickey'], + :port => rport, + :key_data => [ key_data ], + :use_agent => false, + :config => false, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } opt_hash.merge!(:verbose => :debug) if datastore['SSH_DEBUG'] begin diff --git a/modules/exploits/linux/ssh/exagrid_known_privkey.rb b/modules/exploits/linux/ssh/exagrid_known_privkey.rb index c48f9c5a3c64..95ecea370f70 100644 --- a/modules/exploits/linux/ssh/exagrid_known_privkey.rb +++ b/modules/exploits/linux/ssh/exagrid_known_privkey.rb @@ -118,14 +118,14 @@ def exploit factory = ssh_socket_factory ssh_options = { - :auth_methods => ['publickey'], - :config => false, - :use_agent => false, - :key_data => [ key_data ], - :port => rport, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['publickey'], + :config => false, + :use_agent => false, + :key_data => [ key_data ], + :port => rport, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } ssh_options.merge!(verbose: :debug) if datastore['SSH_DEBUG'] diff --git a/modules/exploits/linux/ssh/f5_bigip_known_privkey.rb b/modules/exploits/linux/ssh/f5_bigip_known_privkey.rb index f93995af4dac..c740744f7d27 100644 --- a/modules/exploits/linux/ssh/f5_bigip_known_privkey.rb +++ b/modules/exploits/linux/ssh/f5_bigip_known_privkey.rb @@ -77,14 +77,14 @@ def do_login(user) factory = Rex::Socket::SSHFactory.new(framework, self, datastore['Proxies']) opt_hash = { - :auth_methods => ['publickey'], - :port => rport, - :key_data => [ key_data ], - :use_agent => false, - :config => false, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['publickey'], + :port => rport, + :key_data => [ key_data ], + :use_agent => false, + :config => false, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } opt_hash[:verbose] = :debug if datastore['SSH_DEBUG'] diff --git a/modules/exploits/linux/ssh/mercurial_ssh_exec.rb b/modules/exploits/linux/ssh/mercurial_ssh_exec.rb index 552ee1cc8e9f..31801762f9a6 100644 --- a/modules/exploits/linux/ssh/mercurial_ssh_exec.rb +++ b/modules/exploits/linux/ssh/mercurial_ssh_exec.rb @@ -74,14 +74,14 @@ def ssh_priv_key def exploit factory = ssh_socket_factory ssh_options = { - :auth_methods => ['publickey'], - :config => false, - :use_agent => false, - :key_data => [ ssh_priv_key ], - :port => rport, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['publickey'], + :config => false, + :use_agent => false, + :key_data => [ ssh_priv_key ], + :port => rport, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } ssh_options.merge!(:verbose => :debug) if datastore['SSH_DEBUG'] diff --git a/modules/exploits/linux/ssh/quantum_dxi_known_privkey.rb b/modules/exploits/linux/ssh/quantum_dxi_known_privkey.rb index c934a8c06f6a..6890b8584027 100644 --- a/modules/exploits/linux/ssh/quantum_dxi_known_privkey.rb +++ b/modules/exploits/linux/ssh/quantum_dxi_known_privkey.rb @@ -70,14 +70,14 @@ def rport def do_login(user) factory = ssh_socket_factory opt_hash = { - :auth_methods => ['publickey'], - :port => rport, - :key_data => [ key_data ], - :use_agent => false, - :config => false, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['publickey'], + :port => rport, + :key_data => [ key_data ], + :use_agent => false, + :config => false, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } opt_hash.merge!(:verbose => :debug) if datastore['SSH_DEBUG'] begin diff --git a/modules/exploits/linux/ssh/quantum_vmpro_backdoor.rb b/modules/exploits/linux/ssh/quantum_vmpro_backdoor.rb index 977c3bbd6ef4..97475cc83ca4 100644 --- a/modules/exploits/linux/ssh/quantum_vmpro_backdoor.rb +++ b/modules/exploits/linux/ssh/quantum_vmpro_backdoor.rb @@ -82,14 +82,14 @@ def rport def do_login(user, pass) factory = ssh_socket_factory opts = { - :auth_methods => ['password', 'keyboard-interactive'], - :port => rport, - :use_agent => false, - :config => true, - :password => pass, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['password', 'keyboard-interactive'], + :port => rport, + :use_agent => false, + :config => true, + :password => pass, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } opts.merge!(:verbose => :debug) if datastore['SSH_DEBUG'] diff --git a/modules/exploits/linux/ssh/solarwinds_lem_exec.rb b/modules/exploits/linux/ssh/solarwinds_lem_exec.rb index 346dc5176f11..4ddb30742fdb 100644 --- a/modules/exploits/linux/ssh/solarwinds_lem_exec.rb +++ b/modules/exploits/linux/ssh/solarwinds_lem_exec.rb @@ -75,14 +75,14 @@ def password def exploit factory = ssh_socket_factory opts = { - :auth_methods => ['keyboard-interactive'], - :port => rport, - :use_agent => false, - :config => false, - :password => password, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['keyboard-interactive'], + :port => rport, + :use_agent => false, + :config => false, + :password => password, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } opts.merge!(:verbose => :debug) if datastore['SSH_DEBUG'] diff --git a/modules/exploits/linux/ssh/symantec_smg_ssh.rb b/modules/exploits/linux/ssh/symantec_smg_ssh.rb index b347714e1db0..85860eeca4b5 100644 --- a/modules/exploits/linux/ssh/symantec_smg_ssh.rb +++ b/modules/exploits/linux/ssh/symantec_smg_ssh.rb @@ -86,14 +86,14 @@ def rport def do_login(user, pass) factory = ssh_socket_factory opts = { - :auth_methods => ['password', 'keyboard-interactive'], - :port => rport, - :use_agent => false, - :config => false, - :password => pass, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['password', 'keyboard-interactive'], + :port => rport, + :use_agent => false, + :config => false, + :password => pass, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } opts.merge!(:verbose => :debug) if datastore['SSH_DEBUG'] diff --git a/modules/exploits/linux/ssh/ubiquiti_airos_file_upload.rb b/modules/exploits/linux/ssh/ubiquiti_airos_file_upload.rb index 7d8136bf8a81..647903c60dcc 100644 --- a/modules/exploits/linux/ssh/ubiquiti_airos_file_upload.rb +++ b/modules/exploits/linux/ssh/ubiquiti_airos_file_upload.rb @@ -124,14 +124,14 @@ def ssh_login factory = ssh_socket_factory ssh_opts = { - :port => datastore['SSH_PORT'], - :auth_methods => %w{publickey password}, - :key_data => [private_key], - :non_interactive => true, - :config => false, - :use_agent => false, - :proxy => factory, - :verify_host_key => :never + port: datastore['SSH_PORT'], + auth_methods: %w{publickey password}, + key_data: [private_key], + non_interactive: true, + config: false, + use_agent: false, + verify_host_key: :never, + proxy: factory } ssh_opts.merge!(verbose: :debug) if datastore['SSH_DEBUG'] diff --git a/modules/exploits/linux/ssh/vmware_vdp_known_privkey.rb b/modules/exploits/linux/ssh/vmware_vdp_known_privkey.rb index 99c54f34dfd1..04383008c6e3 100644 --- a/modules/exploits/linux/ssh/vmware_vdp_known_privkey.rb +++ b/modules/exploits/linux/ssh/vmware_vdp_known_privkey.rb @@ -70,14 +70,14 @@ def rport def do_login() factory = Rex::Socket::SSHFactory.new(framework,self, datastore['Proxies']) opt_hash = { - :auth_methods => ['publickey'], - :port => rport, - :key_data => [ key_data ], - :use_agent => false, - :config => false, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['publickey'], + :port => rport, + :key_data => [ key_data ], + :use_agent => false, + :config => false, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } opt_hash.merge!(:verbose => :debug) if datastore['SSH_DEBUG'] begin diff --git a/modules/exploits/multi/ssh/sshexec.rb b/modules/exploits/multi/ssh/sshexec.rb index 2da695080b04..713da863fcaa 100644 --- a/modules/exploits/multi/ssh/sshexec.rb +++ b/modules/exploits/multi/ssh/sshexec.rb @@ -147,14 +147,14 @@ def execute_command(cmd, opts = {}) def do_login(ip, user, pass, port) factory = ssh_socket_factory opt_hash = { - :auth_methods => ['password', 'keyboard-interactive'], - :port => port, - :use_agent => false, - :config => false, - :password => pass, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['password', 'keyboard-interactive'], + :port => port, + :use_agent => false, + :config => false, + :password => pass, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } opt_hash[:verbose] = :debug if (datastore['SSH_DEBUG']) diff --git a/modules/exploits/unix/ssh/array_vxag_vapv_privkey_privesc.rb b/modules/exploits/unix/ssh/array_vxag_vapv_privkey_privesc.rb index d546acc4cfc1..1acefbe6b93d 100644 --- a/modules/exploits/unix/ssh/array_vxag_vapv_privkey_privesc.rb +++ b/modules/exploits/unix/ssh/array_vxag_vapv_privkey_privesc.rb @@ -101,14 +101,14 @@ def login_key(user) factory = ssh_socket_factory opts = { - :auth_methods => ['publickey'], - :port => rport, - :use_agent => false, - :config => true, - :key_data => key_data, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['publickey'], + :port => rport, + :use_agent => false, + :config => true, + :key_data => key_data, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } opts @@ -118,14 +118,14 @@ def login_user_pass(user, pass) print_status("#{rhost}:#{rport} - Attempting to login with '#{user}:#{pass}'") factory = ssh_socket_factory opts = { - :auth_methods => ['password', 'keyboard-interactive'], - :port => rport, - :use_agent => false, - :config => true, - :password => pass, - :proxy => factory, - :non_interactive => true, - :verify_host_key => :never + :auth_methods => ['password', 'keyboard-interactive'], + :port => rport, + :use_agent => false, + :config => true, + :password => pass, + :proxy => factory, + :non_interactive => true, + :verify_host_key => :never } opts diff --git a/modules/exploits/unix/ssh/tectia_passwd_changereq.rb b/modules/exploits/unix/ssh/tectia_passwd_changereq.rb index 2d8884fa3a10..47635db862f1 100644 --- a/modules/exploits/unix/ssh/tectia_passwd_changereq.rb +++ b/modules/exploits/unix/ssh/tectia_passwd_changereq.rb @@ -186,10 +186,10 @@ def userauth_passwd_change(user, transport, connection) end def init_ssh(user) - opts = { - :user => user, - :port => rport, - :verify_host_key => :never + opts = { + :user => user, + :port => rport, + :verify_host_key => :never } options = Net::SSH::Config.for(rhost, Net::SSH::Config.default_files).merge(opts) transport = Net::SSH::Transport::Session.new(rhost, options) diff --git a/modules/exploits/windows/ssh/freesshd_authbypass.rb b/modules/exploits/windows/ssh/freesshd_authbypass.rb index ef1017bd2949..1b2fcf149f83 100644 --- a/modules/exploits/windows/ssh/freesshd_authbypass.rb +++ b/modules/exploits/windows/ssh/freesshd_authbypass.rb @@ -80,13 +80,13 @@ def execute_command(cmd, _opts = {}) def setup_ssh_options { - :password => rand_text_alpha(8), - :port => datastore['RPORT'], - :timeout => 1, - :proxies => datastore['Proxies'], - :key_data => OpenSSL::PKey::RSA.new(2048).to_pem, - :auth_methods => ['publickey'], - :verify_host_key => :never + :password => rand_text_alpha(8), + :port => datastore['RPORT'], + :timeout => 1, + :proxies => datastore['Proxies'], + :key_data => OpenSSL::PKey::RSA.new(2048).to_pem, + :auth_methods => ['publickey'], + :verify_host_key => :never } end diff --git a/spec/lib/metasploit/framework/login_scanner/ssh_spec.rb b/spec/lib/metasploit/framework/login_scanner/ssh_spec.rb index 39bb685fafc9..7f4d8b94c9af 100644 --- a/spec/lib/metasploit/framework/login_scanner/ssh_spec.rb +++ b/spec/lib/metasploit/framework/login_scanner/ssh_spec.rb @@ -138,13 +138,13 @@ it 'calls Net::SSH with the correct arguments' do factory = Rex::Socket::SSHFactory.new(nil,nil,nil) opt_hash = { - :port => ssh_scanner.port, - :use_agent => false, - :config => false, - :verbose => ssh_scanner.verbosity, - :proxy => factory, - :auth_methods => ['password','keyboard-interactive'], - :password => private, + :port => ssh_scanner.port, + :use_agent => false, + :config => false, + :verbose => ssh_scanner.verbosity, + :proxy => factory, + :auth_methods => ['password','keyboard-interactive'], + :password => private, :non_interactive => true, :verify_host_key => :never }