Commit Graph

15808 Commits

Author SHA1 Message Date
William Vu 53ea7e577f Add sanitized new XML format 2019-06-07 00:07:50 -05:00
William Vu 10dccfcedb Remove warning
<context> provides service info now:

<context>TCP:443 ([redacted]), SHA256[=][redacted], Serial[=][redacted]</context>
2019-06-06 23:45:07 -05:00
William Vu 40eeae541b Fix style 2019-06-06 23:38:41 -05:00
Jeffrey Martin f646a973a7 Update retina imports to better handle parsing 2019-06-06 19:13:06 -05:00
James Barnett 37414b5760 Land #11948, surface errors returned from remote data service in console 2019-06-06 12:40:42 -05:00
Metasploit 614c1afc41 Bump version of framework to 5.0.28 2019-06-06 10:07:53 -07:00
Matthew Kienow 3c4699c848 Remove unnecessary leading slash from log message 2019-06-05 15:10:00 -04:00
Matthew Kienow 25f45144e8 Handle exceptions raised by get_msf_version call
Exceptions may be raised via the remote data service response handling
while making the call to check the MSF version.
2019-06-05 15:09:33 -04:00
Matthew Kienow 749501d449 Refactor remote data service response handling
Raises exceptions for error responses rather than failing silently.
This exposes the server-side error message to the user in console.
2019-06-04 12:09:06 -05:00
Matthew Kienow 8fe11744bd Use the revised ResponseWrapper error classes 2019-06-04 11:59:00 -05:00
Matthew Kienow 52c67a6952 Modify ResponseWrapper to support three states
There is a success response, an error response and a failed response.
An error response contains a body with an error message from the
server-side, while a failed response represents an invalid response
caused by an issue with the request or response.
2019-06-04 11:56:12 -05:00
bwatters-r7 eff819b523 Land #11945, Make auto_cl more selective based on HTTP method
Merge branch 'land-11945' into upstream-master
2019-06-04 09:04:13 -05:00
bwatters-r7 c28b15e9fe Land #11823, Handle invalid payloads more clearly
Merge branch 'land-11823' into upstream-master
2019-06-04 08:34:41 -05:00
Brent Cook e5a4c2d341 Make auto_cl more selective based on HTTP method
According to https://tools.ietf.org/html/rfc7230#section-3.3.2, a zero content-length is valid for some kinds of HTTP methods.

Instead of implicitly disabling auto_cl if there is no actual content, disable auto_cl default for HTTP methods where semantics of the message do not anticipate any content. This can still be overridden by a caller if it still wants to add an empty content-length for HTTP methods where it does not normally make sense (e.g. if it exploits a bug.)
2019-06-04 04:04:08 -05:00
Wei Chen 17170e2152 Land #11937, make content-length header optional 2019-06-03 18:56:27 -05:00
Brent Cook 3cf375c05c if there is no content, don't include content length 2019-06-02 13:27:11 -05:00
Brent Cook 53557cc92e replace trivial usage of expand_path with getenv
expand_path is not implemented consistently across platforms and
sessions, which leads to confusing behavior. In places where we have trivial
single variable expansions, this changes modules and library code to just use
getenv.

We'll look at the rest individually to see if they can also be reimplemented in
terms of getenv.
2019-05-31 17:44:35 -05:00
Brent Cook 621d404a27 fix tests, handle stdin properly 2019-05-31 15:02:59 -05:00
Jacob Robles 7c29c56880 Bubble error
Raise Validation error that is checked for
2019-05-31 14:57:33 -05:00
Brent Cook d988fe6e5c handle invalid payloads more clearly
Currently, if you have an error in a payload module (e.g. you have a syntax
error in a module), the error is not noticed early enough in the generation process by the parameter validator, leading to a mysterious message like so:

```
Error: undefined method `platform' for nil:NilClass
```

This change cleans up some of the error handling, checks to see if the payload
module can be instantiated, and gives a more useful error output for the
different cases. This also tweaks some of the literal string outputs to match
other exception strings from payload_generator.
2019-05-31 14:32:49 -05:00
Chris Higgins 01de6954fe Land #11912, Bigdecimal boot 2019-05-31 14:04:20 -05:00
Brent Cook 73c8e803fe Land #11892, Fix parse IPv6 address in reverse_http 2019-05-31 12:41:36 -05:00
Brent Cook d9d0639a91 move BigDecimal patch earlier in boot process
This makes msfvenom also quiet about the impending deprecation.
2019-05-31 12:31:35 -05:00
Brent Cook 23e59c9e66 Land #11838, add keyboard and mouse input controls on Windows/MacOS 2019-05-31 09:35:01 -05:00
Brent Cook edefc52bbd Merge branch 'master' into land-11838- 2019-05-31 09:29:25 -05:00
Jeffrey Martin b14a40f564 Land #11887, Fix multi meterpreter_reverse_http handler to not care so much about the workspace. 2019-05-30 18:32:57 -05:00
Metasploit 026b38eb71 Bump version of framework to 5.0.27 2019-05-30 10:06:32 -07:00
Metasploit eaaaab98f7 Bump version of framework to 5.0.26 2019-05-30 06:38:42 -07:00
ssyy201506 ecda8d864a Fix incorrect parsing of IPv6 uri. 2019-05-28 16:41:34 +09:00
Matt Robinson 26eebb9620 Fix multi handler reverse_http to not care so much about the workspace. 2019-05-25 16:25:06 -04:00
Metasploit 0701ee1dbd Bump version of framework to 5.0.25 2019-05-24 14:45:04 -07:00
William Vu 9d0cf0661c Land #11857, cmd/unix/reverse_bash_udp payload 2019-05-24 02:19:44 -05:00
William Vu 019b177e31 Update show command to zero-index 2019-05-23 18:02:22 -05:00
William Vu bea3659475 Fix truncated range 2019-05-23 15:41:38 -05:00
William Vu bd31999f1a Limit tab completion in a smarter way 2019-05-23 15:19:36 -05:00
William Vu 9df782c9d9 Limit tab completion 2019-05-23 14:55:39 -05:00
William Vu 2b7a77a0f4 Add tab completion to analyze command 2019-05-23 14:36:54 -05:00
William Vu e9aba85c9d Land #11877, analyze command nil fix 2019-05-23 14:30:15 -05:00
Brent Cook 0559fda9db Land #11873, allow calling methods across related modules 2019-05-23 13:56:27 -05:00
Metasploit c2e8b8962a Bump version of framework to 5.0.24 2019-05-23 10:06:40 -07:00
Jeffrey Martin d1895b3db9 restore analyze on framework object 2019-05-23 11:49:43 -05:00
Brent Cook bc5aa2ea3d Merge remote-tracking branch 'upstream/master' into land-11871 2019-05-23 11:35:20 -05:00
William Vu c9813cf379 Fix comments 2019-05-23 10:39:11 -05:00
Jacob Robles 1fe981b8e2 Land #11843, Update MSB references 2019-05-23 08:07:46 -05:00
Jacob Robles 5d2cd40010 Update MSB reference
Previous MSB references were redirecting to docs.microsoft.com
2019-05-23 07:00:23 -05:00
William Vu 7eb279e079 Use human_name in reverse_udp handler 2019-05-22 20:25:37 -05:00
William Vu b5622b160e Fix typo 2019-05-22 19:59:08 -05:00
William Vu 0febc730fa Clarify comment 2019-05-22 19:49:24 -05:00
William Vu 3e84f57544 Clarify comment 2019-05-22 18:34:02 -05:00
William Vu 690b15afc5 Check CheckCode 2019-05-22 17:40:39 -05:00