Commit Graph

9396 Commits (95d802754bcb3c66913e9785a95b756311b56ece)

Author SHA1 Message Date
HD Moore 95d802754b Rework to avoid a warning
git-svn-id: file:///home/svn/framework3/trunk@12598 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 19:26:11 +00:00
Joshua Drake 3122c500a6 See #4371, add a missing autoload for :Script
git-svn-id: file:///home/svn/framework3/trunk@12597 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 19:12:00 +00:00
Joshua Drake fd4e6db85d Fixes 4373, Migrates lib/msf to use autoload instead of require (first try)
git-svn-id: file:///home/svn/framework3/trunk@12596 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 19:07:35 +00:00
Joshua Drake 7600f9110e remove some more unecessary requires
git-svn-id: file:///home/svn/framework3/trunk@12595 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 18:33:49 +00:00
David Rude 3c133a1415 added some more verbosity so its clear things are happening, moved the session.type check to be more immediate
git-svn-id: file:///home/svn/framework3/trunk@12594 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 17:56:18 +00:00
HD Moore 664bbf7c3c Remove the requires now that autoload has been fixed
git-svn-id: file:///home/svn/framework3/trunk@12593 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 15:09:27 +00:00
Joshua Drake 025c68244b See #4371, fix uninitialized constant Rex::Exploitation::Egghunter
git-svn-id: file:///home/svn/framework3/trunk@12592 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 15:03:20 +00:00
HD Moore 78a2558142 Apply patch from chao-mu, fixes #4414
git-svn-id: file:///home/svn/framework3/trunk@12591 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 14:59:44 +00:00
HD Moore c9566da399 Add missing requires and autoload to make browser exploits work again.
git-svn-id: file:///home/svn/framework3/trunk@12590 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 05:23:32 +00:00
Joshua Drake 8bd4f463a6 See #4371, add autoload for PeParsey
git-svn-id: file:///home/svn/framework3/trunk@12589 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 01:26:58 +00:00
James Lee 06779bc8c0 remove unnecessary requires for stuff in rex. autoload and a high-level require 'rex' in lib/msf/core.rb should take care of everything. see #4371, #4373, r12587, and r12554.
git-svn-id: file:///home/svn/framework3/trunk@12588 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 00:53:33 +00:00
James Lee d0614a4be7 fix a few requires in rex in preparation of removing unneeded requires from msf
git-svn-id: file:///home/svn/framework3/trunk@12587 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 23:28:12 +00:00
James Lee 7837e64b85 remove cruft leftover from the dawn of time
git-svn-id: file:///home/svn/framework3/trunk@12586 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 22:55:25 +00:00
HD Moore a95186df6a Revert previous patch and handle via override instead
git-svn-id: file:///home/svn/framework3/trunk@12585 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 22:18:16 +00:00
Wei Chen 40894c3726 Moving Iconics webhmi activeX exploit from browser to scada directory
git-svn-id: file:///home/svn/framework3/trunk@12584 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 20:45:54 +00:00
HD Moore ea2da5f9ce Applies a patch to fix autoload + active_support conflicts: https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/2283-unnecessary-exception-raised-in-asdependenciesload_missing_constant
git-svn-id: file:///home/svn/framework3/trunk@12583 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 17:39:40 +00:00
Steve Tornio d0c93f7e49 add osvdb ref
git-svn-id: file:///home/svn/framework3/trunk@12582 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 11:33:16 +00:00
Wei Chen 5d59d819ac Added SPlayer Content-Type bof
git-svn-id: file:///home/svn/framework3/trunk@12581 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 00:18:11 +00:00
Tod Beardsley 3e6d526eca Fixes #4391. Sorry! Ruby incompatability on method defs where if you set one option, you need to set them all (doesn't affect current 1.9 Rubies).
git-svn-id: file:///home/svn/framework3/trunk@12580 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 21:27:17 +00:00
James Lee 69d09113b5 use Metasm to parse elf templates and set appropriate header flags for marking .text as rwx, fixes #4384
git-svn-id: file:///home/svn/framework3/trunk@12579 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 21:06:19 +00:00
Joshua Drake 28ae2316a4 Fixes #4390, such a bute
git-svn-id: file:///home/svn/framework3/trunk@12578 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 20:52:59 +00:00
Joshua Drake cd5dbe7d58 See #4371, fix rex/file autoloads
git-svn-id: file:///home/svn/framework3/trunk@12577 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 20:15:16 +00:00
Steve Tornio b84df80983 add osvdb ref
git-svn-id: file:///home/svn/framework3/trunk@12576 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 19:16:07 +00:00
Tod Beardsley 50b26cb2d6 Adds another Qualys formatted XML importer for ASSET_DATA_REPORT files.
git-svn-id: file:///home/svn/framework3/trunk@12575 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 19:10:02 +00:00
Joshua Drake cdeb44747f huh? missing something important heh
git-svn-id: file:///home/svn/framework3/trunk@12574 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 18:33:38 +00:00
Wei Chen 105b5799af Added ICONICS WebHMI ActiveX SetActiveXGuid bof
git-svn-id: file:///home/svn/framework3/trunk@12573 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 18:07:15 +00:00
Joshua Drake af45f0166f re-unbreak omelet code
git-svn-id: file:///home/svn/framework3/trunk@12572 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 22:42:41 +00:00
David Rude 2de7f9eb30 fixes a stack trace in converting a char to hex in ruby 1.9.x
git-svn-id: file:///home/svn/framework3/trunk@12571 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 20:48:40 +00:00
Wei Chen 90278f308b Fixed issue with 'break'. Added x64 support.
git-svn-id: file:///home/svn/framework3/trunk@12570 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 18:27:54 +00:00
James Lee 2e1d25dad7 store some state so we can associate scripts with the right port/host. fixes #4378
git-svn-id: file:///home/svn/framework3/trunk@12569 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 18:10:56 +00:00
Tod Beardsley ce90282884 See #4378 -- this should limit the nmap parser to script tags that are associated only with ports. egyp7 may have a better way with dealing with this though, so not calling it fixed yet.
git-svn-id: file:///home/svn/framework3/trunk@12568 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 17:24:43 +00:00
HD Moore 244e251d7b Keywords
git-svn-id: file:///home/svn/framework3/trunk@12567 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-08 21:36:29 +00:00
amaloteaux af87e1def0 weird, was pretty sure those lines are some how automatically updated ....
git-svn-id: file:///home/svn/framework3/trunk@12566 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-08 04:49:11 +00:00
amaloteaux cb72073cd8 pcaprub: add a respond_to? in the capture mixin to ensure latest version
git-svn-id: file:///home/svn/framework3/trunk@12565 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-08 04:43:24 +00:00
amaloteaux 09a2bceec5 arp_spoof: add an arp poisoning auxiliary module with several config mode
git-svn-id: file:///home/svn/framework3/trunk@12564 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-08 04:26:16 +00:00
amaloteaux 5d8db916d7 pcap_replay: small fix on th delay
git-svn-id: file:///home/svn/framework3/trunk@12563 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-08 01:44:09 +00:00
Stephen Fewer c48633cff0 Merge in a rewritten windows x86 reverse_ipv6_tcp stager (The previous one seems hosed since r6744 due to new host/port offsets[1] but the shellcode blob remained the same after modification[2]) - This new one uses the block_api_call technique, is 37 bytes smaller and can handle arbitrary size stages.
[1] https://dev.metasploit.com/redmine/projects/framework/repository/revisions/6744/diff/modules/payloads/stagers/windows/reverse_ipv6_tcp.rb
[2] https://dev.metasploit.com/redmine/projects/framework/repository/revisions/6744/diff/external/source/shellcode/windows/stager_reverse_ipv6_tcp_nx.asm

