Commit Graph

265 Commits

Author SHA1 Message Date
adfoster-r7 3a281234df Add feature flagged datastore rewrite, with support for option fallback lookups 2022-09-16 12:59:02 +01:00
Grant Willcox 1e67d62f42 Minor fix to improve readability 2022-04-19 12:43:57 -05:00
Jeffrey Martin 74e734c7e8 restore multi-char short flag support
Recent updates in `Rex::Parser::Arguments` regressed the ability have
short flags with multiple characters.
2022-04-15 15:11:11 -05:00
sjanusz 158a0aa30c Change custom parser to Rex, add custom opt, add tabcomplete 2022-01-19 13:01:33 +00:00
sjanusz 063c3936a9 Add support for long arguments to Rex Parser 2021-12-14 17:45:56 +00:00
dwelch-r7 afb9cbfb77 Only normalize new/updated hosts after nmap import 2021-11-25 13:46:57 +00:00
Alan Foster 03400991af Update uses of open ssl 2021-08-10 15:40:23 +01:00
Spencer McIntyre eddb6af650 Add block level randomization for the PSH bypass 2021-05-25 14:38:52 -04:00
Spencer McIntyre 38b45380f4 Fix and process block edges within the GraphML 2021-05-25 14:38:50 -04:00
Spencer McIntyre 48272435c2 Fix a bug in GraphML parser for escaped strings
The GraphML parser was failing to properly handle escaped strings within
XML nodes. The #characters method was being called multiple times
causing the preceding value to be overwritten rather than appended to.
2021-05-19 12:44:37 -04:00
Jeffrey Martin cf6a401b9d more flexible time parse
Acunetix reports may serialize time in multiple patterns
Previously
```
<StartTime><![CDATA[8/5/2016, 23:45:12]]></StartTime>
```
Recently
```
<StartTime><![CDATA[2021-03-29T01:23:45.112233+01:00]]></StartTime>
```
2021-04-29 10:28:44 -05:00
Alan Foster af330874f5 Prefix time module with namespace resolution operator 2021-03-04 13:19:09 +00:00
agalway-r7 275e9c5454 Land #14696, Further Zeitwerk lands to improve boot speed
Zeitwerk rex folder
2021-02-19 10:33:37 +00:00
Alan Foster bed7ae2c78 Add latest rubocop rules 2021-02-12 13:31:51 +00:00
dwelch-r7 b95be3ed10 Zeitwerk rex folder 2021-02-08 12:24:12 +00:00
dwelch-r7 1617b3ec9b Use zeitwerk for lib/msf/core folder 2020-12-07 10:31:45 +00:00
Grant Willcox b0f96fd755 Land #14200, Fix whitespace issue in OpenVAS importer that was breaking some imports 2020-09-30 14:02:28 -05:00
Alan Foster 33fbd52d8b Fix port parsing error when importing openvas 2020-09-30 09:51:30 +01:00
Adam Galway a0d6431ed5 adds protocol to search terms 2020-09-22 12:44:32 +01:00
adfoster-r7 9ef5822d3a Revert "Replaces erroneous calls to get_service" 2020-09-18 19:09:25 +01:00
Adam Galway 4918ecf826 replaced get_service calls with services calls 2020-09-16 12:29:15 +01:00
gwillcox-r7 c79f293e52 Land #13846, Add support for import Nmap vulners script output 2020-08-13 12:21:31 -05:00
Jeffrey Martin 35017886b8 Land #13935, Preliminary Version 6 2020-08-06 10:19:34 -05:00
adfoster-r7 18b2c32c78 Land #13831, update to rails 5.2 2020-08-05 21:05:49 +01:00
dwelch-r7 1bf75e338f delete commented out code 2020-08-03 17:34:49 +01:00
Jeffrey Martin 07cbe426e2 Rails 5, all models inherit from ApplicationRecord
ApplicationRecord is a new superclass for all app models, analogous to app controllers subclassing ApplicationController instead of ActionController::Base. This gives apps a single spot to configure app-wide model behavior.
https://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#active-record-models-now-inherit-from-applicationrecord-by-default

