Commit Graph

1196 Commits (760defd218157ccc8a7a56d0a2f6cc47ee3f4b81)

Author SHA1 Message Date
Green-m 5df6f11cfc
Enhance regular to match blank before include. 2018-10-17 16:20:10 +08:00
Wei Chen 69cd0a5ddc Disable ERB templating for Metasploit::Framework::Compiler::Utils 2018-10-16 14:02:13 -05:00
William Vu ccfdfb6a5c Clean up new "unknown" platform and current use 2018-10-08 14:31:31 -05:00
h00die cd9ef01c9a add default case unknown platform and new cisco ios proof 2018-10-08 13:07:45 -04:00
Matthew Kienow 34f87efb2b
Land #10532, enhance db_connect for data services 2018-09-03 09:43:34 -04:00
James Barnett 68aca395a4
Remove debug logging 2018-08-21 15:06:30 -05:00
James Barnett b6401dbe56
Add db_save command 2018-08-21 11:10:43 -05:00
William Vu 7a20d05fa6
Land #10456, known_hosts fix for SSH modules 2018-08-15 21:28:08 -05:00
James Barnett f05844d8f4
Refactor options handling and help printing 2018-08-15 11:48:03 -05:00
Jacob Robles a956f675ff
PMA Scanner Check Error Condition 2018-08-14 06:16:55 -05:00
Kevin Kirsche 4450d34fee
Remove SSH scanner using known_hosts
Fix #10266 

