315164b388
Land #12467 , Bug Fix: nops generate '-s' option ignored
...
Merge branch 'land-12467' into upstream-master
2019-10-25 12:02:20 -05:00
d7b629c858
Apply suggestions from code review
...
Co-Authored-By: Brendan <bwatters@rapid7.com >
2019-10-25 05:34:56 -03:00
72abac0683
Fix call to method in null object in rpc_creds method
2019-10-24 11:19:09 +02:00
13b54efbfa
We don't need no stinking regexes....
2019-10-23 13:47:46 -05:00
991ccdbda5
Land #12106 , Add Linux PTRACE_TRACEME local root exploit
2019-10-23 14:01:14 +00:00
8c93b219d1
fix compile.rb and rubocop
2019-10-23 20:54:42 +08:00
3cb9f2d709
remove pointless upload_binary function
2019-10-23 20:28:13 +08:00
32e7787821
Clearly, I fail at ruby implicit returns
...
Changed the newline remove to a chomp in case the newline is not there
2019-10-22 11:51:00 -05:00
ee282fe84c
Land #12458 , Refactor extended check messages
...
Merge branch 'land-12458' into upstream-master
2019-10-21 12:23:06 -05:00
100c0a7580
Land #12438 , add support for custom Meterpreter prompts
2019-10-21 12:20:06 -05:00
e48132d7df
Bug Fix: nops generate '-s' option ignored
...
This error was trying to parse the contents of undefined '-c' option instead of '-s'.
Making impossible the definition of SaveRegisters from the console.
Step to reproduce:
`msfconsole -q -x 'use nop/x86/single_byte; generate -s esp 10; exit' | grep -v '0m' | tr -d '\n\\x+ ";' | rasm2 -b 32 -D -`
```asm
0x00000000 1 0e push cs
0x00000001 1 d6 salc
0x00000002 1 54 push esp
0x00000003 1 f8 clc
0x00000004 1 43 inc ebx
0x00000005 1 56 push esi
0x00000006 1 5a pop edx
0x00000007 1 56 push esi
0x00000008 1 5a pop edx
0x00000009 1 44 inc esp
```
As we can see, 'inc esp', and some 'push/pop' instructions have been generated although having explicitly asked to save `esp` register through `generate` command.
This commit addresses this issue
2019-10-18 17:31:03 +00:00
121a6fd0e7
Order matters sometimes
...
Since the constants are evaluated when they are declared, they need to
be after the new `#initialize` method since it sets the messages.
2019-10-18 10:57:16 -05:00
d1817d8f12
Fix the preceeding newline upstream when we read it rather than when
...
after we pass it around for a while.
2019-10-17 14:46:20 -05:00
299865bdeb
* Clean up cmd_exec test module's dead code and add support for
...
inconsistent windows platform type.
* Add extra front chomp to shell_command response string because
there's a leading newline there.. for some reason?
2019-10-17 13:30:43 -05:00
ef1fe8d62a
Fix delimiter selection on commands
2019-10-16 20:06:50 -05:00
ba9c46ee91
Remove CheckCodes kludge from external modules
...
Now that the new CheckCode class can add boilerplate human text by
itself we no longer need the hash of built-in values.
2019-10-15 16:24:35 -05:00
7e5f866ffe
Keep extended check reasons separate from messages
...
Have the long code text and the reason glued together does not make
sense for all check displayers. I would prefer to have this at a
different level, but I'm not too keen on refactoring all the places
where it's touched. I couldn't find any remaining places that depend on
the length of the struct, so this looks safe to add straight as another
field.
2019-10-15 16:24:02 -05:00
7505e1bf71
Consolidate logic for actions taken on a workspace
...
* When renaming a workspace allow validation to handle all cases the same
* Do not display backtrace on console for rename failure, this is still logged to framework.log
2019-10-15 16:12:11 -05:00
b494bf5d65
cred imports need a workspace object passed to lib
...
Metasploit::Credential importers expect an Mdm::Workspace object.
2019-10-15 14:51:53 -05:00
f5bb6f8ca2
Land #12428 , Extend check codes with custom messages
...
Merge branch 'land-12428' into upstream-master
2019-10-15 11:06:33 -05:00
59bf03b947
Land #12420 , Add environment-based API token authentication
2019-10-15 15:27:05 +01:00
d670e31e34
Remove unnecessary requirement
2019-10-15 15:18:41 +01:00
4997d72201
add options for keeping/deleting files
...
This change makes it optional to keep/delete
the files that are created when generating
compiled payloads
2019-10-14 13:34:30 -05:00
63acf686a6
Fixed typos, extended messages append existing ones
2019-10-14 15:52:24 +01:00
b1b59fca35
add support for Powershell::prepend_protections_bypass
2019-10-13 03:27:21 +02:00
fd447736dc
colors are safe on Windows
2019-10-11 16:23:10 -05:00
b300284d82
switch logic
2019-10-11 16:22:51 -05:00
3d2d49259a
use uuid to get key/nonce, fall back to datastore
2019-10-11 12:24:56 -05:00
85a39f75d8
Use a larger payload size to include the UUID
2019-10-10 22:08:26 -04:00
d87308e9c0
Fix a couple of bugs in the MeterpreterPrompt
2019-10-10 21:13:12 -04:00
48f1e1d909
Add the %D and %U meterpreter prompt chars
2019-10-10 21:13:12 -04:00
f63fd37938
Support a dynmaic meterpreter prompt
2019-10-10 21:13:12 -04:00
e8abbfe5c2
add db usage
2019-10-10 12:16:10 -05:00
b78b36dc8a
add utility module for retrieving chacha key/nonce
2019-10-10 12:16:10 -05:00
7c8af0754d
add warning about db
2019-10-10 12:16:10 -05:00
fd347be3dc
make optimization level configurable
2019-10-10 12:16:10 -05:00
b674f3dda3
add AlignRSP call, remove begin from linker script
2019-10-10 12:16:10 -05:00
e295732d3f
generate alphanumeric key/nonce
2019-10-10 12:16:10 -05:00
4b8a1a99e0
use new key after session begins
2019-10-10 12:16:10 -05:00
e4c25a7e2b
separate encryption function for payloads
2019-10-10 12:16:10 -05:00
bb742771e5
add stager and stage for x64 arch
2019-10-10 12:16:10 -05:00
2d00e7332a
fix staged payload
2019-10-10 12:16:10 -05:00
c3a7d377f4
add payload for X64 arch
2019-10-10 12:16:10 -05:00
ca45d77595
randomize key
2019-10-10 12:16:10 -05:00
3e6283c193
add staged payload
2019-10-10 12:16:10 -05:00
e17013867a
add stager code
2019-10-10 12:16:09 -05:00
fe1b802cf9
check for dependency in stager/stage
2019-10-10 12:16:09 -05:00
7130e8dc98
use binread instead of File.open/read
2019-10-10 12:16:09 -05:00
f39fc3a82d
remove extraneous data from shellcode
2019-10-10 12:16:09 -05:00
db0abdbec8
use correct method
2019-10-10 12:16:09 -05:00
bwatters-r7