Commit Graph

3889 Commits (c679de9d7a98da5e99aaa0b300178aea65507fa9)

Author SHA1 Message Date
Jonathan Cran 19d9185ca3 updated for remote workstation control
git-svn-id: file:///home/svn/framework3/trunk@11647 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 07:33:59 +00:00
James Lee d2670d52ec add BufferRegister and BufferOffset support for shikata_ga_nai. see #3563. tested this pretty extensively. /me crosses fingers
git-svn-id: file:///home/svn/framework3/trunk@11646 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 04:24:41 +00:00
Joshua Drake 4b777686d8 whitespace fixes
git-svn-id: file:///home/svn/framework3/trunk@11645 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 03:13:40 +00:00
Joshua Drake 53bba0bd54 Move cache logic from statistics->module_manager, More modularization in ModuleManager
git-svn-id: file:///home/svn/framework3/trunk@11643 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 00:07:34 +00:00
Joshua Drake a2e6f0e96c add -q option to suppress banner, improve -n warning
git-svn-id: file:///home/svn/framework3/trunk@11642 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 22:58:21 +00:00
Joshua Drake 56b112e03b See #3596, Only force encoding for rubies that support encoding
git-svn-id: file:///home/svn/framework3/trunk@11640 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 20:03:33 +00:00
Joshua Drake 1e6365ed58 Fixes #3596, Force Rex::Text.gzip to use ASCII-8BIT strings, Reverts r10653
git-svn-id: file:///home/svn/framework3/trunk@11639 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 19:59:56 +00:00
Carlos Perez 05fd7b4e57 Patch for railgun and post mixin; and module from cha-mou to add capability to delete users on windows hosts.
git-svn-id: file:///home/svn/framework3/trunk@11638 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 13:02:35 +00:00
HD Moore 3794ed35cc Apply patches from Matthew Weeks (scriptjunkie) to fix traversal flaws outlined in his Black Hat DC talk:
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-wp.pdf
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-Slides.pdf



