854485a016
add bg command to meterpreter
2018-10-16 14:01:50 +00:00
1241041739
[Issue 6100] Add --pad-size option to msfvenom to prepend nopsled given total payload size
2018-10-15 14:46:16 -05:00
f399b59ae4
Merge branch 'master' of https://github.com/rapid7/metasploit-framework into cisco_device_manager
2018-10-13 13:31:20 -04:00
46a3d065ce
fix indentation
2018-10-13 08:54:44 -04:00
aadefdbc82
Update msfvenom formatter to be case insensitive
2018-10-12 11:11:52 -04:00
4ae45cb20b
comment around why we do this, make check more explicit
2018-10-12 02:12:30 -05:00
e8097791fe
remove spaces at eol
2018-10-11 21:46:45 -04:00
d480a78b91
capture ephone creds
2018-10-11 21:21:53 -04:00
14e87bf06f
Baby come back
2018-10-11 11:10:36 -06:00
e207c225a2
Remove function entirely
2018-10-11 10:41:43 -06:00
5c061c02b9
Remove peer information from the prefix
2018-10-10 16:31:48 -06:00
3349ecf212
Land #10788 , Clarify "NameError: wrong constant name" message on invalid module name
2018-10-10 15:34:55 -05:00
0b8926715e
Reactively check for invalid module names
2018-10-10 14:33:59 -05:00
29f36a3921
Add Msf::ModuleLoadError exception
2018-10-10 14:22:40 -05:00
1737935dc0
Convert reverse_relative_name to a class method
...
It'll be easier to use this way if someone uses it externally.
2018-10-10 13:21:18 -05:00
12857a1d93
Land #10784 , Add 'evasion' to search help
2018-10-10 13:02:45 -05:00
e829c6a838
Land #10786 , Fix 'show evasion' command
2018-10-10 13:01:35 -05:00
1a0df7ce07
Land #10787 , Remove unused 'unknown' author mapping in author.rb
2018-10-10 13:01:05 -05:00
63bcbdc8db
Remove unknown author mapping in author.rb
...
No one was using it and instead writing "Unknown" directly. It was also
producing an invalid e-mail address.
2018-10-10 11:59:01 -05:00
b103ea256d
Fix #10785 , incorrect implementation of "show evasion" command
...
Fix #10785
2018-10-10 10:20:12 -05:00
a6797f101d
Add 'evasion' to search help
2018-10-10 20:15:47 +05:30
ba0bfb1114
Land #10781 , Fix error in rpc_shell_read RPC method.
2018-10-10 09:02:47 -05:00
50755b2e00
Fix function rpc_shell_read - return result as string
2018-10-10 11:36:17 +02:00
36b7fb3524
Fix function rpc_shell_read - remove wrong parameter data, return correct values
2018-10-10 11:31:03 +02:00
7f2aa8ca4e
Land #10770 , show full path for webcam_stream file
2018-10-09 05:32:32 -05:00
6c74820843
Land #10773 , session.platform TypeError fix
...
This also adds an "unknown" platform class.
2018-10-08 14:38:31 -05:00
ccfdfb6a5c
Clean up new "unknown" platform and current use
2018-10-08 14:31:31 -05:00
edea3c45cd
dont append nothing
2018-10-08 13:23:54 -04:00
023f7db9ba
explicitly declare rank 0
2018-10-08 13:16:14 -04:00
cd9ef01c9a
add default case unknown platform and new cisco ios proof
2018-10-08 13:07:45 -04:00
e937f5fee1
to_s platform
2018-10-08 11:39:31 -04:00
71a6d802e8
show full path
2018-10-08 10:27:56 -04:00
c6dddaa481
Support automatic payload choice
2018-10-06 20:28:41 -05:00
c7efd57144
Sync up with master
2018-10-06 08:27:01 -05:00
15d8cbbff6
Land #10744 , Add AUDIO_EFFECTS to distinguish from others
2018-10-05 16:51:36 -05:00
6efadb5f2d
Further clarify {AUDIO,PHYSICAL}_EFFECTS
2018-10-05 16:03:21 -05:00
4363bd830b
Land #10755 , 50, it's a magic number (sorry 2)
2018-10-05 15:04:20 -05:00
2e7ac9f449
Land #10751 , session interaction fix for RHOSTS
2018-10-05 14:37:10 -05:00
938139d23c
Add vi and more for hysterical raisins
2018-10-05 14:21:44 -05:00
25147c49e8
Bump fallback pager in log command to tail -n 50
...
24 is never enough. Unless you're Jack Bauer.
(The 24 comes from the VT100. :)
2018-10-05 14:05:54 -05:00
eb0febc86c
Land #10729 , Namespace modules using full name instead of hex
2018-10-05 11:40:50 -04:00
f6306254ce
Land #10746 , Fix RPC module.payloads method performance
2018-10-05 11:30:46 -04:00
3ec71ed549
Fix issue that not interact with session.
2018-10-05 17:30:38 +08:00
4a4c759a4b
add ndkstager to data/exploits
2018-10-05 15:10:21 +08:00
08c196c5d5
show the output of apktool if injection fails
2018-10-05 14:11:36 +08:00
06700efbc4
Skip payload generate to reduce processing time
2018-10-04 22:06:32 -04:00
9e512b0246
Clarify {SCREEN,AUDIO,PHYSICAL}_EFFECTS
2018-10-04 14:20:26 -05:00
566d540b87
Add AUDIO_EFFECTS to distinguish from others
2018-10-04 14:06:50 -05:00
9f30512532
Land #10707 , module traits to augment module rank
2018-10-04 13:26:14 -05:00
f5190525fc
support for multiple module types
2018-10-04 13:20:47 -05:00
a4509c1757
Land #10739 , Remove unneeded UserServlet from JSON-RPC App
2018-10-04 08:28:35 -05:00
e9ef18bff6
Land #10735 , Enhance RPC module information retrieval
2018-10-04 08:21:58 -05:00
ff0ee51da1
Land #10686 , ARGS, TIMEOUT, and output to upload_exec module
...
Merge remote-tracking branch 'upstream/pr/10686' into upstream-master
2018-10-04 04:28:02 -05:00
5e5e663812
Merge pull request #44 from wvu-r7/pr/10707
...
Add PHYSICAL_EFFECTS constant from Will.
2018-10-03 23:37:34 -05:00
92ac5635b1
Support module documentation
2018-10-03 23:35:30 -05:00
97ebc832f0
Clarify target of PHYSICAL_EFFECTS
2018-10-03 20:34:24 -05:00
fa92808cc6
Add PHYSICAL_EFFECTS constant
2018-10-03 20:32:00 -05:00
d69ae54835
Remove unneeded UserServlet
2018-10-03 16:40:37 -04:00
18d6cc0ee0
Add support for info command
2018-10-03 15:19:08 -05:00
ccad78d567
Fix spelling mistake
2018-10-02 14:11:02 -04:00
d807600ebe
Enhance RPC information retrieval
...
Add the ability to retrieve additional module information for payloads,
encoders and nops. Add ability to filter these modules by architectures.
2018-10-02 13:38:07 -04:00
9c120ef123
Land #10699 , Avoid double-closing meterpreter channels
2018-10-02 09:46:43 -05:00
b3dca6081d
Land #10720 , better handle errors with multi-host exploits
2018-10-02 05:28:57 -05:00
304acd42f0
minor comment tweaks
2018-10-02 05:23:13 -05:00
2c0d4de70b
Land #10732 , add api key for android wlan_geolocate
2018-10-02 05:09:10 -05:00
b993d74f6c
minor tweak
2018-10-02 11:41:58 +08:00
4d51bace42
fix android wlan_geolocate
2018-10-02 11:26:46 +08:00
46e7b8ac98
Namespace modules using full name instead of hex
2018-10-01 18:32:23 -05:00
7842174d8b
Fix loading external modules without notes
2018-10-01 12:41:39 -05:00
1b93363588
Change the error message when interrupt exploit.
2018-09-30 16:09:00 +08:00
90b98a193c
Refactor the rhosts for exploit modules.
2018-09-30 16:08:49 +08:00
5dcb6ab321
fix typo in route command examples
2018-09-28 16:53:12 -05:00
572d430429
Land #10682 , add JSON RPC framework and msfrpc v1.0 API endpoints
2018-09-28 15:21:02 -05:00
c22ec85d9c
Land #10703 , Update payloads to include the new Kiwi release
2018-09-28 14:43:51 -05:00
5f5b334493
Call keyword argument methods with params hash
2018-09-28 11:11:18 -04:00
60bd00ee5b
Move prepare_params method to v1.0 RpcCommand
...
The method was created to support RPC v1.0 (v10) processing and should
not be necessary for future RPC versions.
2018-09-28 10:51:10 -04:00
0686c76cd5
Restore help on empty args for reload_lib
2018-09-27 23:21:43 -05:00
11538bcd4f
Remove pathspec due to vague errors
...
"error: Could not access '*.rb'" is printed when not a repo. We fall
back on reload_file's checks, once again. :(
2018-09-27 22:12:56 -05:00
ab56ac6655
Refactor and clean up reload_lib -a and others
2018-09-27 22:11:22 -05:00
3ca95933a1
Update help text.
2018-09-27 13:13:25 -05:00
64c86ef4de
Add support for working outside install directory
2018-09-27 13:05:23 -05:00
a2694555d0
Change typo
2018-09-27 12:45:17 -05:00
974a727862
Update comment
2018-09-27 12:32:43 -05:00
086e2b311b
Update constants
2018-09-27 12:31:04 -05:00
7ba73ef658
Check for valid files in git command
2018-09-27 12:01:04 -05:00
c5c1706636
Acutally, get rid of git? check
2018-09-27 11:14:01 -05:00
7f9b9be78b
Allow git? to return true
2018-09-27 11:12:10 -05:00
31e9b831d8
Change constant name
2018-09-26 21:42:00 -05:00
e34371c7d3
Add a newline
2018-09-26 21:19:49 -05:00
c0ddbba049
rm junk code
2018-09-26 21:19:16 -05:00
9064fac1ff
Fix code based on Will's feedback
2018-09-26 21:13:37 -05:00
583874d370
Update use of reliability/side-effects/stability metadata
2018-09-26 18:54:08 -05:00
0e2361d675
Use friendly error messages and also Open3.capture2e
2018-09-26 18:49:07 -05:00
bbfac2af1c
Fix copypasta typo
2018-09-26 18:46:43 -05:00
5444d7a1a5
Update chmod_x_file to chmod
2018-09-26 18:46:42 -05:00
896dd13bbe
&& instead of and
2018-09-26 18:46:42 -05:00
4adca52103
create chmod helper function
2018-09-26 18:46:42 -05:00
79c26bce08
Add a more comprehensive git check
2018-09-26 18:32:52 -05:00
173f570812
Check for presence of git directory
2018-09-26 18:29:49 -05:00
71cb3e8e94
Use OptionParser
2018-09-26 18:08:46 -05:00
f8984c4f9b
Rename function, change args from to
2018-09-26 17:55:43 -05:00
04ff0931d7
Add metadata place holders for reliability/side-effects/stability
2018-09-26 17:42:54 -05:00
0b48d2371d
Add error handling for non-git situations
2018-09-26 17:32:40 -05:00
b3053020d1
Update help docs
2018-09-26 17:23:46 -05:00
eeee289e2f
Add command to reload all files changed as per git diff
2018-09-26 17:16:46 -05:00
736b60f63c
Update payloads to include the new Kiwi release
2018-09-26 14:26:31 +10:00
0269110faf
Land #10696 , autofilter_{ports,services} in cache
2018-09-25 17:12:54 -05:00
2db3279956
use symbols and match filter keys to code
2018-09-25 15:04:26 -05:00
94988e26e0
add mutex on closes
2018-09-25 09:57:45 -05:00
1a493c4508
Only send a close channel message once, avoid if Meterpreter told us
...
Don't send a close message for a nil channel ID, and if we do send a close
message, only do it once. I could have added a mutex somewher in _close(), but
because it's a class method, it's a little awkward and would require all of the
callers to instead have voluntary lock. As an alternative, I just made the
finalizer close the channel instead.
Fixes #10177
2018-09-25 02:30:38 -05:00
f08cb18afd
Land #10594 , Fix hashdump and user enumeration on new macOS versions
2018-09-24 22:18:24 -05:00
c89d8f8fb7
fix user enumeration methods, be more robust
2018-09-24 22:17:32 -05:00
ea888eaa7c
Add method comments for raise
2018-09-24 17:22:25 -04:00
cb2f4ae419
Add filter_ports and filter_services to cache
...
When caching metadata about module include `filters` when available.
2018-09-24 14:11:52 -05:00
02ef565730
Update evasion_module_type branch
2018-09-24 08:20:32 -05:00
fb032745a1
Print nicely about what object you're in
2018-09-21 16:03:48 -05:00
7c000c6692
Add pry -h
2018-09-21 16:03:37 -05:00
094cc527de
Add pry command to Meterpreter
2018-09-21 16:03:24 -05:00
5280cf0c50
Move required members and types to constants
2018-09-21 11:19:38 -04:00
a38080528b
Land #10684 , stray quote fix for writable? raise
2018-09-20 22:55:11 -05:00
3bc0a821d5
Prefer ye olde TeX-style quotes
...
This was @bcoles' initial commit. I agree. Looks good with the raise.
2018-09-20 22:54:17 -05:00
fdbb085f0b
Fix NameError in cmd_shell due to renamed variable
...
I missed this while refactoring. I didn't use the var after all. :'(
2018-09-20 22:27:28 -05:00
95e2c388c4
Remove stray quote from raise in writable? method
...
Didn't break the string but looked funny.
2018-09-20 22:19:18 -05:00
7d30f781f6
Add missing raise
2018-09-20 20:09:42 -04:00
c7badd5c37
Add method comments
2018-09-20 20:07:45 -04:00
9d3d9c3ad6
Change parameter version to Symbol
2018-09-20 19:58:04 -04:00
4acf695de9
Remove debug output and unused code
2018-09-20 18:05:36 -04:00
8bd9faad22
Initial JSON-RPC servlet and support architecture
2018-09-20 17:39:33 -04:00
0fd98d5eaa
Add set_raw_response method
2018-09-20 17:31:06 -04:00
768e3b4971
Land #10575 , add meterpreter chmod command
...
Merge branch 'land-10575' into upstream-master
2018-09-20 16:05:30 -05:00
185931ca91
Land #10625 , repeat command to repeat commands
2018-09-20 15:24:03 -05:00
6f72a0516f
Fix remaining typos
2018-09-20 15:23:15 -05:00
dbb75fd2af
Land #10659 , Minor code cleanups
2018-09-19 14:55:47 -05:00
f4b7584b6c
use max_by &:size instead of max
...
this should fix the issue in the PR
2018-09-19 10:26:21 -04:00
c7ee3bdf45
Land #10666 , compatible_sessions NoMethodError fix
2018-09-19 03:44:04 -05:00
85c40a122a
Fix crash issue when auto complete the session option.
2018-09-18 18:49:56 +08:00
d24eb2dbac
Add a comment
2018-09-18 15:58:09 +08:00
862a8c921c
Fix issue when kill a job with non-integer jobid
2018-09-18 15:50:00 +08:00
d4cdaf56ae
Fix issue when kill a non-existent job.
2018-09-18 15:48:30 +08:00
a462a84b61
Land #10653 additional gcc paths for solaris libs
2018-09-17 18:23:21 -04:00
86f5b25d8f
Land #10563 , Add 'Notes' metadata section
2018-09-17 11:18:08 -05:00
781d808056
use tr insteas of gsub
2018-09-17 09:54:07 -04:00
c3ca1a6cb8
use tr instead of gsub
2018-09-17 09:53:59 -04:00
c97a2ce626
use delete! insteas of gsub
2018-09-17 09:50:21 -04:00
bcf78e6067
use tr instead of gsub
2018-09-17 09:45:52 -04:00
31a2afb586
use max instead of sort[-1]
2018-09-17 09:45:20 -04:00
b10671a331
Fix #10601 , add api key for android wlan_geolocate
2018-09-17 06:04:11 +08:00
28f23a842a
Update gcc path for Solaris
2018-09-16 17:22:38 +00:00
b76849d64e
Update gcc path for Solaris
2018-09-16 07:39:07 +00:00
bcb7348648
Land #10645 , writable? method for Msf::Post::File
2018-09-15 17:27:42 -05:00
ea47b6de04
Add writable? method to Msf::Post::File - Fix #10644
2018-09-15 06:29:24 +00:00
d49d7a1214
Land #10638 , Warn when listing inactive sessions without DB connection
...
Replaces confusing message and stack trace with a warning message,
when the `sessions -d` command is used to list inactive sessions
when no database is connected.
2018-09-15 05:36:37 +00:00
6fae6065d6
Upcase all the things
2018-09-14 16:05:43 -05:00
e590b7c01f
Consolidate notes reference in erb templates
2018-09-14 12:08:22 -05:00
184d1d5954
Leave notes type as a plain hash
2018-09-14 11:17:37 -05:00
c71078a381
use max instead of sort_by { |p| p.size }.last
...
`sort_by { |p| p.size }.last` is less readable compared to just using the `max` method
I believe this does basicall the exact same thing, ontop of being much faster in my micro benchmark.
The old method was, something like, 8 times slower.
2018-09-14 11:19:16 -04:00
2dcfdcbdc4
remove redundant hash merge
...
https://github.com/JuanitoFatas/fast-ruby#hashmerge-vs-hash-code
2018-09-14 11:04:39 -04:00
ed338bbeec
use tr instead of gsub
...
https://github.com/rails/rails/pull/17257
https://github.com/JuanitoFatas/fast-ruby#stringgsub-vs-stringtr-code
2018-09-14 10:51:51 -04:00
4a759fd048
Refactor cmd_shell and add cmd_shell_{help,tabs}
2018-09-13 19:44:24 -05:00
cfbd259e80
Merge remote-tracking branch 'upstream/master' into pr/10389
2018-09-13 16:08:07 -05:00
7c6c621a8f
Remember to assign `self.prompt` in shell.rb
...
Not everything updates the prompt all the time, make them feel welcome.
2018-09-13 15:51:07 -05:00
c2230f98d5
Warn user about inactive sessions without DB
2018-09-13 15:13:41 -04:00
6a6d92abc1
Check DB is active before querying sessions
2018-09-13 15:06:53 -04:00
b3e9856851
Revert doc changes to exploit.rb autofilter
...
I think the changes might have been accidental.
3cf4329335
2018-09-13 13:27:52 -05:00
8025a49c44
Land #10633 fix for solaris pidof for more versions
2018-09-13 13:10:28 -04:00
175dec7ade
Print help when `repeat` is run with no commands
2018-09-13 11:27:05 -05:00
04cc7843a4
Typo fixes
2018-09-13 11:19:13 -05:00
53a326c743
Cleanup is_root? method for Linux::Priv / Solaris::Priv
2018-09-13 08:54:31 +00:00
bba818a323
Fix Msf::Post::Solaris::System pidof method
2018-09-13 08:29:56 +00:00
68a51da27b
Land #10477 , console prompt fixes and refactor
2018-09-12 18:00:48 -05:00
84e87b10af
Update warning message when loading mimikatz on new OSes
2018-09-13 08:31:08 +10:00
b70960bddb
Land #10619 , mimikatz/kiwi warning per OS version
2018-09-12 17:11:11 -05:00
5c65f23847
add chmod tab completion
2018-09-12 19:04:51 +08:00
d017f420bf
Fix missing exception capture
2018-09-11 17:58:41 -05:00
e2c6748759
Replace 'and' with '&&'
2018-09-12 08:27:27 +10:00
8fa71ade44
Add `repeat` command to loop msfconsole commands
2018-09-11 17:25:33 -05:00
de0f0a97fb
Add mode to Shell#run_single to re-raise errors
2018-09-11 17:23:56 -05:00
da25391426
Relocate option parsing error handling up a level
2018-09-11 17:22:05 -05:00
74ae89ac96
Minor fixups for `grep`
...
Use Shellwords to join words that have been shellsplit and will be
shellsplit again, and correctly reference a missing command name.
2018-09-11 17:20:34 -05:00
a7105b45a6
add gcc path for solaris
2018-09-11 05:18:26 -04:00
117121b058
Land #10617 , sessions -x fix for when LURI is used
2018-09-11 03:00:34 -05:00
7c1ae843b1
Fix Msf::Post::Solaris::Kernel class name
2018-09-11 07:15:19 +00:00
8d6fcefccc
Fix crash when using sessions -x
2018-09-11 13:28:33 +10:00
a3d74d926c
Land #9897 , Fix #8404 ListenerComm Support For Exploit::Remote::TcpServer
2018-09-10 16:25:55 -05:00
ea2fcb6fc4
Land #10593 , Refactor SSH mixins and update modules
2018-09-10 15:38:53 -05:00
55ae02ba4e
DRY up doc generator
2018-09-07 11:47:29 -05:00
1eb703b1b5
Refactor initialization of module's notes attribute
2018-09-06 16:15:52 -05:00
b7ee406203
Use a 'reduce' to transform notes
2018-09-06 15:50:23 -05:00
876240d18c
Condense note transformation inside mod_meta_common
2018-09-06 15:48:22 -05:00
dd476066cf
Land #10584 , fix session upgrade HANDLE_TIMEOUT and upgrading osx shells
2018-09-06 05:52:40 -05:00
35fb0d19ab
Refactor SSH mixins and update modules
2018-09-05 23:53:11 -05:00
e2428b5c20
Fix target DisableNops not being passed to payload
2018-09-05 18:07:54 -05:00
1f16052988
Make key random and fix RPC
2018-09-05 15:09:47 -05:00
635d92901f
Add warning for mimikatz and kiwi if OS versions are wrong
2018-09-05 09:34:34 +10:00
c38a7e97fd
fix session.type for osx shells
2018-09-04 22:59:03 +08:00
a3df5bb5d9
Fix rpc_info
2018-09-04 08:35:39 -05:00
0a2b0f8cec
Remove trailing comma
...
Fix issue causes target.ret to be an array
2018-09-04 07:43:43 -05:00
d89b971d83
Add API doc for rpc_compatible_evasion_payloads
2018-09-03 22:25:51 -05:00
e9c4698291
Support RPC
2018-09-03 22:15:23 -05:00
d5e78ab66f
Land #10437 , sync some linux local libraries to solaris
2018-09-03 22:46:50 +08:00
Rich Whitcroft
Patrick
h00die
Kevin Kirsche
Brent Cook
Nate Caroe
Nate Caroe
William Vu
Wei Chen
Auxilus
Ivo Nutár
Green-m
Tim W
Matthew Kienow
jgor
bwatters-r7
Erin Bleiweiss
OJ
Jeffrey Martin
Adam Cammack
Kent 'picat' Gruber
Brendan Coles
Jacob Robles