Commit Graph

984 Commits (1faa41aafe43c40701047503acf65cbfb4443025)

Author SHA1 Message Date
James Barnett 5e9bbb4bef Merge branch 'master' into local_api_docs 2018-05-02 11:48:13 -05:00
Brent Cook 7e31c2cf76
Land #9942, IPv6 channel fixes for Python and Linux/macOS Meterpreters 2018-04-30 15:14:12 -05:00
Metasploit 53da6ad8b9
Weekly dependency update 2018-04-30 08:06:54 -07:00
Brent Cook 8fd7448e48
bump payloads, ipv6 channel fixes 2018-04-27 14:18:54 -05:00
Metasploit 67e7f917e7
Weekly dependency update 2018-04-26 10:05:16 -07:00
James Barnett df9df01f19
First pass on swagger/blocks documentation 2018-04-25 12:58:29 -05:00
Metasploit 30276eb11c
Weekly dependency update 2018-04-19 10:05:14 -07:00
Jeffrey Martin 2a922f7186
remove rex-text version lock 2018-04-18 10:38:01 -05:00
Jeffrey Martin 60c69314b6
Weekly dependency update 2018-04-13 12:33:03 -05:00
Jeffrey Martin e7a7bcfd7d
Lock rex-text due to compatibility issues
The new depndency on the openssl gem creates compatibility issues
in some of the currently supported enviornments.  Lock version until
this is sorted out.
2018-04-13 11:15:55 -05:00
William Vu c8da88b21a Update rex-text to 0.2.17 2018-04-08 02:35:15 -05:00
Brent Cook b55eb9b8f2 bump payloads, add Python UDP channel support
This pulls in Python UDP channel support from
https://github.com/rapid7/metasploit-payloads/pull/276
2018-04-07 14:21:30 -05:00
William Vu 7433069239 Bump RubySMB to latest for MSF5 2018-04-03 13:18:42 -05:00
Brent Cook d793d89830 Land #9787, Fix adding IPv6 routes with subnets or cidr masks
This bumps rex-socket for the previous commit.
2018-04-02 23:02:55 -05:00
Brent Cook 3443d30ae3 update gemfile.lock for Ruby 2.5.1 2018-03-30 07:01:32 -05:00
Metasploit d446a24d0c
Weekly dependency update 2018-03-29 10:06:55 -07:00
Jeffrey Martin b97ed7f425
updates to Gemfile.lock for current master 2018-03-27 12:28:07 -05:00
Brent Cook b134a33877 Merge branch 'master' into land-9740 2018-03-27 11:59:55 -05:00
James Barnett 9559c06c10
Land #9762, Fix OpenSSL deprecation in Ruby 2.5
This PR replaces a deprecated method in the Ruby 2.5
OpenSSL library. It also bumps the ruby-version to use 2.5.

