infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,155 Commits
7 Branches
556 Tags
419 MiB
Commit Graph

59 Commits (5b32c63a427113a6aef33eb3e7657200ea2d1c13)

Author SHA1 Message Date
Tod Beardsley 56ffa4ae2f Fixes for network_interface PR #2085 
Implementing the suggestions from @limhoff-r7.

See #2085

FixRM #8023
FixRM #7943
 2013-07-10 13:25:06 -05:00
lsanchez-r7 4541a9e49e now with passing msftidy 2013-07-08 17:44:50 -05:00
lsanchez-r7 5c93fb2849 arp_sweep is once again working 
modified the capture mixin to use NetworkInteface instead of
pcaprub for interfaces and addresses

FIXRM #8023,#7943
 2013-07-08 17:24:28 -05:00
Tod Beardsley 9a08090b0f Inch toward making modules more testable 2013-06-10 16:02:19 -05:00
James Lee db676f1a88 Whitespace at EOL 2013-03-07 18:20:08 -06:00
HD Moore d656e3185f Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
HD Moore 6f54f0637b Dont run ifconfig on windows 2012-02-04 01:18:32 -06:00
James Lee bf105f48cb massive removal of spaces at EOL and some bad tabs 2011-11-20 12:32:06 +11:00
HD Moore 77c86a2406 Fix a couple cosmetic warnings 
git-svn-id: file:///home/svn/framework3/trunk@13818 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-05 15:31:56 +00:00
amaloteaux 1dbc0e988e more simple 
git-svn-id: file:///home/svn/framework3/trunk@13637 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-25 20:49:12 +00:00
amaloteaux a1bace0cb9 make exploit::capture compatible with pcaprub under Windows 
git-svn-id: file:///home/svn/framework3/trunk@13625 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-24 20:40:48 +00:00
Tod Beardsley b22ca615c7 Fixes #5038, missed a couple mentions of Racket. Excised now for sure. 
git-svn-id: file:///home/svn/framework3/trunk@13371 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-27 17:44:36 +00:00
Tod Beardsley c54e18d757 Fixes #5038. Removes all instances of Racket objects, as far as I can tell. If I missed any through my mighty grep -ril racket . statement, please reopen! 
git-svn-id: file:///home/svn/framework3/trunk@13342 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-26 01:29:21 +00:00
amaloteaux b7ca38f212 correct a bug on capture module when pcapfile are used 
git-svn-id: file:///home/svn/framework3/trunk@13269 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 23:17:55 +00:00
amaloteaux f1b8bbd436 arp poisoning : auto detect SMAC through new pcaprub code and avoid spoofing local host 
git-svn-id: file:///home/svn/framework3/trunk@12822 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-02 21:12:21 +00:00
HD Moore afa11f51a4 Fix up check for IPv6 constant, some minor grammar typos 
git-svn-id: file:///home/svn/framework3/trunk@12811 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-02 00:29:28 +00:00
amaloteaux 40f06cd3e1 pcaprub : -add several native function to get all the informations about the network intefaces, original code is a python c extension called netifaces 
-add also some initial wrappers into capture mixin
-Fixes #4376


git-svn-id: file:///home/svn/framework3/trunk@12799 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-01 17:22:48 +00:00
Tod Beardsley edd3041c9e Fixes #4561 - ensures that the declared interface is preferred over LHOST, and makes it possible to specify a device to capture_sendto(). 
Also makes should_arp?() logic a little easier to follow using an if instead of an unless.




git-svn-id: file:///home/svn/framework3/trunk@12673 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-20 15:27:13 +00:00
Tod Beardsley 520aa7d01c Fixes #4558. Since the arp spoofer is the only module that actually uses lookupaddrs, don't require every other pcaprub module to check for it. 
git-svn-id: file:///home/svn/framework3/trunk@12672 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-20 14:26:24 +00:00
HD Moore ecb726fb2c Rolling two changes through again (stomped on by the autoload revert) 
git-svn-id: file:///home/svn/framework3/trunk@12601 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-12 20:08:33 +00:00
HD Moore 9ce47c01bd Reverting the autoload changes until we can upgrade to a new ActiveSupport library or find a workaround 
git-svn-id: file:///home/svn/framework3/trunk@12600 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-12 20:03:55 +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 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
amaloteaux 91bb4b0130 auxiliary: add a basic pcap replay module 
git-svn-id: file:///home/svn/framework3/trunk@12403 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-22 18:25:19 +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
Tod Beardsley 3c199b0364 Fixes #824. PcapLog now works, and doesn't use racket nor packetfu -- just straight pcaprub, since I'm not doing anything exciting with them aside from saving to a file. 
Also, it's a proper plugin now, not just a singleton, with a command dispather and everything.

Pretty much totoally rewritten. Since it hasn't worked for at least 5 months, I doubt anyone will be shocked by the API change.



