Commit Graph

369 Commits (e9ce622db7c043de02d209cafcff5dca557d1f29)

Author SHA1 Message Date
Spencer McIntyre 2070934758 Improve output file handling and expand_path 2015-05-29 13:50:44 -04:00
Spencer McIntyre 72650d72b1 Use an authorization header and fix uri.path 2015-05-29 13:50:44 -04:00
Spencer McIntyre 50b2ae477f Add a plugin for making curl-like http requests 2015-05-29 13:50:43 -04:00
Brent Cook 9549d572cc
Land #5280, update to Ruby on Rails 4.0
This upgrades a number of other gems as a side-effect.
2015-05-12 16:48:49 -05:00
wchen-r7 7b5da6f266
Land #5241, sqlmap parsing fixes 2015-05-07 14:21:20 -05:00
wchen-r7 eb84c8b89c Fix NilClass bugs 2015-05-07 14:20:25 -05:00
darkbushido 26e7fe15f9
Merge branch 'upstream' into staging/rails-4.0
Conflicts:
	Gemfile.lock
2015-05-05 11:00:38 -05:00
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
James Lee 0c1d02c940
Fix event handlers on ruby 2
Fixes #4219
2014-12-11 20:08:45 -06:00
Jon Hart b81c7e28f4
Land #3588, @tobd-r7's Fix SpaceBeforeModifierKeyword Rubocop warning 2014-08-04 14:25:03 -07:00
Joshua Smith a4f2fb218c adds most rubocop cleanups, not all 2014-08-04 00:11:25 -05:00
Joshua Smith c08b1cb829 uses mult-assign & include? more readable 2014-08-03 23:59:03 -05:00
Victor 3fd15d001d Update sqlmap.rb 2014-08-04 04:25:33 +04:00
Victor 2805af2a04 `\t` error msgs bug and some codestyle tweaks
Minor bugs: `\t` were used inside single quoted strings.
Tweak: `a, b = c` is the same as `a = c[0]; b = [1] if c.length > 1`.
Minor tweak: `qwe if rty` form instead of multiline when `qwe` is only one line long.
Minor tweak: thanks to `#{}` interpolation we can omit `.to_s`.
2014-08-04 04:11:49 +04:00
Tod Beardsley adf03e28ce
Fix SpaceBeforeModifierKeyword Rubocop warning
This also deals with some errant tabs where internal spaces should be,
as well as one syntax error which was preventing an old meterpreter
script from ever working correctly.

Some day, we need to get rid of those Meterpeter scripts. Srsly.
2014-07-29 17:10:54 -05:00
sinn3r faee2c7026
Land #3492 - sqlmap plugin for sqlmap API 2014-07-25 16:30:30 -05:00
Brandon Perry 1a157ff803 Change all the " to ' when not interpolating 2014-07-21 18:00:03 -05:00
Brandon Perry 5190ed750f This adds the human readable IDs
and converts the negative if's into unless.
2014-07-21 17:49:53 -05:00
Tod Beardsley 53d941d4a8
Parens for readability 2014-07-11 14:22:47 -05:00
Brandon Perry 6c18ee884e Create sqlmap.rb 2014-07-04 10:54:07 -05:00
Trenton Ivey c56182a978 Removed an old comment about an added method. Data validation for each wiki type is attempted inline instead of through Rex 2014-04-21 12:26:28 -05:00
Trenton Ivey 0b7a2b9cef Added plugin to provide formatted wiki output from the framework database 2014-04-21 11:03:52 -05:00
William Vu 3e1ae4c9b3
Land #2504, @todb-r7's edit command for msfconsole 2013-10-30 15:38:07 -05:00
Tod Beardsley 6203446015
Remove the editor plugin.
Sorry, @jcran, didn't see that this was available. Turns out, this
feature is almost identical to the editor plugin, so this effectively
promotes 'edit' to a first class command.
2013-10-11 10:44:23 -05:00
Meatballs c460f943f7
Merge branch 'master' into data_dir
Conflicts:
	modules/exploits/windows/local/always_install_elevated.rb
	plugins/sounds.rb
	scripts/meterpreter/powerdump.rb
	scripts/shell/spawn_meterpreter.rb