This disables writing to the `known_hosts` file when performing auxiliary ssh scans.
2018-08-13 21:27:51 -04:00
James Barnett 387d784ddc
Implement db_disconnect for remote data service
And a couple of fixes for db_connect for remote data services
2018-08-07 14:03:38 -05:00
Erin Bleiweiss 3e8efea57a Merge branch 'conform_to_api_standards' into exploit-query
Prepare for new JSON format.
2018-07-31 14:48:37 -05:00
James Barnett eb240892fc
Fix but with origin display in console
Also prevent adding workspace to opts when id is present
2018-07-31 14:03:53 -05:00
Erin Bleiweiss 3291931955 Merge branch 'upstream-master' into exploit-query 2018-07-31 11:51:14 -05:00
James Barnett 0843e6789d
Fix private data not displaying for creds
Also fix issue where delete and update cred were not using the data format
2018-07-30 15:31:38 -05:00
James Barnett d1f09ca81c
Add path selection for GET requests
Also remove instances where workspace is passed for
single object lookups since it is no longer required
2018-07-30 13:56:34 -05:00
James Barnett 9e08bf6ec2
Fix logic issue when processing HTTP requests 2018-07-28 15:23:56 -05:00
James Barnett 829b43f743
Address minor code review comments 2018-07-27 16:19:17 -05:00
Erin Bleiweiss 57c9a3544a delete unnecessary proxy files 2018-07-27 16:01:45 -05:00
James Barnett 15fe80de06 Merge branch 'master' into conform_to_api_standards 2018-07-27 11:08:18 -05:00
Wei Chen 625ea87ea9
Land #10368, PhpMyAdmin Login Scanner Module 2018-07-24 23:25:27 -05:00
Erin Bleiweiss 87434ef22d pull changes 2018-07-24 15:42:31 -05:00
James Barnett 503a2276f2
Convert creds to use new format 2018-07-24 15:25:48 -05:00
Jeffrey Martin 6d878a9bb6
Land #10367, Pass a framework instance to external module shims 2018-07-24 15:22:47 -05:00
Adam Cammack de52e8c631
Update Rspec expected thread count
External modules start threads during the test run, so the thread
manager is always running by the end in addition to the main VM thread.
2018-07-24 15:14:47 -05:00
Shelby Pace 4f81fcdc87
retn versions in chk_setup, tests to reflect, doc 2018-07-24 14:51:00 -05:00
James Barnett eccd223a3e
Merge branch 'master' into conform_to_api_standards 2018-07-24 12:11:14 -05:00
Shelby Pace 976a3464e1
added phpmyadmin login scanner and aux module 2018-07-24 09:47:01 -05:00
James Barnett 2242cb590d
Fix name in credential_data_service 2018-07-23 17:26:12 -05:00
James Barnett e3da0a6828 Merge branch 'master' into remote_creds_data 2018-07-23 16:39:13 -05:00
James Barnett c7ea24e856
Pass symbols for credential types 2018-07-20 13:17:57 -05:00
Shelby Pace c11d404ae0
successfully works on v4.8.1 2018-07-20 09:13:51 -05:00
James Barnett 65d42380d3
Merge branch 'master' into remote_creds_data 2018-07-19 16:25:06 -05:00
James Barnett a8e5308fd3
WIP: Convert each endpoint to use the correct JSON format 2018-07-19 16:20:35 -05:00
Jacob Robles 9327d75ceb
Land #10343, Add decryption and decoding support for Metasploit C compiler 2018-07-19 14:57:43 -05:00
Erin Bleiweiss 04a6cf8f0a pull latest changes and re-register module servlet in new sinatra base 2018-07-19 14:42:39 -05:00
James Barnett 59962c5273 Merge branch 'master' into conform_to_api_standards 2018-07-19 09:26:17 -05:00
Wei Chen f2fd24780c Add support for XOR 2018-07-18 23:13:45 -05:00
Wei Chen 1534613cda Add Base64 support 2018-07-18 20:07:27 -05:00
Wei Chen 999d0e994f Add RC4 decryption 2018-07-18 19:50:46 -05:00
James Barnett 612959d9ab
Land #10323, add authentication to REST API 2018-07-18 17:29:22 -05:00
James Barnett 026ddad9d8
Remove more unused code 2018-07-18 12:44:27 -05:00
James Barnett 08b53a1ef7
Homogenize GET requests 2018-07-18 12:43:48 -05:00
Erin Bleiweiss a2da40a104 refactor endpoint under /v1/modules/ 2018-07-18 12:06:25 -05:00
James Barnett 846df018e0
Minor code cleanup. Remove unused methods 2018-07-18 11:51:43 -05:00
Jacob Robles f30c4e0465
Land #10226, Add code randomization capabilities to Metasploit::Framework::Compiler 2018-07-12 11:20:04 -05:00
James Barnett b8ae4f5d12
Update rspec tests for creds and add stubs 2018-07-11 17:42:55 -05:00
James Barnett 8c350cdcd7
Add protections for nil HTTP responses 2018-07-11 15:45:26 -05:00
James Barnett d3eb71e8e5
Implement invalidate_login 2018-07-09 16:15:40 -05:00
James Barnett bbc16e1873 Merge branch 'master' into remote_creds_data 2018-07-09 09:49:14 -05:00
Wei Chen 0e75317cfe Change a typo 2018-07-06 13:30:07 -05:00
Wei Chen a60fc3dc00 Fix code based on feedback from Jacob 2018-07-06 00:00:28 -05:00
Matthew Kienow 77a0b74f76
Add delete option to data_services cmd 2018-07-05 16:40:55 -04:00
Matthew Kienow 8a3166e198
Set a default user-agent value 2018-07-03 18:28:35 -04:00
Matthew Kienow ed34cd8898
Simplify request headers assignment 2018-07-03 17:59:57 -04:00
Matthew Kienow 514c0c76d5
Add API token to RemoteHTTPDataService 2018-07-02 18:34:35 -04:00
Wei Chen 2beaabb11a Add dep for GetTickCount 2018-06-29 10:22:07 -05:00
Wei Chen d9b664c86a Change option name 2018-06-29 00:07:40 -05:00
Wei Chen 52047a6c59 Add switch_spec 2018-06-28 21:21:54 -05:00
Wei Chen 5c86b836c4 Add rspec for outputdebugstring and correct a few things 2018-06-28 21:08:15 -05:00
Jacob Robles b8094aca7a
Combine rescues 2018-06-28 07:59:40 -05:00
Jacob Robles 1699f352c1
Rescue RubySMB Error
Error occurs when scanning OSX SMB server.
2018-06-28 07:06:33 -05:00
Wei Chen cec506421d Add rspec fake_function_collection and update the lib 2018-06-27 18:18:05 -05:00
Wei Chen dcaa623075 make random compiling work 2018-06-27 00:09:04 -05:00
Wei Chen 823647fbe1 Add compile_random_c func && support optional func collection 2018-06-25 16:50:05 -05:00
Wei Chen 90bc7d2294 Update randomizer for progress 2018-06-22 18:22:29 -05:00
Wei Chen 8f5ad7c1cb Add CRandomizer 2018-06-21 14:33:04 -05:00
Wei Chen e42c695baf Add CRandomizer (WIP) 2018-06-21 10:50:39 -05:00
James Barnett 2ded48a510 Merge branch 'master' into remote_creds_data 2018-06-15 10:26:10 -05:00
James Barnett 0ba319bf56
More handling of nil private, publics, and origins 2018-06-14 16:20:13 -05:00
James Barnett 9f2f61c481
Implement create_credential_and_login in the dataproxy 2018-06-14 13:28:03 -05:00
James Barnett 9aaa7ce142
Enable cracked credential creation via data proxy 2018-06-12 16:00:02 -05:00
James Barnett 64cb7dfb3c
Include origin in remote requests and display it 2018-06-05 14:59:11 -05:00
Brent Cook 20c9190aca
Land #10093, Add Winsock2 API for Metasploit::Framework::Compiler::Windows 2018-06-02 14:35:21 -05:00
James Barnett d1e0bcf946
WIP: add endpoint for Credential::Login 2018-05-31 15:33:11 -05:00
James Barnett a8f19df4e6
Pass params through query string on creds GET
Also updated API docs to use correct params
2018-05-30 16:23:37 -05:00
James Barnett 7bcf28440f Merge branch 'local_api_docs' into remote_creds_data 2018-05-29 12:52:15 -05:00
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
Wei Chen cab2daf4ed Add Winsock2 API for Metasploit::Framework::Compiler::Windows 2018-05-24 11:57:41 -05:00
Matthew Kienow add51a6741
Remove OpenStruct 2018-05-23 18:05:48 -04:00
James Barnett a107336ad5
Move cred delete to DBManager 2018-05-23 16:47:56 -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
Wei Chen e5c763f6bf Add support for stdio.h, stdlib.h, and String.h 2018-05-17 14:40:49 -05:00
Matthew Kienow 6b1113d38d
Fix incorrect rescue argument 2018-05-17 12:46:41 -04:00
Matthew Kienow 73393b236c
Add missing data service stub methods 2018-05-14 17:42:52 -04:00
Matthew Kienow 09a7396ad5
Remove remote data service find_or_create method 2018-05-14 17:20:58 -04:00
Matthew Kienow 02566071be
Implement find_or_create DataProxy methods 2018-05-14 17:09:20 -04:00
Wei Chen b1e767298f Update doc 2018-05-11 10:30:15 -05:00
Wei Chen ad0ba4f402 Update to update compile_c_to_file argument 2018-05-11 10:29:24 -05:00
Wei Chen 6cd59faa69 Namespace update 2018-05-11 10:27:54 -05:00
Wei Chen 76865732c8 Namespace update 2018-05-11 10:26:59 -05:00
Wei Chen 82c8138de0 Update naming and license 2018-05-11 10:08:16 -05:00
Wei Chen d3f50f421d Update regex 2018-05-10 22:39:49 -05:00
Wei Chen caf07116db Add compiler support capable of including headers.
This is basically a wrapper for metasm, but supports built-in
headers so that as an user, I don't have manually do this
every time I compile something with metasm.
2018-05-10 00:33:01 -05:00
Matthew Kienow 06e178cba2
Add functionality to retrieve sessions 2018-05-05 00:39:56 -04:00
christopher lee 038fe03777 Merge branch 'master' into ms-2962 2018-05-02 15:31:57 -05:00
christopher lee a7ec7b52b7 Fix error on data server due to unexpected report_exploit call 2018-05-02 14:59:02 -05:00