git-svn-id: file:///home/svn/framework3/trunk@11636 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 02:24:37 +00:00
Joshua Drake 8a4c23ffd4 small adjustment
git-svn-id: file:///home/svn/framework3/trunk@11635 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 02:15:25 +00:00
Joshua Drake 81ff9483bf add ms09-004 exploit via sql injection from Rodrigo Marcos
git-svn-id: file:///home/svn/framework3/trunk@11631 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 19:37:58 +00:00
Joshua Drake 0af8915fd5 Fixes #1936, Add accounts mixin and accompanying post module
git-svn-id: file:///home/svn/framework3/trunk@11629 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 17:23:48 +00:00
Joshua Drake 3346a30023 See #1936, Add FreeSid definition and convert several PSID* out params to PDWORD
git-svn-id: file:///home/svn/framework3/trunk@11628 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 05:36:38 +00:00
James Lee 8bf60c6d11 carlos forgot to delete this, see r11550, r11551
git-svn-id: file:///home/svn/framework3/trunk@11624 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:56:37 +00:00
James Lee d7cda0f85a accept a client argument for get_uri()
git-svn-id: file:///home/svn/framework3/trunk@11623 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:16:57 +00:00
Tod Beardsley 8b5f0f6559 Allow getsystem to report its success as a host note.
git-svn-id: file:///home/svn/framework3/trunk@11622 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:08:35 +00:00
James Lee f8120a8e3f servers don't have a sock().
git-svn-id: file:///home/svn/framework3/trunk@11621 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 23:42:56 +00:00
James Lee e7ced5f887 disable ssl for the php include server, and try the address with the default gateway for get_uri when SRVHOST is inaddr_any
git-svn-id: file:///home/svn/framework3/trunk@11620 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 23:19:11 +00:00
Joshua Drake b8b3d9e00f See #1936, Apply patch from Chao Mu - PSID is kind of opaque, so we treat it as a pointer only (not a blob)
git-svn-id: file:///home/svn/framework3/trunk@11618 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 22:05:28 +00:00
Tod Beardsley 63f893dd90 Adds an OptFloat option class, for when people actually want floats and not integers.
git-svn-id: file:///home/svn/framework3/trunk@11616 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 17:21:42 +00:00
Tod Beardsley e1e35ea15b Adds a attribute_locked? method to Host objects. If an attribute is locked, report_host() won't update it. (These aren't very serious locks since you can still set them directly on objects, but if you use the API, and you should, locks will be respected.)
git-svn-id: file:///home/svn/framework3/trunk@11613 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-20 23:10:27 +00:00
Tod Beardsley a12f5556cb Fixes #3564 by better randomizing the temp directory for extraction (minimizing the chance of a filesystem name collision), correctly extracting the original workspace name, and identifying the correct XML file to work off of for importing hosts and services.
git-svn-id: file:///home/svn/framework3/trunk@11609 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-20 17:32:48 +00:00
James Lee dfbef1e38c make sure we have the right kind of args. fixes argument processing for scripts
git-svn-id: file:///home/svn/framework3/trunk@11605 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 23:36:11 +00:00
Joshua Drake 987ce12ba8 Fixes #3552, add ConvertStringSidtoSid
git-svn-id: file:///home/svn/framework3/trunk@11604 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 23:15:42 +00:00
Jonathan Cran d8fddbfcd4 missing file
git-svn-id: file:///home/svn/framework3/trunk@11603 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 21:23:29 +00:00
Matt Weeks 067c612d9e Make creds visible to RPC and GUI.
git-svn-id: file:///home/svn/framework3/trunk@11602 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 20:09:18 +00:00
James Lee bd2dcdb5c3 add the scriptable mixin. fixes #3550, see #3541. /me grumbles
git-svn-id: file:///home/svn/framework3/trunk@11600 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 16:01:12 +00:00
James Lee d120892e7c post modules working for shell sessions, fixes #3541
git-svn-id: file:///home/svn/framework3/trunk@11599 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 02:24:21 +00:00
James Lee 6210fea1f3 add post/ module support for meterpreter autorunscript, see #3541
git-svn-id: file:///home/svn/framework3/trunk@11595 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 23:48:19 +00:00
James Lee 5429c73b3b don't try to store to the database if there isn't one. fixes #3540
git-svn-id: file:///home/svn/framework3/trunk@11594 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 23:41:01 +00:00
James Lee aca1a0d8e4 allow passive post modules, fixes #3542. add 'Passive' => true to the module info for a passive module
git-svn-id: file:///home/svn/framework3/trunk@11591 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 22:00:12 +00:00
James Lee 437b060ab9 fix a namespace problem, maybe related to #3592
git-svn-id: file:///home/svn/framework3/trunk@11590 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 20:53:57 +00:00
James Lee 9df78e8f47 correct passive?() for post modules, see #3542
git-svn-id: file:///home/svn/framework3/trunk@11589 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 20:50:30 +00:00
James Lee 63934c34ec check for a ancestors instead of a straight comparison of classes when matching payloads for generics, fixes #3477
git-svn-id: file:///home/svn/framework3/trunk@11585 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 17:15:43 +00:00
Jonathan Cran 4384618950 add workstation-over-ssh control into the lab vm-control plugin
git-svn-id: file:///home/svn/framework3/trunk@11584 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 05:58:16 +00:00
Carlos Perez a237122869 for Java version of Meterpreter options can not be included with the command, they have to be given apart updating mixin for this behavior
git-svn-id: file:///home/svn/framework3/trunk@11581 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-15 05:08:42 +00:00
James Lee 64d160e393 add a method for determining if an address is internal, i.e. within the ranges specified in rfc1918 or rfc5735, and cleanup the unit tests to work on 1.9 and account for various changes to the library that previously didn't get any love in the tests, e.g. r4545.
git-svn-id: file:///home/svn/framework3/trunk@11580 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-15 04:40:21 +00:00
James Lee 0158cd28f1 tab complete local filenames for upload command
git-svn-id: file:///home/svn/framework3/trunk@11575 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 20:22:13 +00:00
James Lee 1e3df538f9 use more specific config directory for future-proofing.
git-svn-id: file:///home/svn/framework3/trunk@11574 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 18:55:26 +00:00
James Lee ef883859f1 jduck is right, this isn't necessary since non-matches get removed for us later. if this does indeed make it easier to make modules tab like files later, we can add it back in.
git-svn-id: file:///home/svn/framework3/trunk@11572 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 16:34:09 +00:00
James Lee 0355271662 fix a <1.9.2 compat bug. =(
git-svn-id: file:///home/svn/framework3/trunk@11569 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 00:17:07 +00:00
James Lee 7226a43bea move tab completion helpers up to ShellDispatcher to avoid copy-paste and allow non-msf shells to complete filenames
git-svn-id: file:///home/svn/framework3/trunk@11562 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 22:09:32 +00:00
James Lee e27e824755 rectify a lying comment
git-svn-id: file:///home/svn/framework3/trunk@11561 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 19:24:54 +00:00
Joshua Drake a7d92937df Fixes #3500, Copy pasta find/replace bug
git-svn-id: file:///home/svn/framework3/trunk@11553 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 01:21:52 +00:00
Carlos Perez 9399e69425 Updated original mixin files to use the new post mixing
git-svn-id: file:///home/svn/framework3/trunk@11552 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 00:18:40 +00:00
Carlos Perez e48aa7856a Migration of Meterpreter mixin to post module mixin
git-svn-id: file:///home/svn/framework3/trunk@11550 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 00:10:32 +00:00
Tod Beardsley af8850feb4 Avoid actually prompting the user for SSH messages in keyboard-interactive, since it depends on stdin/stdout, and is kind of useless for us anyway.
git-svn-id: file:///home/svn/framework3/trunk@11547 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 22:14:12 +00:00
Joshua Drake 855f8b0752 fix more silly tab completion behavior
git-svn-id: file:///home/svn/framework3/trunk@11546 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 18:55:37 +00:00
Joshua Drake ffbea6199f Do not wait for the DCERPC call to timeout
git-svn-id: file:///home/svn/framework3/trunk@11545 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:56:27 +00:00
James Lee 18ee35149a move script mixin code into Post mixins and include them back in for backwards compatibility
git-svn-id: file:///home/svn/framework3/trunk@11544 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:53:24 +00:00
Tod Beardsley d87b5ad3d2 Drops the DBImportError when you import a pcap file that doesn't actually contain any normal Eth::IP hosts. It doesn't add a whole lot or give the user any more information than merely failing to import anything.
git-svn-id: file:///home/svn/framework3/trunk@11543 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:35:45 +00:00
Joshua Drake f001463ed1 catch ENOTSOCK errors in has_read_data?
git-svn-id: file:///home/svn/framework3/trunk@11541 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 08:47:42 +00:00
James Lee 972fdc8cc3 display module's fullname when dumping options or info, thanks chao-mu for the patch, fixes #3486
git-svn-id: file:///home/svn/framework3/trunk@11539 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 23:34:05 +00:00
Joshua Drake 40fa5eebaf Don't convert the timeout to an integer, it makes 0.1 -> 0 svn status eek. See #3483
git-svn-id: file:///home/svn/framework3/trunk@11536 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 19:42:58 +00:00
James Lee 87cdaa4ea5 add an info command + tab completion for post modules. fixes #3478
git-svn-id: file:///home/svn/framework3/trunk@11534 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 18:37:23 +00:00
Joshua Drake 5efb5e318b fix various tab completions so they dont recurse/add silly spaces
git-svn-id: file:///home/svn/framework3/trunk@11519 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-08 05:36:00 +00:00
HD Moore e776697f38 Fixes #3466 by detecting a second null handle and breaking the loop (happens with likewise servers)
git-svn-id: file:///home/svn/framework3/trunk@11508 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-07 19:51:59 +00:00
James Lee eb4ae0e5b7 add tab-completion for post modules in the meterpreter run command
git-svn-id: file:///home/svn/framework3/trunk@11498 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 22:16:24 +00:00
James Lee dbeae8df24 add support for running post modules from the meterpreter prompt. options are set in the same way as the -o arg to run, e.g. run post/escalate/bypassuac LHOST=192.168.0.1
git-svn-id: file:///home/svn/framework3/trunk@11496 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:28:00 +00:00
James Lee aafb30ba8c update user agent string detection for some android, fedora, ipod/ipad/iphone
git-svn-id: file:///home/svn/framework3/trunk@11495 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:24:38 +00:00
James Lee 58277dd00e updated browser detection for android, ipod/ipad/iphone, a couple of new fingerprints for FF and IE.
git-svn-id: file:///home/svn/framework3/trunk@11492 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:11:54 +00:00
James Lee 713db12a39 add post modules to the search command
git-svn-id: file:///home/svn/framework3/trunk@11486 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 17:49:46 +00:00
James Lee ecfcb7b89a updated chrome detection
git-svn-id: file:///home/svn/framework3/trunk@11480 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 00:53:53 +00:00
James Lee 3b67ea5124 print usage when the route command is given an argument we don't understand
git-svn-id: file:///home/svn/framework3/trunk@11471 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-04 17:13:30 +00:00
James Lee 0ba8cbd8a1 don't complain about no session being created when DisablePayloadHandler is true
git-svn-id: file:///home/svn/framework3/trunk@11470 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-04 17:06:22 +00:00
Joshua Drake be1ee243bf Switch ord for the more compatibly .unpack("C"), Fixes #3431
git-svn-id: file:///home/svn/framework3/trunk@11468 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-04 16:15:56 +00:00
James Lee bafd318ba7 replace exe_lhost with the more generic payload_lhost
git-svn-id: file:///home/svn/framework3/trunk@11463 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-04 01:13:03 +00:00
Matt Weeks 0b2f68aa3b Fix error with TcpServer modules not properly cleaning up after job is killed.
Stops StreamServerListener and ClientMonitor threads from remaining after the job is killed and preventing rerunning such modules.



git-svn-id: file:///home/svn/framework3/trunk@11460 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-02 22:30:14 +00:00
HD Moore bec8a95b02 Merges pello's Cisco uploader module, merges changes back into the TFTP server class. Fixes #3429
git-svn-id: file:///home/svn/framework3/trunk@11454 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-30 16:37:58 +00:00
James Lee efafb793c4 only add a / if one wasn't there before; update comments/documentation to reflect the current reality now that #968 and #664 are fixed
git-svn-id: file:///home/svn/framework3/trunk@11452 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 21:10:14 +00:00
James Lee 9f05e02b85 a better fix for rbreadline, also fixes completion for ~/, see #3352
git-svn-id: file:///home/svn/framework3/trunk@11451 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 20:31:22 +00:00
Joshua Drake 269f123143 add PropertySetStream implementation in preperation for upcoming exploit ;)
git-svn-id: file:///home/svn/framework3/trunk@11444 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 17:07:46 +00:00
James Lee 85efd12467 make sure the dirname is actually a directory before trying to read it's entries, fixes #3352. also fixes a typo and a bug where directories other than ./ wouldn't be considered for tabbing.
git-svn-id: file:///home/svn/framework3/trunk@11441 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 02:56:01 +00:00
Joshua Drake c25b08452b remove LocalInput as a string (no Rex::Ui::Text::Input::File class exists), see #3426
git-svn-id: file:///home/svn/framework3/trunk@11440 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 02:15:18 +00:00
Jonathan Cran 93e1f56cd8 `butane's patch for my msfrpcd breakage
git-svn-id: file:///home/svn/framework3/trunk@11439 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 00:35:27 +00:00
Jonathan Cran a4571f927a handle nessus xml files w/o a leading <xml> tag -- resolves #3369
git-svn-id: file:///home/svn/framework3/trunk@11438 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 22:07:41 +00:00
Jonathan Cran a1af22d330 applying a patch to enable easy output to file: ./msfconsole -o output.txt -r input.msfrc
git-svn-id: file:///home/svn/framework3/trunk@11436 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 20:24:17 +00:00
Jonathan Cran f164059d60 backend changes for lab functionality. architecture now allows storage of more info about VMs, and Labs made up of different-technology vms (ie, 1 vmware, 1 vbox, 1 amazon). drivers still need to be written
git-svn-id: file:///home/svn/framework3/trunk@11433 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 19:47:33 +00:00
James Lee 02c555c4c6 use the module's platfrom if no session is set
git-svn-id: file:///home/svn/framework3/trunk@11430 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 19:28:43 +00:00
HD Moore cd2088ee96 Import the OpenVAS bridge from Kost. Go see his talk: http://www.berlinsides.org/node/14
git-svn-id: file:///home/svn/framework3/trunk@11428 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 17:45:05 +00:00
James Lee 1ac8b5abe9 fix a nil.dup by returning a proper platformlist when we don't have a session, dump actual info with 'info' command instead of nothing
git-svn-id: file:///home/svn/framework3/trunk@11425 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 18:21:33 +00:00
James Lee de9c1286e6 missed file, makes post/hashdump work again
git-svn-id: file:///home/svn/framework3/trunk@11424 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 18:11:43 +00:00
James Lee 1351af8300 missed file. =(
git-svn-id: file:///home/svn/framework3/trunk@11422 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 17:56:29 +00:00
James Lee f0cc6ff596 big commit for converting meterpreter scripts to modules, see #3377. also fixes payload tab-completion and 'show payloads' after TARGET has changed
git-svn-id: file:///home/svn/framework3/trunk@11421 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 17:46:42 +00:00
HD Moore 30affd4b2c This commit adds a new set of discovery modules from wuntee and some useful utility methods for working with link-local addresses
git-svn-id: file:///home/svn/framework3/trunk@11417 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 16:43:53 +00:00
Tod Beardsley 0468dbeabe Fixes a db_import bug introduced in r11355 .
git-svn-id: file:///home/svn/framework3/trunk@11416 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 16:30:08 +00:00
HD Moore 1df394638e Remove an annoying warning
git-svn-id: file:///home/svn/framework3/trunk@11413 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-25 06:33:04 +00:00
HD Moore 2bb7528e26 Switch to 8.8.8.8 from 50.50.50.50 now that the 50 block has been allocated. Note that this isn't actually sending data to the target
git-svn-id: file:///home/svn/framework3/trunk@11384 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-20 22:13:49 +00:00
HD Moore a8311fd71d Verify a host is actually a real string before using it
git-svn-id: file:///home/svn/framework3/trunk@11372 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-18 03:37:27 +00:00
HD Moore c28ad8ea0c Minor improvements and corner case bug fixes to session handling. This fixes issues that can come up when a stream is shut down
git-svn-id: file:///home/svn/framework3/trunk@11371 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-18 03:00:26 +00:00
James Lee c252d53c15 back to dev
git-svn-id: file:///home/svn/framework3/trunk@11370 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-17 18:35:23 +00:00
Tod Beardsley f159678bf0 Rejigger the packet analysis to not suck up so much memory for no real reason. This ensures that the initial file read represents (pretty much) the entire overhead needed to process packets. I'd say this fixs bumps the ceiling up to about a million packets that can be read without too much trouble (assuming you have a serious amount of RAM available -- I'm testing with 8GB here).
git-svn-id: file:///home/svn/framework3/trunk@11364 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-17 03:20:47 +00:00
Tod Beardsley 3ed2d8b694 Add a pcap counter to the pcap importer.
git-svn-id: file:///home/svn/framework3/trunk@11356 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 21:36:00 +00:00
HD Moore 743cdba360 Detect empty imports
git-svn-id: file:///home/svn/framework3/trunk@11355 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 21:26:39 +00:00
Tod Beardsley 925e4a66f0 See #3371. Uncommits the database logging of smb_hash credentials.
This kind of meterpreter update may not actually be desirable, given the introduction of a dependency on Metasploit Framework in to the stand-alone Rex library.

#3371 will remain open until this debate is resolved. In the meantime, need to back this out. :/



git-svn-id: file:///home/svn/framework3/trunk@11351 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 16:53:28 +00:00
Carlos Perez 9627194330 Hashdump will now save found credentials to the database.
git-svn-id: file:///home/svn/framework3/trunk@11347 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 02:42:45 +00:00
Joshua Drake e92c073c22 Sync RbReadline with TIP, some diffs remain Metasploit specific
git-svn-id: file:///home/svn/framework3/trunk@11338 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 22:09:38 +00:00
HD Moore 93c26125aa Recognize RO vs RW strings
git-svn-id: file:///home/svn/framework3/trunk@11337 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 20:52:48 +00:00
HD Moore 55b21d4aaf Fixes to enable password parsing and rw/ro detection in snmp brute force
git-svn-id: file:///home/svn/framework3/trunk@11336 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 20:51:17 +00:00
Tod Beardsley 1c2c3ed1f6 Adds an example protocol analyzer to pick out http basic auth credentials and do some server analysis for libpcap imports.
git-svn-id: file:///home/svn/framework3/trunk@11334 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 19:04:12 +00:00
James Lee c6dd53b5c0 look for database configuration in environment variable as well as command line arguments and configuration directory
git-svn-id: file:///home/svn/framework3/trunk@11327 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 09:59:49 +00:00
James Lee d12be5bd4d testing -> release!
git-svn-id: file:///home/svn/framework3/trunk@11325 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 05:28:32 +00:00
Joshua Drake f45e03cd14 remove wait when DisablePayloadHandler was set
git-svn-id: file:///home/svn/framework3/trunk@11324 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 23:34:43 +00:00
Tod Beardsley 256d3409d4 Fixes #3351. Suppress the warning message about pcaprub. It's not a big deal at all in Metasploit
Note that while missing pcaprub is fine, loading the wrong versions of pcaprub is still not fine, and raises actual exceptions.



git-svn-id: file:///home/svn/framework3/trunk@11319 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 18:30:42 +00:00
Tod Beardsley 244dc18867 Fixes #3348. Adds the PacketFu packet processing library from http://code.google.com/p/packetfu/ , and adds a db_import path for pcaps (it's straightforward -- db_import /path/to/file.pcap will import hosts and service ports from a pcap file.)
git-svn-id: file:///home/svn/framework3/trunk@11308 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 17:44:48 +00:00
HD Moore 431a0e13aa Store these in a format more friendly to JtR
git-svn-id: file:///home/svn/framework3/trunk@11305 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 08:53:37 +00:00
HD Moore 68dc327222 Fix missing decode for enable password 7
git-svn-id: file:///home/svn/framework3/trunk@11304 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 08:51:08 +00:00
HD Moore 4e4eb14887 This adds a TFTP version of #3345 (Pello's snmp config downloader). Still more work to do for the generic module
git-svn-id: file:///home/svn/framework3/trunk@11300 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 23:36:37 +00:00
HD Moore 644633454d Cleanups to credential type
git-svn-id: file:///home/svn/framework3/trunk@11297 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 20:36:08 +00:00
HD Moore e3f909cef9 Fixes for chunked http reply processing, additional cisco configuration support, and a scanner module for unprotected cisco device managers.
git-svn-id: file:///home/svn/framework3/trunk@11287 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 07:37:09 +00:00
HD Moore 5b43ea2c15 Buffer data before sending it to the response parser, handle buffered data on disconnect
git-svn-id: file:///home/svn/framework3/trunk@11286 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 06:19:36 +00:00
HD Moore 26aca9d6ba Swap some module locations, add loot and cred reporting
git-svn-id: file:///home/svn/framework3/trunk@11271 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-10 05:47:33 +00:00
HD Moore fa29afaece Handle character echoing sessions more gracefully
git-svn-id: file:///home/svn/framework3/trunk@11268 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-09 22:44:17 +00:00
Tod Beardsley 493db14006 Adds a "duplicate_ok" option to report_auth_info to allow for multiple passwords on the same username. Never came up before I took a look at SNMP.
Also normalizes the print_status messages to be explicit about which module is reporting (important when you're running several at once).



git-svn-id: file:///home/svn/framework3/trunk@11267 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-09 21:23:39 +00:00
Joshua Drake 2742475ae0 fix refactoring scrap
git-svn-id: file:///home/svn/framework3/trunk@11258 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 22:30:01 +00:00
HD Moore e5dc368b57 Add WoW64 detection
git-svn-id: file:///home/svn/framework3/trunk@11256 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 21:05:07 +00:00
Joshua Drake 19ba0164f6 fix bad socket reference
git-svn-id: file:///home/svn/framework3/trunk@11255 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 20:37:31 +00:00
HD Moore 5dd1f52349 Bump to testing
git-svn-id: file:///home/svn/framework3/trunk@11248 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 20:16:39 +00:00
Joshua Drake fbd340aae8 add an adodb based cmdstager, fixes #1431
git-svn-id: file:///home/svn/framework3/trunk@11247 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 18:51:12 +00:00
James Lee 284e568f7c fix 'search -o', thanks Larry Wert for the patch! fixes #3306
git-svn-id: file:///home/svn/framework3/trunk@11243 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 16:02:44 +00:00
HD Moore 2192d06189 Handle cases where the class has already been loaded
git-svn-id: file:///home/svn/framework3/trunk@11242 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 13:45:49 +00:00
Mike Smith ebaf100a9f Add RangeWalker#include_range?
git-svn-id: file:///home/svn/framework3/trunk@11237 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-06 22:18:49 +00:00
Mike Smith 1b6c0664e6 Add EmailTemplate fields: exploit_module, exploit_attach_name & attach_exploit
git-svn-id: file:///home/svn/framework3/trunk@11236 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-06 22:18:33 +00:00
James Lee 185f50212f use TCPServer instead of Socket + bind and work around JRuby's broken Socket#getsockname (see http://jira.codehaus.org/browse/JRUBY-5232)
git-svn-id: file:///home/svn/framework3/trunk@11211 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 23:49:02 +00:00
James Lee b89fe64e74 whitespace
git-svn-id: file:///home/svn/framework3/trunk@11209 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 22:13:39 +00:00
Tod Beardsley 2d4af15581 Peerhost, not peerhot. :/
git-svn-id: file:///home/svn/framework3/trunk@11205 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:33:20 +00:00
Tod Beardsley 0204cedca6 Makes the print_status displays more consistent between smb_login and psexec by moving some of the domain display functions up into exploit/smb proper.
git-svn-id: file:///home/svn/framework3/trunk@11204 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:29:26 +00:00
Tod Beardsley fed550d7e7 Fixes #3285. Checks for nil for session.peerhost and session.tunnel_peer -- hard to test, though, since I can't tell what originally causes the issue -- with and without this fix I get idential results on a normal ssh session. But, with the nil check in place, it should clear up the stack trace listed.
git-svn-id: file:///home/svn/framework3/trunk@11203 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:26:43 +00:00
Joshua Drake 9e03e8a142 fix service name handling
git-svn-id: file:///home/svn/framework3/trunk@11198 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 02:23:27 +00:00
James Lee b0a0a2413c print the proper proto (https vs http) when ssl is in use
git-svn-id: file:///home/svn/framework3/trunk@11194 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-01 16:57:20 +00:00
Joshua Drake 5a01ede38a only assign the original request if a response was returned
git-svn-id: file:///home/svn/framework3/trunk@11193 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-01 16:32:40 +00:00
James Lee bf24e44114 avoid creating a second manifest.mf entry if one already exists
git-svn-id: file:///home/svn/framework3/trunk@11175 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 07:10:57 +00:00
Joshua Drake c5c2b37c8b dont mangle offset 0x88 if using sub_method
git-svn-id: file:///home/svn/framework3/trunk@11174 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 04:53:43 +00:00
James Lee 85113deb04 allow modifying the data in a Zip::Entry to support the previous commit (r11172)
git-svn-id: file:///home/svn/framework3/trunk@11173 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 03:52:46 +00:00
Joshua Drake 225bf0738e improve handling of return from connect_from_privileged_port, rework rlogin fromuser merging
git-svn-id: file:///home/svn/framework3/trunk@11171 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 02:00:58 +00:00
Joshua Drake 7e15c97328 remove duplicate credentials before running
git-svn-id: file:///home/svn/framework3/trunk@11168 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 01:15:42 +00:00
Joshua Drake 1061baba8d fix some potential bugs from Edward Kolodka, fixes #3256
git-svn-id: file:///home/svn/framework3/trunk@11165 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 00:16:07 +00:00
Joshua Drake ee7d5827d5 prevent mangling the input string
git-svn-id: file:///home/svn/framework3/trunk@11148 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 07:42:34 +00:00
Joshua Drake 778040ec5b move rservices mixin to aux instead of exploit
git-svn-id: file:///home/svn/framework3/trunk@11142 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 06:02:35 +00:00
Joshua Drake e74d023971 formatting, modularization, and optimization
git-svn-id: file:///home/svn/framework3/trunk@11137 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 05:59:15 +00:00
Joshua Drake 20dc5d57cf force key length to 8, pad if less and truncate if more
git-svn-id: file:///home/svn/framework3/trunk@11131 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 20:57:26 +00:00
Joshua Drake 1fda94f438 improve error reporting
git-svn-id: file:///home/svn/framework3/trunk@11121 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 06:09:36 +00:00
Joshua Drake db28497900 add an extra check for JAVA_HOME
git-svn-id: file:///home/svn/framework3/trunk@11118 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 01:11:17 +00:00
Tod Beardsley fb79d97bca Allow for things external to a scanner module to come in an kill all the threads with the mod.seppuko!() method.
git-svn-id: file:///home/svn/framework3/trunk@11117 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 00:08:39 +00:00
James Lee 7581ce0153 try the payload's arch/platform if we don't have an associated exploit
git-svn-id: file:///home/svn/framework3/trunk@11116 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 20:37:32 +00:00
James Lee b3b43bbb8b fix a bug in arch detection when an EncodedPayload's pinst is an EncodedPayload instead of a Payload
git-svn-id: file:///home/svn/framework3/trunk@11115 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 20:34:27 +00:00
HD Moore fc5fcaea57 Handle unlicensed nexpose instances better
git-svn-id: file:///home/svn/framework3/trunk@11109 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 05:03:58 +00:00
James Lee 23a6874954 add support for browsers other than firefox, starting with sensible-browser to try to use the system default. fixes #3059, thanks Larry Wert for the patch
git-svn-id: file:///home/svn/framework3/trunk@11108 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 04:42:59 +00:00
Joshua Drake 9c668b8daf Super-duper rservices commit -
1. Added rsh, rlogin, and rexec auth brute scanners
2. Login negotation moved into new Msf::Auxiliary::Login mixin
3. Centralized session registration for auth brute scanners
4. Telnet and SSH auth brute scanners updated to use new mixins
5. Previously committed rservices mixin (r11093)



git-svn-id: file:///home/svn/framework3/trunk@11106 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 01:23:24 +00:00
HD Moore 04f9aec2d8 Pass framework into the TcpReverseDoubleSessionChannel class
git-svn-id: file:///home/svn/framework3/trunk@11100 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 19:18:24 +00:00
James Lee 9df192497b make sure we're not turning nil into [nil], since it breaks the arch detection
git-svn-id: file:///home/svn/framework3/trunk@11098 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 17:48:35 +00:00
Joshua Drake 14e147c931 add the rservices mixin
git-svn-id: file:///home/svn/framework3/trunk@11093 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 13:18:02 +00:00
Joshua Drake b495ca8aab add a mixin for pdf gen, see #2841
git-svn-id: file:///home/svn/framework3/trunk@11092 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 12:21:49 +00:00
Matt Weeks 2e72926638 Add audio (microphone) recording support to stdapi.
git-svn-id: file:///home/svn/framework3/trunk@11087 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 00:32:39 +00:00
Joshua Drake 4c93eb974f this fixes #3602, incompatabilities TBD
git-svn-id: file:///home/svn/framework3/trunk@11077 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:36:38 +00:00
Joshua Drake 51fd4fb550 this fixes #3602, incompatabilities TBD
git-svn-id: file:///home/svn/framework3/trunk@11076 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:32:29 +00:00
Joshua Drake b5c5e21b24 this fixes #3602, incompatabilities TBD
git-svn-id: file:///home/svn/framework3/trunk@11075 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:28:35 +00:00
Joshua Drake fe9710b836 add a rand: special case for OptAddress options
git-svn-id: file:///home/svn/framework3/trunk@11071 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:31:14 +00:00
James Lee 1c5481dcfb add a method for getting the full uri from an HttpServer to complement get_resource
git-svn-id: file:///home/svn/framework3/trunk@11069 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:15:20 +00:00
Matt Weeks 9d0cf722fa Spelling!
git-svn-id: file:///home/svn/framework3/trunk@11042 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 20:00:52 +00:00
Joshua Drake 77bc5cf6cd Big VNC update:
* Created Rex::Proto::RFB
 * Updated vnc_none_auth scanner to use Rex::Proto::RFB::Client
 * Added vnc_login (refactored from carstein)
 * Created an initial vnc_passwords.txt file
 * Removed cipher/des.rb - incompatible license
 * Updated getvncpw script to use new Rex::Proto::RFB::Cipher.decrypt




git-svn-id: file:///home/svn/framework3/trunk@11033 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 03:37:45 +00:00
HD Moore 4c69fc7b84 Fix typo
git-svn-id: file:///home/svn/framework3/trunk@11028 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:58:24 +00:00
HD Moore 432a2e0ee8 Nuke the old mixin
git-svn-id: file:///home/svn/framework3/trunk@11027 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:55:53 +00:00
HD Moore dc5116f9df Move the crawler mixin to an auxiliary
git-svn-id: file:///home/svn/framework3/trunk@11026 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:55:19 +00:00
HD Moore f457ccb8f7 Add the crawler mixin and a sample form extractor crawler
git-svn-id: file:///home/svn/framework3/trunk@11025 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:40:56 +00:00
HD Moore bc2d43d86d Raise thread errors instead of eating them
git-svn-id: file:///home/svn/framework3/trunk@11024 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:22:40 +00:00
HD Moore 54f3563c7e Store the http request in the http response object when Rex::HTTP::Client.send_recv() is used. Let Anemone store the request as well, passing it into the Page object for further analysis.
git-svn-id: file:///home/svn/framework3/trunk@11023 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 05:25:39 +00:00
HD Moore 510f61ac37 A working Rex backend for Anemone
git-svn-id: file:///home/svn/framework3/trunk@11022 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 05:20:51 +00:00
HD Moore a0b76b1979 This merges in support for Rex sockets to anemone
git-svn-id: file:///home/svn/framework3/trunk@11016 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 03:33:36 +00:00
HD Moore 375a655317 Fix windows platform detection
git-svn-id: file:///home/svn/framework3/trunk@11012 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 19:46:33 +00:00
HD Moore 29073a519a Small tweaks to the thread code, add an update method
git-svn-id: file:///home/svn/framework3/trunk@11011 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 17:28:40 +00:00
James Lee 9df4c2bccf don't fail if we were given a peerhost of 'Remote Pipe'. Fixes #3049, thanks Raphael M for the patch
git-svn-id: file:///home/svn/framework3/trunk@11010 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 16:43:00 +00:00
HD Moore a12d9f8dbf This patch adds detailed thread tracking across the metasploit framework, along with a new console command (threads) to manage these. This level of tracking is required to accurately monitor background tasks, assist with debugging, and kill orphaned threads.
git-svn-id: file:///home/svn/framework3/trunk@11003 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 06:19:49 +00:00
Carlos Perez b171d5192e Changes to handle errors and to output print
git-svn-id: file:///home/svn/framework3/trunk@11001 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 01:27:15 +00:00
James Lee 326dc42bca add EncodedPayload#encoded_exe, encoded_jar, and encoded_war. simplifies exploits that need java and native payloads. see #406 and #3009
git-svn-id: file:///home/svn/framework3/trunk@10999 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 23:01:35 +00:00
Joshua Drake 3992eb7ef8 Mass RE-update: fix all framework URL references
git-svn-id: file:///home/svn/framework3/trunk@10998 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:43:22 +00:00
Matt Weeks 594a46bfc7 Merge webcam extension into stdapi.
git-svn-id: file:///home/svn/framework3/trunk@10997 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:36:54 +00:00
Joshua Drake 9fc6f2f3a3 Mass update: fix all framework URL references
git-svn-id: file:///home/svn/framework3/trunk@10996 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:25:13 +00:00
HD Moore 8afc9ebb41 Revert, this is causing threading issues with Windows.
git-svn-id: file:///home/svn/framework3/trunk@10989 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 19:54:27 +00:00
Carlos Perez 3edccbc118 fix help message
git-svn-id: file:///home/svn/framework3/trunk@10986 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 16:55:36 +00:00
HD Moore b143c8eac1 Only load priv on win32/win64 sessions
git-svn-id: file:///home/svn/framework3/trunk@10984 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 16:15:26 +00:00
James Lee 0b8f0c51bc use a random name for the app if one is not supplied
git-svn-id: file:///home/svn/framework3/trunk@10976 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:35:02 +00:00
James Lee 4aae717312 only need metasploit.dat in WEB-INF/classes/
git-svn-id: file:///home/svn/framework3/trunk@10975 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:22:00 +00:00
James Lee 75cd356803 a less obnoxious .inspect
git-svn-id: file:///home/svn/framework3/trunk@10974 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:04:01 +00:00
Joshua Drake 73d9135c91 merge patch from Larry Wert, fixes #2510
git-svn-id: file:///home/svn/framework3/trunk@10955 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 02:31:21 +00:00
Matt Weeks db602dd478 Add functional in-memory webcam support.
git-svn-id: file:///home/svn/framework3/trunk@10954 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 02:24:28 +00:00
HD Moore dc9274229a Reapply Yoann's patch from r7247 to the new tree
git-svn-id: file:///home/svn/framework3/trunk@10953 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 22:51:29 +00:00
HD Moore bed66d4f64 Change the default domain to "." (local host) from WORKGROUP. Suggestion from Rob Fuller (mubix)
git-svn-id: file:///home/svn/framework3/trunk@10952 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 20:07:17 +00:00
Joshua Drake d75e7885d4 remove has_badchars? in favor of Rex::Text.badchar_index
git-svn-id: file:///home/svn/framework3/trunk@10949 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 17:00:07 +00:00
Joshua Drake 2037262950 turn verbosity off by default
git-svn-id: file:///home/svn/framework3/trunk@10948 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 16:59:20 +00:00
James Lee 5c692aa034 genericize the message since we now support LOGIN as well as PLAIN
git-svn-id: file:///home/svn/framework3/trunk@10945 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 05:03:15 +00:00
James Lee 289c068f2a add support for LOGIN authentication, thanks Ricardo Gandara for the patch. fixes #3072
git-svn-id: file:///home/svn/framework3/trunk@10944 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 05:01:18 +00:00
HD Moore 8f4cb4fbf6 Merge Zate Berg's latest patch
git-svn-id: file:///home/svn/framework3/trunk@10938 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-07 01:57:17 +00:00
Matt Weeks bc983ea52c Run meterpreter GUI commands in background to not interfere with active shell or other channel interaction.
Also simplify calling commands in file browser and process viewer.



git-svn-id: file:///home/svn/framework3/trunk@10929 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 16:51:48 +00:00
HD Moore dc43689578 Make a note about the second callback
git-svn-id: file:///home/svn/framework3/trunk@10926 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:48:41 +00:00
HD Moore 1460e7134b Merge in some minor tweaks to Anemone, overhaul to the HTTP class still in the works
git-svn-id: file:///home/svn/framework3/trunk@10925 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:45:27 +00:00
HD Moore b3cc6e19b6 Initial import of an Anemone snapshot
git-svn-id: file:///home/svn/framework3/trunk@10924 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:34:43 +00:00
Tod Beardsley f6415186a8 Adds the imported_creds table.
git-svn-id: file:///home/svn/framework3/trunk@10923 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 01:01:20 +00:00
HD Moore cf70f322d0 This minor syntax change allows rubinius to at least start the console
git-svn-id: file:///home/svn/framework3/trunk@10921 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 21:16:33 +00:00
Joshua Drake 8353bf7bf3 move 100-continue processing into Rex, fixes #3109
git-svn-id: file:///home/svn/framework3/trunk@10919 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 16:20:13 +00:00