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

91 Commits (bd3f27afa8f3c767b19f6439cf8e2e5146667c35)

Author SHA1 Message Date
Matt Buck e0a75c1b2c Merge branch 'release/4.2-stable' 
Conflicts:
	lib/msf/core/model/host.rb
 2012-02-19 22:57:22 -06:00
Tod Beardsley 95f54413d8 Create a stable branch of vmware-api 
Just to pick up the soap library and the esx_fingerprint stuff.
 2012-02-15 21:25:56 -06:00
James Lee 038893f72a Don't override the host's os_flavor, either 
See commit:ca0d2d7bc21e100d5471551d9fb65cce39cc064c
 2012-02-15 14:57:06 -07:00
James Lee ca0d2d7bc2 Don't override the host's os_name with "Unknown" 
This prevents modules that provide OS fingerprint details via
report_host from being overridden with inconclusive or missing OS
details from service fingerprints.
 2012-02-15 10:17:26 -07:00
Tod Beardsley 33c53b1f3f Updates vm checking 2012-01-26 13:02:39 -06:00
Tod Beardsley 4ac6c0c3ee A great big pile of fixes to the ssh scanners 
Not sure how this managed to fall out of master -- some of these fixes
are five days old, and should certianly have been merged in prior to
just now.
 2012-01-13 13:49:21 -06:00
Tod Beardsley 5f121fe181 Workaround postgresql.fingerprint dlog message 
Came up as a concern, this special-cases notes of
"postgresql.fingerprint". Not thrilled with this fix, though.
 2012-01-11 13:17:21 -06:00
Tod Beardsley badf62d8e0 Add back in ssh_key_matches?() 2012-01-08 22:45:00 -06:00
Tod Beardsley a1668f2b23 Adds SSHKey gem and some other ssh goodies 
Pubkeys are now stored as loot, and the Cred model has new and exciting
ways to discover which pubkeys match which privkeys.

Squashed commit of the following:

commit 036d2eb61500da7e161f50d348a44fbf615f6e17
Author: Tod Beardsley <todb@metasploit.com>
Date:   Sun Jan 8 22:23:32 2012 -0600

    Updates ssh credentials to easily find common keys

    Instead of making the modules do all the work of cross-checking keys,
    this introduces a few new methods to the Cred model to make this more
    universal.

    Also includes the long-overdue workspace() method for credentials.

    So far, nothing actually implements it, but it's nice that it's there
    now.

commit c28430a721fc6272e48329bed902dd5853b4a75a
Author: Tod Beardsley <todb@metasploit.com>
Date:   Sun Jan 8 20:10:40 2012 -0600

    Adding back cross-checking for privkeys.

    Needs to test to see if anything depends on order, but should
    be okay to mark up the privkey proof with this as well.

commit dd3563995d4d3c015173e730eebacf471c671b4f
Author: Tod Beardsley <todb@metasploit.com>
Date:   Sun Jan 8 16:49:56 2012 -0600

    Add SSHKey gem, convert PEM pubkeys to SSH pubkeys

commit 11fc363ebda7bda2c3ad6d940299bf4cbafac6fd
Author: Tod Beardsley <todb@metasploit.com>
Date:   Sun Jan 8 13:51:55 2012 -0600

    Store pubkeys as loot for reuse.

    Yanked cross checking for now, will drop back in before pushing.

commit aad12b31a897db2952999f7be0161df1f59b6000
Author: Tod Beardsley <todb@metasploit.com>
Date:   Sun Jan 8 02:10:12 2012 -0600

    Fixes up a couple typos in ssh_identify_pubkeys

commit 48937728a92b9ae52d0b93cdcd20bb83f15f8803
Author: Tod Beardsley <todb@metasploit.com>
Date:   Sat Jan 7 17:18:33 2012 -0600

    Updates to ssh_identify_pubkeys and friends

    Switches reporting to cred-based rather than note-based, accurately deal
    with DSA keys, adds disable_agent option to other ssh modules, and
    reports successful ssh_login attempts pubkey fingerprints as well.

    This last thing Leads to some double accounting of creds, so I'm not
    super-thrilled, but it sure makes searching for ssh_pubkey types a lot
    easier.... maybe a better solution is to just have a special method for
    the cred model, though.
 2012-01-08 22:28:37 -06:00
