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

61 Commits (30f7c651c9dc753356fa66673131dd4b18ae65c0)

Author SHA1 Message Date
OJ 83fbd41970 Merge branch 'upstream/master' into multi-transport-support 
Conflicts:
	Gemfile.lock
	modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb
 2015-05-14 14:50:25 +10:00
OJ e9e3d9c1e4 Update payloads gem, and updated payload sizes 2015-05-13 15:37:09 +10:00
darkbushido d5cfeb7711
updating the metasploit gems to ~> 1.0 2015-05-12 14:49:33 -05:00
darkbushido 26e7fe15f9
Merge branch 'upstream' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
 2015-05-05 11:00:38 -05:00
Brent Cook 3771a78564 update to metasploit-payloads 0.0.3 2015-05-04 16:17:57 -05:00
Brent Cook e6ea5511ca update linux and windows meterpreters to use metasploit-payloads 2015-05-04 09:44:36 -05:00
darkbushido 542937415b updating the gemspecs to use the pre-release versions of the other metasploit gems 2015-04-29 14:07:50 -05:00
Matt Buck 8163c3cdda Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
	plugins/nessus.rb
 2015-04-28 15:33:46 -05:00
Brent Cook 2ee28916f7 bump meterpreter_bins to 0.0.22 2015-04-16 22:21:12 -05:00
Matt Buck e82fb5f836
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
	lib/msf/ui/console/command_dispatcher/db.rb
	metasploit-framework-db.gemspec
	metasploit-framework.gemspec
 2015-04-15 14:04:35 -05:00
Matt Buck 1e7a6bf3e9
Update metasploit gem dependencies to released versions 2015-04-15 13:06:33 -05:00
Luke Imhoff b9bce90759
Update to metasploit-concern 0.4.0 prerelease 
MSP-12550

Properly shows Metasploit::Credential::Core::ToCredential is not loaded.
 2015-04-14 15:03:20 -05:00
Brent Cook 0e864e1631 update bins to 0.0.21 2015-04-14 10:45:49 -05:00
Matt Buck 9f15824e2a
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
 2015-04-10 15:35:27 -05:00
Matt Buck 5e2d6c27c3
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
	db/schema.rb
	lib/msf/core/db_manager/session.rb
	metasploit-framework-db.gemspec
 2015-04-06 11:27:00 -05:00
Fernando Arias 6455862484 Merge branch 'staging/rails-4.0' of github.com:rapid7/metasploit-framework into staging/rails-4.0 
Conflicts:
	Gemfile.lock
	metasploit-framework.gemspec
 2015-04-03 13:56:38 -05:00
Brent Cook 0d78834083 update meterpreter binaries 2015-04-03 05:47:18 -05:00
Brent Cook afe17e1f33 bump meterpreter bins to 0.0.17 2015-03-23 17:15:49 -05:00
OJ 830f328aba Bump meterpreter_bins version 2015-03-20 06:23:10 +10:00
Matt Buck f29a3f69e9 Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
	metasploit-framework-db.gemspec
 2015-03-17 15:47:48 -05:00
HD Moore 4fd2f6867f Switch to rb-readline-r7 for now 2015-02-21 11:30:40 -06:00
OJ 73435c6d1c
Land #4743 - Bump met bins, update Linux bins. 
Includes a merge of Gemfile.lock
 2015-02-11 08:21:23 +10:00
Luke Imhoff 184b4e8a13
Merge branch 'master' into feature/MSP-11141/extract-cache-from-metasploit-model 
MSP-11141

Conflicts:
	Gemfile.lock
	metasploit-framework-db.gemspec
 2015-02-10 14:09:18 -06:00
Luke Imhoff 5df13364b2
Update to latest metasploit dependencies 
MSP-11141
 2015-02-10 14:01:49 -06:00
Brent Cook 7ab7add721 bump meterpreter_bins to 0.0.14, update Linux binaries. 
Hopefully the last manual build before packaging the Linux bins into
meterpreter_bins as well.

This includes all of the fixes and improvements over the past month.

 rapid7/meterpreter#116
 rapid7/meterpreter#117
 rapid7/meterpreter#121
 rapid7/meterpreter#124
 2015-02-10 12:43:47 -06:00
