30f7c651c9
use REGISTRY_VIEW_32_BIT
2015-05-18 10:19:32 +02:00
2721be946a
also check Wow6432Node keys
2015-05-15 14:28:12 +02:00
c62cbe6555
Land #5342 , import dev keys script
2015-05-14 21:43:04 -05:00
661a1fef3e
Land #5350 , Remove stray comma meterp help
2015-05-14 21:31:31 -05:00
1ff6d6298e
Remove stray comma causing help to be incorrect
2015-05-15 09:23:55 +10:00
24a989b8a3
Land #5249 , Add Module for Enum on InfluxDB database
2015-05-14 11:22:54 -05:00
005c36b2a6
If data is empty, don't save (or even continue)
2015-05-14 11:22:10 -05:00
7bbc171ca3
Land #5300 , meterpreter and stager multi-transport
2015-05-14 00:05:53 -05:00
181c770a4e
revert unintentional gem upgrades
2015-05-14 00:05:10 -05:00
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
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
7148e45bfc
Fix incorrect reference to data path for linux meterpreter stage
2015-05-13 14:21:22 +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
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
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
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
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
a97f24a12d
Update payload cached sizes
2015-05-11 10:00:14 +01:00
d4798a2500
Fix spacinG
2015-05-11 09:04:03 +01:00
29649ff881
Fix proxy config not making it through
2015-05-11 17:24:02 +10:00
c0388a770e
Update cached sizes
2015-05-10 22:01:30 +01:00
8ef5e0c87c
Changes to spec file
2015-05-10 21:55:55 +01:00
Donny Maasland (Fox-IT)
Joshua Smith
OJ
wchen-r7
Brent Cook
HD Moore
benpturner
Tod Beardsley
darkbushido
jvazquez-r7
Stuart Morgan