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

154 Commits (dbdb4afb8c7455d5191cdd49280fca2f2519b821)

Author SHA1 Message Date
Brandon Turner 05f0d09828
Merge branch staging/electro-release into master 
On August 15, shuckins-r7 merged the Metasploit 4.10.0 branch
(staging/electro-release) into master.  Rather than merging with
history, he squashed all history into two commits (see
149c3ecc63 and
82760bf5b3).

We want to preserve history (for things like git blame, git log, etc.).
So on August 22, we reverted the commits above (see
19ba7772f3).

This merge commit merges the staging/electro-release branch
(62b81d6814) into master
(48f0743d1b).  It ensures that any changes
committed to master since the original squashed merge are retained.

As a side effect, you may see this merge commit in history/blame for the
time period between August 15 and August 22.
 2014-08-22 10:50:38 -05:00
Brandon Turner 19ba7772f3
Revert "Various merge resolutions from master <- staging" 
This reverts commit 149c3ecc63.

Conflicts:
	lib/metasploit/framework/command/base.rb
	lib/metasploit/framework/common_engine.rb
	lib/metasploit/framework/require.rb
	lib/msf/core/modules/namespace.rb
	modules/auxiliary/analyze/jtr_postgres_fast.rb
	modules/auxiliary/scanner/smb/smb_login.rb
	msfconsole
 2014-08-22 10:17:44 -05:00
Samuel Huckins 149c3ecc63
Various merge resolutions from master <- staging 
* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing
 2014-08-15 11:33:31 -05:00
