916f23fe4e
Add IPv6 support for bit2netmask
2012-03-16 01:50:26 -06:00
a3db547c76
Justify TLVs to be a little easier to read
2012-03-16 01:50:26 -06:00
6895ff9cbb
Whitespace at EOL
2012-03-14 21:42:00 -06:00
9d563d4d9e
Pastographical error
2012-03-14 21:41:14 -06:00
2c34b7d599
Alias `ifconfig` to `ipconfig`
...
This has bugged me for *years*.
2012-03-14 11:07:31 -06:00
248a73a73c
change sniffer behaviour when stopping capture. workaround if pcap_findalldev fails
2012-03-14 11:07:31 -06:00
6cfb3ff4fc
Comment out extension TLV types
...
I suspect this is a load order issue where sometimes the extension's TLV
types are defined before hitting this and sometimes aren't.
Nevertheless, pretty printing a TLV is not worth breaking all the
payloads.
2012-03-13 14:08:58 -06:00
6a6dd06103
Merge branch 'feature/6476-list-all-ifaces'
...
Conflicts:
modules/auxiliary/scanner/afp/afp_server_info.rb
2012-03-13 13:55:45 -06:00
89e3fee5a8
Revert "Squashed commit of the following:"
...
This reverts commit dd9ac8a6c0
2012-03-13 13:38:35 -06:00
dd9ac8a6c0
Squashed commit of the following:
...
commit 8b4750d0dcbac0686f9403acdf5cab50c918212f
Author: James Lee <egypt@metasploit.com>
Date: Tue Mar 13 13:14:43 2012 -0600
Add bins for listing all addresses
[Fixes #6476 ]
commit 213dd92ebc9b706a45725e6515c7939d2edace0e
Author: James Lee <egypt@metasploit.com>
Date: Tue Mar 13 02:08:34 2012 -0600
Accept multiple addresses and netmasks
[See #6476 ]
commit 2e8bd3c3ecfb319bf9456485d2420bb5829b60cc
Author: James Lee <egypt@metasploit.com>
Date: Tue Mar 13 01:55:57 2012 -0600
Make inspecting meterpreter packets a little less painful
Not sure why I originally thought there was no way to access extensions'
constants before. A simple `require` makes it all happy.
commit da367907cf579bd3aefaffbc84d2f96a41b85f00
Author: James Lee <egypt@metasploit.com>
Date: Sun Mar 11 22:08:44 2012 -0600
Fix up Linux after changes for Windows
commit ec9f04378b0155f69df95d4a94e62d33ce61977c
Author: James Lee <egypt@metasploit.com>
Date: Sun Mar 11 21:56:11 2012 -0600
Grab IPv6 addresses on Windows when possible
Tries to GetProcAddress of GetAdaptersAddresses and falls back to the
old GetIpAddrTable() function when it isn't available. This should work
on XPSP1 and newer, albeit without netmasks on versions before Vista.
Still trying to figure that one out.
commit 1052ebdcf86114fbc03d1a37ab5d4c6a78e82daa
Author: James Lee <egypt@metasploit.com>
Date: Tue Mar 6 15:34:09 2012 -0700
Wrap Windows-specifc headers in ifdef
commit f23f20587b3117c38a77e7e5a93d542411e9504f
Author: James Lee <egypt@metasploit.com>
Date: Tue Mar 6 14:36:34 2012 -0700
Handle multiple addrs on one iface on the ruby side
commit d7207d075ac6462875d9da531cf20c175629a416
Author: James Lee <egypt@metasploit.com>
Date: Mon Mar 5 21:57:39 2012 -0700
Adds IPv6 addrs to win32 get_interfaces response
commit 11ae7e8a45bd56d25841ea8724377e0fb6789d72
Author: James Lee <egypt@metasploit.com>
Date: Mon Mar 5 09:07:28 2012 -0700
Don't distinguish between 4 and 6.
The client can figure it out from the length.
commit 2c7490bdf3e4079f30857ee323d2ce23ab1bd9a5
Author: James Lee <egypt@metasploit.com>
Date: Sun Mar 4 04:25:26 2012 -0700
Append to the list instead of assigning to it
All addresses are being sent to the client now. Just need a way to
parse them out correctly on the other side and meterpreter will be able
to list all addresses on all interfaces on Linux. Next step is to
allocate the proper number of TLVs to avoid good ol' stack smashes on
systems with lots of addresses and then make sure we clean all the
memory leaks.
[See #6476 ]
commit 73bba037ad968b922341c02459017afcc8407a76
Author: James Lee <egypt@metasploit.com>
Date: Sun Mar 4 03:12:28 2012 -0700
Lay the groundwork for returning all addresses
This commit only sends the last interface in the list, but it is looping
through all of them as evidenced by the log, just need to make sure
we're not overwriting as we go.
[See #6476 ]
2012-03-13 13:19:18 -06:00
1d99330795
Accept multiple addresses and netmasks
...
[See #6476 ]
2012-03-13 02:08:34 -06:00
58bc9346f4
Make inspecting meterpreter packets a little less painful
...
Not sure why I originally thought there was no way to access extensions'
constants before. A simple `require` makes it all happy.
2012-03-13 01:55:57 -06:00
b815955e09
Allow file argument for the `ls` command
...
Previously only worked for directories.
[Fixes #3055 ]
2012-03-13 00:52:42 -06:00
d99df825b3
Handle multiple addrs on one iface on the ruby side
2012-03-06 14:36:34 -07:00
6b9a21936e
Whitespace at EOL
2012-03-06 14:14:02 -07:00
8cbe5d8a54
Force many integer arguments to be integers
2012-03-06 09:28:29 -06:00
9f05562a18
Don't distinguish between IPv4 and IPv6 routes
...
It's easier to deal with one Array of all routes regardless of INET
family than having get_routes() return a two-element Array of Arrays.
Also fixes a bug in each_route() which was expecting get_routes() to
return a single Array of all routes. Thanks to valsmith for reporting.
2012-03-02 18:26:57 -07:00
6c0f8636ec
Merge pull request #217 from rapid7/reverse-http-randomness
...
Reverse http randomness
2012-03-02 16:36:26 -08:00
b70b41091b
Tested fairly well - this randomizes the URLs and removes the user-agent string from the request
2012-03-02 17:44:23 -06:00
9e2a1b6d52
Allow channel -k as a synonym for -c
...
Makes it consistent with "jobs", "sessions", and "threads" commands in
msfconsole. Because I keep using the wrong thing and being confused
about why it doesn't work.
2012-03-02 15:11:00 -07:00
884550ce7c
Fix undefined constant bug in session.fs.seek
...
How did this ever work? Clearly nothing exercises this code.
2012-03-02 14:43:00 -07:00
4f2fd918e4
Only add a Content-Type when it's not nil
...
Makes it possible to create MIME parts for non-file POST parameters when
sending a file.
2012-03-01 16:28:55 -07:00
bde9a846b9
Default the index to -1
...
This prevents stack traces on Java which doesn't provide the index.
2012-02-29 20:27:10 -07:00
db88145294
Keep the order of iface attributes the same accross rubies
...
1.8 doesn't maintain insertion order for Hash keys like 1.9 does so we
end up with ~random order for the display with the previous technique.
Switch to an Array instead of a Hash so it's always the same.
2012-02-28 08:27:22 -07:00
2b8d16203a
Refactor Interfac#pretty to be more rubyish
2012-02-24 16:42:12 -07:00
f83a7f14ac
Switch to netlink for listing interfaces
...
* Adds support for listing IPv6 addresses on POSIX meterpreter
* Ensures crash logs are only created if debugging is enabled
* Fixes a bug in sniffer where a lock was not acquired correctly
Squashed commit of the following:
commit 955124b264a675c7d67187703bf23b58f0aba6d8
Author: MM <gaspmat@gmail.com>
Date: Thu Feb 23 23:42:26 2012 +0100
posix meterpreter - IPv6 support for route and ipconfig using netlink sockets
[Closes #196 ]
2012-02-24 16:42:12 -07:00
3857bef9f6
Adds help and tabs for commands in meterpreter core
2012-02-21 10:10:42 -07:00
85e644ed4c
Merge branch 'railgun_defs' of https://github.com/NoVAHA/metasploit-framework into NoVAHA-railgun_defs
2012-02-10 01:17:07 -06:00
3312a16708
Added a message when backgrounding a session
2012-02-09 05:49:40 +00:00
1f1e67cb16
Moved railgun function definitions into central storage and out of individual modules where possible
2012-02-09 04:56:13 +00:00
6685a65c39
Spend some time type-checking - no exploitable vulns we are aware of, but no reason to leave it to future chance
2012-02-07 17:17:45 -06:00
f89853d3bc
Squashed commit of the following:
...
commit 69bb41a8176fb814485225e0c3b0e1c44342e652
Author: matugm <matugm@gmail.com>
Date: Tue Jan 31 11:30:52 2012 +0100
indentation
commit 175d230a06dc58e2123f092d39f33063efdce83d
Author: matugm <matugm@gmail.com>
Date: Tue Jan 31 11:13:02 2012 +0100
Changed way of finding hive names so that it works with xp hives
2012-02-03 17:01:35 -06:00
6623988fc0
Remove duplicate interfaces call, fixes #6344
2012-02-03 09:46:08 -06:00
cd0a806a06
Sort by filename instead of the default first column
...
[Fixes 6336]
2012-02-02 12:13:52 -07:00
b347418f90
Add checks for numeric column data
...
[Fixes #6303 ]
2012-02-02 12:13:52 -07:00
eb795514b3
Add a SortIndex option to rex Table
...
Allows Table#to_s to do the right thing when the first column isn't the
one we want sorted.
2012-02-02 12:13:51 -07:00
7ec5f98480
Adding jhart's natpimp libary and modules.
...
Made some minor corrections -- dropped the #vim splats, switched to msf
constants for service open etc, namely.
[See #106 ]
2012-01-24 10:32:30 -06:00
26836cab47
Adds a default context for the TFTP Client lib.
...
For use with nonstandard routing.
2012-01-23 16:00:54 -06:00
d34a9f38a5
Adding bperry's various and sundry regex fixes
...
[Closes #109 ]
Squashed commit of the following:
commit 692568d02fbfd547ef2d05ad9887427fc53f8abb
Author: Brandon Perry <bperry.volatile@gmail.com>
Date: Mon Jan 16 12:34:35 2012 -0600
small get_everything fix
commit 5b29a310601b6658ffb74a4922b52bc5b3f864fb
Author: Brandon Perry <bperry.volatile@gmail.com>
Date: Mon Jan 16 12:31:31 2012 -0600
regex fixes
commit a565ade7f4fe42fb5d070d04ac1ba4e65c98d8b8
Author: Brandon Perry <bperry.volatile@gmail.com>
Date: Sun Jan 15 16:39:29 2012 -0600
registry.rb in lib/rex
commit 3609313ea357884480750948a9b0cc6514dcfcc2
Author: Brandon Perry <bperry.volatile@gmail.com>
Date: Sun Jan 15 16:32:06 2012 -0600
boot key fixed
commit e591ed1815b01b3e535b517c73470ad9984fe8c7
Author: Brandon Perry <bperry.volatile@gmail.com>
Date: Sun Jan 15 15:53:21 2012 -0600
fixes
commit 3598f3482eea2845baead71310d6192e105b6074
Author: Brandon Perry <bperry.volatile@gmail.com>
Date: Sat Jan 14 13:47:29 2012 -0600
stuff
commit 8a8d0dfda603d3697b54bd852f131795259f9c28
Author: Brandon Perry <bperry.volatile@gmail.com>
Date: Fri Jan 13 22:57:30 2012 -0600
reg fixes
commit fcfb51bb64b2d8ee6a28722bbf1998be47145b90
Merge: 2c7cfde 24aaf85
2012-01-16 17:54:33 -06:00
0236a6994f
registry stuff
2012-01-10 18:45:24 -06:00
d0fb9424b2
Updated to use "reject!" instead of "select!" so older versions of ruby are happy
2012-01-08 11:16:17 -05:00
6591bd3a45
Completed test coverage for pointer_util.rb and fixed the bugs I found
2012-01-08 11:05:24 -05:00
f9d123a8c8
Merge remote branch 'upstream/master'
2012-01-07 19:06:51 -05:00
7ea5f87960
Allow proper ruby types for evasion configuration
...
At some point in the distant past, the datastore was all strings and the
various option types got parsed out in the appropriate places. Then, in
the somewhat more recent past, the options started getting converted to
regular ruby types (such as TrueClass for a BOOL options, etc) earlier
in their life. Apparently, that change broke boolean http evasions.
This commit fixes them by ensuring that +true+ is just as acceptable as
"true".
Fixes #6198 , thanks Ashish for the report
2012-01-06 20:05:29 -07:00
c59e08ce7d
Moved utility codde and expanded railgun test suite runner
2012-01-06 21:07:16 -05:00
f41fc7a0ac
Moved platform_util.rb and added the tests for the new utilities to railgun.rb.ts.rb
2012-01-06 20:56:41 -05:00
3772f56260
Am making use of platform_util.rb's platform symbols for standardization across railgun. Ideally only platform_util.rb will need to know what platform strings look like and how they are represented in the railgun world. Corrected railgun.rb mixin's pointer_size function.
2012-01-04 22:28:20 -05:00
d995c3893b
Platform handling utilities. I want to protect railgun against changes to client.platform's general form
2012-01-04 21:56:34 -05:00
3d7d5d5f3d
Utility for working with pointers. Test coverage is incomplete
2012-01-04 19:30:30 -05:00
b9b5b1e66f
Merge remote branch 'upstream/master'
2012-01-02 20:07:50 -05:00
ba017773b2
Cleanup whitespace at EOL
2011-12-30 10:55:01 -07:00
0054fb5167
using select! instead of delete_if to avoid double negatives...
2011-12-28 20:05:54 -05:00
5560c6b17e
Moved and adapted code relating to looking up constant names by constant value
2011-12-28 00:40:08 -05:00
ffcf5af9b0
Merge remote branch 'upstream/master'
2011-12-27 22:06:51 -05:00
80603e03cb
grab the appropriate shell from mult-platform meterpreters and use /bin/sh instead of /bin/bash for linux to improve compatibility, fixes #5996
2011-12-26 14:41:24 -07:00
1604162ba3
A place to add railgun convenience code for use in modules
2011-12-24 15:59:46 -05:00
35e868f705
Merge pull request #67 from kernelsmith/railgun-add_const_reverse_lookup
...
Add const_reverse_lookup and error_lookup to railgun (redmine 6128)
2011-12-22 14:43:24 -08:00
743a0546f1
Don't blow up if the user doesn't set a filename
...
Can't actually require FILENAME or REMOTE_FILENAME because I don't know
if you're going to upload or download. However, there shouldn't be a
stacktrace when you just try to go with neither.
2011-12-21 16:26:29 -06:00
24d53efa7c
Final touches on TFTP client
...
See #5291 . Adds an option to mess with the block size in case someone
wants to write a fuzzer or exploit that leverages that. Adds a cleanup
method to the module (pretty much required, it turns out). Looking
nearly final, just need to rename the module and I think we're good to
push to master.
2011-12-20 10:03:04 -06:00
677cb4b152
Handle empty data sends sanely for TFTP.
...
Don't just hang forever -- let the user know they just send empty data.
TFTP servers don't like this of course.
2011-12-19 21:56:03 -06:00
2b3e3725ac
TFTP adding comment docs, ability to send w/out a file.
...
Commenting the tricksy parts a little better for general usage.
Adding the ability to set FILEDATA instead of FILENAME, in case
only short bits of data are desired and the user doesn't want
to go to the trouble of creating a source file to upload.
2011-12-19 18:15:19 -06:00
431ef826c9
TFTP client now uses constants, preserves trailing spaces/nulls in data
...
See #5291 , just rediscovered the bug on this.
2011-12-19 16:33:25 -06:00
5eaf2e7535
Adding download and loot functionality.
...
Still need to deal with the use case of not passing a block; blocks
should not be required, it should be okay to invoke and just wait for
the complete attribute to be true. You'll miss out on error messages but
eh, maybe those should be return values.
2011-12-19 15:50:50 -06:00
aecde6fea4
Updating TFTP client. Now with grown-up thread handling.
...
No longer blocks on successful connections.
2011-12-19 12:14:40 -06:00
902d7f5ea7
Adding more to TFTP. Still need a read tho
...
Adds error checking and some helpful messaging in the event of an error.
In the event of a failed transfer the module exits immediately, but in
success, I'm still hanging around for several seconds after. Not a deal
breaker but can be annoying.
Also, need to implement a read as well as a write and store it as loot,
to be actually useful for most TFTP checking.
2011-12-18 21:05:27 -06:00
8bdf76a87b
Adds const_reverse_lookup and error_lookup methods to the railgun instance, also adds test/modules/post/test/railgun_reverse_lookups.rb, tested, working great
2011-12-17 16:19:32 -05:00
50fa10679b
First draft of a TFTP client.
...
Could use some actual error checking and also needs to expose
more options.
2011-12-16 18:41:55 -06:00
ec1dd8154e
When duplicating a DLL, duplicate everything underneath it to remain threadsafe. I wrote this patch months and months ago. The way I am deep copying produced much groaning in #metasploit when I put it in for code review. It was ultimately declared the lesser of two evils. If you have chat logs from months ago you may be able to find the discussion
2011-12-15 22:05:02 -05:00
2c538fe9c0
Rework RangeWalker and some of the socket API to fix bugs and generally
...
handle ranges the right way
2011-12-10 20:10:10 -06:00
dee053cd71
Try multiple scopes for link-local addresses, if necessary. Fix a small
...
typo
2011-12-10 15:24:10 -06:00
e46745b761
Add support for link-local scopes
2011-12-10 13:24:58 -06:00
1cc68d1ed5
Accept IPv6 addresses in getaddress() responses
2011-12-10 13:24:58 -06:00
49ff9f594a
Properly enclose IPv6 addresses with brackets inside of the Host header
2011-12-10 13:24:58 -06:00
72f64583e2
Add IPv6 range support, permission tweak
2011-12-06 00:43:11 -06:00
4344a5f92a
Fix up IPv6 resolution in DNS replies
2011-12-05 13:07:37 -06:00
bcebdb1893
Improve IPv6 handling
2011-12-05 13:07:37 -06:00
27974c4c27
Merge branch 'master' of github.com:rapid7/metasploit-framework into fastlib
...
Conflicts:
modules/auxiliary/scanner/http/axis_login.rb
modules/exploits/multi/http/axis2_deployer.rb
modules/post/multi/gather/thunderbird_creds.rb
modules/post/windows/gather/credentials/imvu.rb
msfopcode
2011-12-03 14:07:09 -06:00
6b06df0d7d
Merge pull request #38 from XeroHawk/alpha2_fix
...
Ported over the Issue 3190 SVN changes for unicode_mixed, an old bug that was hiding out in Redmine.
2011-12-02 12:51:47 -08:00
1db9177583
Revert "Merge pull request #22 from scriptjunkie/multithread"
...
This reverts commit 4f76f3bbb8e72dad4e81
2011-12-02 13:35:43 -05:00
4f76f3bbb8
Merge pull request #22 from scriptjunkie/multithread
...
RPC multithreading
2011-12-01 23:43:32 -08:00
e72dad4e81
Rescue the load error so rex will work outside of Metasploit. Fixes
2011-12-02 00:28:31 -06:00
2ac8cbaf66
Ported over the Issue 3190 SVN changes
2011-11-30 14:37:10 -05:00
e9c3e8ee50
Fix SMB_COM_NT_TRANSACT structure definition per specification. For more information see http://j.mp/t5zzku
2011-11-27 19:27:01 -06:00
f82c7e9bb4
Fixup requires to use sane paths
2011-11-21 14:37:26 -06:00
8f56dc1504
get rid of a bunch more spaces at EOL
2011-11-20 11:46:35 +11:00
70b463b257
msftidy run
2011-11-20 11:39:27 +11:00
60c3c44800
remove spaces at EOL
2011-11-20 11:30:15 +11:00
c4eb32d2ff
Add an optional multithreading to stream server, and enable multithreading (one thread per client) to the RPC server.
2011-11-17 08:07:34 -08:00
6715248047
Minor comment fixes
...
Removing patch comment
2011-11-17 08:42:30 -06:00
67c07165c6
Update lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb
2011-11-17 08:26:57 -06:00
66621632f0
added linux shell functionality to meterpreter's shell command.
2011-11-17 08:26:57 -06:00
825c9f776c
Fixes #5980 by correcting the address match for IPv6. Clean up regex mapping in general
2011-11-16 14:35:23 -06:00
91e7e39fd9
Add definition for DeleteService
2011-11-13 21:04:35 -07:00
40614a3cf4
Merge branch 'iss5454'
2011-11-11 11:26:05 -06:00
7b7413d85e
Bash format for msfencode/msfvenom
...
This patch adds a Bash output format for msfencode and msfvenom. This is especially useful for local exploitation with shellcode in an environment variable.
Example output:
$ echo 'this is a test' | ./msfvenom -f bash
[-] Using X86 architecture and Windows platform for stdin payload to change use -a and --platform
export buf=\
$'\x74\x68\x69\x73\x20\x69\x73\x20\x61\x20\x74\x65\x73\x74'\
$'\x0a'
It adds unit tests for the new format and also fixes a unit test that was broken (assert_equal 'AAAAAAAAA', Rex::Text.pattern_create(9,['A'])) due to a bug in the shortcut in pattern_create.
2011-11-11 00:13:17 -08:00
30a86c9378
Merge patch to fix #5271
2011-11-10 20:01:50 -06:00
b689796678
msf*scan is busted with -i because of "uninitialized constant Rex::Socket". This addresses that issue.
...
git-svn-id: file:///home/svn/framework3/trunk@14117 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-29 18:54:24 +00:00
fed2e9a611
Fixes #2052 . The supplied patch wanted to do it in the to_s, but it seems to make more sense to do this kind of thing in the sort_rows() method.
...
Thanks for the patch, though. Note, it's slightly easier to locate which file you're diffing if you diff from the top of /trunk.
git-svn-id: file:///home/svn/framework3/trunk@14051 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-24 20:41:26 +00:00
437e2e79be
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@14043 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-24 04:54:03 +00:00
70bf92edae
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@14042 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-24 04:52:22 +00:00
5fec13a389
Propogate the timeout in send_recv() down to the TCP connect call as well
...
git-svn-id: file:///home/svn/framework3/trunk@14021 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-21 15:41:37 +00:00
3cfa3c25d3
Treat all input as strings, avoids some sloppy caller code that wasn't as strict before
...
git-svn-id: file:///home/svn/framework3/trunk@13995 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-18 19:16:48 +00:00
62740172e4
Officially remove support for the buggy/non-functional MySQL backend
...
git-svn-id: file:///home/svn/framework3/trunk@13948 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 09:42:04 +00:00
c532cfd2ef
Fixes a problem where vulns were sometimes given the reference of the one before it.
...
git-svn-id: file:///home/svn/framework3/trunk@13947 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 04:46:16 +00:00
643f2ab242
better fix for gsub() on non-String values in the table. Fixes cachedump brokenness
...
git-svn-id: file:///home/svn/framework3/trunk@13944 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 00:23:29 +00:00
8295bb0a4e
fix a nil.gsub() bug
...
git-svn-id: file:///home/svn/framework3/trunk@13943 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 00:18:30 +00:00
52767b3104
Fixes #5204 . Adding Windows Console2 color support from mihi. Thanks!
...
git-svn-id: file:///home/svn/framework3/trunk@13913 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-13 17:35:31 +00:00
4d4b07db40
Winsock2 getaddrinfo definition for Railgun
...
git-svn-id: file:///home/svn/framework3/trunk@13894 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-12 23:14:10 +00:00
09423d89ef
Adding support for wlanapi in prep for thelightcosine's coming modules. Note, this will *not* break railgun on systems that don't support wlanapi.
...
git-svn-id: file:///home/svn/framework3/trunk@13888 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-12 02:58:45 +00:00
a75371c282
See #5660 . Well that broke other things. Rats.
...
git-svn-id: file:///home/svn/framework3/trunk@13861 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-10 21:20:45 +00:00
e9e4dc5d02
Fixes #5660 for real. Apparently I cannot tell the difference between 0 and 1. I would be a terrible robot. 0101100101.
...
git-svn-id: file:///home/svn/framework3/trunk@13857 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-10 19:03:18 +00:00
1f1cd87e87
Fixes #5660 . update_prompt('') is now equivalent to update_prompt(nil), which avoids the prompt stacking problem when setting an empty prompt.
...
git-svn-id: file:///home/svn/framework3/trunk@13855 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-10 18:42:44 +00:00
292aae8ab5
This small patch causes any input to RangeWalker that contains a host name to expand to all A records returned for that name. This allows RHOSTS to be set to a dns name that returns multiple addresses and for all addresses corresponding to the name to be tested.
...
git-svn-id: file:///home/svn/framework3/trunk@13837 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-09 01:07:51 +00:00
1649a6d47c
Add function for CredEnumerateA
...
git-svn-id: file:///home/svn/framework3/trunk@13833 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-07 21:01:35 +00:00
b21acdaaae
Rex shouldn't die when trying to Rex::Text.base64_encode(nil). It should return an empty string.
...
git-svn-id: file:///home/svn/framework3/trunk@13817 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-05 01:42:14 +00:00
b3e96add60
fix whitespace at eol
...
git-svn-id: file:///home/svn/framework3/trunk@13795 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-26 17:42:07 +00:00
de9e99bd3d
Fix some TOCTOU confusion and database errors.
...
git-svn-id: file:///home/svn/framework3/trunk@13779 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-23 15:12:19 +00:00
2481eac4be
remove extraneous relative load path addition, bad bad bad
...
git-svn-id: file:///home/svn/framework3/trunk@13761 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-19 23:01:26 +00:00
b72ca9dcc8
Fixes #5452 .
...
Fixes #5446 for real.
Breaks up the regex to more managable registers, ensures that nil is never returned.
git-svn-id: file:///home/svn/framework3/trunk@13729 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-14 16:41:30 +00:00
0413dc25c5
Fixes #5446 by ensuring the method is always sane.
...
git-svn-id: file:///home/svn/framework3/trunk@13723 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-12 19:59:29 +00:00
acae5dcdc8
Killing puts.
...
Die, puts, die!!
git-svn-id: file:///home/svn/framework3/trunk@13715 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-11 02:42:39 +00:00
14f39a69a0
Show DllCharacteristics (see #5234 )
...
git-svn-id: file:///home/svn/framework3/trunk@13709 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-08 22:55:12 +00:00
e748b53a54
Modify the code for imported functions in order to display the addresses. See #5422 .
...
git-svn-id: file:///home/svn/framework3/trunk@13704 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-07 23:17:47 +00:00
047b1b4ee2
RopCollect needs to use print_status too
...
git-svn-id: file:///home/svn/framework3/trunk@13701 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-06 23:08:58 +00:00
7e0424e976
fixes some bugs with imports of rop gadgets
...
git-svn-id: file:///home/svn/framework3/trunk@13700 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-06 22:27:03 +00:00
5e4a3f5beb
Opps typo in the require
...
git-svn-id: file:///home/svn/framework3/trunk@13678 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-01 10:21:15 +00:00
525af4325d
Add the jsobfu require
...
git-svn-id: file:///home/svn/framework3/trunk@13677 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-01 09:11:23 +00:00
1e37649a4d
Add backwards compatability support for old obfuscation methods needed by older exploits
...
git-svn-id: file:///home/svn/framework3/trunk@13674 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-01 08:58:18 +00:00
aa5ad30805
Alters heaplib so it no longer obfuscates using the old method
...
git-svn-id: file:///home/svn/framework3/trunk@13665 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-30 22:08:51 +00:00
ee961b69ad
Add support for virtualalloc (see #5262 )
...
git-svn-id: file:///home/svn/framework3/trunk@13659 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-30 06:52:56 +00:00
6853221762
Fixes #5313 by adding logging support to pivoted PXE attacks, and displaying results as the module runs.
...
git-svn-id: file:///home/svn/framework3/trunk@13646 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-27 15:46:49 +00:00
23b4f4ed98
Address #5313 for locally-launched PXE attacks.
...
git-svn-id: file:///home/svn/framework3/trunk@13639 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-25 22:48:33 +00:00
2b340439e0
Fixes #5312 - auto boot from disk on second PXE boot (after payload delivery).
...
git-svn-id: file:///home/svn/framework3/trunk@13629 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-24 21:28:31 +00:00
3c7f25ff78
help help
...
git-svn-id: file:///home/svn/framework3/trunk@13579 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-18 20:29:49 +00:00
9e80c740b6
Also recognize PXE clients who do not set the PXE option in the DHCP request but do identify in client string.
...
git-svn-id: file:///home/svn/framework3/trunk@13577 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-18 00:18:43 +00:00
f99429138e
clean up some rdoc comments. odd that rdoc doesn't appear to pick up ApiConstants at all...
...
git-svn-id: file:///home/svn/framework3/trunk@13576 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-17 23:00:28 +00:00
0fc14a2164
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@13572 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-16 21:16:25 +00:00
79b7fb7c43
actually store the new Util object. how did this ever work before? fixes #5265
...
git-svn-id: file:///home/svn/framework3/trunk@13571 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-16 18:01:21 +00:00
f16e593628
report udp protocol correctly, see #5260 , r13569
...
git-svn-id: file:///home/svn/framework3/trunk@13570 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-15 22:39:41 +00:00
4779c039f0
protocol != proto. fixes #5260
...
git-svn-id: file:///home/svn/framework3/trunk@13569 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-15 22:29:57 +00:00
c77dfcc48e
fixes #5232 Add DLL definition for crypt32. I removed a custom add too
...
git-svn-id: file:///home/svn/framework3/trunk@13560 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-14 21:08:55 +00:00
4a7714e1b1
Fix #5244
...
git-svn-id: file:///home/svn/framework3/trunk@13551 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-12 20:26:03 +00:00
5966cf460e
Fixes #5240 : avoid crash when read fails
...
git-svn-id: file:///home/svn/framework3/trunk@13550 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-12 19:30:56 +00:00
15a9036dd9
add in the Buffer input class
...
git-svn-id: file:///home/svn/framework3/trunk@13516 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-10 21:05:12 +00:00
0bc44c4736
Expanding the range of mock dll/functions to allow for more thorough testing. Number of assertions when you run railgun tests are about to jump.
...
git-svn-id: file:///home/svn/framework3/trunk@13506 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-10 03:36:39 +00:00
a5b30b1964
sometimes windows raises EADDRNOTAVAIL which gets mapped to AddressInUse when using addresses it doesn't like, e.g. .0 and .255; make AddressInUse a ConnectionError so scanners handle it properly. makes scanners work on windows when an address range includes one of these. they won't be scanned (since windows is dumb) but at least it won't error out.
...
git-svn-id: file:///home/svn/framework3/trunk@13503 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-10 00:51:23 +00:00
b2733c04db
More PXE dust for extra magic!
...
git-svn-id: file:///home/svn/framework3/trunk@13493 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-05 17:10:27 +00:00
842bfdebe8
Lets just leave this here (insurance against my laptop melting down between now and tomorrow morning). Nothing to see here, move along ;)
...
git-svn-id: file:///home/svn/framework3/trunk@13483 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-03 22:58:55 +00:00
d7e775b74c
This speeds up shutdown for normal reverse_tcp meterpreters (avoids the penalization for http/https)
...
git-svn-id: file:///home/svn/framework3/trunk@13470 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-02 01:33:17 +00:00
7fa5795115
Cleanup session files. Wait a little longer for the session to receive the shutdown command
...
git-svn-id: file:///home/svn/framework3/trunk@13458 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 19:46:36 +00:00
f5862e87d0
guard against nil and false ranges
...
git-svn-id: file:///home/svn/framework3/trunk@13446 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 15:48:29 +00:00
7667e5aa74
More of the same.
...
git-svn-id: file:///home/svn/framework3/trunk@13439 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 23:50:04 +00:00
58f7618b78
Fixes #5144 . Repro's with nexpose-raw.xml in sample data -- before the fix, DNS on port 53 would be marked as "Postfix" which is the same as the service prior, 25/tcp. After the fix, it is appropriately blank. (Same with 80/tcp and 443/tcp both being Apache -- technically probably correct but the service fingerprint isn't there for 443 in the import).
...
Checking other service importers for the same kind of problem, but it looks unique to nexpose-raw.
git-svn-id: file:///home/svn/framework3/trunk@13438 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 23:35:13 +00:00
7f758e42e8
Fix up SSL behavior (correctly, this time). Update the msfrpc tools to support the new MessagePack code, fix various defaults in the plugin. Fixes #5116
...
git-svn-id: file:///home/svn/framework3/trunk@13416 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 23:58:05 +00:00
07df5f051f
Woops. Get the right variable name
...
git-svn-id: file:///home/svn/framework3/trunk@13412 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 19:26:43 +00:00
f57799943c
Rework this patch to only enable non-blocking openssl on Windows, as this has also reproduced on BT5 with 1.9.2
...
git-svn-id: file:///home/svn/framework3/trunk@13411 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 19:10:20 +00:00
ace9ca86a8
This commit abstracts the non-blocking SSL check so that it verifies existence of the non-blocking API and skips Mac OS X. This should fix some of the issues with meterpreter on MacOS X with Ruby 1.9.2
...
git-svn-id: file:///home/svn/framework3/trunk@13404 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 03:34:15 +00:00
d50577066f
remove some silliness of registering UserAgent as an option since it's already an advanced option for HttpClient, make the default obvious
...
git-svn-id: file:///home/svn/framework3/trunk@13394 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-28 22:57:47 +00:00
9f8cbc4145
First pass at an import, still missing a few items to call this done
...
git-svn-id: file:///home/svn/framework3/trunk@13390 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-28 21:17:30 +00:00
c7077f2551
Fix up the stop call
...
git-svn-id: file:///home/svn/framework3/trunk@13382 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 20:50:11 +00:00
aa2c025ce1
add a flush option to portfwd. thanks ipax for the patch!
...
git-svn-id: file:///home/svn/framework3/trunk@13359 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 04:59:06 +00:00
f1473c4cb3
Fixes #5062 - Use .length instead of .count (1.8 compat)
...
git-svn-id: file:///home/svn/framework3/trunk@13352 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 23:36:30 +00:00
fa4dbf6783
move the client accessor back to the top so it's available when needed, use the session-specific separator, fixes #4892 again
...
git-svn-id: file:///home/svn/framework3/trunk@13350 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 22:37:41 +00:00
2212afcf31
un-remove an important include...
...
git-svn-id: file:///home/svn/framework3/trunk@13348 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 20:58:23 +00:00
0f95070f3f
add a request type for grabbing the host's directory separator, fixes #4892
...
git-svn-id: file:///home/svn/framework3/trunk@13346 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 20:51:33 +00:00
25bdbe6568
More prompt bug fixes, back and use commands should work properly now
...
git-svn-id: file:///home/svn/framework3/trunk@13326 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-24 18:41:23 +00:00
d3836badc6
add a fingerprint for ie6 on xp sp2 korean
...
git-svn-id: file:///home/svn/framework3/trunk@13321 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 17:42:56 +00:00
d60524a3d4
Fixes #5009 by using the right client object
...
git-svn-id: file:///home/svn/framework3/trunk@13299 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-22 23:33:06 +00:00
a54b8c26c3
Fix prompt updates to show the last set prompt variable
...
git-svn-id: file:///home/svn/framework3/trunk@13291 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-22 01:49:29 +00:00
59b9dfd9eb
no need for the framework reference now
...
git-svn-id: file:///home/svn/framework3/trunk@13281 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 18:35:57 +00:00
2776669a51
reworked how the custom prompts work with different input streams
...
git-svn-id: file:///home/svn/framework3/trunk@13279 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 18:19:43 +00:00
3046896204
This commit makes the new unicode string encoding optional, it can be disabled by setting EnableUnicodeEncoding to false or through the 'disable_unicode_encoding' console command in the Meterpreter shell. Fixes #4986
...
git-svn-id: file:///home/svn/framework3/trunk@13278 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:44:54 +00:00
ce862cf999
Disable this until some bugs are sorted out
...
git-svn-id: file:///home/svn/framework3/trunk@13277 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:38:28 +00:00
8337c9e90a
Add the framework accessor, unbreak trunk
...
git-svn-id: file:///home/svn/framework3/trunk@13276 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:35:28 +00:00
7dfb74be10
See #4986 , make unicode encoding optional
...
git-svn-id: file:///home/svn/framework3/trunk@13275 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:26:15 +00:00
f6e3065a51
camel case the advanced options
...
git-svn-id: file:///home/svn/framework3/trunk@13274 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 14:35:02 +00:00
1902b92878
Merge custom prompt code
...
git-svn-id: file:///home/svn/framework3/trunk@13272 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 06:14:25 +00:00
bffc8088c3
don't just ignore the prefix. see r13244
...
git-svn-id: file:///home/svn/framework3/trunk@13250 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 23:27:37 +00:00
d4055e8697
to_s on table was appending to it self every time it was called
...
git-svn-id: file:///home/svn/framework3/trunk@13244 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 22:04:13 +00:00
93839922dd
fix method name in doc comment
...
git-svn-id: file:///home/svn/framework3/trunk@13235 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 19:52:52 +00:00
b877d3c639
Added memory_grep post module and updated the GetProcessHeaps definition in railgun
...
git-svn-id: file:///home/svn/framework3/trunk@13225 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 17:06:26 +00:00
628f29c551
Correctly throw a not-supported error on older ruby
...
git-svn-id: file:///home/svn/framework3/trunk@13223 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 14:49:34 +00:00
d23a5f6092
"The GetFileSecurityA and GetFileSecurityW functions have a "RequestedInformation" that is defined as a PBLOB and should be a DWORD." - Keith Faber. Thank you Keith! see #4364
...
git-svn-id: file:///home/svn/framework3/trunk@13201 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:48:09 +00:00
cccbdf9fab
This patch allows meterpreter to work with file paths and user names that are not of the US-ASCII character set.
...
git-svn-id: file:///home/svn/framework3/trunk@13200 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:32:52 +00:00
1e1d7c534d
"This is the first update to the Railgun Advapi32.dll Definitions. It adds some of the Windows CryptoAPI function calls." - David Maloney. see #4746
...
git-svn-id: file:///home/svn/framework3/trunk@13199 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:17:48 +00:00
572a5a5b8b
Added method "functions" to DLLWrapper that grabs the DLL's "functions" so that people can continue to test for function existence via .functions['blah'], evne though I hate this, I want to be backwards compatible. This will be deprecated eventually
...
git-svn-id: file:///home/svn/framework3/trunk@13198 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 15:15:26 +00:00
59015b2cbf
Closes Redmine issue 3073 (Railgun DLL cache/definition loader needs a rewrite). Major overhaul of how railgun handles DLLs and requests to them. def_*.rb files are now formed differently, this may break your code if you made changes to railgun/def/def_* or railgun.rb, see http://blog.minorcrash.com/2011/07/new-way-to-add-dlls-to-railgun.html
...
git-svn-id: file:///home/svn/framework3/trunk@13181 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-15 00:18:01 +00:00
d1cfa7560f
Update DHCP server for correctness, reliability, simplicity.
...
Actually keep track of which clients get which IP, only give PXE options to PXE clients, and provide more control over serving to PXE and/or normal clients.
git-svn-id: file:///home/svn/framework3/trunk@13165 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 02:34:25 +00:00
65702f64b6
Check to make sure we are running under Console2; all sorts of gremlins and threading bugs appear when running under a bare cmd.exe console, this should save us a few bug reports.
...
git-svn-id: file:///home/svn/framework3/trunk@13160 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-13 05:01:37 +00:00
687aaf5c71
Apply egghunter patch (by corelanc0d3r) for DEP bypass size calculation improvement.
...
Please see #4909
git-svn-id: file:///home/svn/framework3/trunk@13153 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 01:06:15 +00:00
7f743a5c1b
make meterpreter's File.basename() honor both kinds of directory seperators, use the remote basename as the dest when dest is implicit
...
git-svn-id: file:///home/svn/framework3/trunk@13124 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-08 00:08:42 +00:00
9c8605813e
don't wait for the session to send back a response after telling it to die
...
git-svn-id: file:///home/svn/framework3/trunk@13083 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:29:00 +00:00
56de119a0f
add a few opera fingerprints gathered from http://www.giac.org/paper/gwapt/1353/client-fingerprinting-analysis-browser-scripting-environment/115300
...
git-svn-id: file:///home/svn/framework3/trunk@13082 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:20:31 +00:00
0818a856b6
Some fixups for some new AuthBrute hotness.
...
git-svn-id: file:///home/svn/framework3/trunk@13075 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 06:52:52 +00:00
7d9f36d4b9
Adds support for the new regloadkey/regunloadkey operations.
...
git-svn-id: file:///home/svn/framework3/trunk@13072 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 05:35:18 +00:00
5f5c024193
supress a useless exception (trying to close a closed stream)
...
git-svn-id: file:///home/svn/framework3/trunk@13071 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 05:12:07 +00:00
92bb531af5
New bins, new functions, more info soon
...
git-svn-id: file:///home/svn/framework3/trunk@13059 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-29 06:12:03 +00:00
a98602ed8d
Shut down properly through session.kill
...
git-svn-id: file:///home/svn/framework3/trunk@13055 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:38:24 +00:00
9220506ba2
Merge in recent meterpreter work. These are not the commits you are looking for (more info on what all this is later this week).
...
git-svn-id: file:///home/svn/framework3/trunk@13053 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:26:43 +00:00
5bbf27bf5b
Woops, this may not have a prompt accessor, find another way
...
git-svn-id: file:///home/svn/framework3/trunk@13029 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 20:33:15 +00:00
James Lee
gaspmat@gmail.com
HD Moore
Tod Beardsley
HD Moore
sinn3r
Rob Fuller
matugm
Jon Hart
Tod Beardsley
Brandon Perry
chao-mu
Joshua Smith
chao
David Maloney
Xero Hawk
Joshua J. Drake
scriptjunkie
Dillon
Tom Samstag
Wei Chen
James Lee
Carlos Perez
David Rude
Jonathan Cran