Brent Cook ce87b126c1 Update to the latest meterpreter_bins 
This removes checked-in sniffer extension in favor of the gem-packaged version.
It also pulls in the changes for verifying #4411
 2015-01-09 16:57:10 -06:00
Matt Buck 2cd5be021b
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
	metasploit-framework-db.gemspec
	metasploit-framework.gemspec
 2015-01-08 13:12:27 -06:00
Luke Imhoff 95a9d5010c
Use metasploit-model with metasploit-cache extracted 
MSP-11141

Test that metasploit-model with metasploit-cache extracted and the
compatible metasploit_data_models and metasploit-credential are
compatible with metasploit-framework without changes.
 2014-12-31 15:20:58 -06:00
Matt Buck db0aeb2a05
Make the version constraint a range 2014-12-19 13:54:13 -06:00
Matt Buck c493ccfc06
Define the Rails version constraint in a library constant 2014-12-19 11:46:39 -06:00
Brent Cook ecd73e5901 Update meterpreter_bins to 0.0.12 
This adjusts to the new grouped TLV format for the extapi adsi and
window list commands.
 2014-12-11 22:03:23 -06:00
Matt Buck 0249e0a800
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
	db/schema.rb
	metasploit-framework-db.gemspec
 2014-12-02 09:47:47 -06:00
Matt Buck 66fde33a0c
Get framework working on rails 4 branch with new gemspecs 2014-11-12 14:06:51 -06:00
Matt Buck 02ec1fb234
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-11-12 10:13:34 -06:00
OJ fb751e3b9f Update meterpreter_bins to 0.0.11 
This adds support for the getsid command in the binaries.
 2014-11-12 07:21:00 +10:00
Luke Imhoff f494a9f3da
Don't depend on 'rb-readline' on Windows 
MSP-11585

`rb-readline` gem doesn't work with Ruby Installer for 1.9.3 because of
`NoMethodError undefined method 'dlopen' for Fiddle:Module`.  Removing
`rb-readline` may be a temporary fix it if turns out that this is a bug
with rb-readline or some other upstream bug.
 2014-11-06 14:52:49 -06:00
darkbushido 2d7c517e2f
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
 2014-11-04 15:34:25 -06:00
James Lee 867329d4b3 Fix readline by mucking with load path 2014-10-29 22:14:49 -05:00
darkbushido 979394946a
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
	lib/msf/core/db.rb
 2014-10-28 15:34:37 -05:00
Tod Beardsley 4f32cc8c01
Bump to meterpreter_bins 0.0.10 2014-10-15 19:36:48 -05:00
Tod Beardsley 8afe4ab5e0
Update Gemspec for meterpreter 0.0.8 2014-10-15 19:00:19 -05:00
Matt Buck 25d1caabb5
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile
	Gemfile.lock
	metasploit-framework.gemspec
 2014-10-14 15:20:15 -05:00
James Lee a65ee6cf30
Land #3373, recog 
Conflicts:
	Gemfile
	Gemfile.lock
	data/js/detect/os.js
	lib/msf/core/exploit/remote/browser_exploit_server.rb
	modules/exploits/android/browser/webview_addjavascriptinterface.rb
 2014-10-03 18:05:58 -05:00
Matt Buck 478dbd32f2
Bump to newly-released versions of gems 
MSP-11412
 2014-10-03 12:07:23 -05:00
Matt Buck f748256e47
Use the prerelease versions of the gems 
MSP-11412
 2014-10-03 10:29:10 -05:00
Matt Buck 04dbfb9ad6
Bump metasploit gem dependencies 
MSP-11412
 2014-10-02 18:11:13 -05:00
HD Moore 24eec0e2a6 Swap to recog ~> 1.0 pre Luke's comment 2014-10-02 09:51:41 -05:00
HD Moore 5f4098f650 Bump recog to ~> 1.0.0 2014-10-02 00:51:37 -05:00
darkbushido 701291e029
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
 2014-09-29 15:48:12 -05:00
Joe Vennix b96a7ed1d0
Install a global object in firefox payloads, bump jsobfu. 2014-09-24 16:05:00 -05:00