Commit Graph

512 Commits

Author SHA1 Message Date
void-in 6a286fd514 Single quotes a per ruby style 2015-05-02 15:18:25 +05:00
void_in e5847f0ddc Return only json type from lib as per wchen-7 suggestion 2015-05-02 15:11:59 +05:00
Brent Cook 97d671d156 allow overriding the default timeout for a session 2015-05-01 15:04:55 -05:00
darkbushido 0b608e139a Merge branch 'upstream' into staging/rails-4.0 2015-05-01 11:26:24 -05:00
wchen-r7 89d026c900 Fix merge conflict 2015-04-30 12:33:45 -05:00
Matt Buck 3f797e4393 Reinstate some to_s coercions that were mistakenly dropped 2015-04-30 11:13:48 -05:00
Matt Buck 8163c3cdda Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	plugins/nessus.rb
2015-04-28 15:33:46 -05:00
Matt Buck 6a4d63ca4f Drop explicit IPAddr to String coercion
MSP-12611
2015-04-27 10:48:13 -05:00
William Vu 655e819838 Fix indentation 2015-04-24 11:03:31 -05:00
root fae338d0ae Take out irrelevant file plugin/sqlmap.rb 2015-04-24 12:09:49 +05:00
root 62cb0c8749 Take out irrelevant files (nessus) 2015-04-24 12:06:04 +05:00
root 028f5e119d sqlmap plugin update to fix connection errors 2015-04-24 12:00:50 +05:00
root 624adbaaca Consistent downcase comparison 2015-04-23 12:07:59 +05:00
root 19beafe009 scan_export_status patch for issue 5217 2015-04-23 12:04:02 +05:00
root 93dc809e74 Correct the quotes 2015-04-22 11:06:59 +05:00
root 40107577a0 Case insensitive plugin unload 2015-04-22 11:04:46 +05:00
Matt Buck 5e2d6c27c3 Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	db/schema.rb
	lib/msf/core/db_manager/session.rb
	metasploit-framework-db.gemspec
2015-04-06 11:27:00 -05:00
root 4ba761986f Correct YARD doc comments 2015-04-02 16:14:25 +05:00
sekritskwurl d1c6db5e4e Update nessus.rb
updated as per wchen-r7's comment's, Thank you wchen-r7!
2015-03-27 19:44:11 -04:00
sekritskwurl bb929d416d Update nessus.rb
Add support for imported nessus scan results to be imported with nessus_db_import.
2015-03-27 14:32:01 -04:00
Matt Buck c26dfa263d Ensure IP addresses are explicitly converted to strings
MSP-12113
2015-03-24 16:26:00 -05:00
Samuel Huckins 08df0bfaca Land #4858, RPC client true/truthy fix
* Misc ruby cleanup and fixing the issue that caused MSP-12235, rolling back the
full rollback of PR 4823
2015-03-09 11:35:57 -05:00
sinn3r 9e5231f951 More explicit and better readability
thanks Sam!
2015-03-09 00:16:56 -05:00
William Vu c3e91c263f Fix NoMethodError in plugins/nessus.rb
Triggered by @port.length in nessus_login from YAML.
2015-03-07 17:56:12 -06:00
sinn3r 5f8c14c958 Fix check for TrueClass, plus other small changes 2015-02-28 14:11:15 -06:00
sinn3r 6f4259f2de Revert #4859, temporary solution for unbreaking client
This reverts commit 7ab86be72a, reversing
changes made to 49ae173057.
2015-02-28 14:07:26 -06:00
sinn3r ac81318e7a Revert #4823, changes for ruby style guide
This reverts commit 885469ca52, reversing
changes made to fd73445d9b.

Please see: #4823 for why.
2015-02-27 17:28:00 -06:00
Joshua Smith 4c093985db remove svn vestiges 2015-02-22 15:40:58 -06:00
Joshua Smith 251c284458 modernizes some of the rpc code 2015-02-22 15:37:55 -06:00
sinn3r 6b99103cec Land #4690 - Update Nessus plugin to support the latest REST API
Resolves #4447
2015-02-13 12:46:01 -06:00
sinn3r bbf5fa881d Fix help again 2015-02-13 12:06:56 -06:00
sinn3r c78c40df78 Extra nessus_login in help 2015-02-13 12:00:54 -06:00
sinn3r 56454674f2 Fix nessus_help
Columns are arrays
2015-02-13 11:55:46 -06:00
sinn3r b55fd0572d Use print_status 2015-02-13 11:51:32 -06:00
sinn3r 9a56e5c4f9 Extra space 2015-02-13 11:40:49 -06:00
sinn3r 2f5fad4806 Share plugin name 2015-02-13 11:38:36 -06:00
root 199dca75a6 Implement db_import and finalize plugin 2015-02-12 13:32:49 +05:00
root 64b69d597a Add report_download and db_scan APIs 2015-02-11 14:11:10 +05:00
root e5fd9e70eb clean plugin/nessus.rb implement additional APIs 2015-02-10 12:40:20 +05:00
Tod Beardsley 4014f1929f No random names, but store in .msf4/logs 2015-02-09 16:46:02 -06:00
Tod Beardsley 79abb72589 Add some randomness to the /tmp filename 2015-02-09 14:34:42 -06:00
HD Moore 2d129f9163 Clean up socket_logger, record the module name 2015-02-09 12:10:07 -06:00
sinn3r e8ba0b7c31 Fix broken commands 2015-02-06 19:07:43 -06:00
root 2744db4d11 Add nessus_scan_export and nessus_scan_export_status methods 2015-02-05 22:18:22 +05:00
root 23af5f8c82 Nessus plugin for REST API 2015-02-01 13:54:35 +05:00
Samuel Huckins 9e6fd1879e Fixing order clause
MSP-12011

* This was resulting in PGSyntaxError
2015-02-01 01:19:31 -06:00
Christian Catalan 7d1090baca Convert #find(:all) to #where or #all 2015-02-01 00:31:58 -06:00
Christian Catalan 8740fd9015 Convert #find_all_by_X to #where 2015-01-31 21:07:50 -06:00
Joshua J. Drake 7295cd34aa One more http// fix 2015-01-03 02:32:08 -06:00
sinn3r d45cdd61aa Resolve #4507 - respond_to? + send = evil
Since Ruby 2.1, the respond_to? method is more strict because it does
not check protected methods. So when you use send(), clearly you're
ignoring this type of access control. The patch is meant to preserve
this behavior to avoid potential breakage.

Resolve #4507
2015-01-02 13:29:17 -06:00