James Lee
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
James Lee
e957a7a90e
add support for doing everything msfpayload does into msfconsole and xmlrpc, fixes #589 . Thanks, Ryan Linn for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@9914 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-23 20:22:36 +00:00
Joshua Drake
fbc4be6af4
support outputing selected columns instead of just address
...
git-svn-id: file:///home/svn/framework3/trunk@9913 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-22 16:53:11 +00:00
Joshua Drake
6e34bc5420
further clean up exception handling / session waiting for exploits
...
git-svn-id: file:///home/svn/framework3/trunk@9910 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 23:25:20 +00:00
Joshua Drake
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
James Lee
fed1e88b7d
missed a file
...
git-svn-id: file:///home/svn/framework3/trunk@9908 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 22:37:49 +00:00
James Lee
671d243aaa
put the stop command in core instead of base and default the extra argument to nil. this should allow a cleaner exit without breaking existing code (i hope). see #2247 (again) and also fixes #1010
...
git-svn-id: file:///home/svn/framework3/trunk@9907 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 22:37:26 +00:00
Joshua Drake
a5d179311f
fix session creation, *facepalm*
...
git-svn-id: file:///home/svn/framework3/trunk@9904 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 15:14:54 +00:00
James Lee
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
Joshua Drake
8c5f10006f
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9899 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 06:03:42 +00:00
Joshua Drake
0d8e98a519
handle validation errors more gracefully, check job_id, fixes #2279
...
git-svn-id: file:///home/svn/framework3/trunk@9898 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 00:50:25 +00:00
Joshua Drake
276a83d7b4
allow specifing which code to use for the exe
...
git-svn-id: file:///home/svn/framework3/trunk@9895 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 00:01:45 +00:00
James Lee
45c869d015
revert the rpc.stop patch as it breaks other rpc stuff. i'll have a better fix for this later today.
...
git-svn-id: file:///home/svn/framework3/trunk@9890 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 20:36:09 +00:00
James Lee
88c6bf13dd
apply patch from scriptjunkie to stop the xmlrpc daemon. fixes #2247
...
git-svn-id: file:///home/svn/framework3/trunk@9887 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 19:12:09 +00:00
James Lee
08d705c1db
add java meterpreter and update java_calendar_deserialize to be able to use it, see #406
...
git-svn-id: file:///home/svn/framework3/trunk@9874 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 00:53:24 +00:00
Joshua Drake
33b479e696
adjust https handler status message
...
git-svn-id: file:///home/svn/framework3/trunk@9872 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 00:17:58 +00:00
HD Moore
7963d65f28
Only allow a single instance of a generated DLL to execute (prevent duplicate sessions, like with LNK)
...
git-svn-id: file:///home/svn/framework3/trunk@9871 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 23:24:57 +00:00
HD Moore
f87b7bc59e
Fix up the DLL payloads
...
git-svn-id: file:///home/svn/framework3/trunk@9868 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 22:13:34 +00:00
Tod Beardsley
23fd327f30
Fixes the VulnerabilityListing class in the NeXpose API.
...
git-svn-id: file:///home/svn/framework3/trunk@9860 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 18:14:23 +00:00
Jonathan Cran
d363efd883
slight changes to the vmware controller
...
git-svn-id: file:///home/svn/framework3/trunk@9850 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 22:19:38 +00:00
Jonathan Cran
b6d506f078
centralize lab requires
...
git-svn-id: file:///home/svn/framework3/trunk@9849 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 22:19:17 +00:00
James Lee
bcb62247dd
explicitly clear a module's job_id in case it was set in a previous run. Fixes #2267
...
git-svn-id: file:///home/svn/framework3/trunk@9847 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 21:47:00 +00:00
Joshua Drake
63595d1ce2
update exception handling to bail on RuntimeError or Interrupt, but wait otherwise.
...
git-svn-id: file:///home/svn/framework3/trunk@9845 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 19:58:41 +00:00
HD Moore
d9402edde3
Handle cases where the exploit succeeds but then throws an exception, printing the "exploit failed" message. Closes #2260
...
git-svn-id: file:///home/svn/framework3/trunk@9840 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-15 21:28:21 +00:00
James Lee
9f5042c8ac
add the uripath back into the output of 'jobs -v'
...
git-svn-id: file:///home/svn/framework3/trunk@9835 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-15 03:27:02 +00:00
Tod Beardsley
3c199b0364
Fixes #824 . PcapLog now works, and doesn't use racket nor packetfu -- just straight pcaprub, since I'm not doing anything exciting with them aside from saving to a file.
...
Also, it's a proper plugin now, not just a singleton, with a command dispather and everything.
Pretty much totoally rewritten. Since it hasn't worked for at least 5 months, I doubt anyone will be shocked by the API change.
git-svn-id: file:///home/svn/framework3/trunk@9834 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:38:19 +00:00
HD Moore
ac69cf72bb
Clone the module_store while we are at it
...
git-svn-id: file:///home/svn/framework3/trunk@9832 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:18:39 +00:00
HD Moore
97d3c9da8b
This may solve both of the scanner/bap cases for module cloning
...
git-svn-id: file:///home/svn/framework3/trunk@9831 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:16:22 +00:00
HD Moore
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
HD Moore
7710528432
Duplicate the report info string
...
git-svn-id: file:///home/svn/framework3/trunk@9825 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:06:44 +00:00
HD Moore
5c2f104ade
Fix module.replicant(), closes #2252
...
git-svn-id: file:///home/svn/framework3/trunk@9824 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:06:12 +00:00
HD Moore
ff204324e0
Do not fall through to YAML
...
git-svn-id: file:///home/svn/framework3/trunk@9823 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:05:47 +00:00
Joshua Drake
4b44fdb8c2
adds ftp data functionality from Thomas Ring, after some modifications
...
git-svn-id: file:///home/svn/framework3/trunk@9821 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 14:04:27 +00:00
Stephen Fewer
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
Tod Beardsley
c19e533ec9
Don't call it a success if AIX complains about all upcase logins.
...
git-svn-id: file:///home/svn/framework3/trunk@9813 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 22:30:45 +00:00
HD Moore
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
HD Moore
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
Tod Beardsley
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
James Lee
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
HD Moore
16851f56c9
Swizzle.
...
git-svn-id: file:///home/svn/framework3/trunk@9796 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 21:51:11 +00:00
HD Moore
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
Jonathan Cran
e5d6214bf5
refactored lab libraries - now with more object orientation.
...
git-svn-id: file:///home/svn/framework3/trunk@9793 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 15:00:45 +00:00
James Lee
5b3fa182ba
Switch back to dev mode
...
git-svn-id: file:///home/svn/framework3/trunk@9791 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 07:25:30 +00:00
HD Moore
37f4783d55
Adds -u to the connect command
...
git-svn-id: file:///home/svn/framework3/trunk@9788 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 03:15:45 +00:00
James Lee
1dd2dd2315
add java as a regular platform
...
git-svn-id: file:///home/svn/framework3/trunk@9782 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-11 19:46:55 +00:00
HD Moore
cc963785fc
Bump to -release, final should be cut soon
...
git-svn-id: file:///home/svn/framework3/trunk@9763 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-10 15:18:34 +00:00
HD Moore
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
HD Moore
42f8dc10c0
Change the timeout from 0
...
git-svn-id: file:///home/svn/framework3/trunk@9750 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 18:03:48 +00:00
HD Moore
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
HD Moore
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
Joshua Drake
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
Carlos Perez
e0d9c41b5f
did not write info when file did not exists, problem fixed
...
git-svn-id: file:///home/svn/framework3/trunk@9739 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 20:28:56 +00:00
Jonathan Cran
978c0f30e3
updated get_vmx to handle the structure passed by the control shells. For instance: @lab['metasploitable'] = {"vmx" => "msf_lab/user/Metasploitable/Metasploitable.vmx", "user" => "user", "pass" => "user", "os" => "linux" }
...
git-svn-id: file:///home/svn/framework3/trunk@9737 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 19:13:20 +00:00
HD Moore
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
James Lee
4b1286522d
version bump for beta release
...
git-svn-id: file:///home/svn/framework3/trunk@9731 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 23:15:03 +00:00
Jonathan Cran
2d0e49ca6f
adding in tod's patch ( http://www.0x0e.org/x/msf/vmware_lab_diff.tod.20100707 ) - adds neat functionality like being able to create a lab on the fly or from a set of files on disk.
...
git-svn-id: file:///home/svn/framework3/trunk@9730 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 22:56:26 +00:00
Joshua Drake
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
Joshua Drake
2de94b910b
more specificity
...
git-svn-id: file:///home/svn/framework3/trunk@9725 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 18:25:04 +00:00
Joshua Drake
08a75a0c8e
make shell_read_until_token more agressive
...
git-svn-id: file:///home/svn/framework3/trunk@9724 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 18:18:55 +00:00
HD Moore
c0aca105de
closes #2205 . This is actually part of the bigger datastore bug
...
git-svn-id: file:///home/svn/framework3/trunk@9722 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 18:14:51 +00:00
James Lee
49955d2ca0
check for fileness instead of just existence, fixes #2204
...
git-svn-id: file:///home/svn/framework3/trunk@9720 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 17:42:18 +00:00
Joshua Drake
3aa3a642ac
move fingerprint verification to mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9717 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 17:36:33 +00:00
James Lee
2c5336dabb
attach job_id to the exploit, not just the driver; regenerate the uuid when replicating a module; generate the payload after copying the exploit module for a new job; fixes #2203 , see #2098 and #2096
...
git-svn-id: file:///home/svn/framework3/trunk@9714 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 16:37:23 +00:00
HD Moore
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
Tod Beardsley
01c1d1d6df
Makes sure that Qualys reports only try to report sensible data -- fixes DB complaints about null in non-null contrained columns.
...
git-svn-id: file:///home/svn/framework3/trunk@9707 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 14:53:16 +00:00
Tod Beardsley
dffd8c0c97
Deal with marshaled data for msfx imports.
...
git-svn-id: file:///home/svn/framework3/trunk@9699 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 00:28:34 +00:00
HD Moore
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
Joshua Drake
ce44b02a35
avoid returning nil info, try to look it up
...
git-svn-id: file:///home/svn/framework3/trunk@9693 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:53:24 +00:00
James Lee
8898e2de8f
go back to copying the module for jobs. 'exploit -j' appears to work with the current changes. fixes #2096 and #2098 (for real this time)
...
git-svn-id: file:///home/svn/framework3/trunk@9692 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:09:53 +00:00
HD Moore
d5e9453a9c
Allow yaml for v1/v2, not for v3, tested
...
git-svn-id: file:///home/svn/framework3/trunk@9691 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 19:33:27 +00:00
HD Moore
812d715c35
Validate base64 before demarshal
...
git-svn-id: file:///home/svn/framework3/trunk@9690 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:40:19 +00:00
HD Moore
ef3dbf3841
Workaround for Ruby 1.8's fragile Marshal code
...
git-svn-id: file:///home/svn/framework3/trunk@9689 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:35:49 +00:00
Joshua Drake
7384dec65e
add virtual columns back per egyp7 request, see #2055
...
git-svn-id: file:///home/svn/framework3/trunk@9688 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:18:26 +00:00
Jonathan Cran
2786427113
adding initial version of the lab controller - note that this will be updated to use vixr soon
...
git-svn-id: file:///home/svn/framework3/trunk@9687 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:18:06 +00:00
HD Moore
8f967af2f3
Dont fallback to yaml for service.info, its either base64 or a string
...
git-svn-id: file:///home/svn/framework3/trunk@9686 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:17:14 +00:00
Joshua Drake
7c9e39ab1d
make db_hosts -c conform to the -h text, fixes #2055
...
git-svn-id: file:///home/svn/framework3/trunk@9685 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:05:41 +00:00
James Lee
618b377d58
let's try this again. don't convert datastore values to strings when copying, only dup things that are already Strings, see #2189 , #2098 , #2096
...
git-svn-id: file:///home/svn/framework3/trunk@9684 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:59:36 +00:00
James Lee
5df5991d95
revert r9651, fixes #2189 . Clearly there is more going on when copying a datastore object
...
git-svn-id: file:///home/svn/framework3/trunk@9683 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:26:06 +00:00
Joshua Drake
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
HD Moore
7847a645cd
Remove the 'delete'
...
git-svn-id: file:///home/svn/framework3/trunk@9681 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:44:04 +00:00
HD Moore
fbdf5dca3c
Try the three-way fallback for serialized fields (service.info and note.data)
...
git-svn-id: file:///home/svn/framework3/trunk@9680 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:33:27 +00:00
HD Moore
a482f66cb9
Serialize service.info, handle all 3 forms of possible serialized data (marshal, yaml, and string)
...
git-svn-id: file:///home/svn/framework3/trunk@9679 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:20:04 +00:00
HD Moore
0d40a69f16
Dont mangle the service.info field this way
...
git-svn-id: file:///home/svn/framework3/trunk@9678 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:10:05 +00:00
HD Moore
5cff86cc1e
Use the module-defined workspace if specified
...
git-svn-id: file:///home/svn/framework3/trunk@9676 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 15:43:22 +00:00
HD Moore
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
James Lee
21b3be4f53
fix the payload display in jobs -v
...
git-svn-id: file:///home/svn/framework3/trunk@9673 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-04 23:40:11 +00:00
Tod Beardsley
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
Tod Beardsley
6a20b8f5f5
Fixing a typing error for banner timeouts on telnet.
...
git-svn-id: file:///home/svn/framework3/trunk@9665 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 21:33:38 +00:00
Tod Beardsley
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
Tod Beardsley
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
James Lee
07ef50e4e1
don't copy modules for jobs. fixes 'exploit -j' which was unable to create sessions, but reopens #2096 and #2098
...
git-svn-id: file:///home/svn/framework3/trunk@9662 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 02:46:07 +00:00
James Lee
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
James Lee
37da4be3e4
do a deep copy of the datastore when replicating a module
...
git-svn-id: file:///home/svn/framework3/trunk@9651 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:57:24 +00:00
James Lee
c0eaed263c
abstract some copy-paste; add DataStore#copy for doing a deep copy instead of the shallow copy performed by #dup and #clone
...
git-svn-id: file:///home/svn/framework3/trunk@9650 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:56:38 +00:00
James Lee
f1c7fc79de
remove to_s methods that reference a non-existent attribute. fixes .inspect on instances of Opt*. I have no idea how this bug never showed up before
...
git-svn-id: file:///home/svn/framework3/trunk@9649 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:52:30 +00:00
HD Moore
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
Tod Beardsley
03918eeeda
Adds an explicit function for import file validation acceptability.
...
git-svn-id: file:///home/svn/framework3/trunk@9636 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-30 15:28:49 +00:00
Tod Beardsley
7e247e2f29
db migration to convert services info from varchar(65535) to text, and save info as a yaml'ed form in order to preserve funny characters.
...
git-svn-id: file:///home/svn/framework3/trunk@9633 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-28 22:42:50 +00:00
HD Moore
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
James Lee
d488f133cf
log the number of modules db_autopwn will try
...
git-svn-id: file:///home/svn/framework3/trunk@9628 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 22:32:39 +00:00
James Lee
d4c558b0d0
use the calculated address for :target_host since session.target_host is nil for client exploits
...
git-svn-id: file:///home/svn/framework3/trunk@9625 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 18:33:41 +00:00
James Lee
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
Mike Smith
63a563c20b
Add disclosure_date method
...
git-svn-id: file:///home/svn/framework3/trunk@9619 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 04:21:23 +00:00
James Lee
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
James Lee
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
James Lee
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
Joshua Drake
f0a4812644
add special encoder for piranha_passwd_exec vuln (rh62)
...
git-svn-id: file:///home/svn/framework3/trunk@9613 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 22:36:51 +00:00
Tod Beardsley
b3e5fec174
Fixing misplaced puts from r9606
...
git-svn-id: file:///home/svn/framework3/trunk@9612 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 20:34:36 +00:00
Tod Beardsley
32fa35d53f
Undoing r9607.
...
git-svn-id: file:///home/svn/framework3/trunk@9610 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 16:44:09 +00:00
Tod Beardsley
6280c51382
Adding Java to the platform list (mainly so module_ports.rb will work again)
...
git-svn-id: file:///home/svn/framework3/trunk@9607 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 14:17:09 +00:00
Joshua Drake
19d6ee5edf
add compat for KEXDH_GEX_REQUEST_OLD
...
git-svn-id: file:///home/svn/framework3/trunk@9606 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 06:24:43 +00:00
HD Moore
9c0bcb4bad
Add timeouts to the retry category, helps with the nexpose instance is heavily loaded
...
git-svn-id: file:///home/svn/framework3/trunk@9604 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 03:43:32 +00:00
Tod Beardsley
5f9680d902
Fixes #2133 . This seems to handle many keyfiles pretty well, even if they're concatenated together. Calling it closed.
...
git-svn-id: file:///home/svn/framework3/trunk@9602 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 01:00:08 +00:00
Carlos Perez
ec0e8aba30
Cosmetic changes, renamed mixin function and now all scripts that generate logs they are saved to .msf3/logs/scripts
...
git-svn-id: file:///home/svn/framework3/trunk@9588 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-23 00:50:14 +00:00
Tod Beardsley
4953b3b69f
If the :fix_services option is used for nmap, actually fix the services, and in addition, skip hosts which only present filtered ports.
...
git-svn-id: file:///home/svn/framework3/trunk@9585 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 22:37:14 +00:00
Tod Beardsley
3591143f3a
When importing MSFX data, just report unique collateral once.
...
git-svn-id: file:///home/svn/framework3/trunk@9584 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 20:30:43 +00:00
Joshua Drake
171543624a
fix typos
...
git-svn-id: file:///home/svn/framework3/trunk@9581 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 16:11:02 +00:00
James Lee
3f7dbaaaac
check the database for a previous fingerprint before going out to the network
...
git-svn-id: file:///home/svn/framework3/trunk@9580 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 06:30:48 +00:00
James Lee
f14b3221ca
move http version reporting into the HttpClient mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9579 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 01:39:43 +00:00
James Lee
ef5c0f77eb
move copy-paste into a mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9576 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 00:46:52 +00:00
James Lee
83962cb24a
be explicit about returning false when we couldn't find a vncviewer
...
git-svn-id: file:///home/svn/framework3/trunk@9573 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 00:09:50 +00:00
Joshua Drake
2c91164494
allow x64 payloads to be used with psexec
...
git-svn-id: file:///home/svn/framework3/trunk@9565 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-21 03:49:39 +00:00
Tod Beardsley
613f288226
Fix up ssh_login_pubkey's session management for more effective session reuse.
...
git-svn-id: file:///home/svn/framework3/trunk@9563 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-19 15:03:27 +00:00
James Lee
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
Joshua Drake
025cfa9286
break to_war out from to_jsp_war
...
git-svn-id: file:///home/svn/framework3/trunk@9559 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 21:54:33 +00:00
Joshua Drake
20dd7ca26b
make 100% line up correctly
...
git-svn-id: file:///home/svn/framework3/trunk@9554 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 03:37:23 +00:00
Tod Beardsley
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
James Lee
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
James Lee
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
James Lee
b35baa39f7
allow PHPInclude modules to run automatically
...
git-svn-id: file:///home/svn/framework3/trunk@9545 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 21:16:15 +00:00
Tod Beardsley
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
Tod Beardsley
9924a8d40e
Incorporates a service name map that makes nmap scanning a little more useful for MSFX out of the gate.
...
git-svn-id: file:///home/svn/framework3/trunk@9536 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 18:22:42 +00:00
Tod Beardsley
cb69b0c134
Fixes #2101 . Introduces a proper :skip_user, and adds better comment docs to auth_brute to describe the intended use of each return code.
...
git-svn-id: file:///home/svn/framework3/trunk@9529 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-15 19:10:15 +00:00
Carlos Perez
f4670b26d0
sessions -s was passing unnecesary arguments to scripts, fixeed conflict for scripts that use the -s option
...
git-svn-id: file:///home/svn/framework3/trunk@9508 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-13 01:25:18 +00:00
Tod Beardsley
1b5e35b059
Fixes #2089 . Getting rid of zip_requires() in favor of always loading Zip, Dirtmp, and FileUtils.
...
git-svn-id: file:///home/svn/framework3/trunk@9496 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 21:21:59 +00:00
Tod Beardsley
d4e6e75f7d
Handle loot, tasks, and report times that come from a MSFX ZIP report.
...
git-svn-id: file:///home/svn/framework3/trunk@9493 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 18:56:16 +00:00
James Lee
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
Joshua Drake
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
James Lee
6fc84364b5
make PlatformList a little more like an Array
...
git-svn-id: file:///home/svn/framework3/trunk@9479 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 05:20:40 +00:00
Tod Beardsley
6f37ea2aeb
Adding a 3rd party zip library (rubyzip by Thomas Sondergaard and Technorama Ltd, released under the Ruby license), and a method to import ZIP reports generated by Metasploit Express (still needs work, but is mildly functional right now).
...
git-svn-id: file:///home/svn/framework3/trunk@9478 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-10 21:06:06 +00:00
Tod Beardsley
ec439354b0
Dropping the summary info. It's often incorrect.
...
git-svn-id: file:///home/svn/framework3/trunk@9469 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-10 13:24:43 +00:00
HD Moore
ef372a9d78
Adds the db_sync command
...
git-svn-id: file:///home/svn/framework3/trunk@9466 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-09 21:47:57 +00:00
James Lee
4f2c63dae7
add templates for creating linux armle ELFs, thanks Civ
...
git-svn-id: file:///home/svn/framework3/trunk@9455 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-09 07:20:21 +00:00
Tod Beardsley
d4e1da2fc9
Fixes amap log importing, hopefully once and for all.
...
git-svn-id: file:///home/svn/framework3/trunk@9454 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 22:14:25 +00:00
Tod Beardsley
38674cf62f
Implements callbacks for importing data from vulnerability scanners.
...
git-svn-id: file:///home/svn/framework3/trunk@9452 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 19:16:20 +00:00
Tod Beardsley
dd71e4ac58
Fixes #2034 . Adds the SINGLE_SESSION option, adds an ftp_quit method to handle sending QUIT and disconnecting.
...
git-svn-id: file:///home/svn/framework3/trunk@9451 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 16:30:03 +00:00
James Lee
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
James Lee
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
Tod Beardsley
a0e252ad75
See #2034 . This adds a pretty decent reconnection handler -- keep trying until you're dropped, so this is handy for sites that greylist the banner display.
...
Also ensures that anonymous:somebrowserID is always checked.
git-svn-id: file:///home/svn/framework3/trunk@9447 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 21:37:29 +00:00
James Lee
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
James Lee
394f292c4a
fix handling of '100 Continue' responses
...
git-svn-id: file:///home/svn/framework3/trunk@9444 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-06 19:48:33 +00:00
et
eee1194e82
Removing old wmap lib
...
git-svn-id: file:///home/svn/framework3/trunk@9443 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-06 03:55:21 +00:00
Tod Beardsley
432284ce5a
Handle multiple versions of Metasploit Express XML files.
...
git-svn-id: file:///home/svn/framework3/trunk@9431 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-04 18:54:50 +00:00
Tod Beardsley
c6da645a93
First part of a db import overhaul. Next up: implementing callbacks so the user can follow along with the import to get a sense of where they're at.
...
git-svn-id: file:///home/svn/framework3/trunk@9426 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-04 14:57:58 +00:00
Tod Beardsley
694b70208a
Fix rhost/rport for auth_brute
...
git-svn-id: file:///home/svn/framework3/trunk@9408 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-03 17:58:57 +00:00
Tod Beardsley
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
Tod Beardsley
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
Joshua Drake
7039bc3461
change "local port" to "listen port", see #2005
...
git-svn-id: file:///home/svn/framework3/trunk@9395 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-02 16:23:46 +00:00
Tod Beardsley
d242143518
Allow for spaces and funny characters in usernames and passwords
...
git-svn-id: file:///home/svn/framework3/trunk@9390 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 22:44:50 +00:00
Tod Beardsley
d41e94050e
See #2034 . This adds a basic FTP bruteforce module. It also makes some minor changes to auth_brute (allows for both SMB and FTP credentials to get mapped to the basic 'USERNAME' and 'PASSWORD' datastores), and touches up the other FTP modules slightly.
...
git-svn-id: file:///home/svn/framework3/trunk@9388 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 18:17:26 +00:00
James Lee
055ec7d768
session handler stub for php meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@9387 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 17:01:42 +00:00
James Lee
c1371c8758
add a method for checking if we support ssl and make sure we do before trying initializing the client
...
git-svn-id: file:///home/svn/framework3/trunk@9386 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 17:00:00 +00:00
HD Moore
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
James Lee
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
James Lee
0dfe0c38be
use quotes to avoid php warnings, encoders should take care of it anyway
...
git-svn-id: file:///home/svn/framework3/trunk@9383 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 16:26:48 +00:00
HD Moore
766b591988
Add -o to db_hosts, write the list of hosts to a file
...
git-svn-id: file:///home/svn/framework3/trunk@9381 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-30 13:49:28 +00:00
HD Moore
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
Joshua Drake
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
Joshua Drake
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
Joshua Drake
ecba10c4fd
switch to ::IO.select
...
git-svn-id: file:///home/svn/framework3/trunk@9374 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 22:11:42 +00:00
James Lee
1e47a49b7e
match whitespace to the rbreadline standard instead of the msf standard
...
git-svn-id: file:///home/svn/framework3/trunk@9373 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 19:54:32 +00:00
James Lee
2555392fc8
tab complete OptPath options
...
git-svn-id: file:///home/svn/framework3/trunk@9372 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 17:02:58 +00:00
Joshua Drake
350ac4fb7c
grammar!
...
git-svn-id: file:///home/svn/framework3/trunk@9371 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 15:40:12 +00:00
Joshua Drake
3ce61ca466
grammar!
...
git-svn-id: file:///home/svn/framework3/trunk@9370 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 15:38:13 +00:00
Joshua Drake
def1af53ad
remove executable property
...
git-svn-id: file:///home/svn/framework3/trunk@9369 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 01:14:46 +00:00
Tod Beardsley
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
Tod Beardsley
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
James Lee
6167fbe2a3
leave the database commands in all the time and warn if there's no connection, fixes #1923
...
git-svn-id: file:///home/svn/framework3/trunk@9361 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-25 01:32:30 +00:00
James Lee
7b7e2f6e0c
add tab completion to db_import
...
git-svn-id: file:///home/svn/framework3/trunk@9360 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 23:38:45 +00:00
Mike Smith
8b9eb25664
Load rubygems before changing Encoding.default_internal ( fixes #1914 )
...
git-svn-id: file:///home/svn/framework3/trunk@9359 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 23:07:56 +00:00
Mike Smith
d90656be0e
Improve error logging when modules fail to load.
...
* Don't print module file path twice on the same line
* Use print_error instead of print
* Remove unnecessary newlines
git-svn-id: file:///home/svn/framework3/trunk@9358 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 23:07:52 +00:00
James Lee
a6d39ca581
add tab completion for filenames. works fine with real readline, only does current directory in rbreadline, see #664
...
git-svn-id: file:///home/svn/framework3/trunk@9357 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 22:57:27 +00:00
Ramon de C Valle
afd52bd798
Change the base value used for calculating the system call numbers and
...
arguments in aix.rb
git-svn-id: file:///home/svn/framework3/trunk@9353 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 18:07:15 +00:00
Ramon de C Valle
d31dd35f62
Fixes #2004 . Add back the timeout argument to sunrpc_call method.
...
git-svn-id: file:///home/svn/framework3/trunk@9349 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 00:57:18 +00:00
Tod Beardsley
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
Tod Beardsley
df5ce05fa1
Whitespace for the tests.
...
git-svn-id: file:///home/svn/framework3/trunk@9345 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-22 15:48:02 +00:00
Tod Beardsley
3e80e6ce87
See #2002 . Adds a standard, native NTLM library for Ruby that lends itself very well to HTTP authentication. (Ruby licensed by yrock and Minero Aoki)
...
Usage: See lib/net/ntlm.rb.ut.rb
git-svn-id: file:///home/svn/framework3/trunk@9344 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 21:37:45 +00:00
Joshua Drake
a6795c4714
add EXE exploit mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9340 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 06:20:10 +00:00
Joshua Drake
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
HD Moore
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
Joshua Drake
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
Joshua Drake
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
James Lee
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
James Lee
851b68d9ab
make sure the session has ui handles before running the upexec, see #1982
...
git-svn-id: file:///home/svn/framework3/trunk@9331 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 23:30:03 +00:00
HD Moore
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
James Lee
088d501095
default to postgres
...
git-svn-id: file:///home/svn/framework3/trunk@9328 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 19:37:46 +00:00
Tod Beardsley
87ba4a9594
Fixes #1990 . Turns out, we were counting on resolved hostnames, and skipping anything with an unresolved IP address.
...
git-svn-id: file:///home/svn/framework3/trunk@9327 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 14:08:29 +00:00
James Lee
8e648dc7e0
proto is not required, fixes #1976
...
git-svn-id: file:///home/svn/framework3/trunk@9326 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-19 19:08:08 +00:00
James Lee
346f1b715f
bump version to 3.4.1-dev
...
git-svn-id: file:///home/svn/framework3/trunk@9325 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-19 16:20:21 +00:00
Mike Smith
be6520c52b
Racket should not require rubygems
...
git-svn-id: file:///home/svn/framework3/trunk@9323 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-18 23:16:51 +00:00
HD Moore
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
HD Moore
f66d19567e
3.4.0-release time
...
git-svn-id: file:///home/svn/framework3/trunk@9321 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-18 07:35:09 +00:00
Carlos Perez
ef919600f6
Fix error when writing data to file
...
git-svn-id: file:///home/svn/framework3/trunk@9320 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 23:35:43 +00:00
Carlos Perez
d19fabffda
Removed redundant function, API call already for this
...
git-svn-id: file:///home/svn/framework3/trunk@9319 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 23:35:05 +00:00
James Lee
5e920cad93
whitespace and a clearer warning message
...
git-svn-id: file:///home/svn/framework3/trunk@9312 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 15:20:30 +00:00
James Lee
eb29533ee1
get rid of unnecessary dbms-specific disconnect methods
...
git-svn-id: file:///home/svn/framework3/trunk@9311 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 04:49:17 +00:00
James Lee
a17dd47908
move a method closer to where it's used
...
git-svn-id: file:///home/svn/framework3/trunk@9310 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 04:39:07 +00:00
James Lee
f754b9178a
convert db_autopwn -I and -X to use RangeWalker; this has bugged me for a long time
...
git-svn-id: file:///home/svn/framework3/trunk@9309 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 04:35:33 +00:00
James Lee
bfe47b85d8
whitespace and a typo
...
git-svn-id: file:///home/svn/framework3/trunk@9308 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 04:01:26 +00:00
Joshua Drake
5dabc4ba3f
add more validation to return value from exploit check methods
...
git-svn-id: file:///home/svn/framework3/trunk@9305 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-14 19:53:06 +00:00
James Lee
6d69b3870f
use the ActiveRecord tests for DB liveness instead of a simple boolean. fixes #1383
...
git-svn-id: file:///home/svn/framework3/trunk@9304 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-14 18:57:48 +00:00
HD Moore
10364dc70d
Fixes #1915 . Only clear the connection pool if it exists
...
git-svn-id: file:///home/svn/framework3/trunk@9301 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-14 15:55:01 +00:00
Tod Beardsley
084a6e971c
More nessus import fun. NBE files, this time.
...
git-svn-id: file:///home/svn/framework3/trunk@9297 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-12 23:00:21 +00:00
Tod Beardsley
dbbfec125e
Adjusts more Nessus import foo.
...
git-svn-id: file:///home/svn/framework3/trunk@9296 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-12 22:23:40 +00:00
Tod Beardsley
754a939f82
Skip non-IPv4 address in Nessus reports. Namely, this will allow imports that hit a SCAN-ERROR due to homefeed.
...
git-svn-id: file:///home/svn/framework3/trunk@9292 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-12 18:10:37 +00:00
Joshua Drake
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
James Lee
4cfc84a2e4
fix data->info bug in msfe xml import
...
git-svn-id: file:///home/svn/framework3/trunk@9284 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-11 15:39:24 +00:00
James Lee
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
James Lee
fc793f3cfc
print an error if a resource file doesn't exist, fixes #1358
...
git-svn-id: file:///home/svn/framework3/trunk@9280 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-11 03:20:44 +00:00
HD Moore
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
James Lee
2e9d342bf3
fix another missed data->info
...
git-svn-id: file:///home/svn/framework3/trunk@9275 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 23:42:06 +00:00
Joshua Drake
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
James Lee
afec0407c8
fix nessus and nexpose simplexml imports after the vuln.data->info change
...
git-svn-id: file:///home/svn/framework3/trunk@9271 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 16:16:38 +00:00
James Lee
c5efb3c557
add db_status command, fixes #1159
...
git-svn-id: file:///home/svn/framework3/trunk@9270 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 09:23:53 +00:00
James Lee
29c222d575
document that sqlite is not supported, clarify the db_create deprecation warning to indicate the new ability of db_connect to also create the database
...
git-svn-id: file:///home/svn/framework3/trunk@9268 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 06:27:47 +00:00
James Lee
1e85142054
try to create the database through ActiveRecord
...
git-svn-id: file:///home/svn/framework3/trunk@9267 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 06:14:57 +00:00
James Lee
abbd6aeef7
change vulns.data to vulns.info, fixes #1660
...
git-svn-id: file:///home/svn/framework3/trunk@9265 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 23:32:43 +00:00
HD Moore
0db9cd2746
Update the jruby warning
...
git-svn-id: file:///home/svn/framework3/trunk@9260 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 17:05:15 +00:00
HD Moore
22213466d2
Remove object handle hack
...
git-svn-id: file:///home/svn/framework3/trunk@9259 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 17:03:02 +00:00
HD Moore
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
HD Moore
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
HD Moore
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
Carlos Perez
b43a143126
Enable Meterpreter Mixins
...
git-svn-id: file:///home/svn/framework3/trunk@9252 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-08 18:38:49 +00:00
Carlos Perez
c501e65288
Update of the mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9249 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-08 03:47:51 +00:00
Tod Beardsley
7d9819a9df
Altering the MSFE export format.
...
git-svn-id: file:///home/svn/framework3/trunk@9243 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 21:59:35 +00:00
Joshua Drake
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
James Lee
e70dabf3e3
warn and remove commas from CERTCN to prevent a crash bug in Rjb's keytool, fixes 1543
...
git-svn-id: file:///home/svn/framework3/trunk@9241 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 18:19:50 +00:00
Tod Beardsley
044d7758d8
Sometimes, imported nmap hosts are all marked as "up," even if they're not, thanks to the "user-set" reason. Since that's not very trustworthy, only import hosts that actually have a port list.
...
git-svn-id: file:///home/svn/framework3/trunk@9240 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 17:35:49 +00:00
James Lee
ef7c628ff8
add loots to host model
...
git-svn-id: file:///home/svn/framework3/trunk@9239 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 06:37:00 +00:00
Carlos Perez
2b8ffee307
Initial Meterpreter Mixin commands
...
git-svn-id: file:///home/svn/framework3/trunk@9238 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 02:38:22 +00:00
Carlos Perez
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
Tod Beardsley
cb7706f80d
Normalizing report names for import.
...
git-svn-id: file:///home/svn/framework3/trunk@9231 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-05 20:11:03 +00:00
Joshua Drake
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
Tod Beardsley
8632146be4
Adds imported file metadata to imported hosts as a "host.imported" note, indicating the source filename, the detected file type, and the imported time.
...
git-svn-id: file:///home/svn/framework3/trunk@9227 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-05 19:45:48 +00:00
HD Moore
47cea7bbb3
Respin of the service file
...
git-svn-id: file:///home/svn/framework3/trunk@9226 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-05 18:25:26 +00:00
James Lee
fd5b26ad43
add a timestamp to session opened messages, fixes #1776
...
git-svn-id: file:///home/svn/framework3/trunk@9216 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 20:06:25 +00:00
James Lee
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
HD Moore
df9ec8a08c
Updates to the nessus parser. Closes #1715
...
git-svn-id: file:///home/svn/framework3/trunk@9211 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 01:49:00 +00:00
HD Moore
59a0277ff5
Correct syntax
...
git-svn-id: file:///home/svn/framework3/trunk@9210 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 01:19:36 +00:00
HD Moore
c8b9edd2df
Change 'r' to 'rb' read mode, will solve some encoding issues
...
git-svn-id: file:///home/svn/framework3/trunk@9209 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 01:17:20 +00:00
HD Moore
b10d68f3f9
Fixes #1791 . Apply patch from jduck to fix bad returns from within proc
...
git-svn-id: file:///home/svn/framework3/trunk@9208 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 01:03:49 +00:00
HD Moore
74e64c12fd
Skip port-0 endpoints for now
...
git-svn-id: file:///home/svn/framework3/trunk@9207 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 23:51:54 +00:00
HD Moore
7d737ccfba
Remove certainty from service.info for now
...
git-svn-id: file:///home/svn/framework3/trunk@9206 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 23:50:41 +00:00
HD Moore
aea08c56b0
Put colons between each octet of the imported mac address
...
git-svn-id: file:///home/svn/framework3/trunk@9205 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 23:43:41 +00:00
HD Moore
94d67d57f6
Append to the array, dont reset it to an int
...
git-svn-id: file:///home/svn/framework3/trunk@9204 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 23:13:21 +00:00
James Lee
bbc9c14b1e
put hosts into the right workspace, change os_vendor back to :vendor
...
git-svn-id: file:///home/svn/framework3/trunk@9203 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 22:23:43 +00:00
James Lee
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
HD Moore
39a06a88c3
Patch ActiveRecord to use marshal instead of yaml for serialization
...
git-svn-id: file:///home/svn/framework3/trunk@9198 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 16:46:44 +00:00
Tod Beardsley
66e258da2d
Adding a framework.db.sync for on_session_open -- otherwise it can be to quick and session.tunnel_peer can be nil.
...
git-svn-id: file:///home/svn/framework3/trunk@9197 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 16:25:52 +00:00
HD Moore
704702729b
Switch from serialize to marshalize, ugly code still, will consolidate before release
...
git-svn-id: file:///home/svn/framework3/trunk@9196 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 06:09:08 +00:00
HD Moore
49932f9ef5
Deprecate db_create, change the suggested postgres driver to 'postgres'
...
git-svn-id: file:///home/svn/framework3/trunk@9195 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 02:07:30 +00:00
James Lee
176b564007
replace xml entities in a bunch of places. still not perfect, but solves the specific issues you can get to from the exposed config elements
...
git-svn-id: file:///home/svn/framework3/trunk@9194 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 01:53:30 +00:00
HD Moore
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
HD Moore
cbd675e369
Add user.prefs
...
git-svn-id: file:///home/svn/framework3/trunk@9191 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-01 22:02:00 +00:00
HD Moore
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
HD Moore
42da9e899a
Improvements to the cleanup process, close sockets properly for exploits and auxiliary
...
git-svn-id: file:///home/svn/framework3/trunk@9187 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-01 16:26:24 +00:00
Tod Beardsley
af38610728
Allows for an early exit in the event of a guessed credential.
...
git-svn-id: file:///home/svn/framework3/trunk@9180 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-30 21:17:27 +00:00
HD Moore
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
HD Moore
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
HD Moore
bd928017de
Use gsub over tr to handle binary strings better
...
git-svn-id: file:///home/svn/framework3/trunk@9157 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 14:46:00 +00:00
HD Moore
45425c32da
Ignore incoming data when the socket has already been closed. This may not be correct for WebRPC, but it causes problems with the default mode
...
git-svn-id: file:///home/svn/framework3/trunk@9156 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 14:39:51 +00:00
HD Moore
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
HD Moore
8b93465d46
Remove global extend -> include change, identify common cases and change instead
...
git-svn-id: file:///home/svn/framework3/trunk@9152 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 01:00:43 +00:00
Tod Beardsley
111f105117
Handle importing timestamps from Metasploit Express reports.
...
git-svn-id: file:///home/svn/framework3/trunk@9149 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 21:51:29 +00:00
Tod Beardsley
3fa96688f2
Moved the common rexmlifier to its own function for consistency. Ensure that nulls stay null for MSFE import.
...
git-svn-id: file:///home/svn/framework3/trunk@9146 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 20:25:42 +00:00
Tod Beardsley
1b910c1862
Expose a means to import MSFE reports to the user.
...
git-svn-id: file:///home/svn/framework3/trunk@9144 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 19:10:40 +00:00
Tod Beardsley
fab458579e
Implements methods to import reports from Metasploit Express.
...
git-svn-id: file:///home/svn/framework3/trunk@9141 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 18:40:49 +00:00
Joshua Drake
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
HD Moore
6511e4fa77
Workaround for a memory leak on some versions of Ruby
...
git-svn-id: file:///home/svn/framework3/trunk@9136 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-25 23:49:20 +00:00
James Lee
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
James Lee
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
James Lee
30b210a896
make task exception logs a little more readable.
...
git-svn-id: file:///home/svn/framework3/trunk@9127 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-24 18:34:21 +00:00
James Lee
016ec84531
fix auth lookups on mysql ('==' != '=')
...
git-svn-id: file:///home/svn/framework3/trunk@9126 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-24 15:53:20 +00:00
Tod Beardsley
89842fb45f
Adds an easily-accessable fingerprint method to identify public and private ssh keys.
...
git-svn-id: file:///home/svn/framework3/trunk@9115 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-21 16:36:07 +00:00
James Lee
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
James Lee
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
James Lee
dc2b42a8c2
typo fix? actually pass the options instead of always using an empty Hash.
...
git-svn-id: file:///home/svn/framework3/trunk@9107 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-19 23:19:12 +00:00
James Lee
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
James Lee
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
James Lee
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
James Lee
8eff6b6438
differentiate between protocol errors and login failues
...
git-svn-id: file:///home/svn/framework3/trunk@9099 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-16 22:29:33 +00:00
Joshua Drake
2485dcb1b7
dont use the users ssh keys
...
git-svn-id: file:///home/svn/framework3/trunk@9098 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-16 16:06:43 +00:00
HD Moore
7e4515cd7e
Handle task processing errors better
...
git-svn-id: file:///home/svn/framework3/trunk@9087 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 19:25:48 +00:00
Tod Beardsley
888e80f92c
Fixes up various usability bugs with AuthBrute, many of which revolved around smb_login tests.
...
git-svn-id: file:///home/svn/framework3/trunk@9086 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 17:29:47 +00:00
HD Moore
dff1132e08
Remove stderr
...
git-svn-id: file:///home/svn/framework3/trunk@9084 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 15:29:28 +00:00
James Lee
086f82630a
don't queue a task from within a task; error out earlier when we don't have a host
...
git-svn-id: file:///home/svn/framework3/trunk@9081 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 09:00:16 +00:00
Joshua Drake
5aea21fcb8
speel more godoer
...
git-svn-id: file:///home/svn/framework3/trunk@9080 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 02:09:08 +00:00
Joshua Drake
6fec79926c
revert service name string insertion
...
git-svn-id: file:///home/svn/framework3/trunk@9079 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-14 22:17:19 +00:00
Joshua Drake
730b27eed1
fixup some of the payload exe generation/templating stuff, add pe/dll template+src
...
git-svn-id: file:///home/svn/framework3/trunk@9073 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-14 21:44:23 +00:00
HD Moore
914a90a714
Fix the print lins
...
git-svn-id: file:///home/svn/framework3/trunk@9068 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-14 02:46:43 +00:00
James Lee
e1639ce853
truncate host and service info to the size of the database field, see #912
...
git-svn-id: file:///home/svn/framework3/trunk@9064 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 21:15:15 +00:00
Joshua Drake
63e70f2d78
fix up a bunch of incorrect 1.8/1.9 compat fixes, fixes #1540
...
git-svn-id: file:///home/svn/framework3/trunk@9063 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 19:44:04 +00:00
Tod Beardsley
2a3b8ea57a
Adds a module for scanning hosts for valid login credentials using unencrypted SSH private keys. Also completes the commit for r9059 to record auth_info hashes on successes.
...
git-svn-id: file:///home/svn/framework3/trunk@9062 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 19:21:48 +00:00
Joshua Drake
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
Tod Beardsley
5dc72cf63d
Adds an auth_info hash to the SSH connection object (populated by password and publickey auth) to record the details of a successful authentication. Useful for querying which password or publickey was actually used to authenticate.
...
git-svn-id: file:///home/svn/framework3/trunk@9059 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 16:47:21 +00:00
HD Moore
52d17d73da
Show the URL, print an OK error for unknown requests
...
git-svn-id: file:///home/svn/framework3/trunk@9058 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 16:05:37 +00:00
HD Moore
32b8f366de
Do not try to bind to LHOST
...
git-svn-id: file:///home/svn/framework3/trunk@9057 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 15:38:01 +00:00
HD Moore
197595839a
Add a close method, fix a memory leak
...
git-svn-id: file:///home/svn/framework3/trunk@9056 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-12 19:25:29 +00:00
James Lee
71ba477674
handle Interrupt after Timeout::Error since the latter inherits from the former on 1.8
...
git-svn-id: file:///home/svn/framework3/trunk@9055 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-12 18:40:24 +00:00
James Lee
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
James Lee
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
HD Moore
be7f2fdac8
Handle cases where the session has a target_host by not tunnel_peer
...
git-svn-id: file:///home/svn/framework3/trunk@9052 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-11 22:11:31 +00:00
James Lee
c8a8a6a3fe
log a little more info when a migration fails
...
git-svn-id: file:///home/svn/framework3/trunk@9050 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-11 16:33:21 +00:00
HD Moore
ba7b0e7cba
Disable pageant by default
...
git-svn-id: file:///home/svn/framework3/trunk@9046 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-10 17:40:22 +00:00
HD Moore
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
HD Moore
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
Joshua Drake
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
Joshua Drake
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
James Lee
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
HD Moore
36836423d9
Add a warning, cosmetic comment to asm
...
git-svn-id: file:///home/svn/framework3/trunk@9037 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 20:51:05 +00:00
Joshua Drake
4e23992588
move to more indirect method for defining syscall sets
...
git-svn-id: file:///home/svn/framework3/trunk@9035 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 16:49:48 +00:00
HD Moore
b2568a33df
Change the gem name
...
git-svn-id: file:///home/svn/framework3/trunk@9034 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 16:21:14 +00:00
Joshua Drake
71426f1af7
fix db_destory help
...
git-svn-id: file:///home/svn/framework3/trunk@9033 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 16:09:01 +00:00
HD Moore
af10ee5e57
Handle timeout errors more gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@9023 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-06 02:05:50 +00:00
HD Moore
724f980842
Make auth reports critical by default
...
git-svn-id: file:///home/svn/framework3/trunk@9022 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-06 00:04:52 +00:00
HD Moore
987757246f
Speed up the queue processing a little
...
git-svn-id: file:///home/svn/framework3/trunk@9019 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-05 20:34:41 +00:00
HD Moore
ca5963fbc7
Check for the host first
...
git-svn-id: file:///home/svn/framework3/trunk@9017 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-05 19:58:18 +00:00
HD Moore
97026edee6
Aggressively update the host.updated_at during report_* calls
...
git-svn-id: file:///home/svn/framework3/trunk@9016 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-05 19:38:51 +00:00
HD Moore
756c981c2b
Add timestamps to print_good() too
...
git-svn-id: file:///home/svn/framework3/trunk@9011 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-04 22:48:35 +00:00
Joshua Drake
8d6f934570
provide better error messages when dealing failing to generate AIX payloads
...
git-svn-id: file:///home/svn/framework3/trunk@9010 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-04 20:57:17 +00:00
HD Moore
c8defe9716
Size tweaks to bring the ssl stager + encoder + target_id to exactly 400 bytes
...
git-svn-id: file:///home/svn/framework3/trunk@8998 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 07:48:53 +00:00
HD Moore
eac38aaa23
Allow alphanumeric targetid's
...
git-svn-id: file:///home/svn/framework3/trunk@8996 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:21:00 +00:00
HD Moore
949874e541
Remove close message
...
git-svn-id: file:///home/svn/framework3/trunk@8995 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:14:58 +00:00
HD Moore
e98af96779
Revert - sort out a bug
...
git-svn-id: file:///home/svn/framework3/trunk@8994 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:14:10 +00:00
HD Moore
84e30cd71e
Switch from int to string, no reason not to
...
git-svn-id: file:///home/svn/framework3/trunk@8993 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:11:45 +00:00
HD Moore
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
HD Moore
4fe58a8f02
Revert previous exe change
...
git-svn-id: file:///home/svn/framework3/trunk@8989 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 05:44:40 +00:00
HD Moore
32f50fac66
Woops. Add the missing base class:
...
git-svn-id: file:///home/svn/framework3/trunk@8987 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 05:37:40 +00:00
HD Moore
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
HD Moore
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
James Lee
7061c782d3
make Session#inspect a little nicer
...
git-svn-id: file:///home/svn/framework3/trunk@8981 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-02 18:00:30 +00:00
HD Moore
bf7b84c7e2
See you next year
...
git-svn-id: file:///home/svn/framework3/trunk@8977 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-02 04:44:02 +00:00
HD Moore
cf1a6bdfb1
Yup, still that time
...
git-svn-id: file:///home/svn/framework3/trunk@8973 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-01 15:12:53 +00:00
HD Moore
48a672ce6a
Its that time again
...
git-svn-id: file:///home/svn/framework3/trunk@8972 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-01 15:02:09 +00:00
natron
c1fa8d60f7
Expose exe :template and :insert via advanced options plus formatting changes. Thanks MarkBagget for the kick in the pants and the example options to to_win32pe\!
...
git-svn-id: file:///home/svn/framework3/trunk@8966 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-31 22:05:32 +00:00
Joshua Drake
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
James Lee
d248575c57
comment about the use of .peerhost
...
git-svn-id: file:///home/svn/framework3/trunk@8962 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-31 00:10:34 +00:00
HD Moore
688d40520d
Move ActiveRecord to UTC
...
git-svn-id: file:///home/svn/framework3/trunk@8952 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-29 17:04:40 +00:00
HD Moore
ddc98a65a1
Support importing raw IP lists as well
...
git-svn-id: file:///home/svn/framework3/trunk@8950 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-28 23:07:52 +00:00
HD Moore
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
James Lee
deeb00e4ae
display who we're sending the stage to, if possible
...
git-svn-id: file:///home/svn/framework3/trunk@8948 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-28 21:53:58 +00:00
HD Moore
900fb250a2
Fix warning when report_service() contains host_name/host_mac
...
git-svn-id: file:///home/svn/framework3/trunk@8947 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-28 16:53:55 +00:00
HD Moore
ba12ddd280
Allow authbrute modules to use a single username/password in a sane way
...
git-svn-id: file:///home/svn/framework3/trunk@8945 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 23:52:43 +00:00
HD Moore
dfeb7978bf
More authors
...
git-svn-id: file:///home/svn/framework3/trunk@8944 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 23:47:59 +00:00
HD Moore
9cc4cab9ec
Duplicate the datastore and manually set user/pass in the telnet/ssh modules
...
git-svn-id: file:///home/svn/framework3/trunk@8943 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 22:57:29 +00:00
HD Moore
c3eccf2cb5
Change default to 445, its 2010
...
git-svn-id: file:///home/svn/framework3/trunk@8941 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 21:00:28 +00:00
HD Moore
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
HD Moore
d0529c325e
Only process autoruns if the session supports it (VNC)
...
git-svn-id: file:///home/svn/framework3/trunk@8938 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 15:03:03 +00:00
HD Moore
9277f060a7
Store a uuid for each module, track this in sessions
...
git-svn-id: file:///home/svn/framework3/trunk@8937 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 02:39:52 +00:00
HD Moore
56e2f73e59
Dont import port 0
...
git-svn-id: file:///home/svn/framework3/trunk@8936 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 02:31:14 +00:00
HD Moore
7e86cd7b35
Try not to break the tree this time
...
git-svn-id: file:///home/svn/framework3/trunk@8928 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-26 01:21:01 +00:00
HD Moore
ee2e796a19
Store the last generated error
...
git-svn-id: file:///home/svn/framework3/trunk@8927 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-26 01:18:10 +00:00
HD Moore
52da4d13bf
Correct variable used
...
git-svn-id: file:///home/svn/framework3/trunk@8926 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-26 01:12:03 +00:00
HD Moore
2d96570ce5
Leftover change from the initialize() to prepare_http_client() move
...
git-svn-id: file:///home/svn/framework3/trunk@8925 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-26 01:08:22 +00:00
HD Moore
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
Tod Beardsley
25ec5fa444
Do a little better password management for services that don't ask for usernames -- fingerprint them ahead of time, and resort the credentials list in a usernameless way. Also, this allows telnet RST's to be treated just as busy services, since sometimes telnet servers get persnickety about a lot of login attempts, but they do come back shortly.
...
git-svn-id: file:///home/svn/framework3/trunk@8920 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 21:32:32 +00:00
HD Moore
a560992c7f
If a duplicate note is found, change the updated_at to indicate its fresh.
...
git-svn-id: file:///home/svn/framework3/trunk@8919 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 18:10:37 +00:00
HD Moore
eb0e9fdc73
Always insert auth notes, dupe data doesnt make sense for long-running work
...
git-svn-id: file:///home/svn/framework3/trunk@8918 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 18:07:51 +00:00
HD Moore
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
HD Moore
dde2531194
Rename to match the class name
...
git-svn-id: file:///home/svn/framework3/trunk@8914 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 03:51:04 +00:00
HD Moore
1a53881e3b
Add Kurt Grutzmacher's VNC password dumper
...
git-svn-id: file:///home/svn/framework3/trunk@8913 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 03:50:25 +00:00
Joshua Drake
f7f0f03a4a
handle the user hitting ^D while interacting properly
...
git-svn-id: file:///home/svn/framework3/trunk@8911 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 01:38:47 +00:00
HD Moore
af3ab0a260
Handle situations where any user/pass is allowed
...
git-svn-id: file:///home/svn/framework3/trunk@8904 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 21:11:00 +00:00
Tod Beardsley
dabe51f3c4
Converting credentials_tried and credentials_skipped to class variables so threads can access them and cut down on the repeats.
...
git-svn-id: file:///home/svn/framework3/trunk@8902 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 20:31:43 +00:00
James Lee
1dc7a4a21f
i'm tired of support requests for oci libs not being installed
...
git-svn-id: file:///home/svn/framework3/trunk@8899 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 19:02:38 +00:00
James Lee
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
HD Moore
2efa31cfec
Closes #1244 with a caveat. If the template injected calls ExitProcess(), the payload will be killed. This means that -k is not compatible with our default executable
...
git-svn-id: file:///home/svn/framework3/trunk@8896 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 15:55:24 +00:00
HD Moore
756e00c3bb
A little more work for each connection, but this should be slightly more robust
...
git-svn-id: file:///home/svn/framework3/trunk@8895 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 14:50:25 +00:00
HD Moore
e28e4ac923
Document how the ssl verification (or lack of) should be implemented. Handle oddball connection errors gracefully with a retry
...
git-svn-id: file:///home/svn/framework3/trunk@8894 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 14:47:30 +00:00
HD Moore
4625e9b363
Catch Meterpreter-timeout errors for pivoted scanners
...
git-svn-id: file:///home/svn/framework3/trunk@8893 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 12:09:32 +00:00
HD Moore
2b419a421d
Add default timeouts to autopwn, control with -T
...
git-svn-id: file:///home/svn/framework3/trunk@8892 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 00:11:21 +00:00
James Lee
1265cccde7
override the command shell session interaction to use shell_read and shell_write instead of operating on rstream directly
...
git-svn-id: file:///home/svn/framework3/trunk@8886 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-23 00:33:18 +00:00
HD Moore
38e4a9c8a2
Store the tunnel_peer directly
...
git-svn-id: file:///home/svn/framework3/trunk@8885 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 23:24:08 +00:00
James Lee
e088d9ff68
change order of paths to src, dest in session up/download events
...
git-svn-id: file:///home/svn/framework3/trunk@8882 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 20:56:22 +00:00
Tod Beardsley
4f3c5fd44d
Whoops, left a print_debug in there.
...
git-svn-id: file:///home/svn/framework3/trunk@8880 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 20:14:03 +00:00
Tod Beardsley
83d96d713c
Refactoring Auxiliary::AuthBrute. Now that several modules actually use it, the real use cases have become obvious. So, refactored for simplicity and readability. Also touched up all the authentication modules to behave consistently.
...
git-svn-id: file:///home/svn/framework3/trunk@8879 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 20:07:26 +00:00
HD Moore
05bd6b816d
Fix this for when users dont have msfconsole.rc
...
git-svn-id: file:///home/svn/framework3/trunk@8877 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 15:50:42 +00:00
HD Moore
0bea440dcb
Add the ability to process ruby blocks in resource scripts. Fixes #1288
...
git-svn-id: file:///home/svn/framework3/trunk@8876 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 14:26:02 +00:00
HD Moore
189dd8eb21
Fixes #770 . Update Racket UDP checksum to play nice with 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@8875 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 13:01:50 +00:00
HD Moore
4c8dbafe1d
Only set KCODE on 1.8, prevent warnings on 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@8874 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 12:34:06 +00:00
James Lee
73cd20f8a6
add the skeleton for new session events. now the hard part is going to be triggering them for meterpreter sessions without mixing the Rex and Msf namespaces...
...
git-svn-id: file:///home/svn/framework3/trunk@8873 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 01:13:58 +00:00
HD Moore
6c502a6fd3
Woops, fix reporting os the nmap fingerprint on import
...
git-svn-id: file:///home/svn/framework3/trunk@8872 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 00:36:59 +00:00
HD Moore
869435322e
Move direct OS updates out, fingerprints instead
...
git-svn-id: file:///home/svn/framework3/trunk@8870 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 00:11:43 +00:00
James Lee
25f9458c86
allow Msf::Module::SiteRefence to be reported via report_vuln; report module references when creating vulns from a successful exploit
...
git-svn-id: file:///home/svn/framework3/trunk@8867 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-21 23:12:37 +00:00
HD Moore
480380003c
Make verbose status printing standardized across login modules
...
git-svn-id: file:///home/svn/framework3/trunk@8866 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-21 18:42:47 +00:00
HD Moore
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
HD Moore
0b996801d0
Some database drivers will reset the status of $KCODE, which then auto-unicodes all of the binary strings. Prevent them
...
git-svn-id: file:///home/svn/framework3/trunk@8860 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-20 21:40:59 +00:00
HD Moore
9d918b3cbc
Make the uuid more hash-like
...
git-svn-id: file:///home/svn/framework3/trunk@8859 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-20 19:04:21 +00:00
HD Moore
56c91e0441
Store the session type as well
...
git-svn-id: file:///home/svn/framework3/trunk@8858 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-20 18:40:41 +00:00
HD Moore
b19e21a3e3
Use the right workspace
...
git-svn-id: file:///home/svn/framework3/trunk@8857 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-20 16:58:19 +00:00
Tod Beardsley
e3355656ee
Don't record 127.0.0.1 in the database as a host.
...
If you really want to record localhost, call it 127.0.0.2 or something.
git-svn-id: file:///home/svn/framework3/trunk@8856 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-20 14:38:50 +00:00
James Lee
1678a0f74a
move\ vuln\ reporting\ out\ of\ the\ console\ so\ it works in all\ UIs
...
git-svn-id: file:///home/svn/framework3/trunk@8855 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-19 22:17:07 +00:00
Joshua Drake
24934444b6
only allow living sessions to be deregistered -- in theory this won't cause any issues
...
git-svn-id: file:///home/svn/framework3/trunk@8854 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-19 03:12:36 +00:00
Joshua Drake
b8b11338b1
add linux x86/x86_64 support for tomcat manger deploy, see #1016
...
git-svn-id: file:///home/svn/framework3/trunk@8853 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-19 02:13:02 +00:00
James Lee
99414acc54
fixes #1120 . only wait for the jobs we spawned
...
git-svn-id: file:///home/svn/framework3/trunk@8850 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-18 18:26:53 +00:00
HD Moore
260b92f65a
Correct decoding
...
git-svn-id: file:///home/svn/framework3/trunk@8847 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-18 15:31:01 +00:00
HD Moore
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
HD Moore
6383ef6cfd
Typo
...
git-svn-id: file:///home/svn/framework3/trunk@8844 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 18:41:09 +00:00
HD Moore
37d1965b24
allow the configuration directory to be overloaded
...
git-svn-id: file:///home/svn/framework3/trunk@8843 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 18:25:53 +00:00
HD Moore
ae90a52e94
Pass the username back to the rpc client
...
git-svn-id: file:///home/svn/framework3/trunk@8842 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 18:25:36 +00:00
Tod Beardsley
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
HD Moore
984890a2cd
Merge in the user -> username change
...
git-svn-id: file:///home/svn/framework3/trunk@8840 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 14:07:45 +00:00
HD Moore
cae92bbe7d
Explicitly handle username
...
git-svn-id: file:///home/svn/framework3/trunk@8839 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 14:04:47 +00:00
James Lee
efceaa84cf
add on_module_complete and on_module_error events
...
git-svn-id: file:///home/svn/framework3/trunk@8837 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 19:32:54 +00:00
James Lee
38fe469ce8
deal with via_exploit being fullname instead of refname by creating it through framework.modules instead of framework.exploits. fixes #1165
...
git-svn-id: file:///home/svn/framework3/trunk@8836 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 19:17:21 +00:00
Tod Beardsley
3f69bb8053
Fixes the handling for telnet services when the server is "busy" -- this is common wit HP JetDirect servers, where the server will respond with a busy message up to several seconds after the last connection logged off. While this does mean that credential tests will be skipped, they will at least not be scored incorrectly as false postives.
...
Also, this removes the disconnect() method in favor of self.sock.close(). Disconnect seems to have a tendency to leave sessions half-closed, which will cause a busy state to never clear. self.sock.close doesn't appear to have this effect if you use a slower bruteforce_speed option (3 seems to work all right).
git-svn-id: file:///home/svn/framework3/trunk@8835 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 18:45:50 +00:00
Tod Beardsley
cb640571b0
Fixes #1109 -- ARP is now less picky about ARP replies, but does conform to normal networking standards.
...
git-svn-id: file:///home/svn/framework3/trunk@8832 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 16:04:02 +00:00
Joshua Drake
32fb7653ca
only set .info if its nil or empty
...
git-svn-id: file:///home/svn/framework3/trunk@8831 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 15:20:48 +00:00
HD Moore
18075f9b68
Store session UUID and username
...
git-svn-id: file:///home/svn/framework3/trunk@8830 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 15:11:07 +00:00
Joshua Drake
f9267498e3
save initial command shell session output into session.info
...
git-svn-id: file:///home/svn/framework3/trunk@8829 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 04:50:47 +00:00
Joshua Drake
7cf8b4c43f
distinguish the error message for sessions that die from EOF
...
git-svn-id: file:///home/svn/framework3/trunk@8828 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 03:15:52 +00:00
HD Moore
d03342fa49
Store the full module paths
...
git-svn-id: file:///home/svn/framework3/trunk@8827 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-15 23:40:12 +00:00
HD Moore
2dd91d4f88
Allow API tokens to be used instead of user/pass
...
git-svn-id: file:///home/svn/framework3/trunk@8823 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-15 20:16:37 +00:00
HD Moore
9ccce2a166
Move the nexpose api code into a separate file
...
git-svn-id: file:///home/svn/framework3/trunk@8821 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-15 03:19:25 +00:00
HD Moore
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
HD Moore
9ae8422c05
Fix info field
...
git-svn-id: file:///home/svn/framework3/trunk@8817 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 16:09:46 +00:00
HD Moore
5e26eb9498
Adds name and info to the loot table:
...
git-svn-id: file:///home/svn/framework3/trunk@8816 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 15:38:52 +00:00
HD Moore
8464a36bf5
Bump pool to 256; may still be driver limited. See #976 .
...
git-svn-id: file:///home/svn/framework3/trunk@8814 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 03:54:54 +00:00
Joshua Drake
ec325f9ab1
adjust help text, see #394
...
git-svn-id: file:///home/svn/framework3/trunk@8809 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 23:06:33 +00:00
Joshua Drake
a811ad0c32
clean up, add comments, and fix bug in command dispatcher, fixes #394
...
git-svn-id: file:///home/svn/framework3/trunk@8808 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 22:59:19 +00:00
Joshua Drake
7b41d08387
remove dupe "-s" option from help, add "-u" option to upgrade command shell session to meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@8807 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 21:51:55 +00:00
Joshua Drake
ac06e2d667
only copy user_input and user_output if they are non-nil
...
git-svn-id: file:///home/svn/framework3/trunk@8806 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 21:47:27 +00:00
Joshua Drake
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
HD Moore
9288f34fbf
Add a results column
...
git-svn-id: file:///home/svn/framework3/trunk@8804 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 15:58:02 +00:00
HD Moore
1b1ec3b5dc
Store the job_id for auxiliary modules running as a background job
...
git-svn-id: file:///home/svn/framework3/trunk@8803 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 02:39:02 +00:00
HD Moore
c5cbacd194
Handle long responses better
...
git-svn-id: file:///home/svn/framework3/trunk@8799 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 22:21:41 +00:00
HD Moore
c3d17ab48b
Add hooks for input/output/error
...
git-svn-id: file:///home/svn/framework3/trunk@8798 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 21:57:04 +00:00
James Lee
646044f631
move session_output events to the session where they belong (instead of in rpc). add a timeout arg to shell_read
...
git-svn-id: file:///home/svn/framework3/trunk@8797 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 20:07:06 +00:00
HD Moore
7f1e5fd475
Base64 encode the console output as well
...
git-svn-id: file:///home/svn/framework3/trunk@8796 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:49:39 +00:00
James Lee
dbe4d05875
typo fix. how did this ever work?
...
git-svn-id: file:///home/svn/framework3/trunk@8795 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:41:59 +00:00
James Lee
a20b74536c
add an events accessor
...
git-svn-id: file:///home/svn/framework3/trunk@8794 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:38:19 +00:00
James Lee
89e378dd4c
break output into 1024-byte chunks so it fits in the database
...
git-svn-id: file:///home/svn/framework3/trunk@8793 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:18:39 +00:00
HD Moore
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
HD Moore
5957dd5393
Add tasks
...
git-svn-id: file:///home/svn/framework3/trunk@8791 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 18:42:21 +00:00
James Lee
0e537a17bb
fix some pastographical errors
...
git-svn-id: file:///home/svn/framework3/trunk@8790 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 17:48:59 +00:00
Stephen Fewer
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
James Lee
09c1fdd13d
store full name (which includes module type) instead of just the refname
...
git-svn-id: file:///home/svn/framework3/trunk@8785 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 14:33:48 +00:00
HD Moore
ac0e6515ab
Remove the PID from session.info, it doesn't add much value:
...
git-svn-id: file:///home/svn/framework3/trunk@8784 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 14:21:46 +00:00
HD Moore
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
HD Moore
4c22afed31
Fix other occurrences of on_session_close not taking a second parameter. See #1075
...
git-svn-id: file:///home/svn/framework3/trunk@8782 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 13:54:10 +00:00