1c86441f12
This removes the abortive_close code for stream sockets, it was leading to inconsistencies in how dead sessions were cleaned up
...
git-svn-id: file:///home/svn/framework3/trunk@12519 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 03:59:02 +00:00
b93e134195
Use shell_write vs ring.put
...
git-svn-id: file:///home/svn/framework3/trunk@12516 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 23:07:02 +00:00
d98f8dfd89
Make it clear that all Rex::IO::Stream implementations must accept a second parameter called opts for the read, write, and put methods
...
git-svn-id: file:///home/svn/framework3/trunk@12515 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 21:39:09 +00:00
366bc8979d
Only try to report to the database if the database driver is active. Fixes #4306
...
git-svn-id: file:///home/svn/framework3/trunk@12512 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 20:29:01 +00:00
c668534105
This normalizes openssl non-blocking support across both 1.8.x/1.9.1 and 1.9.2+
...
git-svn-id: file:///home/svn/framework3/trunk@12509 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 17:25:26 +00:00
eb78aac8dd
Only try to catch the non-blocking exceptions if they are defined
...
git-svn-id: file:///home/svn/framework3/trunk@12508 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 16:30:45 +00:00
d402ebf6fb
Fix #3498 by showing post module options in the info output
...
git-svn-id: file:///home/svn/framework3/trunk@12506 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 16:06:37 +00:00
1eee55b3cf
remove a crufty require
...
git-svn-id: file:///home/svn/framework3/trunk@12502 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 03:42:26 +00:00
e30d2bbdd4
revert r12476, as it breaks interactive meterpreter channels. r12495 and r12494 should deal with what it was it was trying to solve in the first place. fixes #4293 .
...
git-svn-id: file:///home/svn/framework3/trunk@12496 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 00:29:48 +00:00
a170d37c62
make it a little clearer what getprivs actually does
...
git-svn-id: file:///home/svn/framework3/trunk@12492 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-01 22:28:09 +00:00
39cab9b076
Correct use of select and expand the listen queue for TCP Servers
...
git-svn-id: file:///home/svn/framework3/trunk@12484 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 18:08:52 +00:00
140a304032
Specify IO::select for sleep directly.
...
git-svn-id: file:///home/svn/framework3/trunk@12483 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 17:56:38 +00:00
22537ffbde
A few more tweaks to non-blocking ssl mode
...
git-svn-id: file:///home/svn/framework3/trunk@12482 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 10:24:52 +00:00
96ac0fd51a
Swap out exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@12481 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 08:47:32 +00:00
5758f2ab46
Add support for non-blocking OpenSSL sockets when the Ruby version supports them (1.9.2+ or with openssl-nonblock gem).
...
git-svn-id: file:///home/svn/framework3/trunk@12480 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 07:59:33 +00:00
6bdf2a4e2b
Proactively wrap each() in other Hash based classes to avoid situations that trigger modification during enumeration
...
git-svn-id: file:///home/svn/framework3/trunk@12479 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:59:27 +00:00
20c949d1fb
Fix some bad copypasta from non-blocking write commit. This should make stream sessions happy again.
...
git-svn-id: file:///home/svn/framework3/trunk@12476 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:25:42 +00:00
e99b5a4f35
Un-break DHCP server when not using served_over.
...
Variable must be initialized before use regardless of whether HOSTNAME is defined.
git-svn-id: file:///home/svn/framework3/trunk@12471 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 22:58:55 +00:00
0978047673
clean up help a little for several meterpreter file commands
...
git-svn-id: file:///home/svn/framework3/trunk@12451 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 00:38:15 +00:00
8ba356271f
Fixes #4223 on Windows by catching the specific exception class
...
git-svn-id: file:///home/svn/framework3/trunk@12450 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 00:20:32 +00:00
2031c0d288
Importing Nexpose reports should retain test keys (which are usually some kind of proof or expanded details about a vulnerability).
...
git-svn-id: file:///home/svn/framework3/trunk@12442 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 17:31:26 +00:00
b24b787e0a
Add the right class wrappers
...
git-svn-id: file:///home/svn/framework3/trunk@12426 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 19:35:25 +00:00
4426a1b7f2
Port of the python Manifest.mbdb parser
...
git-svn-id: file:///home/svn/framework3/trunk@12424 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 18:21:13 +00:00
9d715a1492
Switch from readpartial to read_nonblock, which works around an OpenSSL deadlock. This also adds support for the openssl-nonblock gem's specific exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@12414 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 20:45:49 +00:00
56049012cb
remove my code out of the tree, tests all passing. thanks chao-mu!
...
git-svn-id: file:///home/svn/framework3/trunk@12413 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 02:49:14 +00:00
c9ab8f248d
commit the rest of chao's patch :/
...
git-svn-id: file:///home/svn/framework3/trunk@12412 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 01:10:49 +00:00
a61e7290b0
Do not modify the string passed to write() operations
...
git-svn-id: file:///home/svn/framework3/trunk@12394 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 17:29:11 +00:00
8b920a8f95
Dont modify the data buffer passed to write
...
git-svn-id: file:///home/svn/framework3/trunk@12393 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 17:17:26 +00:00
86bca6438f
add a routes table; delete each comm's routes when flushing
...
git-svn-id: file:///home/svn/framework3/trunk@12377 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 17:49:27 +00:00
78d3998854
Fixes #4125 , add hostname support to the Rex DHCP server & aux module
...
git-svn-id: file:///home/svn/framework3/trunk@12375 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 14:21:36 +00:00
0437d20f9d
Commit railgun tests from chao-mu: http://blog.minorcrash.com/2011/04/railgun-update-1st-milestone-almost.html
...
~/framework$ ruby lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts.rb
Loaded suite lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts
Started
.............
Finished in 8.804126009 seconds.
13 tests, 30 assertions, 0 failures, 0 errors
git-svn-id: file:///home/svn/framework3/trunk@12366 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-19 14:15:45 +00:00
f1f15ba448
Allow socks4a to relay through meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@12353 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 18:17:49 +00:00
1b63d36c85
Fix typo reported by mubix
...
git-svn-id: file:///home/svn/framework3/trunk@12346 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 04:40:06 +00:00
1d0d6195bd
fixes a load error
...
git-svn-id: file:///home/svn/framework3/trunk@12344 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 02:08:42 +00:00
03fdd9a0d0
add support method used in previous commit (r12341)
...
git-svn-id: file:///home/svn/framework3/trunk@12342 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 00:35:32 +00:00
c14580adf3
add help for several meterp commands and allow the channel command to do everything the associated with channels (list, interact, read, write, close)
...
git-svn-id: file:///home/svn/framework3/trunk@12341 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 00:34:45 +00:00
827bec98d6
ljust the option names so we don't have funky alignment for multi-char option names
...
git-svn-id: file:///home/svn/framework3/trunk@12335 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 15:57:52 +00:00
9c1b4ddca5
add a load command. this will later deprecate the use command under meterpreter for 3.7 release
...
git-svn-id: file:///home/svn/framework3/trunk@12334 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 13:59:57 +00:00
d294f511b6
add logging for interactive meterpreter channels
...
git-svn-id: file:///home/svn/framework3/trunk@12328 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 21:10:15 +00:00
50155919ea
Add File.exists? as a wrapper to File.stat
...
git-svn-id: file:///home/svn/framework3/trunk@12324 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 15:29:57 +00:00
904e7af88b
added API call for extracting keystrokes from client.ui.keyscan_dump
...
git-svn-id: file:///home/svn/framework3/trunk@12323 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 02:21:40 +00:00
f43fe6e31b
clarify the help for getprivs
...
git-svn-id: file:///home/svn/framework3/trunk@12309 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 16:01:40 +00:00
05e47166a3
push the check for msf up to the main meterpreter command dispatcher and fire events for file upload/download.
...
git-svn-id: file:///home/svn/framework3/trunk@12307 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-12 20:39:46 +00:00
857b5c786b
don't store less accurate nmap fingerprints, see #4099
...
git-svn-id: file:///home/svn/framework3/trunk@12302 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 23:05:07 +00:00
36367f8a67
save os version info (usually windows service packs) and close the names tag, so we don't store every xml tag's text as a hostname
...
git-svn-id: file:///home/svn/framework3/trunk@12298 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 22:16:25 +00:00
d5d9d56081
Create a dedicated db table to track sessions & session events.
...
* Add new db tables for session & session_events
* Migrate existing session data from events db table
* Modify session report methods to log to the new tables
git-svn-id: file:///home/svn/framework3/trunk@12273 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-07 21:59:32 +00:00
485211288f
doc formatting
...
git-svn-id: file:///home/svn/framework3/trunk@12237 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 18:06:41 +00:00
cd8866d22f
add doc for initialize
...
git-svn-id: file:///home/svn/framework3/trunk@12235 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:32:17 +00:00
dcefdc5f28
whitespace and rdoc fixes
...
git-svn-id: file:///home/svn/framework3/trunk@12234 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:27:12 +00:00
7444436750
fix directives for rdoc
...
git-svn-id: file:///home/svn/framework3/trunk@12233 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:06:59 +00:00
3e0982a792
enable ntlmv2 by default for smb, mssql and http
...
git-svn-id: file:///home/svn/framework3/trunk@12227 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 21:06:50 +00:00
f9680c854b
reworj http ntlm authentificaion and correct some bug
...
git-svn-id: file:///home/svn/framework3/trunk@12225 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 20:38:27 +00:00
b38a187631
mssql login : enable ntlmv2 authentification
...
git-svn-id: file:///home/svn/framework3/trunk@12223 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 17:02:23 +00:00
c5e137d7d3
correct a bug on ntlm signing
...
git-svn-id: file:///home/svn/framework3/trunk@12211 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 20:58:11 +00:00
b823ea9876
fix undefined method error by using the correct class
...
git-svn-id: file:///home/svn/framework3/trunk@12169 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-28 18:42:22 +00:00
19a4a2d88a
move some code from lib/rex/proto/smb/client to lib/rex/proto/ntlm/util and add a mini mixin for ntlm
...
git-svn-id: file:///home/svn/framework3/trunk@12162 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 20:14:56 +00:00
3c6b33bd80
continuation of tests / fixes from chao.
...
git-svn-id: file:///home/svn/framework3/trunk@12155 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 00:37:54 +00:00
08df8179cc
mssql login : enable windows authentification and add an encrypion check through tds prelogin mechanism
...
see issue #402 for some comment on the implementation and the todo's
git-svn-id: file:///home/svn/framework3/trunk@12154 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 00:24:19 +00:00
d18f14de4e
add a test suite for railgun
...
git-svn-id: file:///home/svn/framework3/trunk@12152 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 19:49:08 +00:00
35c33020ca
merge in test updates from chao-mu
...
git-svn-id: file:///home/svn/framework3/trunk@12150 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 19:29:59 +00:00
4892a67fa1
small tweaks, remove model - no longer necessary
...
git-svn-id: file:///home/svn/framework3/trunk@12143 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:46:55 +00:00
cf3fbdad71
unneeded require in comments
...
git-svn-id: file:///home/svn/framework3/trunk@12142 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:45:52 +00:00
50d573f282
doh! commit the rest of chao's railgun work
...
git-svn-id: file:///home/svn/framework3/trunk@12141 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:33:05 +00:00
29061c5799
merge in chao-mu's changes. all tests passing :)
...
git-svn-id: file:///home/svn/framework3/trunk@12138 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-25 21:16:41 +00:00
c09be5561d
this should have been a raise all along, see r9752
...
git-svn-id: file:///home/svn/framework3/trunk@12119 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 23:15:11 +00:00
3527aa2472
correct width calculation for sysinfo
...
git-svn-id: file:///home/svn/framework3/trunk@12057 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 16:58:24 +00:00
12ea375d25
See #3183 : Pad the plain text before trying DES on it.
...
git-svn-id: file:///home/svn/framework3/trunk@12033 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 08:55:12 +00:00
a31eadc554
Change IPs before offer instead of between offer and ack. Fixes #3973 .
...
git-svn-id: file:///home/svn/framework3/trunk@12030 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 00:33:02 +00:00
b5bd7599fd
Updated usage message to reflect that more than one resource file can be used
...
git-svn-id: file:///home/svn/framework3/trunk@12017 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-18 02:47:58 +00:00
3416862f13
Resource command for Meterpreter Sessions
...
git-svn-id: file:///home/svn/framework3/trunk@12016 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-18 02:44:15 +00:00
a7d2a34fe2
move comment
...
git-svn-id: file:///home/svn/framework3/trunk@11972 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:27:44 +00:00
b7a0a305ee
allow psexec to success when SPN validation level is required on windows seven / 2008r2 servers
...
git-svn-id: file:///home/svn/framework3/trunk@11971 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:12:07 +00:00
b68396351a
See #3941 . This is a first attempt at supporting driving nmap via a metasploit module. It's a somewhat hefty checkin that includes the Nmap auxiliary mixin as well as an oracle login bruteforce module that uses it.
...
This definitely needs to be tested on Win32 before it can be called f i x e d, due to the differences between the nmap binaries and the way files are created and used.
Also, the oracle_login scanner could use another once-over for error handling -- don't rely on that yet.
Once this all works the way I expect, I'll document the procedure more thoroghly so people can take advantage.
git-svn-id: file:///home/svn/framework3/trunk@11948 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-13 22:52:50 +00:00
468f500e31
add a function to detect if ntlm response comes from an empty pwd
...
git-svn-id: file:///home/svn/framework3/trunk@11936 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-11 20:24:49 +00:00
dbcb02b8de
future-proof the sysinfo command by generically looping over the values returned by the server instead of hardcoding keys
...
git-svn-id: file:///home/svn/framework3/trunk@11925 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-10 17:23:47 +00:00
b5323c129c
when ntlmssp is not used, better to disable signing then raising an error
...
git-svn-id: file:///home/svn/framework3/trunk@11918 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 21:51:11 +00:00
fea87fb82b
enable pass-the-hash when signing is required
...
git-svn-id: file:///home/svn/framework3/trunk@11917 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 21:13:04 +00:00
2fa2ca174c
use the correct exception
...
git-svn-id: file:///home/svn/framework3/trunk@11916 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 17:31:53 +00:00
7755cdd983
correct a bug on ntlmv2_response and comment style compliance
...
git-svn-id: file:///home/svn/framework3/trunk@11915 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 16:57:33 +00:00
612c2e6796
This commit fixes much of the NTLM crypt code to work properly again, fixing #3918 as well.
...
git-svn-id: file:///home/svn/framework3/trunk@11914 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 05:04:42 +00:00
046d75533a
This patch adds a method for recognizing LM/NTLM hashes, disables signing when no user is specified and the server denies our NTLMSSP logon with an empty user, and cleans up the indents and formatting for some of the new code
...
git-svn-id: file:///home/svn/framework3/trunk@11912 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 03:35:25 +00:00
315a1cb4f2
Disable signing when we reach this corner case, required to setup null sessions to XP SP2/SP3 (no domain)
...
git-svn-id: file:///home/svn/framework3/trunk@11910 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 03:08:11 +00:00
b04ac2d446
enable pass-the-hash for ntlmv2 as well, signing is not yet suported
...
git-svn-id: file:///home/svn/framework3/trunk@11908 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 02:41:50 +00:00
1f948c1e17
re-enable pass-the-hash for smb client when ntlmv1 or ntlm2_session is used ( ntlmv2 or signing not yet supported but coming soon)
...
git-svn-id: file:///home/svn/framework3/trunk@11906 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 01:56:09 +00:00
5f6995e8d3
enable ntlmv2 and signing for smb client stack (pth implementation is coming), fixes #11678 and #152
...
git-svn-id: file:///home/svn/framework3/trunk@11893 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-07 19:57:53 +00:00
c775f07a82
this test works, re-enable. fix a 1.9 compat issue.
...
git-svn-id: file:///home/svn/framework3/trunk@11877 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-04 16:43:20 +00:00
3e99eea120
Adds a to_csv method to the table class
...
git-svn-id: file:///home/svn/framework3/trunk@11861 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-02 15:06:43 +00:00
1cdc5d8c0a
add_row instead of just adding to self.rows. fixes #3825
...
git-svn-id: file:///home/svn/framework3/trunk@11844 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-28 02:30:47 +00:00
5db118fa9b
add support for reading various WinAPI data structures, thanks, chao-mu! fixes #3721
...
git-svn-id: file:///home/svn/framework3/trunk@11778 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 19:23:36 +00:00
64529011a0
add the meterpreter platform to the output of sysinfo command
...
git-svn-id: file:///home/svn/framework3/trunk@11772 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 00:29:43 +00:00
f8c2fa6b72
aesthetic
...
git-svn-id: file:///home/svn/framework3/trunk@11771 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 00:25:36 +00:00
d6b8ef4c16
don't show meta type for packets (since they don't have one)
...
git-svn-id: file:///home/svn/framework3/trunk@11768 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 20:04:46 +00:00
b7d1ccb304
add packet-type to meterpreter packets' inspect
...
git-svn-id: file:///home/svn/framework3/trunk@11767 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 19:59:12 +00:00
e8e0841afc
don't error out if we previously loaded the client extension
...
git-svn-id: file:///home/svn/framework3/trunk@11763 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 04:32:26 +00:00
b56f6293a3
stupid debugging
...
git-svn-id: file:///home/svn/framework3/trunk@11760 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 02:09:32 +00:00
24f37e25de
add a search path for client extensions
...
git-svn-id: file:///home/svn/framework3/trunk@11758 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 21:13:44 +00:00
257fe9d47c
add more descriptive usage for meterpreter run command
...
git-svn-id: file:///home/svn/framework3/trunk@11751 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-15 22:34:46 +00:00
e94d39af2c
un-ghetto meterpreter output logging
...
git-svn-id: file:///home/svn/framework3/trunk@11750 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-15 05:45:01 +00:00
708ff0e2ce
fix 1.8 vs 1.9 compat in option parsing
...
git-svn-id: file:///home/svn/framework3/trunk@11745 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-12 22:25:02 +00:00
648214cad2
make help work the same in meterpreter as main console
...
git-svn-id: file:///home/svn/framework3/trunk@11690 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-01 01:20:55 +00:00
13f7ad406a
make it more obvious when portfwd usage is wrong, add a help cmd for it
...
git-svn-id: file:///home/svn/framework3/trunk@11689 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-01 01:14:25 +00:00
ac651fba6b
Merge code from Alexandre Maloteaux, fixes #3615
...
git-svn-id: file:///home/svn/framework3/trunk@11678 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 19:26:35 +00:00
8da92a7bb9
don't bomb out when given no args or an invalid module for the info command, fixes #3558 , thanks chao-mu for the patch!
...
git-svn-id: file:///home/svn/framework3/trunk@11672 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 18:07:30 +00:00
05022b6fe4
client.framework, there's no top-level framework obj in rex. see #3557
...
git-svn-id: file:///home/svn/framework3/trunk@11670 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 16:46:41 +00:00
2618e4fffe
Add traceroute parsing to nmap
...
git-svn-id: file:///home/svn/framework3/trunk@11661 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 23:32:14 +00:00
88a5b1982e
always reload post modules when run from meterpreter prompt, fail and error out instead of running the old one when a reload fails. Fixes #3557
...
git-svn-id: file:///home/svn/framework3/trunk@11659 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 17:02:26 +00:00
a7b5e831f7
clean up how help works, pull cmd_reload up so all module types can use it
...
git-svn-id: file:///home/svn/framework3/trunk@11658 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 03:29:20 +00:00
47a706962a
do the win32api thing if it's mingw. thanks Ludovic Courgnaud
...
git-svn-id: file:///home/svn/framework3/trunk@11651 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 19:20:45 +00:00
d2670d52ec
add BufferRegister and BufferOffset support for shikata_ga_nai. see #3563 . tested this pretty extensively. /me crosses fingers
...
git-svn-id: file:///home/svn/framework3/trunk@11646 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 04:24:41 +00:00
56b112e03b
See #3596 , Only force encoding for rubies that support encoding
...
git-svn-id: file:///home/svn/framework3/trunk@11640 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 20:03:33 +00:00
1e6365ed58
Fixes #3596 , Force Rex::Text.gzip to use ASCII-8BIT strings, Reverts r10653
...
git-svn-id: file:///home/svn/framework3/trunk@11639 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 19:59:56 +00:00
05fd7b4e57
Patch for railgun and post mixin; and module from cha-mou to add capability to delete users on windows hosts.
...
git-svn-id: file:///home/svn/framework3/trunk@11638 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 13:02:35 +00:00
3794ed35cc
Apply patches from Matthew Weeks (scriptjunkie) to fix traversal flaws outlined in his Black Hat DC talk:
...
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-wp.pdf
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-Slides.pdf
git-svn-id: file:///home/svn/framework3/trunk@11636 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 02:24:37 +00:00
3346a30023
See #1936 , Add FreeSid definition and convert several PSID* out params to PDWORD
...
git-svn-id: file:///home/svn/framework3/trunk@11628 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 05:36:38 +00:00
8b5f0f6559
Allow getsystem to report its success as a host note.
...
git-svn-id: file:///home/svn/framework3/trunk@11622 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:08:35 +00:00
b8b3d9e00f
See #1936 , Apply patch from Chao Mu - PSID is kind of opaque, so we treat it as a pointer only (not a blob)
...
git-svn-id: file:///home/svn/framework3/trunk@11618 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 22:05:28 +00:00
dfbef1e38c
make sure we have the right kind of args. fixes argument processing for scripts
...
git-svn-id: file:///home/svn/framework3/trunk@11605 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 23:36:11 +00:00
987ce12ba8
Fixes #3552 , add ConvertStringSidtoSid
...
git-svn-id: file:///home/svn/framework3/trunk@11604 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 23:15:42 +00:00
d120892e7c
post modules working for shell sessions, fixes #3541
...
git-svn-id: file:///home/svn/framework3/trunk@11599 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 02:24:21 +00:00
64d160e393
add a method for determining if an address is internal, i.e. within the ranges specified in rfc1918 or rfc5735, and cleanup the unit tests to work on 1.9 and account for various changes to the library that previously didn't get any love in the tests, e.g. r4545.
...
git-svn-id: file:///home/svn/framework3/trunk@11580 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-15 04:40:21 +00:00
0158cd28f1
tab complete local filenames for upload command
...
git-svn-id: file:///home/svn/framework3/trunk@11575 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 20:22:13 +00:00
ef883859f1
jduck is right, this isn't necessary since non-matches get removed for us later. if this does indeed make it easier to make modules tab like files later, we can add it back in.
...
git-svn-id: file:///home/svn/framework3/trunk@11572 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 16:34:09 +00:00
0355271662
fix a <1.9.2 compat bug. =(
...
git-svn-id: file:///home/svn/framework3/trunk@11569 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 00:17:07 +00:00
7226a43bea
move tab completion helpers up to ShellDispatcher to avoid copy-paste and allow non-msf shells to complete filenames
...
git-svn-id: file:///home/svn/framework3/trunk@11562 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 22:09:32 +00:00
855f8b0752
fix more silly tab completion behavior
...
git-svn-id: file:///home/svn/framework3/trunk@11546 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 18:55:37 +00:00
f001463ed1
catch ENOTSOCK errors in has_read_data?
...
git-svn-id: file:///home/svn/framework3/trunk@11541 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 08:47:42 +00:00
87cdaa4ea5
add an info command + tab completion for post modules. fixes #3478
...
git-svn-id: file:///home/svn/framework3/trunk@11534 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 18:37:23 +00:00
eb4ae0e5b7
add tab-completion for post modules in the meterpreter run command
...
git-svn-id: file:///home/svn/framework3/trunk@11498 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 22:16:24 +00:00
dbeae8df24
add support for running post modules from the meterpreter prompt. options are set in the same way as the -o arg to run, e.g. run post/escalate/bypassuac LHOST=192.168.0.1
...
git-svn-id: file:///home/svn/framework3/trunk@11496 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:28:00 +00:00
58277dd00e
updated browser detection for android, ipod/ipad/iphone, a couple of new fingerprints for FF and IE.
...
git-svn-id: file:///home/svn/framework3/trunk@11492 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:11:54 +00:00
ecfcb7b89a
updated chrome detection
...
git-svn-id: file:///home/svn/framework3/trunk@11480 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 00:53:53 +00:00
bec8a95b02
Merges pello's Cisco uploader module, merges changes back into the TFTP server class. Fixes #3429
...
git-svn-id: file:///home/svn/framework3/trunk@11454 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-30 16:37:58 +00:00
269f123143
add PropertySetStream implementation in preperation for upcoming exploit ;)
...
git-svn-id: file:///home/svn/framework3/trunk@11444 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 17:07:46 +00:00
c25b08452b
remove LocalInput as a string (no Rex::Ui::Text::Input::File class exists), see #3426
...
git-svn-id: file:///home/svn/framework3/trunk@11440 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 02:15:18 +00:00
a1af22d330
applying a patch to enable easy output to file: ./msfconsole -o output.txt -r input.msfrc
...
git-svn-id: file:///home/svn/framework3/trunk@11436 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 20:24:17 +00:00
30affd4b2c
This commit adds a new set of discovery modules from wuntee and some useful utility methods for working with link-local addresses
...
git-svn-id: file:///home/svn/framework3/trunk@11417 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 16:43:53 +00:00
2bb7528e26
Switch to 8.8.8.8 from 50.50.50.50 now that the 50 block has been allocated. Note that this isn't actually sending data to the target
...
git-svn-id: file:///home/svn/framework3/trunk@11384 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-20 22:13:49 +00:00
c28ad8ea0c
Minor improvements and corner case bug fixes to session handling. This fixes issues that can come up when a stream is shut down
...
git-svn-id: file:///home/svn/framework3/trunk@11371 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-18 03:00:26 +00:00
925e4a66f0
See #3371 . Uncommits the database logging of smb_hash credentials.
...
This kind of meterpreter update may not actually be desirable, given the introduction of a dependency on Metasploit Framework in to the stand-alone Rex library.
#3371 will remain open until this debate is resolved. In the meantime, need to back this out. :/
git-svn-id: file:///home/svn/framework3/trunk@11351 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 16:53:28 +00:00
9627194330
Hashdump will now save found credentials to the database.
...
git-svn-id: file:///home/svn/framework3/trunk@11347 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 02:42:45 +00:00
244dc18867
Fixes #3348 . Adds the PacketFu packet processing library from http://code.google.com/p/packetfu/ , and adds a db_import path for pcaps (it's straightforward -- db_import /path/to/file.pcap will import hosts and service ports from a pcap file.)
...
git-svn-id: file:///home/svn/framework3/trunk@11308 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 17:44:48 +00:00
e3f909cef9
Fixes for chunked http reply processing, additional cisco configuration support, and a scanner module for unprotected cisco device managers.
...
git-svn-id: file:///home/svn/framework3/trunk@11287 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 07:37:09 +00:00
5b43ea2c15
Buffer data before sending it to the response parser, handle buffered data on disconnect
...
git-svn-id: file:///home/svn/framework3/trunk@11286 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 06:19:36 +00:00
2742475ae0
fix refactoring scrap
...
git-svn-id: file:///home/svn/framework3/trunk@11258 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 22:30:01 +00:00
e5dc368b57
Add WoW64 detection
...
git-svn-id: file:///home/svn/framework3/trunk@11256 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 21:05:07 +00:00
19ba0164f6
fix bad socket reference
...
git-svn-id: file:///home/svn/framework3/trunk@11255 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 20:37:31 +00:00
2192d06189
Handle cases where the class has already been loaded
...
git-svn-id: file:///home/svn/framework3/trunk@11242 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 13:45:49 +00:00
ebaf100a9f
Add RangeWalker#include_range?
...
git-svn-id: file:///home/svn/framework3/trunk@11237 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-06 22:18:49 +00:00
185f50212f
use TCPServer instead of Socket + bind and work around JRuby's broken Socket#getsockname (see http://jira.codehaus.org/browse/JRUBY-5232 )
...
git-svn-id: file:///home/svn/framework3/trunk@11211 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 23:49:02 +00:00
b89fe64e74
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@11209 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 22:13:39 +00:00
5a01ede38a
only assign the original request if a response was returned
...
git-svn-id: file:///home/svn/framework3/trunk@11193 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-01 16:32:40 +00:00
bf24e44114
avoid creating a second manifest.mf entry if one already exists
...
git-svn-id: file:///home/svn/framework3/trunk@11175 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 07:10:57 +00:00
85113deb04
allow modifying the data in a Zip::Entry to support the previous commit (r11172)
...
git-svn-id: file:///home/svn/framework3/trunk@11173 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 03:52:46 +00:00
1061baba8d
fix some potential bugs from Edward Kolodka, fixes #3256
...
git-svn-id: file:///home/svn/framework3/trunk@11165 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 00:16:07 +00:00
ee7d5827d5
prevent mangling the input string
...
git-svn-id: file:///home/svn/framework3/trunk@11148 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 07:42:34 +00:00
20dc5d57cf
force key length to 8, pad if less and truncate if more
...
git-svn-id: file:///home/svn/framework3/trunk@11131 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 20:57:26 +00:00
23a6874954
add support for browsers other than firefox, starting with sensible-browser to try to use the system default. fixes #3059 , thanks Larry Wert for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@11108 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 04:42:59 +00:00
2e72926638
Add audio (microphone) recording support to stdapi.
...
git-svn-id: file:///home/svn/framework3/trunk@11087 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 00:32:39 +00:00
4c93eb974f
this fixes #3602 , incompatabilities TBD
...
git-svn-id: file:///home/svn/framework3/trunk@11077 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:36:38 +00:00
51fd4fb550
this fixes #3602 , incompatabilities TBD
...
git-svn-id: file:///home/svn/framework3/trunk@11076 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:32:29 +00:00
b5c5e21b24
this fixes #3602 , incompatabilities TBD
...
git-svn-id: file:///home/svn/framework3/trunk@11075 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:28:35 +00:00
9d0cf722fa
Spelling!
...
git-svn-id: file:///home/svn/framework3/trunk@11042 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 20:00:52 +00:00
77bc5cf6cd
Big VNC update:
...
* Created Rex::Proto::RFB
* Updated vnc_none_auth scanner to use Rex::Proto::RFB::Client
* Added vnc_login (refactored from carstein)
* Created an initial vnc_passwords.txt file
* Removed cipher/des.rb - incompatible license
* Updated getvncpw script to use new Rex::Proto::RFB::Cipher.decrypt
git-svn-id: file:///home/svn/framework3/trunk@11033 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 03:37:45 +00:00
54f3563c7e
Store the http request in the http response object when Rex::HTTP::Client.send_recv() is used. Let Anemone store the request as well, passing it into the Page object for further analysis.
...
git-svn-id: file:///home/svn/framework3/trunk@11023 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 05:25:39 +00:00
375a655317
Fix windows platform detection
...
git-svn-id: file:///home/svn/framework3/trunk@11012 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 19:46:33 +00:00
29073a519a
Small tweaks to the thread code, add an update method
...
git-svn-id: file:///home/svn/framework3/trunk@11011 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 17:28:40 +00:00
a12d9f8dbf
This patch adds detailed thread tracking across the metasploit framework, along with a new console command (threads) to manage these. This level of tracking is required to accurately monitor background tasks, assist with debugging, and kill orphaned threads.
...
git-svn-id: file:///home/svn/framework3/trunk@11003 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 06:19:49 +00:00
b171d5192e
Changes to handle errors and to output print
...
git-svn-id: file:///home/svn/framework3/trunk@11001 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 01:27:15 +00:00
594a46bfc7
Merge webcam extension into stdapi.
...
git-svn-id: file:///home/svn/framework3/trunk@10997 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:36:54 +00:00
8afc9ebb41
Revert, this is causing threading issues with Windows.
...
git-svn-id: file:///home/svn/framework3/trunk@10989 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 19:54:27 +00:00
3edccbc118
fix help message
...
git-svn-id: file:///home/svn/framework3/trunk@10986 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 16:55:36 +00:00
75cd356803
a less obnoxious .inspect
...
git-svn-id: file:///home/svn/framework3/trunk@10974 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:04:01 +00:00
db602dd478
Add functional in-memory webcam support.
...
git-svn-id: file:///home/svn/framework3/trunk@10954 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 02:24:28 +00:00
8f4cb4fbf6
Merge Zate Berg's latest patch
...
git-svn-id: file:///home/svn/framework3/trunk@10938 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-07 01:57:17 +00:00
8353bf7bf3
move 100-continue processing into Rex, fixes #3109
...
git-svn-id: file:///home/svn/framework3/trunk@10919 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 16:20:13 +00:00
652764ebd3
Merge in nCircle support from Dave Lassalle, handle file reads more consistently
...
git-svn-id: file:///home/svn/framework3/trunk@10902 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 21:44:16 +00:00
97d7290440
Fix an inadvertant change to close_key()
...
git-svn-id: file:///home/svn/framework3/trunk@10878 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 04:20:42 +00:00
1e4eed0559
Let recursive downloads skip over locked files
...
git-svn-id: file:///home/svn/framework3/trunk@10877 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 03:16:23 +00:00
fba2cb6d2d
Remove the response wait for close calls triggered by the finalizer, should help in a few corner cases that currently result in a timeout or hang.
...
git-svn-id: file:///home/svn/framework3/trunk@10876 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 03:03:29 +00:00
8e44f66d31
add a simple method for adding multiple files to a Jar from the file system. may eventually bubble this up to Rex::Zip::Archive
...
git-svn-id: file:///home/svn/framework3/trunk@10871 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:10:35 +00:00
33e11421b4
fix sytax error bugs in dhcp server
...
git-svn-id: file:///home/svn/framework3/trunk@10868 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:37:11 +00:00
2dbf731946
fix ArgumentError in everything that closes a process handle
...
git-svn-id: file:///home/svn/framework3/trunk@10776 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 17:10:46 +00:00
0e04505232
Fixes #3027 , a set of bugs introduced during the meterpreter posix work.
...
git-svn-id: file:///home/svn/framework3/trunk@10773 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 04:43:54 +00:00
44fa5c67a6
fix a latent issue with windows paths surrounded by quotes
...
git-svn-id: file:///home/svn/framework3/trunk@10763 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 09:50:12 +00:00
182943fe6c
This change allows IPv6 addresses to be ignored by passing false as a second parameter to getaddress()
...
git-svn-id: file:///home/svn/framework3/trunk@10761 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:27:00 +00:00
9d99bf1039
Store the original error code in the RequestError object as well, use this code to determine whether to raise a connect error or not
...
git-svn-id: file:///home/svn/framework3/trunk@10759 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:05:50 +00:00
e114f373b0
move content-disposition header before content-type, per rfc1867 examples
...
git-svn-id: file:///home/svn/framework3/trunk@10724 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 07:01:54 +00:00
467fceb2a7
Fixes #2692 by retrying writes when the sendQ is full.
...
git-svn-id: file:///home/svn/framework3/trunk@10712 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 21:50:03 +00:00
3e09fc30ae
Fixes #2070 by adding finalizers to process, event, thread, registry, and channels.
...
git-svn-id: file:///home/svn/framework3/trunk@10711 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 19:39:11 +00:00
f7bb3b82de
Fixes #2952 . Instead of raising an error when we hit the end of all possibles in converge_sets, just return what's left in the buffer, since it happens to be right anyway.
...
The associated test cases demonstrate that this doesn't cause any trouble (even with silly values) and nothing uses converged_sets except for pattern_create.
git-svn-id: file:///home/svn/framework3/trunk@10696 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 19:40:33 +00:00
238242ecb9
add latest nessus plugin patches from Zate, fixes #2704
...
git-svn-id: file:///home/svn/framework3/trunk@10685 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:54:35 +00:00
c7fc361140
apply patch from Peter, see #684
...
git-svn-id: file:///home/svn/framework3/trunk@10657 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 17:29:35 +00:00
dbbd0dc07e
This ensures that even if some wonky string encoding is passed as the body of a HTTP reply, it will be treated as binary. Fixes some of the HTTP Server exploits on Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10653 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 16:16:39 +00:00
0b82de4846
Force binmode for Tempfile use to prevent issues with Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10650 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 01:48:42 +00:00
2d425d2e67
Make our Quickfile's always binary mode
...
git-svn-id: file:///home/svn/framework3/trunk@10649 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 01:42:08 +00:00
5a2444eb24
Clean up web_vuln import, use additional fields
...
git-svn-id: file:///home/svn/framework3/trunk@10635 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 02:57:07 +00:00
e408d5a155
add windows error messages for windows meterpreter sessions, minor cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@10605 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 19:36:34 +00:00
41183d3395
Bump the packet queue timeout as well (10 minutes), which should handle even the worst lag
...
git-svn-id: file:///home/svn/framework3/trunk@10598 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 05:00:03 +00:00
9489c2fa58
Note on thread safety
...
git-svn-id: file:///home/svn/framework3/trunk@10597 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:55:06 +00:00
2e9138ebbc
This commit overhauls much of the meterpreter timeouts and staging processes. This fixes a bug with concurrent session handling, reduces CPU load by caching a single SSL certificate for all sessions, increases all of the critical timeouts, and generally makes mass ownage work better. We still need to limit the maximum number of concurrent on_session() threads to something sane to prevent sesssion spikes from dragging out the process even longer. The C-side meterpreter change is minimal and will only help with future compatibility if we move to non-blocking fd's for the SSL socket.
...
git-svn-id: file:///home/svn/framework3/trunk@10595 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:11:47 +00:00
e4a00b2fd1
Handle a larger backlog
...
git-svn-id: file:///home/svn/framework3/trunk@10594 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 03:20:09 +00:00
754225a80d
Implement per dispatch run channel_write of packets, remove __FUNCTION__ due to dprintf changes, and fix shutting down networkpug interfaces. Re-add networkpug binary.
...
git-svn-id: file:///home/svn/framework3/trunk@10586 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 11:52:38 +00:00
6a47af814a
Basic, still buggy support for NetSparker XML
...
git-svn-id: file:///home/svn/framework3/trunk@10585 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 06:24:26 +00:00
1afba58f94
Fix typos
...
git-svn-id: file:///home/svn/framework3/trunk@10584 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 04:16:48 +00:00
3250ab13e0
Add a parser for Retina XML
...
git-svn-id: file:///home/svn/framework3/trunk@10582 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 02:33:57 +00:00
1e75603894
Add a Quickfile class that is identical to Tempfile except for the finalizer
...
git-svn-id: file:///home/svn/framework3/trunk@10568 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 17:57:56 +00:00
4e7e69f768
Avoid GC issue with Tempfiles in meterpreter's command dispatcher.
...
git-svn-id: file:///home/svn/framework3/trunk@10567 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 17:26:33 +00:00
e2ed2f0d75
Fix a long-standing issue with Resolv.getaddress() being broken on Ruby 1.9.1 Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10544 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 14:49:19 +00:00
1b4190df38
This commit brings configurability to TCP Servers as to which Comm they use. The ReverseListenerComm and ListenerComm advanced options can be used to prevent a given listener from trying to bind a listener over the pivoted routed. This is useful for a number of situations and not possible to configure explicitly before.
...
git-svn-id: file:///home/svn/framework3/trunk@10534 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 02:11:22 +00:00
14cabd2611
Allow debugging to be enabled.
...
This will make it easier to hopefully track down bugs.
exploitme-posix.c - make complete stack executable. On some kernel versions, execstack doesn't do the trick.
git-svn-id: file:///home/svn/framework3/trunk@10485 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 05:58:59 +00:00
784e355d93
Networkpug improvements
...
git-svn-id: file:///home/svn/framework3/trunk@10484 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 05:58:48 +00:00
e646176db7
check number of fields before trying to add row
...
git-svn-id: file:///home/svn/framework3/trunk@10482 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 04:16:18 +00:00
cdc97316b5
Automatically close dead sessions (finally), also, automatically mark meterpreter sessions as dead when writes start to trigger exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@10475 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:57:30 +00:00
54c1ec843d
tab complete on scripts in ~/.msf3/scripts/meterpreter/ as well. fixes #2403
...
git-svn-id: file:///home/svn/framework3/trunk@10468 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 23:05:10 +00:00
ae48757fd5
new nessus plugin patches from Zate Berg
...
git-svn-id: file:///home/svn/framework3/trunk@10450 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 23:17:13 +00:00
465fe7c60d
nice work troulouliou, shuffling comments only
...
git-svn-id: file:///home/svn/framework3/trunk@10427 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 16:24:18 +00:00
3204b3ad83
Patch for the SMB timestamp parser which allows it to function in GMT+ zones
...
git-svn-id: file:///home/svn/framework3/trunk@10425 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 14:21:38 +00:00
50241faa57
Implement a sniffer for posix meterpreter using libpcap.
...
This version of the sniffer supports packet filtering after the packet count variable, like so:
meterpreter > sniffer_interfaces
1 - 'eth0' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )
2 - 'any' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )
3 - 'lo' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )
meterpreter > use sniffer
Loading extension sniffer...success.
meterpreter > sniffer_start 1 500000 icmp <-- picks up only icmp packets.
[*] Capture started on interface 1 (500000 packet buffer)
meterpreter > sniffer_stop 1
[*] Capture stopped on interface 1
git-svn-id: file:///home/svn/framework3/trunk@10424 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 11:43:30 +00:00
a179836fca
Initial import of networkpug, a pivoting interface using libpcap to monitor/inject packets on a interface on the remote machine.
...
git-svn-id: file:///home/svn/framework3/trunk@10423 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 09:35:46 +00:00
4590844871
tons of indentation fixes, some other style tweaks
...
git-svn-id: file:///home/svn/framework3/trunk@10394 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 08:06:27 +00:00
5d3089c135
raise EOFError from SSL connections
...
git-svn-id: file:///home/svn/framework3/trunk@10375 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 21:20:06 +00:00
ff22e5212e
revert to backward compatible method of using utc+zone
...
git-svn-id: file:///home/svn/framework3/trunk@10367 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 05:09:47 +00:00
b22c24289d
fix up the simple.client.system_time and underlying stuffs
...
git-svn-id: file:///home/svn/framework3/trunk@10362 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 01:12:44 +00:00
012654947a
Store the time zone as well
...
git-svn-id: file:///home/svn/framework3/trunk@10357 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:19:04 +00:00
31f5ee512c
Store the server time in Ruby object format
...
git-svn-id: file:///home/svn/framework3/trunk@10354 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:03:08 +00:00
d0ea92d35f
Dont match on directories with the name of the intended file. Problem identified by JJ Gray
...
git-svn-id: file:///home/svn/framework3/trunk@10347 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 16:02:10 +00:00
21d734201a
Closes #2520 . Merges Rob's patch to check admin privs on start
...
git-svn-id: file:///home/svn/framework3/trunk@10341 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 21:44:25 +00:00
5e2295a9a8
Add in an aux module to create a socks4 proxy server. If you add in a route via a meterpreter session to the framework routing table the proxy server will use that route where appropriate. (Also modified the servers opts hash to optionally take a 'Comm' param if you want to programmatically create a socks4 server which will always use a specific meterpreter session for all socket creation - by default this does not happen and it uses the rex socket switchboard as per normal rex socket creation).
...
git-svn-id: file:///home/svn/framework3/trunk@10337 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 18:23:03 +00:00
5c2717a189
Add in a Socks4a proxy server.
...
git-svn-id: file:///home/svn/framework3/trunk@10330 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 12:11:30 +00:00
cf440fc6c9
Rename for consistency
...
git-svn-id: file:///home/svn/framework3/trunk@10324 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-15 08:40:57 +00:00
6f4eaeb8e3
Delete the ruby side railgun meterpreter extension and add in the new stdapi railgun stuff. Railgun with stdapi works the same (e.g. just use client.railgun.user32.MesageBoxA(...) ). The module definitions are lazy loaded on demand to avoid the performance hit if we load them all at once when stdapi is initially loaded.
...
git-svn-id: file:///home/svn/framework3/trunk@10319 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 23:28:52 +00:00
e85b8adcf8
Add Ruby side meterpreter packet support for QWORD Tlv's.
...
git-svn-id: file:///home/svn/framework3/trunk@10318 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 23:23:15 +00:00
44a67d0440
Typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@10315 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 18:20:17 +00:00
792285cb87
Clean up monitor threads
...
git-svn-id: file:///home/svn/framework3/trunk@10309 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 21:07:02 +00:00
778132ad02
Remove the select spin loop in favor of a thread.join
...
git-svn-id: file:///home/svn/framework3/trunk@10308 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 20:57:38 +00:00
7ccf4e2f11
Change stream writes to be non-blocking, this has been pretty heavily tested over the last couple days, and should preserve the original behavior as well. This fixes a deadlock in Ruby in certain conditions
...
git-svn-id: file:///home/svn/framework3/trunk@10306 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 14:39:17 +00:00
eddd6d481d
add some documentation for request_cgi
...
git-svn-id: file:///home/svn/framework3/trunk@10293 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 17:31:26 +00:00
eec9b59609
add docs dir
...
git-svn-id: file:///home/svn/framework3/trunk@10274 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 15:49:06 +00:00
1405bda8a4
properly set defaults for ip start and end, fixes #2500
...
git-svn-id: file:///home/svn/framework3/trunk@10261 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-08 17:06:31 +00:00
e8e796868e
default to nil
...
git-svn-id: file:///home/svn/framework3/trunk@10237 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-04 00:08:12 +00:00
0b8eebcace
make sure sets has something in it. lib/msf/core/exploit.rb sends this a nil if the user didn't specify anything
...
git-svn-id: file:///home/svn/framework3/trunk@10235 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 23:48:46 +00:00
4388b886c8
jduck tricked me on purpose.
...
git-svn-id: file:///home/svn/framework3/trunk@10222 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-02 16:22:48 +00:00
e7aa1a86ec
Avoid xml encoding spaces.
...
git-svn-id: file:///home/svn/framework3/trunk@10221 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-02 16:20:30 +00:00
832960b6df
Whoops forgot the x.
...
git-svn-id: file:///home/svn/framework3/trunk@10216 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 23:26:35 +00:00
1d1805306e
Adds xml_char_encode. Like html_encode, but allows xml-safe character through.
...
git-svn-id: file:///home/svn/framework3/trunk@10214 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 22:40:07 +00:00
a0f86c62e3
Meterpreter search support to leverage the index on older systems (2000/XP/2003) via Windows Desktop Search v2.
...
git-svn-id: file:///home/svn/framework3/trunk@10187 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 09:50:41 +00:00
6d333eb185
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10173 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 21:26:59 +00:00
d02687b755
add dest adjust option to omelete hunter
...
git-svn-id: file:///home/svn/framework3/trunk@10172 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 21:19:42 +00:00
8dd489ad3b
expose the payload exe filename, remove the concat operator
...
git-svn-id: file:///home/svn/framework3/trunk@10169 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 17:23:47 +00:00
a3a20ebb05
default to no concatenation
...
git-svn-id: file:///home/svn/framework3/trunk@10168 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 17:16:44 +00:00
fbf64adf2a
Commit the ruby side for meterpreter file search. If available, will leverage Windows Search to speed up searching an indexed directory. Examples of usage as follows:
...
Find all .PDF files on the host system:
meterpreter>search *.pdf
Find all files on bob's desktop:
meterpreter>search -d 'c:\users\bob\desktop' -f *
Find all files in the root drive c: but don't search subdirectories:
meterpreter>search -d c: -r false -f *
If Windows Search is available (Vista and above by default, XP/2003 by addon) we can also search any indexed IE history and indexed email
meterpreter>search -d iehistory -f *
meterpreter>search -d mapi -f *
git-svn-id: file:///home/svn/framework3/trunk@10167 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 14:59:38 +00:00
a119cb7b71
dont let close exceptions slow us down
...
git-svn-id: file:///home/svn/framework3/trunk@10163 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 04:44:02 +00:00
6e48076249
fixes #2435 , add BROADCAST option to DHCP server, use in cases where sending to 255.255.255.255 fails
...
git-svn-id: file:///home/svn/framework3/trunk@10159 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-26 19:34:53 +00:00
330281eadd
see #684 , adds checksum support, updates modules to use it, fixes some wfs_delay/WfsDelay issues
...
git-svn-id: file:///home/svn/framework3/trunk@10150 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:55:37 +00:00
a0e7901c19
add syscall name comment
...
git-svn-id: file:///home/svn/framework3/trunk@10147 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:23:38 +00:00
9557980607
oops, semicolon is a comment except when used in metasm_shell
...
git-svn-id: file:///home/svn/framework3/trunk@10144 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 17:46:06 +00:00
1477ae6b92
merge in checksum support, add quick-n-dirty unit test
...
git-svn-id: file:///home/svn/framework3/trunk@10143 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 16:52:13 +00:00
623e4ef3ac
add forward search, reset between eggs, move options into a hash
...
git-svn-id: file:///home/svn/framework3/trunk@10132 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 01:21:12 +00:00
49beb83081
add the "makerc" command for quick resource script generation, fixes #738
...
git-svn-id: file:///home/svn/framework3/trunk@10119 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 21:19:01 +00:00
b6577681c6
another omelet update from Peter, this time with in-line assembly
...
git-svn-id: file:///home/svn/framework3/trunk@10118 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 21:03:00 +00:00
bd96c10cc0
only read the history file if we have no history
...
git-svn-id: file:///home/svn/framework3/trunk@10117 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 20:56:50 +00:00
6e66831517
couple minor fixes to omelet mixin/class
...
git-svn-id: file:///home/svn/framework3/trunk@10116 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 19:53:15 +00:00
d2bada79a9
typo in error string
...
git-svn-id: file:///home/svn/framework3/trunk@10109 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:37:06 +00:00
08fc366d0b
add omlet mixin from Peter Van Eeckhoutte
...
git-svn-id: file:///home/svn/framework3/trunk@10108 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:35:41 +00:00
62f6c9b961
fix some 1.8/1.9 incompatabilities, should be last commit on #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10106 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 16:45:38 +00:00
8c9d08b1e8
add egg override param for egghunter
...
git-svn-id: file:///home/svn/framework3/trunk@10098 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-22 20:19:19 +00:00
5d95f48848
add preliminary support for the new java payloads. Working meterpreter and shell stages with tcp bind and reverse stagers, see #406
...
git-svn-id: file:///home/svn/framework3/trunk@10073 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 07:01:23 +00:00
d9337f3cca
add a Jar class to Rex::Zip
...
git-svn-id: file:///home/svn/framework3/trunk@10057 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 17:08:29 +00:00
d5149b8e23
less verbose Entry#inspect
...
git-svn-id: file:///home/svn/framework3/trunk@10056 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 17:04:42 +00:00
a9a4e3f2da
Add meterpreter client side support for cleaning up loaded extensions upon server termination by calling the loaded extensions cleanup() method if available.
...
git-svn-id: file:///home/svn/framework3/trunk@10055 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 11:37:22 +00:00
48e91af25d
remove client ip send, remove puts lines, fixes #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10049 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 23:35:28 +00:00
8463e026bd
read responses until EOF per RFC
...
git-svn-id: file:///home/svn/framework3/trunk@10045 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 22:41:07 +00:00
06dca2addb
fix this unit test
...
git-svn-id: file:///home/svn/framework3/trunk@10044 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 22:36:13 +00:00
b8991c541e
add a NO RECV flag to the client call function
...
git-svn-id: file:///home/svn/framework3/trunk@10038 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 17:21:10 +00:00
626f7e0c66
add a flag indication not to recv to various smb/client methods
...
git-svn-id: file:///home/svn/framework3/trunk@10037 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 17:20:55 +00:00
24d10866b6
add update_checksum, size, and length methods
...
git-svn-id: file:///home/svn/framework3/trunk@10036 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 04:39:38 +00:00
d46d4313e7
reduce verbosity for printed exceptions when processing on_request
...
git-svn-id: file:///home/svn/framework3/trunk@10029 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-17 22:57:52 +00:00
9ba0916937
fix port bug, add diff from sj, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10015 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 20:21:14 +00:00
3a0402de2a
a few minor cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@10013 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 06:42:17 +00:00
10c2bfb64e
added validation for the meterpreter route command - thanks robin for pointing it out
...
git-svn-id: file:///home/svn/framework3/trunk@9993 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 06:12:05 +00:00
f48afb37a7
merge tftp.diff from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9991 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 03:25:43 +00:00
939bf2a881
merge dhcp.diif from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9990 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 03:11:30 +00:00
23a0064f9d
merge cleanup.diff from scriptjunkie, rewrote set_option, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9970 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 06:45:02 +00:00
7f8bbbc535
add dhcp/pxe stuff from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9963 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 17:37:28 +00:00
52b2d0a495
add support for various options
...
git-svn-id: file:///home/svn/framework3/trunk@9962 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 17:21:22 +00:00
1c7ead1699
remove duped p_filesz entry, fixes #2307
...
git-svn-id: file:///home/svn/framework3/trunk@9937 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-27 18:03:18 +00:00
1ae81367ac
Forgot, TABS not spaces for indent
...
git-svn-id: file:///home/svn/framework3/trunk@9921 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 01:54:29 +00:00
d279123b77
Added functions for managing services in the railgun api and created new calls to use this functions for starting, stopping and creating services, Thanks to Scriptjunkie for the calls and example code that I used to base the mixin calls on
...
git-svn-id: file:///home/svn/framework3/trunk@9920 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 01:32:50 +00:00
3ae1a26aef
include a bunch more firefox fingerprints. thanks Mark Fioravanti for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@9917 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-23 22:20:05 +00:00
25bc9f2973
add error printing for HttpServer exploits
...
git-svn-id: file:///home/svn/framework3/trunk@9909 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 23:24:51 +00:00
b8b5d0586d
generate job info from available properties in rpc. fixes #2236
...
git-svn-id: file:///home/svn/framework3/trunk@9902 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 08:57:11 +00:00
6b25b1024e
Always try to read the NB header first to get the length
...
git-svn-id: file:///home/svn/framework3/trunk@9826 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:07:10 +00:00
c78b87a356
Add support for the ring0 stager_sysenter_hook payload to run its ring3 payload in a new thread in order to preserve/resume the original hijacked ring3 thread.
...
git-svn-id: file:///home/svn/framework3/trunk@9819 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 13:43:17 +00:00
e765553d26
Fix BufferItem references
...
git-svn-id: file:///home/svn/framework3/trunk@9811 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:34:32 +00:00
9d859e4dce
Implements the client side of multi-call railgun
...
git-svn-id: file:///home/svn/framework3/trunk@9807 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:19:36 +00:00
e67e231659
Adds Rex::Text.to_hex_ascii(), replaces the gsub on the banner checks to use it.
...
git-svn-id: file:///home/svn/framework3/trunk@9804 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 18:52:27 +00:00
301d220c80
get rid of debugging alerts. wtf
...
git-svn-id: file:///home/svn/framework3/trunk@9800 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 07:58:50 +00:00
a430970ddd
Wrap the write() calls to catch exceptions from the socket api
...
git-svn-id: file:///home/svn/framework3/trunk@9794 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 17:55:20 +00:00
16134447d9
Cleanup / cosmetic for dcerpc, make EBADF pretend to be EOFError in terms of what exception is raised
...
git-svn-id: file:///home/svn/framework3/trunk@9752 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 19:05:16 +00:00
adf33feb0e
Catch an odd corner case with zero timeouts - this broke dcerpc over tcp
...
git-svn-id: file:///home/svn/framework3/trunk@9749 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 17:58:59 +00:00
2d65cb602b
Fix boolean handling
...
git-svn-id: file:///home/svn/framework3/trunk@9747 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 16:34:18 +00:00
573fc216dd
add write support, tftproot, output dir for tftp server
...
git-svn-id: file:///home/svn/framework3/trunk@9742 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 23:34:29 +00:00
a4c6280ae0
Minor cleanups for railgun, fix 1.8/1.9 differences, remove use of string encoding routines for 1.8 back-compat
...
git-svn-id: file:///home/svn/framework3/trunk@9736 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 18:53:49 +00:00
3049d527ef
there is no comm variable here, fixes #2200
...
git-svn-id: file:///home/svn/framework3/trunk@9728 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 20:49:49 +00:00
9915be8935
Add the railgun client extensions
...
git-svn-id: file:///home/svn/framework3/trunk@9712 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 16:31:24 +00:00
843b6ffa00
Make the http client try harder
...
git-svn-id: file:///home/svn/framework3/trunk@9698 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 23:08:28 +00:00
24fbbfb906
use fat_offset, from Dino, fixes #2183
...
git-svn-id: file:///home/svn/framework3/trunk@9682 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:16:35 +00:00
f3afedf490
Fix an issue caused by pad_data being a string not an integer, this caused the evasion code to return a nil. Fixed a couple of ambiguities in how options are passed
...
git-svn-id: file:///home/svn/framework3/trunk@9674 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-05 13:38:39 +00:00
2250a83913
Updates meterpreter autoroute to accept CIDR notation.
...
git-svn-id: file:///home/svn/framework3/trunk@9667 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 01:27:24 +00:00
fb273e83a9
Updates autoroute to enforce sensible netmasks. This is serious business.
...
git-svn-id: file:///home/svn/framework3/trunk@9664 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 18:42:56 +00:00
01139ed655
Adding an autoroute meterpreter script, and enabling route housekeeping to be stored and retrived via Sessions directly, rather than through Rex::Socket::SwitchBoard.
...
git-svn-id: file:///home/svn/framework3/trunk@9663 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 17:38:56 +00:00
1c9059eeb1
standardize job context as an Array and always copy datastore for jobs. fixes #2096 and fixes #2098
...
git-svn-id: file:///home/svn/framework3/trunk@9652 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 22:02:46 +00:00
864fcafb4a
See #2167 . This should make all platforms equal now in terms of how read selects are handled. It looks like OS X needs the same workaround as Windows
...
git-svn-id: file:///home/svn/framework3/trunk@9641 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 14:49:49 +00:00
aecb6cd43f
Prevent a loop condition noted by commonism
...
git-svn-id: file:///home/svn/framework3/trunk@9631 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-28 14:40:11 +00:00
96cd7bddae
compatibility for 1.9. fixes #2143
...
git-svn-id: file:///home/svn/framework3/trunk@9622 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 05:52:05 +00:00
83d3e3cbac
1.9 fixes, see 2143
...
git-svn-id: file:///home/svn/framework3/trunk@9618 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 04:03:58 +00:00
01702e8506
don't rescue IOError.
...
git-svn-id: file:///home/svn/framework3/trunk@9616 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 00:31:00 +00:00
6e01b03767
IO.select has different behavior when a socket is closed, go back to Rex::ThreadSafe.select; fixes portfwd
...
git-svn-id: file:///home/svn/framework3/trunk@9615 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 00:28:49 +00:00
161ae211c4
add a capabilities hash to the meterpreter client for determining whether libs are available on the server. eventually there should be a way to request this from the server directly instead of inferring it from platform
...
git-svn-id: file:///home/svn/framework3/trunk@9561 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 23:15:48 +00:00
50c59a9ab1
Skip nmap port imports where the result is unknown and the target is really localhost.
...
git-svn-id: file:///home/svn/framework3/trunk@9553 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 03:03:11 +00:00
ebe48096f3
put the original suspend handler back, even if it was nil. fixes 2102
...
git-svn-id: file:///home/svn/framework3/trunk@9547 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 22:41:53 +00:00
3e38aa9cd4
put the old sigint handler back, fixes #2103
...
git-svn-id: file:///home/svn/framework3/trunk@9546 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 21:57:46 +00:00
3d98f22ef4
Un-private-ing :range
...
git-svn-id: file:///home/svn/framework3/trunk@9537 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 19:12:31 +00:00
f6901861fa
allow host specifications like 'range, range' e.g. '10.1.1.0/24, 10.2.2.1'. Note that the space is required
...
git-svn-id: file:///home/svn/framework3/trunk@9489 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 17:20:14 +00:00
e32abab8dc
a HTTP -> an HTTP ( http://www.english-zone.com/grammar/a-anlessn.html )
...
git-svn-id: file:///home/svn/framework3/trunk@9488 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 16:12:05 +00:00
32c24b944a
actually increment the loop variable; document the deficiencies of the employed technique
...
git-svn-id: file:///home/svn/framework3/trunk@9449 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 23:56:35 +00:00
7044c65f22
make sure we have a newline in a chunk length before parsing it, tighten up the regex. fixes 2063 (I hope)
...
git-svn-id: file:///home/svn/framework3/trunk@9448 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 23:43:32 +00:00
6950cae916
more legible inspect for meterpreter packets
...
git-svn-id: file:///home/svn/framework3/trunk@9445 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 15:20:24 +00:00
e4c2a74915
DIY on the iconv stuff. just load the arrays once, plz.
...
git-svn-id: file:///home/svn/framework3/trunk@9407 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-03 17:35:58 +00:00
a5a318f623
Workaround for a lack of Iconv for performing EBCDIC/ASCII conversions
...
git-svn-id: file:///home/svn/framework3/trunk@9406 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-03 17:28:45 +00:00
87379e798a
Bump the timeout for hashdump, handle large DCs better, thanks Chris!
...
git-svn-id: file:///home/svn/framework3/trunk@9385 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 16:45:34 +00:00
5b6b13e7e8
check for existence before using stuff
...
git-svn-id: file:///home/svn/framework3/trunk@9384 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 16:35:10 +00:00
845407a356
Allow interrupts to break out of recvfrom
...
git-svn-id: file:///home/svn/framework3/trunk@9380 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-29 06:52:47 +00:00
288b700e75
remove silly debugging statements
...
git-svn-id: file:///home/svn/framework3/trunk@9377 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 22:46:22 +00:00
6d1e7bdaa5
big commit - lots of cmdstager changes
...
created 4 cmd stagers (instead of just one): CmdStagerVBS, CmdStagerDebugAsm, CmdStagerDebugWrite, CmdStagerTFTP
created a TFTPServer mixin
created Msf::Exploit::EXE mixin to generate executables
updated all uses of CmdStager to use CmdStagerVBS for the time being
add exploit for cve-2001-0333 using CmdStagerTFTP
updated tftp server to wait for transfers to finish (up to 30 seconds) before shutting down
write debug.exe stager stub in 16-bit assembly (used in CmdStagerDebugAsm)
git-svn-id: file:///home/svn/framework3/trunk@9375 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 22:39:56 +00:00
110e0c8404
Allow for an IP range notation of "10.1.1.1-10.255.255.255" . This is equivalent to "10.1-255.1-255.1-255" but is more natural for some people not familiar with the nmap-style notation. Note that there must be no spaces around the hyphen. In the case of "10.1.1.1 - 10.255.255.255", this will merely fail normally. In the case of "10.1.1.1- 10.255.255.255," you will end up with a funny range of 10.1.1.1-255 and 10.255.255.255, since the space after the hyphen denotes "until the end of the octet space."
...
git-svn-id: file:///home/svn/framework3/trunk@9368 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-25 22:44:55 +00:00
563ab310dc
Strengthening up the checks for valid formats for CIDR address ranges when passed to Rex::Socket::RangeWalker
...
git-svn-id: file:///home/svn/framework3/trunk@9366 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-25 20:46:00 +00:00
1a2be34a63
Fixes #2002 . Needed to work with some pipelining to get this all to work right, but it seems to function now pretty well -- if the target takes Basic, do basic, if the target takes NTLM, do NTLM. Should implement Digest too, but I don't think hardly anyone uses that.
...
git-svn-id: file:///home/svn/framework3/trunk@9346 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-22 17:58:01 +00:00
83adc3f391
switch to ::IO.select
...
git-svn-id: file:///home/svn/framework3/trunk@9339 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 05:02:52 +00:00
872575209f
Fix a corner case with udp send destinations already having a ::ffff: prefix
...
git-svn-id: file:///home/svn/framework3/trunk@9338 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 05:01:14 +00:00
21130bc38a
replace hardcoded numbers with friendly constants
...
git-svn-id: file:///home/svn/framework3/trunk@9334 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 00:15:10 +00:00
957b1432ed
add simple tftp server
...
git-svn-id: file:///home/svn/framework3/trunk@9333 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 00:03:04 +00:00
15cee53b41
move tab completion setup out of init_ui. fixes #1180
...
git-svn-id: file:///home/svn/framework3/trunk@9332 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 23:47:49 +00:00
dfa7fb7d0b
Move away from Kernel.select in exchange for IO.select, solves some issues with windows compatibility
...
git-svn-id: file:///home/svn/framework3/trunk@9330 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 20:42:17 +00:00
a29371647f
Force cygwin to use the Rex::ThreadSafe.select code
...
git-svn-id: file:///home/svn/framework3/trunk@9322 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-18 15:11:19 +00:00
670bacb9bc
a couple rex/ole fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9287 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-12 05:33:35 +00:00
c0494dcbc0
compat fix for 1.8.6, there are probably many more bugs like this
...
git-svn-id: file:///home/svn/framework3/trunk@9281 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-11 07:37:57 +00:00
cdc591488c
Bug fix
...
git-svn-id: file:///home/svn/framework3/trunk@9276 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 23:55:58 +00:00
3d023ec1fa
add comment about pe.read
...
git-svn-id: file:///home/svn/framework3/trunk@9272 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 16:18:19 +00:00
542782e7e6
Match existing mime implementations more closely
...
git-svn-id: file:///home/svn/framework3/trunk@9258 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 17:01:52 +00:00
14363ca2e8
Rex::MIME::Message can now parse as well as write
...
git-svn-id: file:///home/svn/framework3/trunk@9257 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 16:53:16 +00:00
5f23151c22
Replace the core of the text generation methods; previously, these could result in an oddball string result that would not auto-convert into ASCII-8BIT. Looks like a strange corner case in Ruby 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@9254 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 02:58:55 +00:00
cd213c29c5
change offset_to_rva into file_offset_to_va, add comments
...
git-svn-id: file:///home/svn/framework3/trunk@9242 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 21:45:21 +00:00
abe2cb9919
cd can now change directory giving it a Windows ENV variable
...
git-svn-id: file:///home/svn/framework3/trunk@9237 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 02:05:26 +00:00
873f8bd1ed
added a couple of convenience methods
...
not sure if these are correct, but they worked for me
git-svn-id: file:///home/svn/framework3/trunk@9230 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-05 20:07:15 +00:00
9fe0186ddb
document in a comment the fact that vulns don't have service info yet
...
git-svn-id: file:///home/svn/framework3/trunk@9213 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 18:16:23 +00:00
1ab399d0ea
use a stream parser to import NeXpose raw xml, short-circuit find_or_create_ref to avoid going to the task queue when possible
...
git-svn-id: file:///home/svn/framework3/trunk@9199 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 19:16:52 +00:00
7631b193fd
Glue to tie Metasploit mixins into Rex::Script::Meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@9193 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 00:09:01 +00:00
5bc9a572e6
Add a close method to the file output
...
git-svn-id: file:///home/svn/framework3/trunk@9189 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-01 17:13:14 +00:00
4308689fd9
Remove diagnostic line
...
git-svn-id: file:///home/svn/framework3/trunk@9165 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 23:08:06 +00:00
49635c4ab0
Call the right select:
...
git-svn-id: file:///home/svn/framework3/trunk@9164 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 22:55:17 +00:00
936190125e
Bug fix for Ruby 1.9 (error can close the server socket, not the client socket). Small jRuby compatibility improvement
...
git-svn-id: file:///home/svn/framework3/trunk@9155 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 14:39:09 +00:00
a953c47cfb
remove carriage returns
...
git-svn-id: file:///home/svn/framework3/trunk@9140 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 18:29:24 +00:00
01f9c0b616
only do the UA string search in firefox if we don't have a perfect match on buildId
...
git-svn-id: file:///home/svn/framework3/trunk@9129 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-24 21:31:12 +00:00
13171ad1c6
add a fingerprint for ff 3.6.3 on windows
...
git-svn-id: file:///home/svn/framework3/trunk@9128 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-24 19:36:58 +00:00
928389e8b0
update comments to explain the reason for not running init_ui
...
git-svn-id: file:///home/svn/framework3/trunk@9114 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-20 07:01:46 +00:00
4243ce5bf4
preliminary fix for the meterpreter-breaks-tab-completion bug pending some testing, see #1180
...
git-svn-id: file:///home/svn/framework3/trunk@9113 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-20 03:59:27 +00:00
8919688e1a
don't truncate the version when it doesn't contain a string, fixes #1711 , thanks Peorth Yggdrasil
...
git-svn-id: file:///home/svn/framework3/trunk@9104 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-19 22:12:35 +00:00
6d788a9437
add print_good methods to rex input shells, fixes #1703
...
git-svn-id: file:///home/svn/framework3/trunk@9103 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-19 22:09:55 +00:00
af901888d2
add detection for FF 3.6, thanks Peorth Yggdrasil
...
git-svn-id: file:///home/svn/framework3/trunk@9102 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-19 19:33:09 +00:00
32cd6b2101
fix reference to readline_compatible
...
git-svn-id: file:///home/svn/framework3/trunk@9060 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 17:09:42 +00:00
6507c4fcea
clarify comments about what the checks for a deceitful UA are doing
...
git-svn-id: file:///home/svn/framework3/trunk@9054 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-12 04:44:33 +00:00
548e242e75
add firefox detection based on navigator.buildID. Thanks, Mark Fioravanti\!
...
git-svn-id: file:///home/svn/framework3/trunk@9053 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-12 04:21:42 +00:00
108362cf95
Switch to recvfrom_nonsock, solves a hang with win32 + 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@9045 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-10 17:31:40 +00:00
3ad0560d00
Use the kernel select in 1.9, its less buggy and doesn't have the issues that lead us to create our own in the first place
...
git-svn-id: file:///home/svn/framework3/trunk@9044 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-09 22:48:31 +00:00
df16eec4d7
revert r9038, see r9039, fixes #1531 , fixes #531
...
git-svn-id: file:///home/svn/framework3/trunk@9040 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 23:42:04 +00:00
9a8d14a5ec
use RL_PROMPT_ constants for places where a prompt is colorized (only)
...
git-svn-id: file:///home/svn/framework3/trunk@9039 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 23:37:49 +00:00
a502c2647d
tell readline that the color escapes shouldn't be counted as part of the line length, thanks to Niklas Baumstark. fixes 1531, fixes 531
...
git-svn-id: file:///home/svn/framework3/trunk@9038 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 23:24:54 +00:00
3c4024a0c6
Expose the server client list, set the keepalive
...
git-svn-id: file:///home/svn/framework3/trunk@8992 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:05:06 +00:00
c6c956ab46
Small patch to enable a new stager
...
git-svn-id: file:///home/svn/framework3/trunk@8984 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 05:21:15 +00:00
5f3def5bee
License corrections
...
git-svn-id: file:///home/svn/framework3/trunk@8982 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-02 21:34:15 +00:00
71a2064520
closes #1408 - merge patch from Mike Ryan
...
git-svn-id: file:///home/svn/framework3/trunk@8963 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-31 02:25:44 +00:00
09dd8c1fcc
Adds portlist_to_portspec and portspec_to_portlist. Merges in Qualys XML support from Sertan Kolat
...
git-svn-id: file:///home/svn/framework3/trunk@8949 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-28 23:02:28 +00:00
432f1676aa
Increase LocalRelay block size, return exploit_uuid in sessions
...
git-svn-id: file:///home/svn/framework3/trunk@8939 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 15:44:33 +00:00
cd71cfbad1
Handle buggy HTTP servers better
...
git-svn-id: file:///home/svn/framework3/trunk@8921 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 21:35:37 +00:00
3e29a2fd2f
Adds bgrun, bglist, bgkill to run Meterpreter scripts in the background
...
git-svn-id: file:///home/svn/framework3/trunk@8917 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 15:54:43 +00:00
2a2682052b
patch from Mark Fioravanti for detecting chrome vs safari
...
git-svn-id: file:///home/svn/framework3/trunk@8897 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 16:13:59 +00:00
bb0db3cdf6
Closes command and meterpreter sessions in a much more consistent way
...
git-svn-id: file:///home/svn/framework3/trunk@8865 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-21 04:24:27 +00:00
eb31c8f24b
Fixes up SunRPC to use proper timeouts and track the socket context (needed for pivoting)
...
git-svn-id: file:///home/svn/framework3/trunk@8845 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 23:02:35 +00:00
a29ff6f435
Adding a Rex library method for generating an array of mixed case strings.
...
git-svn-id: file:///home/svn/framework3/trunk@8841 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 17:47:08 +00:00
5dd404abd6
Fix an issue with 1.9.1 compat
...
git-svn-id: file:///home/svn/framework3/trunk@8818 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 16:20:24 +00:00
b6851b8ee4
modify cmd stager to take a raw payload string instead of a payload instance
...
git-svn-id: file:///home/svn/framework3/trunk@8805 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 21:47:01 +00:00
aa12dc912f
Add a file output type
...
git-svn-id: file:///home/svn/framework3/trunk@8792 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 18:58:20 +00:00
be93341cff
Commit the ruby side for the new screenshot/session stuff.
...
git-svn-id: file:///home/svn/framework3/trunk@8788 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 17:11:27 +00:00
89c62bc838
Fixes #1079 . Handle a closed SSL socket gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@8783 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 14:13:53 +00:00
6bd2a954cf
Lots of small changes, the big one is moving from sysread -> readpartial in the stream base class
...
git-svn-id: file:///home/svn/framework3/trunk@8764 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 06:43:46 +00:00
195d1ab4b8
Commit snojobs jpeg patch for espia with an x64 build and some minor changes on the ruby side (The 'screenshot' command is now 'screengrab' to avoid a future conflict with changes happening in stdapi).
...
git-svn-id: file:///home/svn/framework3/trunk@8726 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 15:50:24 +00:00
73da75a931
big update to cmd stager
...
1. returns array of commands instead of big blob of lines
2. combine lines together when possible (to reduce # of commands to execute)
3. add cmd stager usage in mssql_payload
4. remove extraneous stuff here and there
git-svn-id: file:///home/svn/framework3/trunk@8721 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 00:29:44 +00:00
a44358df67
Simple fix for #1013 and the migration permission error message.
...
git-svn-id: file:///home/svn/framework3/trunk@8714 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 19:31:36 +00:00
f40a9a5c4b
new ie fingerprint
...
git-svn-id: file:///home/svn/framework3/trunk@8707 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 07:17:10 +00:00
dea2ba3420
try a little harder not to break things by making sure there's a space in front of comments before removing them
...
git-svn-id: file:///home/svn/framework3/trunk@8704 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 03:20:52 +00:00
506fdb63ff
remove comments after obfuscating strings so things like ' http://example.com ' in a string doesn't get mangled. will still have problems with a string like that and no string obfu
...
git-svn-id: file:///home/svn/framework3/trunk@8702 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 20:51:29 +00:00
7d348c3593
honor the SSL option in HttpServer, fixes #1001
...
git-svn-id: file:///home/svn/framework3/trunk@8699 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 18:47:04 +00:00
9148068acc
pass unlink_now flag to close for Tempfile instances
...
git-svn-id: file:///home/svn/framework3/trunk@8697 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 04:58:12 +00:00
15b13d2472
make string obfuscation produce correct code more often (should be 100% now, but no guarantees). stops doing hex-encoding (more hassle than it's worth) and adds random split/concats (jduck's idea)
...
git-svn-id: file:///home/svn/framework3/trunk@8690 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 14:36:09 +00:00
b16a08c4cd
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@8687 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 11:10:23 +00:00
ac517fafea
Remove the db dependency from Meterpreter scripts
...
git-svn-id: file:///home/svn/framework3/trunk@8676 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-28 19:29:43 +00:00
d03c26430c
Max is 32k
...
git-svn-id: file:///home/svn/framework3/trunk@8670 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 21:18:58 +00:00
c4fe7193f1
print_raw receives color-substituted strings, don't override print
...
git-svn-id: file:///home/svn/framework3/trunk@8669 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 20:10:18 +00:00
303d99650a
Store the workspace in the script object
...
git-svn-id: file:///home/svn/framework3/trunk@8668 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:50:33 +00:00
3b0c82b131
args should be an array, fixes 981
...
git-svn-id: file:///home/svn/framework3/trunk@8666 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:26:34 +00:00
88cc851a41
Commit the stager_sysenter_hook win32 kernel shellcode source and mixin patch, resolves #405 .
...
git-svn-id: file:///home/svn/framework3/trunk@8655 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 13:41:16 +00:00
c1609d0db1
Woops!
...
git-svn-id: file:///home/svn/framework3/trunk@8631 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 23:15:01 +00:00
2f195694f4
Switch shell to a base class, allow the base class to use a null sink for output when no user_output is set.
...
git-svn-id: file:///home/svn/framework3/trunk@8630 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 23:07:08 +00:00
999feb879f
setup the input/output handles correctly for meterpreter sessions so we can get the output from scripts
...
git-svn-id: file:///home/svn/framework3/trunk@8618 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 16:46:47 +00:00
b391abd32d
adds scripting for command shell sessions
...
1. InitialAutoRunScript and AutoRunScript vars work
2. scripts/shells was created to hold them
3. *_shell methods were renamed shell_*
4. added "shell_command" method to command shell sessions
5. converted all uses of *_shell to shell_*
6. all payloads that produce command shell sessions include Msf::Sessions::CommandShellOptions
git-svn-id: file:///home/svn/framework3/trunk@8615 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 01:19:59 +00:00
a71e8d2af0
Fix up meterpreter script changes
...
git-svn-id: file:///home/svn/framework3/trunk@8611 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 20:16:45 +00:00
4220c33675
Stuff meterpreter scripts into a dedicated object
...
git-svn-id: file:///home/svn/framework3/trunk@8603 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 17:59:35 +00:00
455434a9f2
typo fix, thanks SubINacls for catching it
...
git-svn-id: file:///home/svn/framework3/trunk@8597 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 06:25:19 +00:00
4ad6c24a95
look for dead sesions with a reaper thread instead of on other session events, add Session#alive accessor for all session types; still need to figure out when a shell session is dead and set it accordingly. Add a reason argument to on_session_close to distinguish between killed sessions and dead sessions
...
git-svn-id: file:///home/svn/framework3/trunk@8596 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 05:59:30 +00:00
06b369a79b
add a class method for route_exists?
...
git-svn-id: file:///home/svn/framework3/trunk@8591 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 22:30:37 +00:00
a12670b311
check for existence before stat'ing. fixes #893
...
git-svn-id: file:///home/svn/framework3/trunk@8581 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 17:27:54 +00:00
b5e1e56f44
fix slicing of compressed deflate data
...
git-svn-id: file:///home/svn/framework3/trunk@8572 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-21 01:37:04 +00:00
4800d6841c
commit cmd stager stuff from bannedit
...
git-svn-id: file:///home/svn/framework3/trunk@8518 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 16:38:19 +00:00
17de90a902
Modify the client core to use compression for the loading of extensions and migration for a speed boost.
...
git-svn-id: file:///home/svn/framework3/trunk@8517 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 15:01:06 +00:00
4b4b2d62b1
Commit the Ruby side for channel/TLV compression.
...
git-svn-id: file:///home/svn/framework3/trunk@8516 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 14:58:23 +00:00
2539a6fc09
Updated nmap parsing, store notes for last boot and os matches
...
git-svn-id: file:///home/svn/framework3/trunk@8494 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 19:07:15 +00:00
bfa3ae28cb
Import OS and hostname information
...
git-svn-id: file:///home/svn/framework3/trunk@8491 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 18:32:37 +00:00
5dff9c4efc
Fixes #807 . Make the html encoded output standards compliant
...
git-svn-id: file:///home/svn/framework3/trunk@8462 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-12 05:08:16 +00:00
d4d271eef3
add OLE library as Rex::OLE
...
git-svn-id: file:///home/svn/framework3/trunk@8457 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 18:36:38 +00:00
7285e7a2bb
whitespace fixed, also see r8452 which fixes #805
...
git-svn-id: file:///home/svn/framework3/trunk@8453 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 07:48:56 +00:00
a3bf0fd94f
handle arch parameters passed as array
...
oops, these other two functions didn't benefit from the same level of checking as endian? did.
git-svn-id: file:///home/svn/framework3/trunk@8452 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 07:42:26 +00:00
13f837c340
fix zip module samples
...
git-svn-id: file:///home/svn/framework3/trunk@8447 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 00:18:37 +00:00
2c100083bf
add a zip implementation, Rex::Zip, see lib/rex/zip/samples for more info
...
git-svn-id: file:///home/svn/framework3/trunk@8439 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-10 17:27:40 +00:00
6335fde3e1
Commit the Ruby side for the UDP socket pivoting. Change the TCP client channel so the respective StreamAbstraction is responsible for monitoring its own rsock.
...
git-svn-id: file:///home/svn/framework3/trunk@8431 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 16:45:46 +00:00
79d2ecc227
don't slice a nil buffer
...
git-svn-id: file:///home/svn/framework3/trunk@8403 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 01:42:11 +00:00
c8af3431b6
Typo
...
git-svn-id: file:///home/svn/framework3/trunk@8401 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 01:02:46 +00:00
5f76353e8e
Woops, add the missing support files
...
git-svn-id: file:///home/svn/framework3/trunk@8400 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 00:59:29 +00:00
e19633354b
Bug fix for a rare edge case with channels. When creating a Rex::Post::Meterpreter::Stream instance we should initialize_abstraction() before super() as we can get a scenario where dio_write_handler() is called with data to write to the rsock but rsock has not yet been initialized. This happens if the channel is registered (client.add_channel(self) in Channel.initialize) to a session and a 'core_channel_write' request comes in before we have called self.initialize_abstraction()
...
git-svn-id: file:///home/svn/framework3/trunk@8386 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 20:12:52 +00:00
fd2469db24
Commit the Ruby end for TCP server channels, the modified TCP client channels and the support for pivoting a reverse_tcp meterpreter.
...
git-svn-id: file:///home/svn/framework3/trunk@8384 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 17:59:25 +00:00
b3a588b8cc
Adds a module for kcope's samba filesystem traversal
...
git-svn-id: file:///home/svn/framework3/trunk@8369 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 06:38:24 +00:00
a052340703
a few fixes to sunrpc code
...
this fixes a couple of errors handling error messages
also, some whitespace/indenting adjustments
git-svn-id: file:///home/svn/framework3/trunk@8365 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-03 20:30:09 +00:00
3fe8d0375b
Adds a print_debug message handler -- mostly useful during development to easily inspect objects.
...
git-svn-id: file:///home/svn/framework3/trunk@8353 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 21:03:07 +00:00
55a82c1642
add simple detection for Chrome
...
git-svn-id: file:///home/svn/framework3/trunk@8330 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-30 21:09:38 +00:00
42b331b47f
Fix #790 . Initialize the client state to be alive, tweak a few things on the meterpreter side
...
git-svn-id: file:///home/svn/framework3/trunk@8327 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 18:52:44 +00:00
7d88f394b4
Use the impersonated token to spawn the shell by default
...
git-svn-id: file:///home/svn/framework3/trunk@8326 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 17:35:30 +00:00
47b08fa6ef
simple patch to get all privileges after a successful getsystem
...
git-svn-id: file:///home/svn/framework3/trunk@8321 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 11:04:24 +00:00
77da632e61
update the ruby side.
...
git-svn-id: file:///home/svn/framework3/trunk@8319 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 01:13:28 +00:00
c396129d41
add a liveness test to meterpreter, fixes 698
...
git-svn-id: file:///home/svn/framework3/trunk@8314 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:53:15 +00:00
a76480d42c
See #726 . Cleaning up my gross whitespace.
...
git-svn-id: file:///home/svn/framework3/trunk@8311 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:08:39 +00:00
HD Moore
Joshua Drake
James Lee
Tod Beardsley
Matt Weeks
Jonathan Cran
Mario Ceballos
Carlos Perez
Mike Smith
amaloteaux
Stephen Fewer