Joshua Smith 6884c87cfa removes IDs/Revisions, resplats test/modules 2014-08-04 01:04:23 -05:00
James Lee 23b04c8ece Fix post/test/* modules' loadpath 
Allows loading when pwd is not framework's install root
 2014-07-30 14:21:42 -05:00
Luke Imhoff 3448b601ee
Remove old, unused cucumber features 
MSP-9606
 2014-05-13 09:26:16 -05:00
jvazquez-r7 ce02f8a7c5 Allow easier control of sprayed memory 2014-03-28 11:58:41 -05:00
jvazquez-r7 0523d9e625 Add comments 2014-03-28 11:09:39 -05:00
jvazquez-r7 04bfe55ae0 Add test modules 2014-03-28 11:09:10 -05:00
Tod Beardsley cfdd64d5b1
Title, description grammar and spelling 2014-03-24 12:16:59 -05:00
Tod Beardsley 4d3f871e9d
Land #2961, get_env and get_envs Post mixin 
This unbreaks the changes introduced by #2782 by introducing
get_env and get_envs for shell sessions (not just meterpreter sessions).
 2014-03-20 10:53:50 -05:00
James Lee 9aaf111523
Only test routes when they are implemented 2014-03-13 13:05:09 -05:00
Tod Beardsley 2086224a4c
Minor fixes. Includes a test module. 2014-03-10 14:49:45 -05:00
sinn3r ee1209b7fb This should work 2014-03-03 11:53:51 -06:00
Meatballs 6e197ce535
Post get_envs library methods 2014-02-08 11:37:25 +00:00
Tod Beardsley 040619c373
Minor description changes 
No code changes (one comment made on play_youtube to suggest xdg-open
rather than firefox for linux targets).
 2013-12-16 14:57:33 -06:00
jvazquez-r7 2284763922
Land #2720, @wchen-r7's httpserver test module 2013-12-13 16:29:26 -06:00
jvazquez-r7 3d18273bcf Make msftidy happy 2013-12-13 16:28:14 -06:00
Tod Beardsley e737b136cc
Minor grammar/caps fixup for release 2013-12-09 14:01:27 -06:00
Meatballs 45a0ac9e68
Land #2602, Windows Extended API 
Retrieve clipboard data
Retrieve window handles
Retrieve service information
 2013-12-08 19:01:35 +00:00
OJ bea0f8c18e Change client to session in tests 2013-12-06 13:43:47 +10:00
sinn3r a147102f54 Oops, I didn't even catch this 2013-12-03 16:55:44 -06:00
sinn3r 46e2a0ecd5 Add an example for PRs that don't have anything to prove functionality 
Some module submissions don't have a pcap, screenshot/video or anything
to prove the module is actually functional or not, because often due to
the author not having the test box anymore, or unable to share info
because of their NDA. We nee a way to prove the module runs by basically
simulating the vulnerable environment live, and this is the answer to that.

This test module is specifically for the cisco_asa_asdm.rb, but future
PRs with the same scenario can also borrow the same idea.
 2013-12-03 16:43:28 -06:00
Meatballs 6ca35283d8
Parent Window - Program Manager instead of Start Menu 2013-12-03 21:20:31 +00:00
Meatballs 7a1e282aac
Parent window fix 2013-12-03 21:09:49 +00:00
Meatballs 221c1ba6be
EXTAPI Test Module 2013-12-03 20:54:17 +00:00
sinn3r 5d10b44430 Add support for Silverlight 
Add support for Silverlight exploitation. [SeeRM #8705]
 2013-11-26 14:47:27 -06:00
sinn3r d9d04fa3a3 Correct test file 2013-11-07 00:59:00 -06:00
sinn3r b34b4ac2b6 Update the java stuff again 2013-11-07 00:57:20 -06:00
sinn3r 991240a87e Support java version detection 2013-11-07 00:54:52 -06:00
sinn3r 3e1771aa77 Being able to pass binding when we need to 2013-11-07 00:12:29 -06:00
sinn3r c338f7a8c0 Change how requirements are defined, rspec, etc 2013-11-06 14:01:29 -06:00
sinn3r 65c96a1f45 Allow the module to be target specific 2013-11-06 00:57:53 -06:00
sinn3r 73701462ed Fix ActiveX. Use ERB for Javascript detection code. 2013-11-05 16:26:41 -06:00
sinn3r 054a525f35 Change profile data structure 2013-11-04 17:46:36 -06:00
sinn3r a806b1aa5e Update test example 2013-11-01 12:11:49 -05:00
sinn3r 735b879e3c Add an example/testcase for BrowserExploitServer 2013-10-31 13:18:45 -05:00
Tod Beardsley ec70861050
Msftidy for test modules? Why not 2013-10-23 16:06:19 -05:00
Tod Beardsley a554784d59
Add @wchen-r7's test module to the test dir 
See the referenced gist on #2545
 2013-10-23 16:01:13 -05:00
Tab Assassin 2e8d19edcf Retab all the things (except external/) 2013-09-30 13:47:53 -05:00
James Lee d4198fdadb Add a resource script for running session tests 2013-09-11 14:06:43 -05:00
James Lee ad31a35231 Fix test/post modules 
Adds test/lib/ to the load path in all modules if it isn't already
there. Makes 'loadpath test/modules/' actually work for all modules.
 2013-09-11 13:09:32 -05:00
Tod Beardsley f307aa70d3 Add some old hard-tabs for sanity 2013-08-07 12:31:56 -05:00
Tod Beardsley be01cd96a3 Adds a test module for space checking 
This module should throw three errors on lines 17, 18, and 19 when
checked against the new msftidy.rb that is space-tolerant (but not
tab-space tolerant)
 2013-08-07 11:43:53 -05:00
sinn3r e169ccab4f Landing #1862 - Remove inline unit tests 2013-05-23 22:19:29 -05:00
Tod Beardsley 05916c079e Inline unit tests are so last decade 
Aside from codebase-wide changes, nearly all of these tests haven't been
touched since before 2010, and there is no effort to maintain this style
of testing. We've moved on to (correctly) seperating out our tests from
our codebase.
 2013-05-23 12:41:14 -05:00
Tod Beardsley ae848cf2fe Fix unix test post module load path 
Works now:

````
msf post(unix) > run

[*] Running against session 1
[*] Session type is shell and platform is linux
[+] should list users
[*] Passed: 1; Failed: 0
[*] Post module execution completed
````
 2013-05-23 12:16:57 -05:00
Tod Beardsley eeea1d9109 Regression test for check in exploits 2013-05-23 11:46:16 -05:00
Tod Beardsley 7436fdad72 First, copy-pasta and add a test 2013-05-23 11:26:53 -05:00
James Lee cd86a69090 Have Post::File use shiny new session.fs.file.mv 
Also adds a quick and dirty test. Verified working on Linux shell, Linux
meterpreter, and Windows x86 and x64 meterpreter.
 2013-04-05 01:24:24 -05:00