Skip to content

Commit

Permalink
Make style consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
@wvu
wvu committed Aug 16, 2018
1 parent 45e0b53 commit 60c0272
Show file tree
Hide file tree
Showing 17 changed files with 135 additions and 135 deletions.
14 changes: 7 additions & 7 deletions modules/auxiliary/scanner/ssh/fortinet_backdoor.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
12 changes: 6 additions & 6 deletions modules/auxiliary/scanner/ssh/ssh_enumusers.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
16 changes: 8 additions & 8 deletions modules/exploits/linux/ssh/ceragon_fibeair_known_privkey.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions modules/exploits/linux/ssh/exagrid_known_privkey.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
16 changes: 8 additions & 8 deletions modules/exploits/linux/ssh/f5_bigip_known_privkey.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
16 changes: 8 additions & 8 deletions modules/exploits/linux/ssh/mercurial_ssh_exec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
16 changes: 8 additions & 8 deletions modules/exploits/linux/ssh/quantum_dxi_known_privkey.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions modules/exploits/linux/ssh/quantum_vmpro_backdoor.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
16 changes: 8 additions & 8 deletions modules/exploits/linux/ssh/solarwinds_lem_exec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
16 changes: 8 additions & 8 deletions modules/exploits/linux/ssh/symantec_smg_ssh.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
16 changes: 8 additions & 8 deletions modules/exploits/linux/ssh/ubiquiti_airos_file_upload.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
16 changes: 8 additions & 8 deletions modules/exploits/linux/ssh/vmware_vdp_known_privkey.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions modules/exploits/multi/ssh/sshexec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
32 changes: 16 additions & 16 deletions modules/exploits/unix/ssh/array_vxag_vapv_privkey_privesc.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions modules/exploits/unix/ssh/tectia_passwd_changereq.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 7 additions & 7 deletions modules/exploits/windows/ssh/freesshd_authbypass.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 7 additions & 7 deletions spec/lib/metasploit/framework/login_scanner/ssh_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 60c0272

Please sign in to comment.