Deprecated Relation#uniq use Relation#distinct instead.
https://edgeguides.rubyonrails.org/5_0_release_notes.html#active-record-deprecations
2020-07-31 11:56:49 -05:00
Brent Cook 3887fb41b1 Allow OpenVAS import to import vulns without references.
Local scanning didn't show any results that had CVEs or BIDs, which the default OpenVAS import logic skips. This modifies the importer to allow for importing vulns even if they do not have references.
2020-07-25 03:18:39 -05:00
Jeffrey Martin 65039a5091 Merge upstream into 6.x 2020-07-15 09:58:07 -05:00
dwelch-r7 bdabebfb3c Refactor code into functions 2020-07-15 13:15:04 +01:00
dwelch-r7 02b8d436c8 Import vulns discovered from nmap 2020-07-14 13:22:09 +01:00
Spencer McIntyre 7745eafa17 Replace usage of Array.filter with Array.select for Ruby < 2.6 2020-07-09 09:00:05 -04:00
Spencer McIntyre af4dcdb22f Add documentation and fix rubocop issues for the new library code 2020-07-07 15:56:22 -04:00
Spencer McIntyre cfae4c76d0 Shuffle the block API source code every time 2020-07-07 15:55:32 -04:00
Spencer McIntyre e29e3be5d4 Add a basic GraphML parser to Rex 2020-07-06 15:23:41 -04:00
cn-kali-team 430e06f218 Simplify code 2020-06-03 20:23:25 +08:00
cn-kali-team a55fef053c add docs 2020-05-29 01:16:29 +08:00
cn-kali-team 1d39112fc7 NetSarang Encryption Decryption parser 2020-05-27 19:52:51 +08:00
Auxilus 260099b506 remove spaces at EOL 2020-03-24 18:15:31 +05:30
Jeffrey Martin 25e0355951 update port processing for openvas
Port in openvas OMP version 7.0 reports serialize in a new format.
<ports max="1000" start="1"><count>3</count>
  <port>general/tcp<host>192.168.8.100</host><severity>2.6</severity><threat>Low</threat></port>
  <port>general/CPE-T<host>192.168.8.100</host><severity>0.0</severity><threat>Log</threat></port>
  <port>general/icmp<host>192.168.8.100</host><severity>0.0</severity><threat>Log</threat></port>
  <port>445/tcp (IANA: microsoft-ds)<host>192.168.8.100</host><severity>9.3</severity><threat>High</threat></port>
  <port>139/tcp (IANA: netbios-ssn)<host>192.168.8.100</host><severity>0.0</severity><threat>Log</threat></port>
  <port>135/tcp (IANA: epmap)<host>192.168.8.100</host><severity>5.0</severity><threat>Medium</threat></port>
</ports>
2020-01-11 15:15:56 -06:00
Jeffrey Martin ba06624e57 consistent usage of :workspace key 2019-11-22 11:16:22 -06:00
Jeffrey Martin 289a9c56f3 when making requests to report send workspace
The report methods of the db layer require the workspace during import.
2019-10-15 15:32:00 -05:00
William Vu dd101a0469 Add nil check
Just in case.
2019-06-07 00:16:44 -05:00
William Vu 53ea7e577f Add sanitized new XML format 2019-06-07 00:07:50 -05:00
William Vu 40eeae541b Fix style 2019-06-06 23:38:41 -05:00
Jeffrey Martin f646a973a7 Update retina imports to better handle parsing 2019-06-06 19:13:06 -05:00
James Barnett ecbbf1d940 Pass workspace when using db_nmap 2018-03-30 15:27:32 -05:00
loftwing 51c1cddb5c Removed requirement for a host to have ports 2017-09-27 12:43:50 -05:00
Brent Cook 6300758c46 use https for metaploit.com links 2017-07-24 06:26:21 -07:00
Brent Cook 0eaffde4b3 fix rex arguments parser to handle adjacent flags, update accordingly 2017-06-22 09:54:03 -05:00
Pearce Barry c4f1130619 Acunetix XML import improvements.
This patch updates the MSF db_import functionality  w.r.t. importing Acunetix XML files to do the following:

 - import web vulnerabilities identified by Acunetix
 - import all services for each scanned host
  - does not pull in the specifc program/version name of each service, as that's pretty loosely formatted in the Acunetix XML
2017-04-26 12:16:20 -05:00