David Maloney 9b995bc0a5 Adds boundary validation to the framework 
enforces boudnary checking on netbios probes
 2011-12-27 11:33:52 -08:00
HD Moore 1d244c4b27 Return the URL in the correct format from the model 2011-12-11 13:50:21 -06:00
James Lee bf105f48cb massive removal of spaces at EOL and some bad tabs 2011-11-20 12:32:06 +11:00
Tod Beardsley f3663520f8 Deal with Windows 7 nexpose fingerprints a little better. 
git-svn-id: file:///home/svn/framework3/trunk@13807 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-30 20:46:20 +00:00
Tod Beardsley b79f4324f9 Quick model for my new table 
git-svn-id: file:///home/svn/framework3/trunk@13806 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-30 15:49:01 +00:00
HD Moore 5ab9e95dda Merge some smarter/faster finder methods over from Pro 
git-svn-id: file:///home/svn/framework3/trunk@13405 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-29 04:55:15 +00:00
HD Moore 16840ebfa5 Add profiles table 
git-svn-id: file:///home/svn/framework3/trunk@13202 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-17 21:39:21 +00:00
Tod Beardsley dc84ee6aab More fixups for ssh_login_pubkey and special handlers for long strings of keys. 
git-svn-id: file:///home/svn/framework3/trunk@13156 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-12 20:58:25 +00:00
Tod Beardsley 4c80d9a427 updates r13154 don't be case insensitive since it's a custom format and would like to preserve case on KEY= 
git-svn-id: file:///home/svn/framework3/trunk@13155 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-12 16:36:28 +00:00
Tod Beardsley 7abb2980a6 Adds a mechanism to compare stored SSH keys by key id. 
git-svn-id: file:///home/svn/framework3/trunk@13154 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-12 16:33:54 +00:00
HD Moore 17145d07b6 Add some new tables 
git-svn-id: file:///home/svn/framework3/trunk@13074 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-30 06:49:04 +00:00
HD Moore 175df6e52d Add framework.db.listeners 
git-svn-id: file:///home/svn/framework3/trunk@13047 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-28 16:01:21 +00:00
HD Moore e4eb2a4af0 Add a new table for managing background listeners 
git-svn-id: file:///home/svn/framework3/trunk@13024 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-25 06:57:47 +00:00
HD Moore 25a2d846e2 Add the settings column 
git-svn-id: file:///home/svn/framework3/trunk@13011 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-23 07:04:20 +00:00
HD Moore 3831e49455 See #4506 for Macro handling 
git-svn-id: file:///home/svn/framework3/trunk@12977 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-20 07:23:16 +00:00
HD Moore 47523c5925 Add RHEL detection from the .el[2-6] match 
git-svn-id: file:///home/svn/framework3/trunk@12973 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-18 18:12:59 +00:00
Tod Beardsley 3fde9c6f1f Reworking how imported crendentials work. 
git-svn-id: file:///home/svn/framework3/trunk@12908 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-11 02:40:02 +00:00
HD Moore 4a0cecbc29 Add the still unused macros table to the database 
git-svn-id: file:///home/svn/framework3/trunk@12879 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-07 00:20:19 +00:00
HD Moore d1ef28df1d Add payload_type 
git-svn-id: file:///home/svn/framework3/trunk@12818 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-02 20:55:46 +00:00
Tod Beardsley 8600bc5bef Foundstone registers a fingerprint instead of directly setting os_name. Also updates the Windows version regex for mbsa. Also adds a fall-through fingerprint parser (which foundstone uses). 
git-svn-id: file:///home/svn/framework3/trunk@12798 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-01 16:31:27 +00:00
Tod Beardsley 23e3d4274d Adds a parser for MBSA XML files. 
git-svn-id: file:///home/svn/framework3/trunk@12790 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-01 00:01:46 +00:00
HD Moore cab5d26181 Add the database table for api keys 
git-svn-id: file:///home/svn/framework3/trunk@12755 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-28 03:41:37 +00:00
James Lee 00a8533a52 add a display field for the message body's From: field 
git-svn-id: file:///home/svn/framework3/trunk@12749 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-27 20:59:36 +00:00
David Rude e1180f5aac Fix a stack trace when handling Qualys imports with unknown fingerprints 
git-svn-id: file:///home/svn/framework3/trunk@12743 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-27 18:11:46 +00:00
Tod Beardsley 76ebc59f29 Somehow missed this performance checkin for the 2000 ips check. 
git-svn-id: file:///home/svn/framework3/trunk@12661 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-19 12:57:14 +00:00
HD Moore 22537ffbde A few more tweaks to non-blocking ssl mode 
git-svn-id: file:///home/svn/framework3/trunk@12482 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-30 10:24:52 +00:00
James Lee 956dcfa6d2 deal with the odd 'No Service Pack' by normalizing to 'Service Pack 0', fixes odd 2003 detection 
git-svn-id: file:///home/svn/framework3/trunk@12444 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-26 19:31:56 +00:00
James Lee 81391d6ebf fix a stupid bug where retina, nessus, and qualys os fingerpritns would not be saved; improve fingerprints for 2003, 2008 
git-svn-id: file:///home/svn/framework3/trunk@12443 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-26 19:13:35 +00:00
HD Moore 4c0c282cf8 Fix a stack trace when one of these is nil 
git-svn-id: file:///home/svn/framework3/trunk@12406 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-22 19:27:50 +00:00
HD Moore 5fc0f4eaf1 Fix typo 
git-svn-id: file:///home/svn/framework3/trunk@12405 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-22 19:07:41 +00:00
James Lee 86bca6438f add a routes table; delete each comm's routes when flushing 
git-svn-id: file:///home/svn/framework3/trunk@12377 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-20 17:49:27 +00:00
Tod Beardsley f386a2c587 Adding an additional sessions mapping to workspaces. 
git-svn-id: file:///home/svn/framework3/trunk@12327 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-15 20:36:10 +00:00
Mike Smith 175cae5047 Add associations between Host, Session & SessionEvent model objects. 
git-svn-id: file:///home/svn/framework3/trunk@12325 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-15 18:54:27 +00:00
James Lee 361922c634 don't use in-place gsub, it breaks on 1.9.2 since the string was a hash key at one point and apparently gets frozen, fixes #4128 
git-svn-id: file:///home/svn/framework3/trunk@12308 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-13 01:48:37 +00:00
James Lee 9831dd5ca6 take linux sysinfo into account for os fingerprints 
git-svn-id: file:///home/svn/framework3/trunk@12303 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-11 23:15:05 +00:00
James Lee b2eb5a4908 store the service pack from nexpose (previously not returned from the xml parser, see r12298); store hostname and more version info from nmap; see #4099 
git-svn-id: file:///home/svn/framework3/trunk@12300 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-11 22:29:53 +00:00
James Lee a82c47789d silly debug print, see #4099 
git-svn-id: file:///home/svn/framework3/trunk@12290 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-11 01:41:35 +00:00
Mike Smith d5d9d56081 Create a dedicated db table to track sessions & session events. 
* Add new db tables for session & session_events
* Migrate existing session data from events db table
* Modify session report methods to log to the new tables


git-svn-id: file:///home/svn/framework3/trunk@12273 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-07 21:59:32 +00:00
Tod Beardsley 2efa01e8bd Deal with importing and exporting tags. 
git-svn-id: file:///home/svn/framework3/trunk@11737 4d416f70-5f16-0410-b530-b9f4589650da
 2011-02-10 00:17:20 +00:00
Tod Beardsley 742e9bca94 Adding the model that goes with r11726. 
git-svn-id: file:///home/svn/framework3/trunk@11728 4d416f70-5f16-0410-b530-b9f4589650da
 2011-02-08 20:46:02 +00:00
Tod Beardsley 14e6809b2b migrations for tags 
git-svn-id: file:///home/svn/framework3/trunk@11726 4d416f70-5f16-0410-b530-b9f4589650da
 2011-02-08 18:53:55 +00:00