William Vu
94297de256
Add grep -C to msfconsole
2018-07-17 20:52:46 -05:00
William Vu
39e381049a
Remove unnecessary include
2018-07-17 15:36:23 -05:00
William Vu
59278aef99
Add command dispatcher for developer commands
2018-07-17 15:07:50 -05:00
Green-m
dc4e438c04
Add multiple commands' tabs
2018-07-17 06:27:51 -04:00
Matthew Kienow
65c290fa39
Make API token optional on data_services cmd
2018-07-16 16:44:44 -04:00
William Vu
2c9d85606c
Refactor and add error messages
2018-07-13 16:29:09 -05:00
William Vu
3cec9026ae
Add janky console command to display framework.log
...
Works best with alternate screen enabled...
2018-07-13 06:11:32 -05:00
James Barnett
bbc16e1873
Merge branch 'master' into remote_creds_data
2018-07-09 09:49:14 -05:00
WangYihang
85bfca95fd
[+] Fixed meterpreter resource bug
2018-07-09 11:27:30 +08:00
asoto-r7
ef78d70a00
Land #9356 . Remove ring buffers from command dispatcher.
2018-07-06 13:12:13 -05:00
Matthew Kienow
77a0b74f76
Add delete option to data_services cmd
2018-07-05 16:40:55 -04:00
Matthew Kienow
514c0c76d5
Add API token to RemoteHTTPDataService
2018-07-02 18:34:35 -04:00
William Vu
bd7974df98
Land #8999 , make generate and msfvenom great again
2018-06-27 15:10:52 -05:00
Green-m
9806ee327a
Fix error when load options from persist file.
2018-06-25 05:50:06 -04:00
Green-m
0145744255
Process persistent job when msf start.
2018-06-25 05:32:17 -04:00
Green-m
2802f17cd5
Add command persist to make job persistent after msf restart.
2018-06-25 05:30:49 -04:00
James Barnett
2ded48a510
Merge branch 'master' into remote_creds_data
2018-06-15 10:26:10 -05:00
Aaron Soto
df9ddebde6
Land #10124 , Add tab completion of values in `set` command
2018-06-14 16:16:24 -05:00
James Barnett
f26d3ffff5
Fix bugs with adding remote creds
2018-06-12 12:00:51 -05:00
James Barnett
1710957d6e
Only add ports when they were specified
2018-06-08 17:16:24 -05:00
James Barnett
83e9af5fb5
Dont skip origin filtering if there are no login entries
2018-06-07 11:41:40 -05:00
James Barnett
3f5373869d
Include ports in creds opts
2018-06-07 11:12:49 -05:00
James Barnett
2114dfa4ff
Retrieve the service manually instead of using AR
2018-06-05 16:35:56 -05:00
James Barnett
64cb7dfb3c
Include origin in remote requests and display it
2018-06-05 14:59:11 -05:00
James Barnett
ea6540358c
Look up related service manually
2018-06-04 14:10:26 -05:00
James Barnett
d6eaa4a7c7
Search for creds at the query level
2018-06-01 17:00:56 -05:00
William Vu
4c019062a5
Land #10095 , tilde expansion for resource command
2018-06-01 12:27:01 -05:00
Green-m
71a1e2ad9c
Fix bug in function tab_complete_option
2018-06-01 04:10:32 -04:00
Matthew Kienow
41de44bfdc
Make resource file checks more robust
...
Correct code style
2018-05-31 21:26:24 -04:00
Matthew Kienow
706d8e5472
Add tilde expansion to resource tab completion
2018-05-31 21:09:57 -04:00
Matthew Kienow
62e56ce844
Change condition-less elsif to else
2018-05-31 17:42:50 -04:00
Brent Cook
224122f805
Land #10094 , Improve network interface support for LHOST
2018-05-29 23:07:55 -05:00
James Barnett
7bcf28440f
Merge branch 'local_api_docs' into remote_creds_data
2018-05-29 12:52:15 -05:00
Auxilus
d24607e1ea
add port to keywords
2018-05-27 22:41:34 +05:30
James Barnett
a595dff6a8
Add remote creds update
2018-05-25 16:02:25 -05:00
Brent Cook
835281c7cc
Land #9979 , Add inactive list option to sessions command
2018-05-25 03:28:22 -05:00
Matthew Kienow
3d6d55e087
Expand tilde in resource file pathname
2018-05-24 21:06:57 -04:00
William Vu
6f1e75e097
Remove loopback restriction
...
It's occasionally useful, and we already warn when setting it.
2018-05-24 15:44:32 -05:00
William Vu
a370270e19
Add tab completion for network interfaces
2018-05-24 15:30:16 -05:00
James Barnett
a107336ad5
Move cred delete to DBManager
2018-05-23 16:47:56 -05:00
Brent Cook
f32020f255
include some training wheels for users
2018-05-23 13:37:53 -05:00
Brent Cook
c9dad7d7c4
unify api usage
2018-05-23 12:12:27 -05:00
Brent Cook
c8b54cef22
add inline datastore parsing to aux/post modules
2018-05-23 12:12:27 -05:00
Brent Cook
fbbfa0e0c3
teach exploit how to parse datastore options too
2018-05-23 12:12:27 -05:00
Brent Cook
d8e5cc60bb
add inline datastore setting for msfvenom/generate commands
2018-05-23 11:48:11 -05:00
Brent Cook
c52e96bfa7
swizzle parameters in generate to match msfvenom
2018-05-23 11:48:11 -05:00
James Barnett
0472b9df3f
Land #10024 , Fix find_or_create_* methods for remote data service
...
This PR updates the find_or_create_* methods associated with each model to
no longer just proxy to the report_* model. It now performs a lookup through
the DataProxy and returns the found object if it exists, or creates a new
record if needed.
2018-05-22 17:08:46 -05:00
Matthew Kienow
4ecc1ff551
Modify loots, notes and services search methods
...
Modify loots and services method signatures. Remove workspace as a
positional argument, move into opts hash argument and update callers.
Made host search for these models more uniform. Update find_or_create
methods to handle difference in opts between find and report
operations.
2018-05-21 17:37:51 -04:00
bwatters-r7
7e34f27004
Land #9246 , Support RHOSTS for exploit modules
2018-05-16 14:40:25 -05:00
William Vu
30dcb78eb5
Land #10042 , reload_lib improvements
2018-05-16 12:53:39 -05:00
William Vu
365289b19e
Add janky regex check if we're reloading a module
2018-05-16 12:03:54 -05:00
William Vu
5addc54b4b
Refactor reload_lib and add multiple file support
2018-05-16 11:23:16 -05:00
William Vu
54908021aa
Update CommandDispatcher for target names, too
2018-05-16 10:39:22 -05:00
Brent Cook
b79b53c438
Land #9962 , tab-complete target options
2018-05-15 16:41:55 -05:00
Matthew Kienow
b3a1f2531b
Update to use new hosts DataProxy method signature
2018-05-14 17:38:49 -04:00
Matthew Kienow
cd38f56924
Add sessions cmd option to list inactive sessions
2018-05-05 00:42:22 -04:00
William Vu
8881d32a45
Add target selection and tab completion by name
2018-05-03 21:03:05 -05:00
christopher lee
038fe03777
Merge branch 'master' into ms-2962
2018-05-02 15:31:57 -05:00
Matthew Kienow
cb8131ab22
Validate search cmd arguments
2018-04-30 00:02:03 -04:00
Matthew Kienow
89d86b1f48
Remove code related to unused search cmd options
2018-04-29 23:16:30 -04:00
Matthew Kienow
ca7b10af39
Add search cmd option to write CSV output file
2018-04-29 23:08:24 -04:00
christopher lee
516b61ebaa
Merged master
2018-04-26 16:02:56 -05:00
Matthew Kienow
c79e39377e
Narrow rescue scope to StandardError
2018-04-26 14:55:41 -04:00
James Barnett
a5172e066d
Land #9926 , check remote data service before connecting
...
This PR adds a check prior to connecting to a remote data service
to verify it is online and returning expected data. This prevents
crashes that were occurring when unexpected responses were returned
2018-04-25 14:07:33 -05:00
christopher lee
071a191055
Merge master + workspace removal from http remote data service
2018-04-25 13:39:46 -05:00
Matthew Kienow
359ef27834
Narrow rescue scope to StandardError
2018-04-24 17:19:54 -04:00
Aaron Soto
a1027d56c9
Land #9912 , Fix type validation in the notes add operation
2018-04-23 16:58:13 -05:00
Wei Chen
ec1294d3f6
Land #9858 , fix error handling in cmd_route
...
Land #9858
2018-04-23 08:46:38 -05:00
Wei Chen
b20042abbd
Fix indent and add elog
2018-04-23 08:45:34 -05:00
Matthew Kienow
d2831536ca
Fix type validation in the notes add operation
...
Make variable nil checks explicit for better style.
2018-04-23 01:46:46 -04:00
James Barnett
988063d377
Dont set default workspace if theres no DB
2018-04-21 10:26:17 -05:00
James Barnett
ea79c65b8e
Handle workspace delete if target does not exist
2018-04-20 11:33:35 -05:00
James Barnett
8d09f23b91
Fixes around workspace messaging
2018-04-20 11:25:24 -05:00
James Barnett
7e971721f0
Adjust messaging when renaming workspaces
2018-04-19 11:52:30 -05:00
James Barnett
348eb293d0
Handle case when renaming nonexistant workspace
2018-04-18 13:02:31 -05:00
James Barnett
81d00fa5b7
Fix edge cases in workspace update
2018-04-18 12:56:38 -05:00
James Barnett
82798424b2
Support getting a workspace via id
...
Also implements a helper method to sanitize sinatra injected
params since it was causing issues downstream. Updated each
use of sinatra params to use this helper method.
2018-04-17 12:35:22 -05:00
James Barnett
b569498250
Address more code review comments
2018-04-17 10:52:56 -05:00
James Barnett
a8a95a03a3
Implement remote workspace delete
2018-04-17 10:19:40 -05:00
James Barnett
f27490dc61
Address PR suggestions and add comments
2018-04-16 16:45:23 -05:00
James Barnett
68ad91763a
Merge branch 'rapid7/master' into MS-3062_workspaces
2018-04-16 15:33:59 -05:00
James Barnett
2ef451c349
Land #9873 , add notes functionality to remote datastore
...
This PR enables create, update, and delete functionality for the notes
command and data model when using a remote data service.
2018-04-16 15:03:27 -05:00
Matthew Kienow
74cb9c38b2
Change source for host address value in output
2018-04-16 14:09:19 -04:00
William Vu
d2a683d2df
Add whitespace and update help
2018-04-12 15:39:04 -05:00
Auxilus
0b3f50ea80
show help when no arguments provided to `search`
2018-04-13 01:27:22 +05:30
Matthew Kienow
4e49b99783
Add cmd notes option to sort by column number
2018-04-12 15:56:42 -04:00
Matthew Kienow
f60bbdd831
Remove cmd notes make_sortable helper method
2018-04-12 10:51:03 -04:00
Matthew Kienow
087ae447c5
Remove cmd notes sort operation
2018-04-11 17:46:13 -04:00
James Barnett
86b6009999
Land #9860 , Fix DB init when database.yml is missing
...
This PR fixes a bug introduced with goliath that caused incorrect error messages
and other error messages when no database.yml was present. It also improves the
messaging around that use case and loads CommandDispatcher::Db correctly.
2018-04-11 16:13:40 -05:00
Matthew Kienow
e639fda53c
Fix DB initialization with no database YAML
2018-04-11 09:15:38 -04:00
James Barnett
e51f41fa34
Merge remote-tracking branch 'msf_jbarnett/fix_services_bugs' into MS-3062_workspaces
2018-04-10 13:35:33 -05:00
Auxilus
f1240b0454
resolves #9855
2018-04-10 22:20:27 +05:30
James Barnett
462db05f4c
Re-enable port search functionality
2018-04-10 11:10:32 -05:00
William Vu
924a336287
Fix unsupported check_simple method for modules
2018-04-09 13:43:22 -05:00
Brent Cook
730010aa06
remove RingBuffer from interactive command shells, fix token handling
2018-04-06 13:49:13 -05:00
James Barnett
6a02712674
Merge remote-tracking branch 'mkienow/MS-3061-remote-notes-read-update-delete' into MS-3062_workspaces
2018-04-04 16:03:43 -05:00
Brent Cook
b0123b2095
Land #9787 , Fix adding IPv6 routes with subnets or CIDR masks
2018-04-02 22:57:15 -05:00
James Barnett
e892911fbe
Use a constant for default workspace name
2018-04-02 17:02:14 -05:00
Brent Cook
f386ae0ba3
Land #9731 , tool updates
2018-04-01 23:26:42 -05:00
James Barnett
7d58b0a5f4
Merge branch 'goliath' into MS-3062_workspaces
2018-03-30 16:35:26 -05:00
Spencer McIntyre
c8033d69c5
Use the new keyword style for v6
2018-03-30 13:56:15 -04:00
Spencer McIntyre
bb17bdb6dd
Fix adding IPv6 routes with subnets or cidr masks
2018-03-30 13:18:03 -04:00
Matthew Kienow
f10924a5c0
Update cmd note operations, validation and output
2018-03-29 23:15:10 -04:00
James Barnett
d23e33a7bc
Make workspace -v work with updates
2018-03-28 13:31:49 -05:00
James Barnett
1b6aa86d92
Merge remote-tracking branch 'mkienow/MS-3061-remote-notes-read-update-delete' into MS-3062_workspaces
2018-03-27 15:57:41 -05:00
William Vu
e761d211b9
Land #9708 , reload_lib command for msfconsole
2018-03-26 17:10:11 -05:00
James Barnett
cfa03a999c
Finish moving current_workspace tracking to client
2018-03-26 15:58:47 -05:00
Matthew Kienow
991f4e35ea
Remove added regex options from search_term
2018-03-26 14:07:21 -04:00
Jon Hart
d0ef5617fa
Merge master and resolve conflict
2018-03-23 14:25:21 -07:00
James Barnett
def0e4d93b
Merge branch 'goliath' into MS-3062_workspaces
2018-03-23 11:37:01 -05:00
James Barnett
6c5a7a663a
Merge branch 'goliath' into MS-2879_db_export
2018-03-22 21:22:23 -05:00
James Barnett
466c97f114
WIP: move tracking active workspace to client side
...
* Move the @current_workspace tracking to workspace proxy
* Create helper for handling workspace value in opts
* Call framework.db.proxy across dbmanager files now that active ws is tracked in proxy
NOTE: This commit throws an exception when adding a remote data service.
2018-03-22 21:00:06 -05:00
Jon Hart
a1287a0776
Remove blank before services output
2018-03-22 18:26:50 -07:00
Jon Hart
2ce8423883
Make vulns and notes with -o similar to services and hosts
...
Now all of them will simply save the requested information to an output
file if specified and will let you know where the file is when done.
Previously, notes and vulns would also print out all of the notes and
vulns, which just felt weird and inconsistent. So, I fixed it.
2018-03-22 18:18:12 -07:00
Matthew Kienow
975948439d
Make vulns cmd option string literals consistent
2018-03-21 16:35:06 -04:00
Matthew Kienow
09bea3ec39
Remove vulns cmd help short-circuit
2018-03-21 16:34:11 -04:00
Matthew Kienow
553789557b
Merge branch 'goliath' into MS-2910-remote-vuln-read-update-delete
2018-03-21 01:45:58 -04:00
g0tmi1k
973d00aca0
Add a message about DisablePayloadHandler
...
Based on 26bf96b3ce/lib/msf/core/exploit/exe.rb (L43)
2018-03-20 13:04:41 +00:00
g0tmi1k
8463ed99b0
Add standardised header comments
2018-03-20 11:33:34 +00:00
James Barnett
90bebc2096
Convert workspace update to new api
2018-03-19 14:24:16 -05:00
Matthew Kienow
cd7ecc4b74
Display vulns information column based on option
2018-03-19 14:29:38 -04:00
James Barnett
35bc8e905e
Refactor workspace delete to be consistent with other commands
2018-03-16 16:11:09 -05:00
James Barnett
ac5669388a
Merge branch 'goliath' into MS-2879_db_export
2018-03-14 11:37:08 -05:00
Mehmet İnce
6811097bed
Create reload_file method for edit and reload_lib cms
2018-03-14 11:47:23 +03:00
Matthew Kienow
e4cc2a565a
Correct services cmd help message for protocol
2018-03-13 16:09:35 -04:00
Mehmet İnce
9b84477ddc
Changing cmd name to reload_lib
2018-03-13 22:17:59 +03:00
Mehmet İnce
b7f95b9cbe
Add a loadlib command
2018-03-13 14:03:44 +03:00
James Barnett
2e287135c4
Fix bug in services search
2018-03-12 16:37:16 -05:00
Brent Cook
3f3ed4aa70
change replicant to clone module objects to copy singleton methods
...
Without this, we are missing methods like exploit_simple.
https://coderwall.com/p/1zflyg/ruby-the-differences-between-dup-clone
2018-03-12 15:46:03 -05:00
Brent Cook
db6377134e
restore original module RHOST on abort
2018-03-12 15:46:03 -05:00
Brent Cook
5d9f2266da
handle passive exploits without RHOST
2018-03-12 15:46:03 -05:00
Brent Cook
4f824af696
add support for '-J' which is the opposite of '-j'
2018-03-12 15:46:03 -05:00
Brent Cook
17c8f7c4c7
support iterating across RHOSTS for exploits
2018-03-12 15:46:03 -05:00
Brent Cook
4ab36bc713
factor out exploit runner from command parsing
2018-03-12 15:46:02 -05:00
Brent Cook
b456cd2c8c
use RHOSTS in many places where we used RHOST
2018-03-12 15:46:02 -05:00
James Barnett
b18ed03407
Merge branch 'goliath' into MS-2909
2018-03-07 14:55:50 -06:00
James Barnett
c670748fe3
Update services signature
2018-03-07 13:59:09 -06:00
James Barnett
c058d0fba0
WIP: port db_export command
2018-03-06 15:15:27 -06:00
christopher lee
68d72cbfa7
Goliath Cleanup in preparation for merge to master
2018-03-06 10:21:22 -06:00
James Barnett
fd4032928e
Add services search
2018-03-02 10:57:35 -06:00
James Barnett
06d2482e86
Implement services update
...
NOTE: This changes functionality for the services command flags.
Previously -s and -p were used for searching for services.
Now the commands will only be used for adds/updates.
If you would like to search, please use -s and pass a search string
2018-02-28 15:12:23 -06:00
James Barnett
dffbc67e71
Implement service delete
...
Also fix bug searching for services by host address
2018-02-27 17:17:07 -06:00
James Barnett
c90fabee60
Implement remote service create
2018-02-27 14:20:43 -06:00
Matthew Kienow
ecad74cf99
Add cmd_vulns search and delete operations
2018-02-22 19:05:18 -05:00
James Barnett
d4440d049d
Merge branch 'goliath' of github.com:clee-r7/metasploit-framework into goliath
2018-02-21 11:16:31 -06:00
James Barnett
3005a8b7ce
Merge branch 'rapid7/master' into goliath
2018-02-21 11:16:05 -06:00
Brent Cook
6734e532f5
Land #9562 , avoid an error with aux module command dispatcher
2018-02-15 17:46:58 -06:00
Brent Cook
a197997aca
avoid chinese finger trap logic, put it all on one side
2018-02-15 17:45:09 -06:00
RageLtMan
177e1321ae
Aux command dispatcher in exploit ctx with action
...
The Auxiliary command dispatcher checks modules for passive actions
expecting them to have included Msf::Module::HasActions mixin. The
mixin is included in post and aux modules already, but not in
exploits. When the aux dispatcher handles an exploit module, it
may get upset along the lines of:
```
[-] Error while running command exploit: undefined method 'passive'
for #<Msf::Modules::M...3::MetasploitModule:0x0000000d83de0428>
Did you mean? passive?
Call stack:
/opt/metasploit4/msf4/lib/msf/ui/console/command_dispatcher/
auxiliary.rb:106:in `cmd_run'
```
Avoid this mess by having the conditional which checks the methods
included by that mixin depend on the module having included the
mixin in the first place.
Testing:
In local fork (hence the lineno) it seems to fix the problem.
The problem condition and fix should be independently tested
upstream.
2018-02-15 04:20:09 -05:00
Wei Chen
b9faa9e92b
Fix a typo
2018-02-09 20:28:55 -06:00
Wei Chen
81e0d56261
Always write the file as long as the option is set
2018-02-09 20:28:12 -06:00
Wei Chen
958513bd86
Fix #9522 , Add output file support to the vulns command
...
This adds a new feature for the vulns command for msfconsole. It
allows the user to be able to save the vulnerability as a CSV
file.
Fix #9522
2018-02-09 19:45:46 -06:00
James Barnett
effd0c3db2
Fix bug when not updating type
2018-02-08 16:07:20 -06:00
James Barnett
f12405191e
Fix a few bugs and PR comments
2018-02-08 15:10:44 -06:00
James Barnett
f114092445
Merge branch 'goliath' into MS-2833
2018-02-08 14:32:03 -06:00
James Barnett
be1ce573e7
Fix style issue
2018-02-08 13:35:28 -06:00
James Barnett
1d2af0658c
Fix bug with updating loot type
2018-02-08 13:26:40 -06:00
jbarnett-r7
352cf295b5
Merge branch 'goliath' into MS-2833
2018-02-07 14:38:26 -06:00
James Barnett
5b35662dbf
Address PR comments
2018-02-07 14:21:31 -06:00
Matthew Kienow
52b8f405bd
Refactor change host methods, remove debug output
2018-02-06 18:54:05 -05:00
James Barnett
74f811d865
Add TODOs
2018-02-06 17:31:42 -06:00
James Barnett
6e2503bbd8
Add loot update
2018-02-06 16:16:22 -06:00
Matthew Kienow
629f79ebf7
WIP remote host update
2018-02-06 16:11:46 -05:00
James Barnett
c72c41e7f3
Move loot search to db_manager
2018-02-05 16:43:02 -06:00
jbarnett-r7
f176e339bc
Merge pull request #12 from clee-r7/ms-2911
...
Ms 2911
2018-02-05 15:46:28 -06:00
christopher lee
1759621b03
Make 8080 default service port
2018-02-05 15:01:03 -06:00
christopher lee
020a28f5c7
Unify data service command
2018-02-05 13:28:17 -06:00
James Barnett
326fdacc41
couple of fixes
...
- Handle bug with hostless loot
- include host data in the JSON
2018-02-02 15:44:42 -06:00
James Barnett
f52cf28e56
cmd_loot now queries on loot directly
2018-02-02 14:07:58 -06:00
christopher lee
5a899d5126
Renamed msfdb to avoid omnibus collision, removed inline data service startup code
2018-02-01 16:28:36 -06:00
christopher lee
3bc0608579
Finish POC cleanup
2018-02-01 13:59:15 -06:00
christopher lee
59bc1a34d5
Remove 'puts' logging and cleanup AWS poc
2018-02-01 13:38:20 -06:00
James Barnett
fc7ab6cbff
Merge branch 'externalize-host-data-search' into MS-2833
2018-02-01 11:24:11 -06:00
Matthew Kienow
5c38207a8e
WIP externalize host data search
2018-01-31 16:34:42 -05:00
James Barnett
858981d814
Convert hosts delete to use id method
2018-01-24 17:38:51 -06:00
James Barnett
5505996518
Add loot delete
2018-01-24 16:42:16 -06:00
Matthew Kienow
2ffd627c56
Merge branch 'goliath' into add_https
2018-01-23 18:59:59 -05:00
James Barnett
bfcb7f2e50
Add long option for cert.
2018-01-23 17:10:10 -06:00
Brent Cook
aae77fc1a4
Land #9349 , GoAhead LD_PRELOAD CGI Module
2018-01-22 23:10:36 -06:00
James Barnett
d10cd2d92a
Add verification methods to HTTPS
...
This commit enables peer verification for SSL.
It also gives the user options to verify the server if the server uses a self-signed cert.
There is an override to skip verification as well.
2018-01-22 18:08:16 -06:00
christopher lee
2521c941d4
Ported singleton calls
2018-01-22 14:57:28 -06:00
William Vu
a255586750
Refactor to use guard clauses
2018-01-22 12:38:02 -06:00
James Barnett
8022294d1d
Fix bug with -s flag
2018-01-19 16:18:20 -06:00
James Barnett
4f3ee6dd83
Address PR comments regarding command options
2018-01-19 15:46:24 -06:00
christopher lee
d5978803eb
Fix all failing rspec for goliath
2018-01-19 15:16:19 -06:00
James Barnett
b8296a809c
Merge branch 'goliath' into add_https
2018-01-19 13:33:24 -06:00
James Barnett
ff9c69c7c8
Merge branch 'rapid7/master' into goliath
2018-01-19 13:28:17 -06:00
James Barnett
0654979be6
Remove separate code path for openstruct for creds.
...
Also fix RemoteCredentialDataService to work with json_to_mdm
2018-01-18 13:27:33 -06:00
Brent Cook
df71defdea
fix library-specific error messages to not appear with modules
2018-01-18 05:55:51 -06:00
Brent Cook
7fe237abe1
Land #9220 , Module cache improvements
2018-01-17 22:34:51 -06:00
Brent Cook
facecb40d7
change default prompt for users who use '-q'
2018-01-17 22:01:34 -06:00
Brent Cook
cbd1a2a505
update default startup with version info
2018-01-17 21:59:53 -06:00
James Barnett
b2666ad3f2
Update host delete method to return full objects of deleted hosts
2018-01-11 16:12:25 -06:00
James Barnett
16cdf1c9f4
Add help text to cmd_add_data_service
2018-01-04 16:41:42 -06:00
James Barnett
5058c2d36f
Merge branch 'goliath' into add_https
2018-01-03 10:51:22 -06:00
James Barnett
92e435898b
Missed a file in the merge somehow
2018-01-02 17:38:41 -06:00
James Barnett
4aac8f5c39
Merge branch 'rapid7/master' into goliath
2018-01-02 17:34:40 -06:00
HD Moore
258ce2ceb2
Allow stub payloads to be autoselected when compatible
2017-12-28 16:19:22 -06:00
Matthew Kienow
5e4836b1e9
Implement hosts remote data store delete
...
Also, resolve an issue when adding a host where the client-side
raises an exception.
2017-12-26 23:09:23 -05:00
Brent Cook
05c6079e0d
remove unused 'active_resource' accessor
2017-12-20 06:15:09 -06:00
William Vu
0a1eea9860
Allow local_editor in cmd_edit to take arguments
...
Such as vim -i NONE. This may allow command injection via arguments.
However, you can already start an arbitrary program by setting
LocalEditor or escaping the editor.
msf > setg LocalEditor /bin/sh
LocalEditor => /bin/sh
msf > edit -i
[*] Launching /bin/sh -i
$
2017-12-14 19:51:57 -06:00
James Barnett
973f3bacd8
Remove require statements for remote_service_endpoint
2017-12-13 11:31:29 -06:00
James Barnett
74c00cf8ba
WIP: Enable HTTPS client.
...
Removed RemoteServiceEndpoint and using URI instead.
2017-12-12 16:42:20 -06:00
Brent Cook
c15f379343
remove some unneeded backward-compat code
2017-12-04 22:27:21 -06:00
William Vu
19b37c7070
Land #9263 , drb_remote_codeexec fixes
...
See pull requests #7531 and #7749 for hysterical raisins.
2017-12-04 18:45:03 -06:00
Brent Cook
09dd5b8489
fix check command to not require an rport _method_
2017-11-30 10:51:21 -06:00
Brent Cook
e5a5d35ad8
add 'promptname' that expands the module path a bit more
...
This allows the user to actually see the module context.
2017-11-29 19:49:43 -06:00
Brent Cook
55f56a5350
Land #9110 , added -C option to change default hosts columns
2017-11-29 17:48:44 -06:00
Brent Cook
0aeb245c9c
Land #9252 , docker improvements
2017-11-29 17:15:47 -06:00
William Vu
f132c1572f
Fix #9194 , clarified error for reloading modules
2017-11-28 17:15:56 -06:00
Christian Mehlmauer
50351320d7
more docker work
2017-11-28 21:35:20 +01:00
William Vu
65412cd2f1
Land #9201 , enhanced tab completion
2017-11-27 11:37:04 -06:00
christopher lee
fe1af35107
First pass at changes needed for module metadata caching
2017-11-15 16:38:01 -06:00
James Barnett
ebcf6924d5
Add a command to performance test HTTP
2017-11-14 11:50:16 -06:00
Spencer McIntyre
fb7635502d
Tab completion for exploit and handler commands
2017-11-11 17:11:54 -05:00
Spencer McIntyre
68a43fef36
Add the new generic tab completion functoin
2017-11-11 16:47:11 -05:00
William Vu
97859ebf8c
Clarify XXX comment no user will ever see anyway
2017-11-09 15:23:37 -06:00
William Vu
577baf6070
Add a check for .rb in cmd_edit
2017-11-09 15:17:53 -06:00
christopher lee
43ddc66350
Initial fix for non db cache
2017-11-07 10:33:47 -06:00
Spencer McIntyre
d815e42ccf
Add a generic tab completion function
2017-11-01 20:38:45 -04:00
Spencer McIntyre
1462330f34
Add tab completion to the payload generate command
2017-10-31 20:33:31 -04:00
Spencer McIntyre
940573ad49
Support ruby directives in Meterpreter rc scripts
2017-10-29 15:57:33 -04:00
William Vu
73c9807c55
Add module support for sessions -s
2017-10-27 12:28:53 -05:00
James Barnett
a4914074fb
Merge branch 'goliath' into loot_and_creds
2017-10-24 12:01:32 -05:00
Tim
ca4feb5136
fix session upgrading
2017-10-23 01:26:45 +08:00
Dave Farrow
636551aa03
Fixed help message to match test
2017-10-20 21:32:54 -07:00
Dave Farrow
ea1ac3d5b3
#9108 : added -C option to change default hosts columns
...
The -C option saves the column list the user provided and uses that as the default column list until msfconsole is restarted
2017-10-20 20:39:38 -07:00
William Vu
8e5deac3f4
Fix nil bug in setting PromptChar without Prompt
2017-10-20 00:38:01 -05:00
christopher lee
2c8f27cd98
More general cleanup including is_local db check
2017-10-16 17:07:26 -05:00
James Barnett
5232e9926e
creds command converted
2017-10-16 15:27:53 -05:00
Adam Cammack
436b72d4cc
Land #9023 , Add tab completion to the edit command
2017-10-09 11:37:12 -05:00
William Vu
27dcc162b2
Revert to Vim because ed is the standard editor
...
https://www.gnu.org/fun/jokes/ed-msg.html
2017-10-09 11:34:45 -05:00
James Barnett
56e95f15c9
Land #9024 , fix bug when manually adding loot
...
cmd_loot was throwing a stack trace when the host was not properly defined.
This fixes it to give a useful error message.
2017-10-06 16:02:12 -05:00
William Vu
5b9a4d73ee
Readd hostless loot display
...
In the chance event someone actually managed to store it.
2017-10-02 23:31:44 -05:00
William Vu
403b5e2fa8
Move TARGET check into option_values_payloads
2017-10-02 23:22:42 -05:00
William Vu
9941097a5c
Remove extraneous else
2017-09-29 19:01:04 -05:00
William Vu
6de986bd70
Fix cache invalidation bug in tab completion
...
We use active_module instead of cmd_use to invalidate @cache_payloads,
since the ivar is no longer shared between cmd_set and cmd_use.
Fixes #8483 . See #7655 .
2017-09-29 18:01:50 -05:00
William Vu
0723477b49
Fix nil bug in loot -a and nix hostless loot
...
Apparently you can't actually store hostless loot.
2017-09-29 16:16:16 -05:00
William Vu
1ec968192b
Add tab completion to the edit command
2017-09-29 15:43:53 -05:00
bwatters-r7
e0fee9e317
Land #8821 , Expose session naming
2017-09-29 15:32:47 -05:00
christopher lee
293d1edeb1
Merge master: 8853193542
2017-09-29 11:06:16 -05:00
James Barnett
ed74c3726f
Proxy session events.
...
This enables modules to use report_loot with a remote data service
2017-09-28 17:03:09 -05:00
James Barnett
0b29408aa2
Allow filtering of loot
2017-09-26 13:48:01 -05:00
Adam Cammack
968ae8e267
Land #8925 , Allow `edit` to optionally take a path
2017-09-26 13:32:39 -05:00
James Barnett
40abbccb03
Merge remote-tracking branch 'rapid7/master' into proxy_loot
2017-09-22 14:10:02 -05:00
James Barnett
f87adf53c6
Print host with loot output
2017-09-22 13:06:44 -05:00
James Barnett
812ad9f9cb
loot printing (maybe) working
2017-09-21 15:20:49 -05:00
James Barnett
765ea01e9f
loot posting working
2017-09-18 15:58:40 -05:00
christopher lee
2cd9649139
Added msf red connection mechanism
2017-09-14 12:57:03 -05:00
Tim
9afb09813f
update cmd_edit_help text
2017-09-13 14:54:35 +08:00