2013-10-02 20:17:11 +01:00
Tab Assassin 2e8d19edcf Retab all the things (except external/) 2013-09-30 13:47:53 -05:00
Meatballs 7ba846ca24 Find and replace 2013-09-26 20:34:48 +01:00
Nicholas Davis 5da714f748 fixed bug #8296 where help table was not displaying properly 2013-08-16 15:10:38 -04:00
James Lee f6969bc918 Land #1575, 'wmap_sites -d' improvements 2013-08-12 11:32:21 -05:00
James Lee a7ff8703b7 Remove errant return
Installing a trap for "INT" is still wrong, it should be rescuing
Interrupt instead. This is just a bandaid to keep it from crashing
msfconsole any time ctrl-c is used after running wmap_run for the first
time.
2013-08-12 11:30:23 -05:00
Samuel Huckins d5be41617e Uses raw-xml-v2 Nexpose export for Nexpose import as this adds device-id
back to XML schema and will result in hosts that can be pushed back to
Nexpose.

[Bug #51521175]
2013-06-11 18:37:02 -05:00
RageLtMan 1336c835ff Implement Egypt's suggestions
Delete_site input is now validated with =~ /^[0-9]*$/.
Help instructions written in English.
2013-03-11 18:40:14 -04:00
RageLtMan a60a4e518a clean up multi delete 2013-03-10 23:55:15 -04:00
RageLtMan 21190cd864 Allow deletion of multiple sites 2013-03-10 20:47:05 -04:00
RageLtMan b74fce7e24 indentation compliance 2013-03-07 14:57:03 -05:00
RageLtMan 6e8f3ff8fe Allow WMAP plugin to delete site by index
WMAP plugin currently lacks the ability to delete sites, meaning
that console users have to remove sites via IRB/Pry. Given the
indexed output of wmap_sites -l, the index is used in delete_site.
If required, deletion by resolving the url,host format can be
added.
2013-03-07 14:40:50 -05:00
sinn3r bc3c289b90 Merge branch 'master' of github.com:averagesecurityguy/metasploit-framework into averagesecurityguy-master 2013-01-23 00:03:52 -06:00
Stephen Haywood cfeccaa4f8 Noted support for importing XML reports. 2013-01-20 23:26:53 -05:00
sinn3r 0589b65afb Makes some small changes based on bperry's feedback 2012-11-27 00:31:31 -06:00
sinn3r 917b9381b9 Merge branch 'nessus-plugin-updates' of git://github.com/kost/metasploit-framework into kost-nessus-plugin-updates 2012-11-27 00:23:19 -06:00
Vlatko Kosturjak 11a44bb9f5 Remove spaces at EOL 2012-11-24 00:05:35 +01:00
Vlatko Kosturjak 288002211e Display status because command can take some time 2012-11-22 12:26:56 +01:00
Vlatko Kosturjak 0a772749d0 Add new nessus command to list all vulns in report 2012-11-22 12:16:27 +01:00
kernelsmith eed8d7ca2d fix ^alias regex and mispelling in comments
/^alias/i needed to be /^alias$/i (thanks bperry)
2012-11-20 11:28:34 -06:00
kernelsmith 8c864efde5 msftidy fixes and updated a comment 2012-11-19 15:00:05 -06:00
kernelsmith b1c70f82bf fixed validation problems
re-engineerd the validation process
2012-11-19 11:13:21 -06:00
kernelsmith dcf608cbbe added comment as to why I changed the output format
added comment as to why I changed the output format of the alias command
# add 'alias' in front of each row so that the output can be copy
pasted into an rc file if desired
2012-11-16 18:40:26 -06:00
kernelsmith d73a0006df changed output format of 'alias' per egypt's suggestion
now the output is copy pasteable to an rc file as valid alias commands
2012-11-16 17:57:26 -06:00
kernelsmith 4953fda8e9 fixed -c problems, plugin name, some tab_compl issues remain 2012-11-15 17:46:16 -06:00
kernelsmith 90081b1826 tag completion aliases is getting there, still not quite right
also added cmd_#{name}_help method to register_alias
2012-08-31 14:16:07 -05:00
kernelsmith a986b46184 initial commit of alias console plugin
It's working, tab complete is messed up and clear is messed up, but the
problems are related
2012-08-27 03:38:56 -05:00