git-svn-id: file:///home/svn/framework3/trunk@9834 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-14 20:38:19 +00:00
Tod Beardsley cb640571b0 Fixes #1109 -- ARP is now less picky about ARP replies, but does conform to normal networking standards. 
git-svn-id: file:///home/svn/framework3/trunk@8832 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-16 16:04:02 +00:00
HD Moore 8296dc85b3 Cache the local interface/netmask 
git-svn-id: file:///home/svn/framework3/trunk@8571 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-20 18:52:13 +00:00
HD Moore 551e7d57ba Speed up packet injection 
git-svn-id: file:///home/svn/framework3/trunk@8570 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-20 18:31:46 +00:00
Tod Beardsley e0060a4f83 See #794. Fixing this better to ensure that we never end up with a nil for a source mac address on ARP packets. 
git-svn-id: file:///home/svn/framework3/trunk@8354 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-02 22:05:24 +00:00
James Lee 554f46be43 fix syntax error 
git-svn-id: file:///home/svn/framework3/trunk@8341 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-01 16:48:04 +00:00
Tod Beardsley d166c166b5 Fixes #794. I also couldn't reproduce -- whiten0ise's error makes is sound like he's running an old or broken version of pcaprub that's missing Pcap#lookupnet (present in at least 0.7-dev, just checked http://rubyforge.org/projects/pcaprub/ 
However, this should at least solve the split error, and give better hints on other errors. Implements check_pcaprub_loaded to ensure that Pcap is in fact available on lookupnet, openpcap, and inject, and implemented a begin/rescue around lookupnet to catch errors involving a bad interface.



git-svn-id: file:///home/svn/framework3/trunk@8340 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-01 15:11:35 +00:00
Tod Beardsley 7c4d7c3d71 Fixes #782. Cleans up the various arp and inject methods so they're a little more sane to read, and streamlines the ARP process. 
Still would like to a) experiment with keeping a persistent cache (with a cache timeout maybe, like a real arp cache), and b) see how caching negative replies will work out, but that's for another time.



git-svn-id: file:///home/svn/framework3/trunk@8280 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-27 22:46:41 +00:00
Tod Beardsley 0711363b49 See #782. Added in a mechanism to determine if I should ARP. This brings synflood back up to speed. 
git-svn-id: file:///home/svn/framework3/trunk@8278 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-27 21:19:23 +00:00
Tod Beardsley bedbc2c341 See #782. Deregistering filter and pcapfile (not needed for these), moving GATEWAY to advanced options. 
git-svn-id: file:///home/svn/framework3/trunk@8277 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-27 20:58:45 +00:00
Tod Beardsley 2f76affadb See #782. Updating ldap exploit to use capture_sendto. Also updating capture.rb to include RHOST. 
git-svn-id: file:///home/svn/framework3/trunk@8266 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-27 19:37:22 +00:00
Tod Beardsley 709c634bfa Renaming sendto to capture_sendto to give the user a hint as to where it came from. 
git-svn-id: file:///home/svn/framework3/trunk@8260 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-27 18:21:33 +00:00
Tod Beardsley 3053bd702a See #782. Updated xmas.rb (again), now uses the nicer frontend function sendto. Diff against r8026 to get an idea of what's changed for module writers. 
git-svn-id: file:///home/svn/framework3/trunk@8259 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-27 18:12:02 +00:00
Tod Beardsley 77771ca5be See #782. Completes integration of the secondary self.arp_capture object. Renames readreply to inject_reply to avoid collisions with existing modules. Implements a configurable "ARP_SECRET" cookie for the self.arp_capture filter. 
git-svn-id: file:///home/svn/framework3/trunk@8258 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-27 17:51:16 +00:00
Tod Beardsley 5adb1aef7e See #782. Fixing GWHOST/GATEWAY, implementing a new capture option for ARP requests. 
git-svn-id: file:///home/svn/framework3/trunk@8257 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-27 15:11:18 +00:00
Tod Beardsley 7eafaab2b2 See #782. Moving the arp cache to a class variable of the capture object. Seems better than just making up my own datastore entry. 
git-svn-id: file:///home/svn/framework3/trunk@8250 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-27 02:57:20 +00:00
Tod Beardsley 4bb6e650da See #782. Implemented a more sensible arp cache so as not to spam with UDP probes and arps. Also refactored xmas to use the new methods. 
git-svn-id: file:///home/svn/framework3/trunk@8245 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-26 21:37:40 +00:00
Tod Beardsley c003a663d1 See #782. Extended the injection ARP query methods to handle local addresses more satisfactorially, fixed a couple errors, and added a bunch of inline documentation to explain how it all works together. 
git-svn-id: file:///home/svn/framework3/trunk@8238 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-26 16:00:16 +00:00
Tod Beardsley cac3d6d56b See #782. This introduces some inject methods to the Capture mixin, and edits the ip_spoof module to take advantage of them. 
git-svn-id: file:///home/svn/framework3/trunk@8237 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-26 06:38:41 +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 a97abcf837 Cleaning up pcaprub, interface closing will still be handled by the GC 
git-svn-id: file:///home/svn/framework3/trunk@6859 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-21 19:36:37 +00:00
HD Moore 465af50f1e Allow option overrides for the callers of open_pcap 
git-svn-id: file:///home/svn/framework3/trunk@6855 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-21 17:48:10 +00:00
HD Moore 7dcc3e5e47 Overhaul of all modules to use racket instead of scruby/packetfu 
git-svn-id: file:///home/svn/framework3/trunk@6823 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-17 20:36:40 +00:00
HD Moore 5e0213c662 Allow the Capture mixin to handle a pcap file instead (thanks Max!) 
git-svn-id: file:///home/svn/framework3/trunk@6813 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-16 22:08:31 +00:00
kris 248f1e9fc3 Remove "#{xxx.to_s}" redundancies ('s/\(#{[^}]*\)\.to_s}/\1}/g') 
git-svn-id: file:///home/svn/framework3/trunk@6022 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-19 07:11:08 +00:00