32255a4621
Always show the URI and User-Agent for unknown requests
2015-10-05 11:05:05 -05:00
711f11abb8
Clean up some things
2015-10-02 18:35:46 -05:00
dea0142da1
catch network exceptions
2015-10-02 18:26:37 -05:00
c967b60bf8
Land #5948 , @bcook-r7's fix shell_to_meterpreter from powershell
2015-10-02 15:59:43 -05:00
953bfe1a81
Delete typo
2015-10-02 15:29:03 -05:00
2445c1fa32
Land #6012 , Use SSLVerifyMode and SSLCipher from the Exploit::Remote::Tcp
2015-10-02 15:27:47 -05:00
40cb13609a
update SSLVersion to support all options for rex TCP sockets, add 'TLS' alias
2015-10-02 15:26:49 -05:00
6468eb51b2
Do changes to have into account powershell sesions are not cmd sessions
2015-10-02 15:26:42 -05:00
55f6fe7037
Land #5510 , update x86/alpha* encoders to be SaveRegister aware
2015-10-01 15:07:10 -05:00
d551f421f8
Land #5799 , refactor WinSCP module and library code to be more useful and flexible
2015-10-01 14:35:10 -05:00
7cd30ef0b8
Land #6031 , delete unused -a db_export option
2015-10-01 14:12:34 -05:00
144bf39038
Land #5998 , fixup PrependMigrate for stageless meterpreter
2015-10-01 11:48:33 -05:00
eb751822d8
Remove dead option in db_export
2015-10-01 10:58:15 -05:00
2ab779ad3d
Land #6010 , capture_sendto fixes
2015-10-01 10:54:24 -05:00
22c424a4c6
Fix CreatProcessA stack alignment in prependmigrate x64
2015-10-01 10:24:13 +10:00
b35a0166bf
Merge branch 'upstream/master' into fix-prepend-https
2015-10-01 09:07:28 +10:00
8861d61ad4
Add stderr/stdout capture and var extraction
2015-10-01 08:17:17 +10:00
bfbd6ad475
Add the NewClass code really
2015-09-30 12:31:18 -05:00
8590c79021
Add support for NewClass
2015-09-30 12:30:52 -05:00
393a71cf46
Merge branch 'master' of github.com:rapid7/metasploit-framework into bug/MSP-13119/rework-match-result-creation
...
Conflicts:
Gemfile.lock
2015-09-29 15:00:22 -05:00
54f9a3b25a
Land #6013 , add mainframe as a platform and architecture
2015-09-29 13:28:23 -05:00
f3e8b34b4f
Land #6007 , restore original behavior when capture_sendto fails
...
we need this while fixing modules to handle exceptions
2015-09-29 09:55:47 -05:00
fb0d766958
First pass of the python extension for windows meterpreter
...
This includes the basic construct for the python extension, and allows
for single-shot commands to be run.
2015-09-29 20:48:29 +10:00
9444c8c410
Fix #5988 , windows x64 stagers
...
* Also, use mov esi, esi to save an extra byte
* Also, modify the block_recv.asm code, just to have it up to date
2015-09-28 15:52:50 -05:00
31552a71cf
Added FIREFOX back as arch - inadvertantly removed
2015-09-28 14:50:46 -05:00
19ada4b842
Revert "Add debug message"
...
This reverts commit 983bedeb85
2015-09-28 14:44:48 -05:00
983bedeb85
Add debug message
2015-09-28 13:58:08 -05:00
50249bd640
Update Metasploit::Framework::Tcp::Client to have SSLVerifyMode and SSLCipher into account
2015-09-28 13:57:08 -05:00
1e4e5c5bae
Update ACPP login scanner to have into account advanced options
2015-09-28 13:50:20 -05:00
3529cdad7b
Add attributes
2015-09-28 13:30:10 -05:00
4a9ef30e9e
Use SSLVerifyMode and SSLCipher from the Exploit::Remote::Tcp mixin
2015-09-28 10:31:17 -05:00
ff87fbc976
Added a mainframe.rb in core/payload
...
Base module for payloads to be developed on the mainframe / SystemZ
(z/os mvs) architecture
2015-09-28 10:06:09 -05:00
ecf6867c35
Added mainframe as a payload constant
...
updated core/payload.rb to include 'mainframe' as a option
2015-09-28 10:04:50 -05:00
bc718da5d9
Added mainframe as a platform in core
...
To develop modules, mainframe and zArchitecture needs to be defined in
several places. This is the official platform.rb definition
2015-09-28 10:03:15 -05:00
bb769f0dca
Added mainframe ebcdic<->ascii conv ability
...
Within text.rb added 2 tables and 2 methods that allow for the
tranlsation of EBCDIC<->ASCII for mainframe modules and functionality
(SystemZ Zarchitecturer mainframe)
2015-09-28 09:55:30 -05:00
33807abeda
Updated contstants.rb with ARCH_ZARCH / mainframe
2015-09-28 09:47:24 -05:00
94e0a78050
Added zarch.rb architecture file
2015-09-28 09:41:22 -05:00
258e743f82
Added ARCH_ZARCH as architecture option
...
SystemZ (z/os, mainframe) added as a constant to the arch.rb file. This
along with other commits in this package will allow for development of
SystemZ (mainframe) based modules.
2015-09-28 09:36:31 -05:00
7d9d3864c3
Add docs for capture_sendto
2015-09-27 15:40:32 -07:00
fc9a757194
Fix #6008 for the 6 modules that use scanner_spoof_send
2015-09-27 15:06:29 -07:00
b508625957
When unable to determine destination MAC, vprint and return false
...
Fixes #6006 .
~20 related modules are affected by this defect and by this "fix"
2015-09-26 15:13:26 -07:00
cb4e609dd5
Land #5997 , database cache update fix
2015-09-26 14:10:04 -05:00
f4b4b21bfc
Land #5990 , reverse_hop_http fix
2015-09-26 13:42:46 -05:00
f3451eef75
Land #5380 , pageantjacker, an SSH agent proxy
2015-09-26 10:52:44 -04:00
4cbe35e1b2
specifically use shell or powershell
2015-09-23 22:08:32 -05:00
157bab4f0d
Land #5518 , TFTP::Client retransmit lost data blocks on upload
2015-09-23 21:58:42 -05:00
d9a76bbe0a
Land #5911 , add adsi enumerate to a file via -o
2015-09-23 21:40:01 -05:00
66c9222968
Make web_delivery proxy aware
2015-09-23 20:45:51 +01:00
52e3405192
Passing report_exploit_success specs
...
MSP-13119
2015-09-23 11:12:02 -05:00
dc84b3b1ba
Passing report_exploit_failure specs
...
MSP-13119
2015-09-23 10:54:13 -05:00
853d822992
Merge pull request #1 from bcook-r7/land-5380-pageantjacker
...
update pageantjacker to run as part of extapi
2015-09-23 09:45:53 +01:00
30102d4526
No longer needed.
2015-09-22 17:05:30 -05:00
d90f87449a
Fix merge
2015-09-22 16:55:01 -05:00
7d2a2a8b64
Fix issues with using hop for new core
2015-09-22 16:54:02 -05:00
6482083b6b
revert WfsDelay short-circuit on exploit failure
...
Some exploits currently succeed, but can fail during cleanup, leading to a
false-negative. Reverting this so that the affected exploits can be fixed
first.
This reverts commits b0858e9d46b3f754136e
2015-09-22 14:43:03 -05:00
66b453edd6
ensure the database cache is always updated, present accurate reporting on search
2015-09-22 12:56:26 -05:00
1bd472107b
Land #5996
...
Missing service in looking up vulns by refs now handled.
2015-09-22 12:16:42 -05:00
8b10cbe3fd
Query for vulns without specifying service when service is nil
...
MSP-13284
2015-09-22 10:50:23 -05:00
46e00389c4
Adjust payload size for stageless in prepend migrate
2015-09-22 18:07:53 +10:00
9230b04674
Update match result creation logic
...
MSP-13119
* Look up match on match set for the run
* If no match exists in the match set for the vuln, attempt to create a match for the vuln
2015-09-22 00:24:38 -05:00
62ff291713
Fix msfrop metasm require
2015-09-21 13:19:23 -05:00
0cc6b53d59
Land #5905 , support newer OpenVAS formats.
2015-09-21 10:30:25 -05:00
cdd39f52b1
Merge branch 'master' of https://github.com/rapid7/metasploit-framework into pageant_extension
2015-09-21 14:34:56 +02:00
e8e4f66aaa
Merge branch 'master' of ssh://github.com/stufus/metasploit-framework into pageant_extension
2015-09-21 14:34:38 +02:00
61e7e1d094
update pageantjacker to run as part of extapi
2015-09-20 20:25:00 -05:00
98da192c70
Land #5615 , Updated YARD Documentation for EXE.rb
2015-09-18 13:36:11 -05:00
0bf20993ec
Fix more doc
2015-09-18 13:35:31 -05:00
d3a73149a2
Add specs around match result creation in exploit attempt
...
MSP-13119
2015-09-18 12:04:45 -05:00
6f19e30723
Merge branch 'staging/hd-wfs' into feature/hd-wfsdelay
2015-09-17 13:07:56 -05:00
c8b27e0563
Land #5889 , @jlee-r7's favors metasm as a gem
2015-09-16 17:01:01 -05:00
c7afe4f663
Land #5930 , MS15-078 (atmfd.dll buffer overflow)
2015-09-16 15:33:38 -05:00
5cf3ac23e2
Fix no method defined error when run_id is not passed down
...
* run_id is an optional param so we handle when it isn't set on user data
MSP-13119
2015-09-16 15:32:48 -05:00
b0858e9d46
Style tweak re: TheLightCosine's feedback
2015-09-16 08:15:26 -07:00
b7572d5494
Handle both serialized & unserialized cases on import
2015-09-16 08:11:15 -07:00
ef043cebc3
Always use the stringified host->address during export
2015-09-16 02:59:11 -07:00
382e01d680
Add comments and use run scope on match
...
MSP-13119
2015-09-15 15:09:26 -05:00
621af7311c
Merge branch 'master' of github.com:rapid7/metasploit-framework into bug/MSP-13119/rework-match-result-creation
2015-09-15 14:35:07 -05:00
eb479318b1
Use existing run for match result or create a new one if it doesnt exist
...
MSP-13119
2015-09-15 14:34:44 -05:00
b3f754136e
Skip WfsDelay when the exploit has clearly failed
2015-09-15 08:04:23 -07:00
c7f15ca940
Rework how match results get created
...
MSP-13119
* Create match result when we create vuln attempt
2015-09-14 12:18:47 -05:00
713ded7ca2
Ignore SMB exceptions during fingerprinting
...
This fixes smb_version in cases where the remote server throws a Login error
for the default creds (null session).
2015-09-14 09:35:44 -07:00
ad0140e0fc
Land #5864 , @jlee-r7's fixes x64 injection
2015-09-11 16:09:37 -05:00
a1a7471154
Land #5949 , is_root? for remove_lock_root
2015-09-11 02:09:14 -05:00
f2ccca97e0
Move require 'msf/core/post/android' to post.rb
2015-09-11 01:56:21 -05:00
53f995b9c3
Do first prototype
2015-09-10 19:35:26 -05:00
86b9535a50
Land #5944 , Nmap parser open|filtered -> unknown
2015-09-10 16:37:42 -05:00
0bb03db786
Rework vuln lookup logic to account for vuln with no service (nexpose import vuln with -1 port)
...
MSP-13234
2015-09-09 13:21:05 -05:00
e88a14aee6
Rework exception handler for exploit simple
...
MSP-13233
2015-09-09 11:51:18 -05:00
4aae9b8272
support upgrading a powershell session to meterpreter
2015-09-08 15:37:42 +02:00
e97056a367
When the port state is open|filtered should be unknown, no open
2015-09-07 22:52:03 +02:00
eaf51a2113
Land #5722 , @vallejocc's busybox work
2015-09-04 13:36:44 -05:00
da221b82a8
Initialize dir
2015-09-04 11:07:49 -05:00
7665747d1c
Land #5736 , certutil cmdstager
...
Ferreal this time.
2015-09-03 14:21:21 -05:00
82b27c9038
Revert "Land #5736 , certutil cmdstager"
...
This reverts commit 93eb42dfa3
2015-09-03 14:18:28 -05:00
9ccd95af26
Land #5916 , fix encoding when badchars contains -
2015-09-03 13:42:45 -05:00
93eb42dfa3
Land #5736 , certutil cmdstager
2015-09-03 13:13:24 -05:00
70b5336356
Merge branch 'upstream-master' into land-5890-android-post-api
2015-09-03 09:51:35 -05:00
895b692b0d
Land #5914 , prevent loading cached modules outside of the load path
2015-09-03 09:29:13 -05:00
ccd0a06353
Use ===
2015-09-03 01:10:13 -05:00
1440f31756
Land #5637 , resiliency improvements to TCP stagers
2015-09-02 22:50:12 -05:00
9767de9bd0
Truncate payload size to 32 bits
2015-09-03 11:56:59 +10:00
6820e8dc03
Land #5926 , @hmoore-r7's fix for #5716
...
Addresses a bug with IPMI RAKP messages having a malformed length field
2015-09-02 17:50:07 -07:00
9f1f797031
Skip substitution if badchars is empty
2015-09-02 18:52:53 -05:00
01cbd842ad
Updates based on @jlee-r7's feedback
2015-09-02 18:42:34 -05:00
9f9bbce034
Land #5840 , add LLMNR & mDNS modules
2015-09-02 18:30:29 -05:00
0120e5c443
Cosmetic tweaks, don't report duplicate responses
2015-09-02 18:30:03 -05:00
ab91d1cc92
More style cleanup
2015-09-02 14:01:12 -07:00
4d77e777fa
Remove explicit CLASS options from llmnr mixin
...
use parent's instead
2015-09-02 13:58:48 -07:00
27174e2bfd
Revert "Bump scanner THREADS to 10 by default"
...
This reverts commit f537f91943
2015-09-02 13:55:48 -07:00
5699908240
Style cleanup
2015-09-02 13:48:01 -07:00
25a22860b7
Summarize MDNS/LLMNR responses
2015-09-02 13:43:26 -07:00
9e98385417
Fix #5716 by correctly setting the data length
2015-09-02 15:16:25 -05:00
55251ffe17
Slightly better output. Unsure if this will work with all response types
2015-09-02 11:21:54 -07:00
24dd454127
Land #5912 , adds timeout option to migrate
2015-09-02 13:08:22 -05:00
54f79e72bb
Initialize writable_dir in the main block
2015-09-02 13:08:07 -05:00
3d04d53e3a
first pass at better output and report_service
2015-09-02 10:31:46 -07:00
cefb7c83f3
Fix call to migrate
2015-09-02 15:37:34 +10:00
1aa7c596ce
Land #5967 , add PACKETSTORM reference types.
2015-09-01 23:25:26 -05:00
77f56c563b
Land #5867 , add PACKETSTORM reference types
2015-09-01 23:25:01 -05:00
8191fac90f
Fix #5907 by replacing String#delete with String#gsub
...
The String#delete method treats the argument as a transliteration. This means that hyphens (-) either
turn into a character range or they throw an error if the range is invalid. This ended up breaking
one encoder and may be the root cause of other hard-to-reproduce bugs.
2015-09-01 18:37:28 -05:00
0d2df33900
Fix two typos, add help detail
2015-09-02 09:35:51 +10:00
27cd0597d7
Land #5908 , default to SSL autoneg, add explicit TLS 1.1/1.2 support
2015-09-01 18:21:51 -05:00
de8205a42e
Fix the defaults for module_info_by_path_from_database!
2015-09-01 17:48:56 -05:00
409f2bd016
Agh, didn't mean to enable that
...
It's never worked
2015-09-01 16:34:28 -05:00
2cd6b1c2df
Update parser, fix UseMasterPassword bug
2015-09-01 22:05:47 +01:00
21ab4531d2
Land #5910 , move help fxn for ps
2015-09-01 14:23:25 -05:00
b8458d6ec7
Land #5705 , allow removing transports by index
2015-09-01 14:08:48 -05:00
b273893947
use URI.parse over a custom regex
2015-09-01 14:07:05 -05:00
148a5ba78e
A better solution for the spec coverage
2015-09-01 13:45:46 -05:00
31087ff33e
Refresh after cache rebuild should use the active module paths
2015-09-01 13:39:15 -05:00
5addf899b2
Refactor, same intent as before, just faster and correct.
2015-09-01 13:15:44 -05:00
2b03487e1f
Fix the module cache rebuild logic
2015-09-01 12:38:20 -05:00
d84caeca72
Ignore cached modules outside of load path, only load cache once on startup
2015-09-01 12:31:05 -05:00
299ceb7087
Add timeout option for migration
...
This commit changes the migrate function so that an optional timeout parameter can be given. This means that people in high-latency scenarios can extend the timeout when migration in order to increase the chances that things will work.
2015-09-01 22:53:30 +10:00
696bc95838
Merge branch 'upstream/master' into adsi-file-output
2015-09-01 17:25:13 +10:00
ef73f56201
Add -o parameter to adsi query functions
...
This allows for the output of the query to be written to a file.
2015-09-01 17:03:41 +10:00
abfeb204b3
Move help functionality for ps command
2015-09-01 16:45:35 +10:00
ff6fbfa738
Land #5895 , rework of ADSI modules
2015-08-31 14:10:41 -07:00
92d74ffb3b
Default to SSLv23 (autonegotiate), fixes #5870
2015-08-31 13:30:05 -07:00
30830ad9e5
Land #5262 , fix webcam_chat and tidy adjacent code
2015-08-31 14:21:24 -05:00
fe69fc84de
expand the path environment variables before executing
2015-08-31 13:38:08 -05:00
fba751a986
Disable early returns
2015-08-31 12:13:42 -05:00
80f21b50c9
Fix #4227 by improving parsing of nested elements
2015-08-31 11:47:43 -05:00
8d0e0b973e
Fix array syntax
2015-08-28 14:12:23 -05:00
06712817cf
Fix specs
2015-08-28 14:06:04 -05:00
9c7f97d124
Fix methods name schema
2015-08-28 13:26:52 -05:00
6a75ad0162
Fix yard documentation
2015-08-28 13:23:30 -05:00
be7db10e7d
Fix busybox_write_file
2015-08-28 13:15:07 -05:00
50f7d99674
Clean get_writable_directory
2015-08-28 13:02:10 -05:00
3f7c8e03e2
Update workspace command to support deleting all workspaces
2015-08-28 10:23:41 -07:00
HD Moore
William Vu
Brent Cook
jvazquez-r7
OJ
Fernando Arias
bigendian smalls
Jon Hart
Meatballs
Stuart
scriptjunkie
Samuel Huckins
dmohanty-r7
Stuart Morgan
wchen-r7
David Maloney
Manuel Mancera
James Lee
Joshua Smith