Merge branch 'master' of github.com:rapid7/metasploit-framework

This commit is contained in:
sinn3r 2012-02-20 14:22:23 -06:00
commit bb55b4e54f
9 changed files with 8 additions and 15 deletions

View File

@ -53,6 +53,7 @@ require 'msf/core/exploit/pop2'
require 'msf/core/exploit/tns'
require 'msf/core/exploit/db2'
require 'msf/core/exploit/postgres'
require 'msf/core/exploit/vim_soap'
require 'msf/core/exploit/wdbrpc'
require 'msf/core/exploit/wdbrpc_client'

View File

@ -11,7 +11,6 @@
require 'msf/core'
require 'msf/core/exploit/vim_soap'
class Metasploit3 < Msf::Auxiliary
@ -42,10 +41,10 @@ class Metasploit3 < Msf::Auxiliary
def run
if vim_do_login(datastore['USERNAME'], datastore['PASSWORD']) == :success
vm_ref = vim_find_vm_by_name(datastore['VM'])
case vm_ref
case vm_ref
when String
return_state = vim_powerOFF_vm(vm_ref)
case return_state
case return_state
when 'success'
print_good "VM Powered Off Successfully"
when 'alreadyOFF'

View File

@ -11,7 +11,6 @@
require 'msf/core'
require 'msf/core/exploit/vim_soap'
class Metasploit3 < Msf::Auxiliary
@ -43,10 +42,10 @@ class Metasploit3 < Msf::Auxiliary
if vim_do_login(datastore['USERNAME'], datastore['PASSWORD']) == :success
vm_ref = vim_find_vm_by_name(datastore['VM'])
case vm_ref
case vm_ref
when String
return_state = vim_powerON_vm(vm_ref)
case return_state
case return_state
when 'success'
print_good "VM Powered On Successfully"
when 'alreadyON'

View File

@ -11,7 +11,6 @@
require 'msf/core'
require 'msf/core/exploit/vim_soap'
class Metasploit3 < Msf::Auxiliary
@ -24,8 +23,8 @@ class Metasploit3 < Msf::Auxiliary
super(
'Name' => 'VMWare Tag Virtual Machine',
'Description' => %Q{
This module will log into the Web API of VMWare and
'tag' a specified Virtual Machine. It does this by
This module will log into the Web API of VMWare and
'tag' a specified Virtual Machine. It does this by
logging a user event with user supplied text},
'Author' => ['TheLightCosine <thelightcosine[at]metasploit.com>'],
'License' => MSF_LICENSE
@ -45,7 +44,7 @@ class Metasploit3 < Msf::Auxiliary
if vim_do_login(datastore['USERNAME'], datastore['PASSWORD']) == :success
vm_ref = vim_find_vm_by_name(datastore['VM'])
case vm_ref
case vm_ref
when String
result = vim_log_event_vm(vm_ref, datastore['MSG'])
case result

View File

@ -11,7 +11,6 @@
require 'msf/core'
require 'msf/core/exploit/vim_soap'
class Metasploit3 < Msf::Auxiliary

View File

@ -11,7 +11,6 @@
require 'msf/core'
require 'msf/core/exploit/vim_soap'
class Metasploit3 < Msf::Auxiliary

View File

@ -11,7 +11,6 @@
require 'msf/core'
require 'msf/core/exploit/vim_soap'
class Metasploit3 < Msf::Auxiliary

View File

@ -11,7 +11,6 @@
require 'msf/core'
require 'msf/core/exploit/vim_soap'
class Metasploit3 < Msf::Auxiliary

View File

@ -11,7 +11,6 @@
require 'msf/core'
require 'msf/core/exploit/vim_soap'
class Metasploit3 < Msf::Auxiliary