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
5f3947312d
Lands #5327 , SSL support + refactor for PowerShell
2015-05-13 23:25:15 -05:00
018833a326
Fix rspec
2015-05-13 20:48:52 -05:00
2e61973411
Resolve #5343 , Print payload size
...
Resolve #5343 . Prints payload size
2015-05-13 16:33:22 -05:00
36aa136091
missing require
2015-05-13 17:36:45 +01:00
bbd11dbb59
remove ssl payload spec
2015-05-13 17:28:13 +01:00
1f294eac0b
Updated to remove dup code
2015-05-13 17:26:21 +01:00
ae73cd3c6c
Add a bash script to import dev keys
...
This merely makes it easy and fun to import all developer keys used over
the past year to your local GPG keychain. This will make the task of
reviewing merge commits for signedness much easier, especially if you
use a nicelog alias such as this one:
https://github.com/todb-r7/junkdrawer/blob/master/dotfiles/git-repos/gitconfig#L40
This does not handle automating checking for signatures as part of
Travis-CI -- for that, see PR #5337 , a work in progress.
2015-05-13 10:29:55 -05:00
e9e3d9c1e4
Update payloads gem, and updated payload sizes
2015-05-13 15:37:09 +10:00
ac0e4e747a
Change writing style of symantec_web_gateway_login
2015-05-13 00:23:37 -05:00
7148e45bfc
Fix incorrect reference to data path for linux meterpreter stage
2015-05-13 14:21:22 +10:00
60d331fe0c
Add support for a "sleep" command
...
This makes meterpeter shut down it's comms and sleep for a while before
it attempts to open communications again. This is effectively the same
as doing a transport change back to the same transport, but with
a timeout.
2015-05-13 10:13:08 +10:00
9549d572cc
Land #5280 , update to Ruby on Rails 4.0
...
This upgrades a number of other gems as a side-effect.
2015-05-12 16:48:49 -05:00
d5cfeb7711
updating the metasploit gems to ~> 1.0
2015-05-12 14:49:33 -05:00
202c5e0121
Land #5333 , HTML Title Grabber
2015-05-12 11:19:06 -05:00
faec5844cb
Some fixes
2015-05-12 11:18:21 -05:00
b2ef4be51f
Merge branch 'master' of github.com:rapid7/metasploit-framework
2015-05-12 11:02:38 -05:00
b1b8f86aae
Lands #5270 , improvements to Msf::ModuleSet
2015-05-12 11:01:23 -05:00
a5267ab77e
Land #4940 , @dnkolegov's modules for F5 BIG-IP devices
2015-05-12 09:59:21 -05:00
f0048b9a6d
Apparently you don't quote the keys with the new syntax
2015-05-12 11:00:18 +01:00
7c81adbd89
MSFTidy is now quiet and happy
2015-05-12 10:47:49 +01:00
1f6bd3e2be
Updated to new ruby hash syntax and removed <> from title
2015-05-12 10:43:32 +01:00
237827bfdc
Fix up payload cached sizes again
...
This time it's against the currently "installed" version of Meterpeter
binaries. When Meterpreter is landed down the track we'll need to make
sure that the payload sizes are updated again.
2015-05-12 12:44:34 +10:00
657ae2c487
Fix #5335 , resolve metasm parsing issues in x64 exitfunk
2015-05-11 19:39:53 -05:00
06dfdbcc2c
Merge updated transport changes
...
Discard changes that were made for reverse_https transport in x64 as
they no longer apply here.
2015-05-12 10:26:39 +10:00
836feaa2d8
Fix uuid setting, fix reverse_https x64 payload
...
The payload changes in this PR will be fixed up/removed in the
update-x64-stagers PR.
2015-05-12 10:24:11 +10:00
5f735c917c
Add condition before overwriting payload_uuid
2015-05-12 09:56:55 +10:00
51e6c13bc4
Adjust transport configuration include for x64/reverse_http
...
Not sure how I missed this, but I did!
2015-05-12 09:54:08 +10:00
489afd5aa1
Remove redundant check for ascii_str setting
2015-05-12 09:50:58 +10:00
849f904711
Finalise style changes as per suggestions in PR
2015-05-12 09:48:50 +10:00
474461d2a4
Merge format and structure changes from multi transport
2015-05-12 09:46:02 +10:00
69d2b8ffb1
Various code format, style changes, file moves
...
As per Egypt's suggestions.
2015-05-12 09:43:41 +10:00
42f94e70c7
Add `nil` default to exit_types, transport param order swap
...
This allows for checking against exit types to be super easy instead of
having to have extra checks in place. Also changed the order of scope_id
and uri in the transport URI generation. The net effect of this is NOP
because these things only appear separately.
2015-05-12 09:05:58 +10:00
5dfab1f426
Fix exitfunk module for x64
...
The exitfunk module was using asm keywords that are considered invalid
by metasm. This commit removes these keywords and also adjusts one of
the label names to reduce the chance of a collision with other files.
2015-05-12 08:44:03 +10:00
0dbfc1e02b
Merge the stager size work from mult-transport-support
2015-05-12 07:50:56 +10:00
fe51f552b8
Make stageless, and reverse_tcp x64 non-dynamic
2015-05-12 07:37:12 +10:00
518e28674e
Removed CGI dependency (@hmoore-r7, @wchen-r7)
2015-05-11 21:10:18 +01:00
12038ed3e1
Fix #5244 , Remove unnecessary check for mysql_drop_and_create_sys_exec
...
Fix #5244 , MySQL is always return OK so it doesn't seem to be so
important to check res for DROP FUNCTION IF EXISTS sys_exe
2015-05-11 14:17:51 -05:00
78e310562b
Readability style change
2015-05-11 19:48:12 +01:00
8e3d803e74
Updated style as per @void-in's comments
2015-05-11 19:46:10 +01:00
62d67469da
Updated code style as per @hmoore-r7's instructions
2015-05-11 19:34:23 +01:00
b8f7c80fd2
Rubocop
2015-05-11 18:50:03 +01:00
8308c2a925
Added check for nonsensical options
2015-05-11 18:48:55 +01:00
99133deabb
Reran tests, sorted out strip problem
2015-05-11 18:29:44 +01:00
c25a5d3859
Fixed a bunch of rubocop errors
2015-05-11 18:14:37 +01:00
34cf90af59
Removed unnecessary include
2015-05-11 17:31:31 +01:00
c001f014ce
HTML Title Grabber
2015-05-11 17:29:22 +01:00
730135705d
Resolve #5330 , change print_error to print_warning for report_auth_info
...
Resolve #5330 for more consistent deprecation style.
2015-05-11 11:01:45 -05:00
1cc44cfc31
An alternative for normalize_uri
...
normalize_uri doesn't seem to work very well in our case, so
we do our own thing here.
2015-05-11 10:42:26 -05:00
10982f0a1a
Login url should normalize too
2015-05-11 10:18:09 -05:00
OJ
HD Moore
wchen-r7
benpturner
Tod Beardsley
Brent Cook
darkbushido
jvazquez-r7
Stuart Morgan