Commit Graph

162 Commits

Author SHA1 Message Date
James Lee ff63e6e05a Land #7018, unvendor net-ssh 2016-07-19 17:06:35 -05:00
David Maloney 20d7e9a7a7 remove old struct2 code in favour of gem
use the new rex-struct2 gem and remove the code form it's old location

MS-1782
2016-07-15 16:01:21 -05:00
David Maloney 01d0d1702b Merge branch 'master' into feature/MS-1688/net-ssh-cleanup 2016-07-14 09:48:28 -05:00
Brent Cook ea94e9752a bump to metasploit-payloads 1.1.13
Includes these PRs:
  https://github.com/rapid7/metasploit-payloads/pull/106
  https://github.com/rapid7/metasploit-payloads/pull/104
  https://github.com/rapid7/metasploit-payloads/pull/103
2016-07-13 00:50:09 -05:00
Pearce Barry 7b1d9596c7 Land #7068, Introduce 'mettle' - new POSIX meterpreter 2016-07-11 22:38:40 -05:00
James Lee 1164c025a2 Revert "Land #7009, egypt's rubyntlm cleanup"
This reverts commit d90f0779f8, reversing
changes made to e3e360cc83.
2016-07-05 15:22:44 -05:00
Adam Cammack 2f3f655352 Add gem for mettle
This adds the gem for the mettle binaries, which contains reflective
payloads for a variety of Linux architectures (and more OSs in the
future)
2016-07-05 11:24:54 -05:00
David Maloney 8b430826c6 merge screwed up gesmepc
add net-ssh back into the gemspec
2016-07-05 11:08:57 -05:00
William Vu f0cd25dcee Land #7035, lib/sshkey* swap to gem 2016-06-30 16:25:27 -05:00
Brent Cook d6c7ac51d6 Fix interactive shell with Windows Meterpreter
see https://github.com/rapid7/metasploit-payloads/pull/105
2016-06-30 15:34:40 -05:00
David Maloney 80563b2c0f Merge branch 'master' into feature/MS-1700/sshkey-gem 2016-06-29 09:44:57 -05:00
David Maloney 2dba09a9ce unvendor sshkey gem
use the actual maintained gem rather than our vendored
copy

MS-1700
2016-06-28 16:10:48 -05:00
David Maloney dcddd2d671 use the bit-struct gem
removed vendored copy of bit-struct and use the gem
instead

MS-1699
2016-06-28 15:58:47 -05:00
David Maloney 0a83b34a85 Land #7025, dev's PR for rex-java
lands the pr for moving Rex::Java into it's own gem
2016-06-28 14:40:02 -05:00
David Maloney 97f9ca4028 Merge branch 'master' into egypt/ruby-ntlm 2016-06-28 14:14:56 -05:00
dmohanty-r7 c2f3d411c3 Replace rex/java with rex-java gem 2016-06-27 14:52:49 -05:00
James Lee c2a063c8ae Start using rubyntlm for ssp auth 2016-06-22 10:15:16 -05:00
David Maloney 69e2d05a5d rip out old rex code and replace with gems
rex-text, rex-random_identifier, rex-powershell, rex-zip, and rex-registry
are now being pulled in as gems instead of part of the spgehtti code that is lib/rex
2016-06-21 13:56:36 -05:00
darkbushido 771171cbe1 adding tzinfo-data to the gemspec
this should fix windows.
2016-05-17 11:40:25 -05:00
Brent Cook 307e565859 Land rapid7/metasploit-payloads#98, Fix python meterpreter reverse_tcp reconnect. 2016-05-13 22:59:52 -05:00
David Maloney fd543f13af fix deps 2016-05-13 13:34:18 -05:00
David Maloney 19af279ce9 Merge branch 'master' into staging/rails-upgrade 2016-05-05 10:46:12 -05:00
Brent Cook 94c8b51a54 bump payloads gem 2016-05-04 10:56:41 -05:00
David Maloney fb5b228984 Merge branch 'master' into staging/rails-upgrade 2016-05-02 11:33:35 -05:00
wchen-r7 aa707fd63b Update gem metasploit-payloads to 1.1.8 2016-04-27 15:25:01 -05:00
David Maloney c52f3dcb0e update to rails 4.2.6
fix lost dep unlocks and upgrade rails to 4.2.6

MS-1400
2016-04-15 11:45:43 -05:00
William Vu 22d08fdf39 Revert #6748, premature Gemfile* changes 2016-04-06 14:52:22 -05:00
David Maloney c3452ab982 unlock gemspec deps
unlock version constraints on deps
defined inside the gemspec

MS-1330
2016-04-04 15:31:09 -05:00
David Maloney 8de58e4b80 Merge branch 'master' into staging/rails-upgrade 2016-04-04 09:30:01 -05:00
Brent Cook 627615d47b update to payloads 1.1.6 2016-04-01 21:30:34 -05:00
OJ 6c602dae90 Bump payloads to 1.1.5 2016-03-31 14:03:59 +10:00
wchen-r7 bc48ebd43b Use patch_finder for msu_finder 2016-03-29 23:21:01 -05:00
Brent Cook b8d53dde4a Merge branch 'upstream-master' into staging/rails-upgrade 2016-03-29 15:56:50 -05:00
thao doan 587f1ee7b3 Land #6708, module documentation for msfconsole 2016-03-29 11:30:55 -07:00
Brent Cook 1fe40d9f2d update to metasploit-payloads 1.1.4 2016-03-24 22:32:55 -05:00
wchen-r7 c3ce621d04 Fix gemfile 2016-03-24 20:43:51 -05:00
Gregory Mikeska 7bd6d0c696 Merge branch 'master' into staging/rails-upgrade 2016-03-24 12:55:05 -05:00
Brent Cook a06236baa6 update to metasploit-payloads 1.1.3 2016-03-14 10:43:41 -05:00
David Maloney ca18996272 setup rails staging branch
rails 4.1 baby!
2016-03-09 15:35:00 -06:00
David Maloney 88697a5d3f Merge branch 'master' into staging/rails-upgrade 2016-03-08 15:22:04 -06:00
Brent Cook 851e8b610e Land metasploit-payloads#80, update to fix #6593 2016-03-02 13:44:02 -06:00
David Maloney 368af93cfe Merge branch 'master' of github.com:rapid7/metasploit-framework 2016-03-01 10:52:00 -06:00
Fernando Arias c4c5944b25 Merge branch 'staging/rails-upgrade' into staging/MS-888/engines-is-deprecated
Conflicts:
	Gemfile.lock
	metasploit-framework.gemspec
2016-02-26 15:35:34 -06:00
David Maloney b7ba38a4c6 update mdm version 2016-02-26 14:32:03 -06:00
Brent Cook 1427887efe update payloads 2016-02-26 06:10:02 -06:00
Gregory Mikeska cbc5b296e4 implement engines method locally instead of adding refinement 2016-02-25 11:05:17 -06:00
David Maloney c0c6dc7a18 point to other staging brnaches for gems
the gem dependencies that have been modified
so far are being pulled in from their staging branches
on github instead of rubygems for this branch
2016-02-22 11:31:58 -06:00
Brent Cook ed5cf821b2 bump payloads to 1.1.0 2016-02-10 23:21:20 -06:00
OJ 4ac7c5e298 Updaed the gemspec to point to the new payloads gem 2016-02-11 14:36:17 +10:00
wchen-r7 d5c3fcae04 Land #6511, Bump Jsobfu version to support preserved_identifiers 2016-02-05 15:57:53 -06:00