git-svn-id: file:///home/svn/framework3/trunk@12562 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-08 01:44:08 +00:00
Matt Weeks 5fa2a9458f Don't encode when not instructed.
git-svn-id: file:///home/svn/framework3/trunk@12561 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-07 21:22:03 +00:00
amaloteaux fd661770ed Fix #4362, thanks to Zack Fasel for report and initial patch
git-svn-id: file:///home/svn/framework3/trunk@12560 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-07 18:52:17 +00:00
Matt Weeks fea1459c50 Update description
git-svn-id: file:///home/svn/framework3/trunk@12559 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-07 02:46:30 +00:00
Matt Weeks 490471e129 Include necessary require.
git-svn-id: file:///home/svn/framework3/trunk@12558 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-07 02:16:09 +00:00
Steve Tornio c87ba8f026 add osvdb ref
git-svn-id: file:///home/svn/framework3/trunk@12557 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 19:33:01 +00:00
Joshua Drake cd4c38333d See #4371, Fixes logging error with LogLevel set in config
git-svn-id: file:///home/svn/framework3/trunk@12556 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 19:10:02 +00:00
Joshua Drake a2cf5c01b9 See #4371, oops, forgot to commit rex.rb!
git-svn-id: file:///home/svn/framework3/trunk@12555 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:55:41 +00:00
Joshua Drake 05f107f466 Fixes #4371, Converts many uses of require to autoload
git-svn-id: file:///home/svn/framework3/trunk@12554 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:47:10 +00:00
Joshua Drake 57b530ccf6 fix up test require path
git-svn-id: file:///home/svn/framework3/trunk@12553 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:41:38 +00:00
Joshua Drake d638586d1f fix up test require path
git-svn-id: file:///home/svn/framework3/trunk@12552 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:39:19 +00:00
Joshua Drake 3e59f77871 add require, get test running
git-svn-id: file:///home/svn/framework3/trunk@12551 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:17:41 +00:00
Joshua Drake 719576b7b9 fix a small bug in omelet hunter, test is now runnable
git-svn-id: file:///home/svn/framework3/trunk@12550 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:14:10 +00:00
Joshua Drake 849c2d682c remove crufty require
git-svn-id: file:///home/svn/framework3/trunk@12549 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:12:38 +00:00