Fixes #9576
2018-03-27 11:02:44 -05:00
Brent Cook 3fb5137c2d use Rex::Socket::SslTcp.supported_ssl_methods for SSLVersion option 2018-03-26 03:40:49 -05:00
Brent Cook d67ae503bf Update base to Ruby 2.5
mask metasploit-aggregator and dependencies on Ruby 2.5
2018-03-26 02:52:52 -05:00
Brent Cook 4194b6d991
Land #9586, fix #9112, improve android screenshot error message on failure 2018-03-25 07:36:15 -05:00
Brent Cook 95424b781b update android payloads 2018-03-25 07:32:04 -05:00
James Barnett 6b3a4a56dc Merge branch 'rapid7/master' into goliath 2018-03-23 11:26:31 -05:00
Metasploit 880f8eee9d
Weekly dependency update 2018-03-22 10:07:18 -07:00
Christian Mehlmauer 7d873ea7ab
replace factory_girls with factory_bot fixes #9736 2018-03-21 23:21:37 +01:00
Metasploit d66f409542
Weekly dependency update 2018-03-15 10:08:23 -07:00
christopher lee 4d04319d2a Merged master 2018-03-15 11:31:44 -05:00
Tim W a978a5edba fix #9497, bump metasploit payloads 2018-03-13 15:12:53 +08:00
Metasploit 1be34848d5
Weekly dependency update 2018-03-08 10:08:28 -08:00
Brent Cook e8e6d01581 bump payloads, fix PHP meterpreter message parsing 2018-03-07 17:28:49 -06:00
christopher lee 68d72cbfa7 Goliath Cleanup in preparation for merge to master 2018-03-06 10:21:22 -06:00
Jeffrey Martin f8cdb88c60
lock grpc version 2018-03-02 08:51:39 -06:00
Jeffrey Martin 8b6cce068a
missing lock file change 2018-03-01 16:18:04 -06:00
christopher lee 4f6b1de9a3 Merge branch 'master' into goliath 2018-03-01 14:14:39 -06:00
Jeffrey Martin b90f960edd
lock protobuf version 2018-02-28 11:11:17 -06:00
Brent Cook 4365bd3af5 bump rex-exploitation 2018-02-23 11:10:49 -06:00
James Barnett 1cee532526 Merge branch 'rapid7/master' into goliath 2018-02-22 14:49:45 -06:00
Brent Cook d737f77b84 bump gems, lock ruby_smb for now 2018-02-22 10:45:49 -06:00
James Barnett 3005a8b7ce
Merge branch 'rapid7/master' into goliath 2018-02-21 11:16:05 -06:00
Brent Cook 05e002e3c5
Land #9366, Add x64 staged Meterpreter for macOS 2018-02-19 23:15:03 -06:00
Brent Cook d28f6888b2 bump payloads, include bind_named_pipe support 2018-02-15 17:37:33 -06:00
Brent Cook 316e657d10
bump gems, remove rbnacl/ffi since unneeded 2018-02-12 11:21:04 -06:00
Brent Cook c7ccfb7952 update payload to flush process channel buffers on exit 2018-02-07 08:04:34 -06:00
Brent Cook d82b8cbf63 bump payloads, fix php meterpreter
a syntax error slipped in, let's fix it
2018-01-26 17:48:11 -06:00
Brent Cook a947f89960
add missing gemfile.lock update 2018-01-24 07:18:47 -06:00
Brent Cook 7ad296d511 bump payloads, fix cmd_exec meterpreter logic 2018-01-21 07:56:24 -06:00
James Barnett ff9c69c7c8
Merge branch 'rapid7/master' into goliath 2018-01-19 13:28:17 -06:00
Brent Cook 08f622b0ce update version 2018-01-17 17:24:15 -06:00
Jeffrey Martin 1f1dc59d17
Land #9392, python meterpreter whitespace normalization 2018-01-12 21:24:13 -06:00
James Barnett 809d3d28c7 Merge branch 'rapid7/master' into goliath 2018-01-11 16:18:41 -06:00
Metasploit 18f16e7c66
Bump version of framework to 4.16.32 2018-01-11 10:03:16 -08:00
Brent Cook f125e13278
python meterpreter whitespace normalization 2018-01-09 16:08:52 -05:00
Metasploit 3a7a539c84
Bump version of framework to 4.16.31 2018-01-04 12:17:08 -08:00
Jeffrey Martin 78872be2ad
Merge released '4.x' 2018-01-04 14:13:18 -06:00
Metasploit d4de9eef9b
Bump version of framework to 4.16.30 2018-01-04 10:03:21 -08:00
Adam Cammack 16fa3b99ef
Land #9350, Improve fake SSL cert details 2018-01-03 15:32:27 -06:00
James Barnett 4aac8f5c39
Merge branch 'rapid7/master' into goliath 2018-01-02 17:34:40 -06:00
Tim W 44fbb171a6 osx stager 2017-12-29 11:13:25 +08:00
Metasploit 7254130b77
Bump version of framework to 4.16.29 2017-12-28 15:19:22 -08:00
Jeffrey Martin 66ca61f636
Merge released '4.x' 2017-12-28 17:15:29 -06:00
Metasploit c681c7881d
Bump version of framework to 4.16.28 2017-12-28 10:03:39 -08:00
Jeffrey Martin 8ea50572df
Land #9329, Add basic framework for interacting with MQTT 2017-12-27 14:59:34 -06:00
Metasploit 909caa0425
Bump version of framework to 4.16.27 2017-12-21 13:27:52 -08:00
Brent Cook 9d8cb8a8d0 Merge branch '4.x' into upstream-master 2017-12-21 15:17:38 -06:00
Metasploit ee2f10efc5
Bump version of framework to 4.16.26 2017-12-21 10:04:38 -08:00
Jon Hart cf21d13b2e
Resolve conflict 2017-12-20 18:58:16 -08:00
Brent Cook 24907938bb
bump payloads, various fixes 2017-12-20 16:47:37 -06:00
Brent Cook df4f62cde9 bump to mettle 0.3.3 2017-12-20 15:58:17 -06:00
Jon Hart f15309bc48
Add basic framework for interacting with MQTT 2017-12-20 12:28:02 -08:00
Brent Cook 6b216f2a20
Land #9290, Fix OverrideLHOST/LPORT with http/s Meterpreter payloads 2017-12-20 00:26:06 -06:00
Jeffrey Martin fe4c701016 Merge released '4.x' 2017-12-19 14:14:22 -06:00
Brent Cook 9f144ce8d4
Land #9151, mettle extension support + sniffer module 2017-12-18 21:49:40 -06:00
Metasploit 66b1a555a1
Bump version of framework to 4.16.25 2017-12-18 16:33:25 -08:00
Jeffrey Martin 04f294bd53
Fix #8972, Remove libsodium until packaged better
Due to issues with packaging for multiple platforms libsodium as an optional dependency for 'rbnacl' is being removed.  Once packaging issue are resolved this will be restored.  This removes support for `ed25519` keys used with ssh for the time being however manual installation of this gem allows user to workaround this limitation.
2017-12-18 15:21:27 -06:00
Brent Cook 2a94a4417a bump payloads 2017-12-18 10:01:10 -06:00
Metasploit be4f9236f2
Bump version of framework to 4.16.24 2017-12-14 10:08:05 -08:00
Brent Cook 3f6846c332 update payloads with python retry fix 2017-12-12 03:13:38 -06:00
Brent Cook 602335abf1 bump payloads 2017-12-11 04:11:21 -06:00
Metasploit 348cbe54b6
Bump version of framework to 4.16.23 2017-12-08 10:01:55 -08:00
Metasploit fd1681edd9
Bump version of framework to 4.16.22 2017-12-01 10:04:07 -08:00
Brent Cook edb2d8b762
fix windows unicode usernames, add recursive directory delete 2017-11-29 17:01:01 -06:00
Metasploit 174d0d46de
Bump version of framework to 4.16.21 2017-11-29 10:45:55 -08:00
Jeffrey Martin e73ba0b3ca
Merge released '4.x' into master 2017-11-29 10:27:42 -06:00
Brent Cook 035d1ef2c6
bump payloads, pull in AES negotation & transport fixes 2017-11-25 18:21:57 -06:00
Brent Cook 8645a518b3 add mettle support for custom headers 2017-11-24 20:27:34 -06:00
Metasploit c9da8f7a18
Bump version of framework to 4.16.20 2017-11-24 10:01:50 -08:00
Brent Cook 4050985649
update payloads 2017-11-21 13:53:33 -06:00
Metasploit 602406a423
Bump version of framework to 4.16.19 2017-11-17 10:02:22 -08:00
Metasploit 5cdd364590
Bump version of framework to 4.16.18 2017-11-15 19:46:12 -08:00
Metasploit 4f660d7dd7
Bump version of framework to 4.16.17 2017-11-10 10:05:05 -08:00
OJ 6f9671ff11
Updated Payloads version to 1.3.14 2017-11-08 12:36:50 +10:00
Metasploit deb5a7b015
Bump version of framework to 4.16.16 2017-11-03 10:03:38 -07:00
Metasploit a14102083c
Bump version of framework to 4.16.15 2017-11-02 10:01:12 -07:00
Brent Cook 56eb828cc5 add e500v2 payloads 2017-10-30 14:04:10 -05:00
Brent Cook ebaf0c5484 bump mettle, update toolchain, add e500v2 and reduce size of x86_64 2017-10-30 05:09:31 -05:00
Metasploit 140955f220
Bump version of framework to 4.16.14 2017-10-27 10:03:00 -07:00
Brent Cook 254c2a33d3 bump metasploit payloads, windows meterpreter fixes 2017-10-27 11:44:23 -05:00
Jeffrey Martin 43b67fe80b
remove errant bracket, formatting update 2017-10-26 15:01:53 -05:00
Jeffrey Martin 87d34bef63
Revert "missing update to Gemfile.lock"
This reverts commit 9961c70cda.
2017-10-25 16:13:25 -05:00
Jeffrey Martin 9961c70cda
missing update to Gemfile.lock 2017-10-25 15:07:36 -05:00
Jeffrey Martin 270ec2e9e6
Bump rex-socket to pick up better certs 2017-10-24 16:39:01 -05:00
Tim 7e398e2ef5 Fix #9111, bump metasploit-payloads gem to include php 5.3.10 fix 2017-10-24 11:40:02 +08:00
Metasploit 884b68fa60
Bump version of framework to 4.16.13 2017-10-20 10:02:23 -07:00
Brent Cook 54d64cdcc5
Land #9064, add aggregator >= 1.0.0 with cryptTLV packet format 2017-10-19 14:51:50 -05:00
Jeffrey Martin 5458b58a74
restrict aggregator on arm for now 2017-10-18 13:21:02 -05:00
christopher lee 2c8f27cd98 More general cleanup including is_local db check 2017-10-16 17:07:26 -05:00
Metasploit 88585a5cfd
Bump version of framework to 4.16.12 2017-10-13 10:03:48 -07:00
William Vu 569b68bee2 Update rex-exploitation to 0.1.15 2017-10-11 14:09:35 -05:00
Jeffrey Martin c478133539
add aggregator >= 1.0.0 with cryptTLV support 2017-10-10 23:19:44 -05:00
Metasploit 4acef04e0d
Bump version of framework to 4.16.11 2017-10-06 10:01:51 -07:00
Metasploit 32104eb90e
Bump version of framework to 4.16.10 2017-09-29 10:04:04 -07:00
christopher lee 293d1edeb1 Merge master: 8853193542 2017-09-29 11:06:16 -05:00
OJ 7ea14e8431
Update payloads for getsystem fixes 2017-09-28 09:43:02 +10:00
Metasploit 68fa3d45f3
Bump version of framework to 4.16.9 2017-09-22 10:05:19 -07:00
Brent Cook 29f65e3dce
finish bumping payloads 2017-09-20 07:25:30 -05:00
Metasploit b2f5bd16e6
Bump version of framework to 4.16.8 2017-09-15 10:02:38 -07:00
Metasploit faa84faf25
Bump version of framework to 4.16.7 2017-09-08 15:38:22 -07:00
Brent Cook 6b0b2550ec
bump payloads, add shell expansion for java/android payloads 2017-09-08 13:45:54 -05:00
Metasploit f5a73f3efe
Bump version of framework to 4.16.6 2017-09-08 10:03:41 -07:00
Brent Cook d38ee0f1ee bump payloads, grab java/android fixes for #8938
fixes #8938
2017-09-08 10:08:22 +02:00
Brent Cook 9877a61eff bump payloads 2017-09-07 01:36:25 -05:00
OJ 7acd772c10 Pivot session stability, display and handling 2017-09-07 01:36:21 -05:00
Metasploit 92f5290a50
Bump version of framework to 4.16.5 2017-09-01 10:08:40 -07:00
Brent Cook b0c1bfaeb7 bump network_interfaces, add Android support
see #8780
2017-08-28 20:08:06 -05:00
William Vu 0e1bafb2d1
Land #8902, vendored robots gem 2017-08-28 16:42:38 -05:00
Metasploit a0131f450e
Bump version of framework to 4.16.4 2017-08-28 14:34:39 -07:00
Brent Cook 928d632042 import https://github.com/fizx/robots.git 0.10.1 2017-08-28 15:47:46 -05:00
Brent Cook 582b2e238e update mettle payload to 0.2.2, add background and single-thread http comms 2017-08-28 05:31:44 -05:00
Metasploit 779b25bdf6
Bump version of framework to 4.16.3 2017-08-25 10:02:45 -07:00
Metasploit 2f72404b26
Bump version of framework to 4.16.2 2017-08-23 19:11:11 -07:00
Metasploit 7c2fa20191
Bump version of framework to 4.16.1 2017-08-23 10:36:19 -07:00
christopher lee c09796ea7e Merge master 2017-08-23 11:37:04 -05:00
Brent Cook 430251b8f6
fix compatibility with php meterpreter 2017-08-21 15:37:31 -05:00
Brent Cook f961495860
Land #8625, Remove OpenSSL from Windows Meterp, packet header changes, and TLV packet encryption 2017-08-20 19:13:51 -05:00
Brent Cook 851c0f4373
disable metasploit-aggregator while we sort out crypttlv updates 2017-08-20 19:05:10 -05:00
Brent Cook b864083cbd
update payload sizes 2017-08-20 19:03:53 -05:00
Brent Cook 20b6f37fb8 bump payloads with crypttlv format awareness 2017-08-20 19:01:42 -05:00
Metasploit ca7d481658
Bump version of framework to 4.16.0 2017-08-20 16:57:48 -07:00
Metasploit 95824ce132
Bump version of framework to 4.15.8 2017-08-18 10:03:23 -07:00
Metasploit be926e1d75
Bump version of framework to 4.15.7 2017-08-11 10:12:37 -07:00
Brent Cook 59cccfffad unpin dnsruby, new release is out 2017-08-10 10:48:03 -05:00
Metasploit 83cd0bc977
Bump version of framework to 4.15.6 2017-08-04 10:07:09 -07:00
Brent Cook ff189147e7
rb-readline made a release, use 0.5.5 instead of git HEAD 2017-08-02 06:09:27 -05:00
Brent Cook bb2304a2d1
Land #8769, improve style, compatibility, for ssh modules 2017-08-01 21:43:32 -05:00
Brent Cook 390f4d52db add ed25519 support for net-ssh 2017-08-01 16:05:25 -05:00
Metasploit 70f659370f
Bump version of framework to 4.15.5 2017-07-28 10:21:44 -07:00
Brent Cook ddc4fd95a5 Update payloads
This incorporates support for HiDPI displays with screen capture for Windows
meterpreter, and fixes a communications bug with Android meterpreter.
2017-07-28 09:56:03 -07:00
Brent Cook a0511c79a4
pull in minor build fixes and filesystem stat implementation from python
This pulls in https://github.com/rapid7/metasploit-payloads/pull/219
and https://github.com/rapid7/metasploit-payloads/pull/195
2017-07-23 22:37:43 -07:00
Brent Cook 3bc0c18e6a Properly handle threads and window destruction, add PID logging
This pulls in https://github.com/rapid7/metasploit-payloads/pull/213
which fixes https://github.com/rapid7/metasploit-framework/issues/8608
and adds PID logging to verbose keyboard capture.
2017-07-23 22:27:42 -07:00