1
mirror of https://github.com/rapid7/metasploit-framework synced 2024-09-11 17:08:02 +02:00
Commit Graph

267 Commits

Author SHA1 Message Date
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
HD Moore
428a98c1d1 Dont store files in /tmp with predictable names 2012-07-16 09:53:19 -05:00
Aram Verstegen
d5d285ae96 Adding aczid's minimal exploit configurator
Note the syntax change, need to chase this down before pushing upstream
and make sure nobody's relying on that.... and grep says everything's
cool.

[Closes #295]

Squashed commit of the following:

commit 33b7438731ae5377c95d3d752d76eca73bad20ef
Merge: 6d3e6dd 7811b0a
Author: Tod Beardsley <todb@metasploit.com>
Date:   Fri May 18 16:55:49 2012 -0500

    Merge branch 'master' into HEAD

commit 6d3e6dd6e2
Author: Aram Verstegen <aram.verstegen@gmail.com>
Date:   Sat Apr 7 22:58:29 2012 +0200

    Automatically configure payloads for wmap-enabled exploits

commit 410008bab7
Author: Aram Verstegen <aram.verstegen@gmail.com>
Date:   Sat Apr 7 22:58:06 2012 +0200

    Exposed exploit_choose_payload as class method Exploit.choose_payload
2012-05-18 17:24:18 -05:00