3efa4186df
Fix search error when platform not in target name
2012-10-27 16:28:38 -05:00
77c8548855
Merge branch 'dmaloney-r7-WinRM_piecemeal'
2012-10-23 16:33:16 -05:00
8c1304557f
Code cleanup
2012-10-23 16:32:26 -05:00
67c46fc97a
Merge branch 'WinRM_piecemeal' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-WinRM_piecemeal
2012-10-23 14:03:44 -05:00
e19f2d235c
Actually use the timeout in winrm cmd
2012-10-23 11:29:32 -05:00
f71f83095b
Merge branch 'WinRM_piecemeal' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-WinRM_piecemeal
2012-10-22 17:13:37 -05:00
04fd990741
bad indent
2012-10-22 17:03:40 -05:00
e08cedec2e
Requested revisions/cleanup
...
minor fixes to spacing, some typos, and abse64 switched to Rex
2012-10-22 17:01:00 -05:00
af918b84a0
Merge branch 'standardize_authorship' of git://github.com/mubix/metasploit-framework into mubix-standardize_authorship
2012-10-22 16:47:03 -05:00
28f47e9aa0
fix spacing for all authors
2012-10-22 17:22:37 -04:00
a13a88ce28
fix spacing
2012-10-22 17:07:58 -04:00
7437d9844b
standardizing author info
2012-10-22 17:01:58 -04:00
dafb56f6b6
Merge branch 'dmaloney-r7-findpids' into rapid7
...
[Closes #950 ]
2012-10-22 15:52:07 -05:00
651f9b9c8f
Use opts.usage instead of a Table
2012-10-22 15:16:55 -05:00
2436ac3a58
Revert "Merge branch 'migrator' of git://github.com/scriptjunkie/metasploit-framework into scriptjunkie-migrator"
...
This reverts commit ca07bdbad6ed3f87b738
2012-10-20 22:38:31 -05:00
04e1856a4f
Fix a copypasta error triggered by a failed load
2012-10-20 15:00:11 -05:00
c80005b85f
Merge branch 'WinRM_piecemeal' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-WinRM_piecemeal
2012-10-19 17:46:15 -05:00
57514e5407
Msftidyness
2012-10-19 16:56:52 -05:00
51c03bbf47
Merge branch 'WinRM_piecemeal' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-WinRM_piecemeal
2012-10-19 15:44:05 -05:00
ca07bdbad6
Merge branch 'migrator' of git://github.com/scriptjunkie/metasploit-framework into scriptjunkie-migrator
2012-10-19 15:25:45 -05:00
56cbe6a67e
Some minor fixups
2012-10-19 15:25:03 -05:00
3a8dd261ae
WinRM mixin and basic discovery module
2012-10-19 15:08:58 -05:00
b7652b44d5
Adding prepend_migrate?
2012-10-19 14:24:13 -05:00
ffa4373242
Merge branch 'rapid7' into wchen-r7-print_warning
...
[Closes #899 ]
2012-10-19 13:49:32 -05:00
205dc8870a
Merge branch 'prependsetguid' of https://github.com/mephos/metasploit-framework into mephos-prependsetguid
2012-10-19 10:33:56 +02:00
e1a4ec2fcc
Fix to SMB Client when using find_first on a directory with exactly 20 files.
2012-10-17 21:58:20 +01:00
0564a6eaa7
Add migrate stub option to Windows x86 payloads.
...
Migrate stub spawns payload in new process.
2012-10-16 20:53:36 -05:00
dd1a352ae1
Merge remote branch 'jlee-r7/dont-require-dot-rb'
2012-10-15 18:41:16 -05:00
45a60b6bdd
Clarify why we need to sleep.
...
[Closes #911 ][FixRM #7344 ]
2012-10-15 17:54:18 -05:00
f4b151f63d
Detect and mitigate CPU starvation condition [SeeRM #7344 ]
2012-10-15 17:54:18 -05:00
46ed888ffe
Don't require .rb
2012-10-15 17:27:23 -05:00
932b8ba841
Require, not load, msf, not lib/msf
2012-10-15 07:11:15 -05:00
d36f642edc
Add print_warning()
2012-10-12 21:48:15 -05:00
13a5892e95
Add a mixin for uploading/executing bins with PHP
...
And use it in three modules that had copy-paste versions of the same
idea.
2012-10-12 02:57:41 -05:00
7d848c7147
Merge remote branch 'origin/bug/fastlib-nested-pathnames'
2012-10-10 17:31:36 -05:00
90b948ffb3
add PrependSet[re]gid support for unix payloads
2012-10-10 12:14:00 +02:00
5ce26c4524
Merge branch 'bug/activerecord-dep' of https://github.com/jlee-r7/metasploit-framework into jlee-r7-bug/activerecord-dep
2012-10-09 11:18:02 -05:00
1ba57af00a
Merge branch 'master' into bug/windows-pro-modules
2012-10-09 11:15:45 -05:00
2d1fd1c305
Pass file size to read for faster reads on Windows
2012-10-09 11:04:05 -05:00
592851e155
Add requires for active_support deps in use
...
Hash for #assert_valid_keys, Module for #parent.
2012-10-09 02:05:08 -05:00
b3e27b16d5
Derp, include is a class method
2012-10-09 01:52:19 -05:00
227418bd11
Make AR a soft dependency again
...
Ensures that the absence of activerecord does not prevent msfconsole
from loading. This returns us to the previous state of affairs where it
is possible to use the framework entirely without a database.
To test:
1. rm -rf lib/gemcache/ruby/1.9.1/gems/activerecord*
2. remove any locally installed versions of activerecord
3. msfconsole
msfconsole should load up with a warning like so:
[-] ***
[-] * WARNING: No database support: LoadError cannot load such file -- active_record
[-] ***
... and should still be functional.
2012-10-08 23:07:04 -05:00
8f07a18d74
Fix comment indentation
2012-10-08 17:29:36 -05:00
eb0f0fee0c
Correct an extra parenthesis
2012-10-08 17:20:25 -05:00
8cdb76d269
Switch to normal String API vs ActiveSupport method
2012-10-08 17:18:40 -05:00
2dce6e6347
FIXRM #7292 by using hex class names
2012-10-08 17:03:41 -05:00
93469604a7
Fix missed rename when adding fastlib under directory
...
I missed a spot where I referenced the nested_paths as nested_pathnams
after I renamed the variable. Now, Msf::ModuleManager#add_module_paths
has rspec tests.
Rspec can be invoked with `rake` as the default task or `rake spec`
explicitly.
I changed RuntimeError to ArgumentError since that error was more
specific to having a bad argument error. I adding missing dependencies
to the Gemfile and a require to msf/core/db_manager.rb where it errored
out trying to access Msf::Config when I just did require 'msf/core' in
the spec.
2012-10-08 16:14:37 -05:00
6bb1b83de3
Align the comments with the space indents for now
2012-10-08 16:09:12 -05:00
114b7886fa
Add back EOF newlines
2012-10-08 12:42:34 -05:00
10dafcd09f
Fix 1.8 compat with Module#const_defined?
...
Before 1.9, const_defined? only takes one parameter.
2012-10-08 12:40:18 -05:00
scriptjunkie