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

14716 Commits (82eaa322fe6b0158d4e06216cf163587142ebc43)

Author SHA1 Message Date
sinn3r a1bc48ebc2 Merge branch 'ropdb' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-ropdb 2012-10-01 17:18:26 -05:00
sinn3r f2c7731b39 Add RopDb mixin 2012-10-01 17:09:01 -05:00
Tod Beardsley e6e25544ec Merge branch 'handler-requires-race' 2012-10-01 16:32:15 -05:00
Tod Beardsley 2ca134a2c3 Merge branch 'printjob_capture' 
This lands #811, and also brings in my changes from
ChrisJohnRiley/metasploit-framework#2

Thanks Chris!
 2012-10-01 15:55:14 -05:00
Tod Beardsley 9bec5d1f86 Merge remote branch 'todb-r7/printjob_capture' into HEAD 2012-10-01 15:54:30 -05:00
Tod Beardsley 31c50ccccb commenting the weird while vs if choice 2012-10-01 13:15:10 -05:00
Tod Beardsley c7ecdfb98e Instance variables for semaphores and scope 2012-10-01 13:11:01 -05:00
Luke Imhoff 555a9f2559 Refactor Msf::ModuleManager 
[Fixes #36737359]

Refactor Msf::ModuleManager into concerns so its easier to understand and
duplicate code can be made DRY.  The refactoring also ensures that when
loading from directories, Fastlibs, or reloading, the wrapper module will
always be named so that activesupport/dependencies will function.
 2012-10-01 13:09:30 -05:00
Tod Beardsley 2573814c9d Deal with these arguments sensibly 2012-10-01 13:07:51 -05:00
Tod Beardsley ee4c6bb976 Deal with wait more sensibly 2012-10-01 12:41:36 -05:00
Tod Beardsley 2b44cd0322 Lets not modify the constant ARGV at runtime 2012-10-01 12:30:37 -05:00
Tod Beardsley 1e4f8591fd Sneaking in an author credit 2012-10-01 11:42:56 -05:00
Tod Beardsley c0bc764fd4 Retabbing for tabs, not spaces 
I'm not a fan of the tabs either, any more. But, until we switch over
for real, let's stick with the project's whitespace conventions?
 2012-10-01 11:26:58 -05:00
Tod Beardsley 802924d67a Getting rid of continuation slashes. Plz don't. 
Continuation slashes are the devil when it comes to reading Ruby,
especially if you're reading something like:

def hello

puts "Hello world!" \
  if true

end

This looks like a syntax error and hurts my eyeballs.

Please avoid this convention in the future.
 2012-10-01 11:23:06 -05:00
Tod Beardsley a38724f53b Adds an apparently spurious require 
SeeRM #7276

Sticking this in a branch for now while I ask Egypt and limhoff for a
second opinion.
 2012-10-01 07:49:58 -05:00
Chris John Riley 0cfa44ba6d Merge pull request #1 from todb-r7/printjob_capture 
Adding Juan's fix for peerhost and other fixes
 2012-10-01 00:13:50 -07:00
HD Moore 49dd19d91d Fallback to system JTR when bundle isnt available 2012-09-30 19:30:16 -07:00
bcoles e2276bfedb Add QNX QCOMM command execution module 2012-09-30 17:21:08 +09:30
jvazquez-r7 c5f863b0b9 minor fixes and msftidy compliant 2012-09-29 23:35:53 +02:00
jvazquez-r7 3e97cb2d85 Merge branch 'module-enumtomcat' of https://github.com/sectorix/metasploit-framework into sectorix-module-enumtomcat 2012-09-29 23:34:46 +02:00
Barry Shteiman 19675b3bea changed report to be more verbose 2012-09-28 19:02:15 +01:00
Tod Beardsley 489c9b701e Whitespace 2012-09-28 12:47:15 -05:00
Tod Beardsley 1b2240d9bd Commenting about IPP 2012-09-28 12:38:36 -05:00
Tod Beardsley a15a2b522c Removing IPP as a selectable mode 2012-09-28 12:38:17 -05:00
Tod Beardsley 6944aab46c Removing Id SVN splat 2012-09-28 12:37:00 -05:00
Barry Shteiman fa03eddbdc extended identification technique 2012-09-28 16:44:03 +01:00
Tod Beardsley db4b19a2df Adding Juan's fix for peerhost 2012-09-28 10:26:35 -05:00
jvazquez-r7 6679ff765a remove extra commas 2012-09-28 12:21:59 +02:00
Barry Shteiman ddb3f27035 added Tomacat Server Enumeration Module 2012-09-28 00:40:17 +01:00
sinn3r 4087790cf7 Oops, forgot to update the check() function 2012-09-27 18:22:57 -05:00
sinn3r 0300576436 Merge branch 'setinfopolicy_heap' of https://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-setinfopolicy_heap 2012-09-27 18:22:22 -05:00
jvazquez-r7 9d3a1871a6 Added module for Samba CVE-2012-1182 2012-09-28 01:18:52 +02:00
jvazquez-r7 6aefa40ec1 fix my english 2012-09-28 00:32:02 +02:00
jvazquez-r7 12177b0ed2 Added module for 2011-1900 2012-09-28 00:29:12 +02:00
Tod Beardsley 60b4190e4a Avoids a race on requires 
Applies Raphael's patch.

[FixRM #7261]
 2012-09-27 13:18:50 -05:00
Luke Imhoff 8a2dc0a09f Give ruby Modules that wrap Metasploit modules a name 
[#36737359]

active_support/dependencies cannot resolve missing constants in Metasploit
modules because the wrapper module is anonymous.  In order to make the
wrapper module non-anonymous, the module must be assigned to a constant.
Since we don't want modules colliding, the wrapper module needs a unique
name, so use the module lookup name to derive the proper nested module names
to namespace the wrapper module.  All derived modules are nested under
Msf::Modules.  The name derivation handles invalid characters for constant
names such as digits as the first character or non-alphanumeric character.
The invalid constant name characters are converted to their hex value and
prefixed with X, so '-' in a name become 'X2d'.
 2012-09-27 12:52:09 -05:00
Spencer McIntyre c93692b06d add a check to verify session is not already system for MS11-080 2012-09-27 08:36:13 -04:00
sinn3r f6baf824b6 The USER_FILE path is wrong. 2012-09-27 01:33:11 -05:00
sinn3r 75d40d4d82 Make msftidy happy 2012-09-27 01:33:11 -05:00
Cristiano Maruti 99ec988485 Updated with wordlist path registered options 2012-09-27 01:33:11 -05:00
Cristiano Maruti 75f5e24178 Dell iDrac login aux scanner 2012-09-27 01:33:11 -05:00
Tod Beardsley 1b59bcc0c8 Removing nonsense .gitignore 
That was my fault, not @sectorix's
 2012-09-26 12:53:56 -05:00
Tod Beardsley 594669cbff Merge remote branch 'sectorix/module-enumdb' 2012-09-26 12:53:30 -05:00
David Maloney aa8a713a30 Fix added datastore item in BAP 2012-09-26 11:55:12 -05:00
Barry Shteiman c192dd6e5c Merge pull request #2 from todb-r7/module-enumdb 
Module enumdb merge
 2012-09-26 08:04:41 -07:00
Spencer McIntyre 8648953747 added MS11-080 AFD JoinLeaf Windows Local Exploit 2012-09-26 11:01:30 -04:00
Tod Beardsley e7281e0085 Merge branch 'master' into module-enumdb 
Fixing up the merge conflicts caused mostly by the CRLF's (fixed in the
parent commit to this one), and probably by failing to merge from
master on sectorix's side.

Conflicts:
	modules/post/windows/gather/enum_db.rb
 2012-09-26 08:42:24 -05:00
Tod Beardsley 5bd39536a2 Reformatting with Unix linefeeds. 
For the curious, I like this procedure a lot, it's my new favorite:

http://vim.wikia.com/wiki/File_Format#Converting_the_current_file
 2012-09-26 08:40:50 -05:00
Tod Beardsley 1171498db3 Merge branch 'upstream-master' 2012-09-26 08:22:08 -05:00
Barry Shteiman 3efe9ac761 removed dev comments 2012-09-26 13:37:17 +01:00