James Lee
91b748a701
Make it clear where we failed
...
Even when VERBOSE=false
2013-07-12 15:57:30 -05:00
corelanc0d3r
e8983a21c5
New meterpreter payload reverse_https_proxy
2013-07-12 16:45:16 -04:00
William Vu
e8294b4f02
Add tentative fixes
2013-07-12 07:12:07 -05:00
James Lee
1ac1d322f2
Dup before modifying
...
Because `remove_resource` modifies @my_resources, we can't call it while
iterating over the actual @my_resources. The following snippet
illustrates why:
```
>> a = [1,2,3,4]; a.each {|elem| a.delete(elem); puts elem }
1
3
=> [2, 4]
```
[See #2002 ]
2013-07-12 00:57:10 -05:00
James Lee
38e837dc28
Remove inaccurate comment
2013-07-11 22:48:35 -05:00
g0tmi1k
a4d96d37f3
Updated regex
2013-07-11 21:16:02 +01:00
g0tmi1k
ff62a85501
command_dispatcher/core.rb - Made msftidy happy
2013-07-11 10:52:25 +01:00
g0tmi1k
b2fe31e30f
go_pro - fix start with kali linux
2013-07-11 10:42:26 +01:00
William Vu
f267c11bc4
Add regex fix
2013-07-10 15:43:16 -05:00
Tod Beardsley
56ffa4ae2f
Fixes for network_interface PR #2085
...
Implementing the suggestions from @limhoff-r7.
See #2085
FixRM #8023
FixRM #7943
2013-07-10 13:25:06 -05:00
lsanchez-r7
4541a9e49e
now with passing msftidy
2013-07-08 17:44:50 -05:00
lsanchez-r7
5c93fb2849
arp_sweep is once again working
...
modified the capture mixin to use NetworkInteface instead of
pcaprub for interfaces and addresses
FIXRM #8023,#7943
2013-07-08 17:24:28 -05:00
Meatballs
2bfe8b3b29
msftidy
2013-07-05 22:35:22 +01:00
Meatballs
0ce3fe2e7c
Added service status checks to Post::Windows::Services
...
Added QueryServiceStatus to Railgun Advapi32 Definitions
Added Checks to module
2013-07-05 22:25:04 +01:00
jvazquez-r7
0e2380c115
Fix method documentation
2013-07-05 11:19:53 -05:00
jvazquez-r7
bcf6d11442
Land #2049 , @wchen-r7's had_pid? method work
2013-07-05 11:19:11 -05:00
Meatballs
1a0bdf335e
Retab lib
2013-07-04 12:09:46 +01:00
Meatballs
a76ee6c2ec
Add flexibility to lib
2013-07-04 11:03:48 +01:00
Meatballs
1368c1c27f
Move options to lib
2013-07-04 10:25:08 +01:00
Meatballs
03de8c1c3d
Pull in exploit/powershell
2013-07-04 09:54:40 +01:00
g0tmi1k
38b83ba335
ui/banner~Made msftidy happy
2013-07-03 00:29:42 +01:00
William Vu
67f30a6828
Land #1739 , resolve workspace rename issues
2013-07-02 16:09:59 -05:00
sinn3r
0f37bbe78e
Add has_pid? function
...
[SeeRM:#8123] - Add commonly used function has_pid?. Related to
redmine issue 8123.
2013-07-02 14:33:15 -05:00
jvazquez-r7
a5c3f4ca9b
Modify ruby code according to comments
2013-06-29 08:54:00 -05:00
sinn3r
e3989ad30c
Extra comments, no thanks
2013-06-28 15:44:06 -05:00
sinn3r
f4c805f5d6
Yarrrrrrrrd
2013-06-28 15:42:56 -05:00
sinn3r
6e1fa05757
Fix a handle leak & change thread creation flag
2013-06-28 13:23:08 -05:00
sinn3r
554d738f26
Update documentation
...
Fix broken English
2013-06-28 13:03:05 -05:00
sinn3r
b7430cb569
Add Msf::Post::Windows::Process
...
The purpose of Msf::Post::Windows::Process is have all the common
functions you might need to do something to a process, for example:
injecting something to a process and then run it.
2013-06-28 12:55:06 -05:00
David Maloney
ea13ac48ec
"fix" indentation to make egypt happy
2013-06-27 17:16:13 -05:00
David Maloney
89faba288d
damnit brandon turner
2013-06-27 17:12:37 -05:00
David Maloney
867be1257a
slight rearrangement
2013-06-27 17:09:20 -05:00
David Maloney
e3fde02eec
conditional wrapping
...
as per egypt's catch
2013-06-27 17:07:16 -05:00
David Maloney
70433820a9
fixes FD leak in RPC client
...
FD leak due to sockets not getting closed
on the rpc client
FIXRM #8107
2013-06-27 16:57:02 -05:00
Josh
d7eda343e9
fix typo in comment
...
change runing to running
2013-06-27 03:12:49 -05:00
James Lee
31ad7b50a9
Fix write_file on FreeBSD
...
[SeeRM #8083 ]
2013-06-25 17:19:00 -05:00
Daniele Martini
c0fda81eb0
Removed options DB_ADD_ALL. Added options DB_ALL_PASS and DB_ALL_USERS
...
to add already known user and passwords to the lists.
2013-06-23 18:20:41 +02:00
James Lee
3c42fe594e
No need to have rescue around a print
2013-06-21 15:55:43 -05:00
James Lee
2c12a43e77
Add a method for dealing with hardcoded URIs
2013-06-21 15:48:02 -05:00
James Lee
39d011780e
Move deletion into #remove_resource
...
Doing it here means that modules manually calling remove_resource won't
screw up the cleanup
2013-06-21 15:34:54 -05:00
James Lee
e8a92eb196
Keep better track of resources
...
[See #1623 ]
[SeeRM #7692 ]
2013-06-21 14:51:47 -05:00
James Lee
81b4efcdb8
Fix requires for PhpEXE
...
And incidentally fix some msftidy complaints
2013-06-19 16:27:59 -05:00
jvazquez-r7
8ae8f25d56
Land #1961 , @wvu-r7's normalization of command_dispatcher/db.rb
2013-06-18 08:57:32 -05:00
HD Moore
819080a147
Enable rhost/rport option overrides in HttpClient
2013-06-17 11:45:01 -05:00
William Vu
53077d4c1a
Add a newline before the delete message
2013-06-14 19:58:19 -05:00
William Vu
cfd05bc68f
Normalize comments
2013-06-14 17:32:33 -05:00
William Vu
0a9a8a57e3
Remove double newlines
2013-06-14 17:20:26 -05:00
William Vu
bb02cc8509
Normalize the syntax and output of db.rb
2013-06-14 17:11:47 -05:00
Tod Beardsley
d341b825d0
Rename dirbust option to conform to style
2013-06-14 12:58:08 -05:00
Tod Beardsley
2971e50d06
Land #1949 , make dirbusting optional for crawler
2013-06-14 11:54:28 -05:00
Brandon Perry
0f06e9b08c
Merge branch 'master' of https://github.com/rapid7/metasploit-framework into csharp_payload
2013-06-12 17:27:55 -05:00
Tasos Laskos
b509ac8504
Crawler mixin: Dirbusting opt moved to advanced
2013-06-13 00:04:31 +03:00
Tasos Laskos
b474cda4aa
Crawler/Anemone: Dirbusting now optional
...
[FIXRM #8030 ]
Anemone updated to make dirbusting optional (on by default) and the Crawler core
module updated to provide an option to do so.
2013-06-13 00:00:09 +03:00
Brandon Perry
d0e1e4df0a
This commit adds support for C# byte arrays for the assembly payloads.
2013-06-11 19:27:06 -05:00
Tod Beardsley
6a5d1d06b2
Make the conditional correct for print_prefix
...
Fixes a bug introduced on #1936 .
2013-06-11 16:16:17 -05:00
Tod Beardsley
f775a0bb01
Handle single quotes for OpenVAS import
2013-06-10 19:45:50 -04:00
Tod Beardsley
9a08090b0f
Inch toward making modules more testable
2013-06-10 16:02:19 -05:00
Tod Beardsley
d4e9431633
Add Gemfile entry for PacketFu
2013-06-10 14:18:05 -05:00
Tod Beardsley
31faf65271
Land #1929 , spool ui fix from @jsherwood0
2013-06-10 12:30:50 -05:00
John Sherwood
7ac5b6de53
Fix prompt and color issue with cmd_spool
...
Changing spool setting caused problems with prompt and color. This
fix makes the following changes:
- Saves the color setting and re-applies it to the new output console
- Sets the prompt in the same way that cmd_use does
2013-06-09 13:35:35 -04:00
David Maloney
6aa7c74fdd
make anemone also rspect domain
2013-06-07 14:24:14 -05:00
David Maloney
78b2a0a2ac
add domain support to web spider
2013-06-07 12:41:20 -05:00
sinn3r
8e2de6d14f
Updates js_property_spray documentation
...
After many tests, it turns out address 0x0c0d2020 is the most
consistent location acorss various IE versions. For dev purposes,
it's rather important to have this documented somewhere.
Thanks to corelanc0d3r for the data.
2013-06-07 00:28:22 -05:00
sinn3r
9466022194
Land #1847 - Add sorting functionality to notes command
2013-06-05 12:17:54 -05:00
sinn3r
026c658260
Comply with the case-sensitive rule
2013-06-05 12:16:38 -05:00
David Maloney
2e26256217
was missing a nil check
2013-06-04 14:21:07 -05:00
David Maloney
c4475538e7
Report on TaskSession associations
...
add TaskSession objects so when we report
on a session, we know what Task created it, if there
was a task
2013-06-04 13:42:36 -05:00
sinn3r
90117c322c
Landing #1874 - Post API cleanup
2013-05-31 16:15:23 -05:00
Luke Imhoff
cc60c95243
Rescue Errno::ENONENT when using File.mtime for memory cache
...
[#47720609 ]
2013-05-30 13:16:43 -05:00
Luke Imhoff
541d287e70
Merge branch 'master' into bug/module-load-cache-update
2013-05-30 12:59:50 -05:00
lsanchez-r7
8b488c3c6b
Merge pull request #1866 from dmaloney-r7/bug/mdm_session_port
...
Add session_port to the mdm object
SEERM #7281
2013-05-30 10:05:48 -07:00
James Lee
12f0448bb4
Use a LIKE test instead of equality
...
Fixes the ability to search for CVE (as well as other reference types)
with a non-exact match
[SeeRM #7989 ]
2013-05-29 16:27:33 -05:00
sinn3r
63694a6c87
Landing #1875 - Also remove *.ts.rb files
2013-05-28 17:29:02 -05:00
Tod Beardsley
14c4dbcf8c
Also remove *.ts.rb files
...
On the heels of #1862 , this gets rid of the "test suites" that bound
together all the old unit tests.
2013-05-28 17:05:44 -05:00
James Lee
f3ff5b5205
Factorize and remove includes
...
Speeds up compilation and removes dependency on bionic source
2013-05-28 15:46:06 -05:00
James Lee
0466cce7b1
Move PostMixin to its own file
...
Also replaces dead code in lib/msf/core/exploit/local.rb with what was
actually being used for the Exploit::Local class that lived in
lib/msf/core/exploit.rb.
2013-05-28 15:46:06 -05:00
sinn3r
8cb1bdefb7
Landing #1849 - 32 and 64bit compatible to_winpe_only() function
2013-05-28 15:24:43 -05:00
Samuel Huckins
e20385dd9e
Merge pull request #1864 from dmaloney-r7/feature/task_associations/cred_service_host
...
Passes specs and functional tests
2013-05-28 12:11:57 -07:00
James Lee
9843dc4cb4
Land #1708 , android meterpreter
...
Conflicts:
data/meterpreter/ext_server_stdapi.jar
2013-05-28 12:19:45 -05:00
David Maloney
849d974463
Add session_port to the mdm object
...
Mdm::Session was not being passed the session_port
FIXRM #7281
2013-05-24 17:46:03 -05:00
Luke Imhoff
4ba571346e
Spec Msf::Simple::Framework#init_module_paths
...
[#47720609 ]
2013-05-24 12:33:42 -05:00
Luke Imhoff
c22178752e
Merge branch 'master' into bug/module-load-cache-update
2013-05-24 11:06:16 -05:00
sinn3r
e169ccab4f
Landing #1862 - Remove inline unit tests
2013-05-23 22:19:29 -05:00
Luke Imhoff
1a487e476d
Merge branch 'master' into bug/module-load-cache-update
2013-05-23 14:23:14 -05:00
David Maloney
0f21861921
Add task handling to imports
...
allow imports to carry along task info
[Story #49167601 ]
2013-05-23 13:33:19 -05:00
Tod Beardsley
05916c079e
Inline unit tests are so last decade
...
Aside from codebase-wide changes, nearly all of these tests haven't been
touched since before 2010, and there is no effort to maintain this style
of testing. We've moved on to (correctly) seperating out our tests from
our codebase.
2013-05-23 12:41:14 -05:00
Tod Beardsley
a852304ba3
DRY: Move check things to the common module level
...
While it makes lots of sense to bring check to all modules, of course
some modules will not be able to actually use it. Namely modules like
nop and payload modules. If you're feeling creative, you could probably
come up with semantically similar checks for those, too.
2013-05-23 11:42:41 -05:00
Tod Beardsley
7436fdad72
First, copy-pasta and add a test
2013-05-23 11:26:53 -05:00
David Maloney
d8074c0bf4
Use create not new
...
Was calling .new instead of .create
[Story #49167601 ]
2013-05-22 18:29:22 -05:00
Luke Imhoff
2b70ec2e08
Payload compatible cache_in_memory
...
[#47720609 ]
Msf::PayloadSet#add_module does NOT return an annotated module class as
Msf::ModuleSet#add_module does because a payload module is defined as a
ruby Module instead of a ruby Class. Since add_module doesn't always
return an annotated_class, the logic in
Msf::ModuleManager#on_module_load needed to change to NOT use
annotated_class and create #add_module as return [void]. Thus, it is
necessary to pass in all the metasploit module metadata to
Msf::ModuleManager#cache_in_memory instead of assuming they can be
derived from the (payload) Module or (other) Class.
2013-05-22 16:06:02 -05:00
David Maloney
69dd7f5c58
Update Mdm and Add Task stuff to report
...
make report_* methods aware of Tasks
[Story #49167601 ]
2013-05-22 14:59:43 -05:00
Luke Imhoff
57576de85f
Update in-memory cache to fix file_changed?
...
[#47720609 ]
Msf::ModuleManager#module_info_by_path was not being updated when a
module was loaded, so if a load_module was called again, say during
start up of prosvc, the module would reload even though there was no
change in the file because file_changed? couldn't find an entry for the
module's path in module_info_by_path.
2013-05-22 12:28:42 -05:00
sinn3r
e2aad8930d
Landing #1853 - Remove ID tags
2013-05-22 12:12:55 -05:00
sinn3r
8483528ae0
Restore generic.rb to the correct state
2013-05-22 12:11:06 -05:00
sinn3r
1cf485fad1
Restore tcp.rb to its current state
2013-05-22 12:06:36 -05:00
sinn3r
162ecd7b45
Landing #1851 - Alias 'run' to 'exploit'
2013-05-22 11:56:04 -05:00
Luke Imhoff
eede80509f
Reuse appropriate terminology in docs
...
[#47720609 ]
Fix some docs and variable names to make it clearer when methods are
expecting module instance and module classes. Change some 'name'
variables to 'reference_name' since that's the proper terminology.
2013-05-21 08:19:47 -05:00
James Lee
f4498c3916
Remove $Id tags
...
Also adds binary coding magic comment to a few files
2013-05-20 16:21:03 -05:00
Luke Imhoff
89bd5b4791
Reset column information after running migrations
...
[#50179803 ]
[SeeRM #7967 ]
[SeeRM #7870 ]
Because metasploit-framework runs migrations with the same process and
with the same connection as it later accesses the database, the column
information can become cached prematurely and be incorrect by the end of
the migrations. Fix the bad cache by automatically resetting the column
information for all model classes after the migrations have run.
2013-05-20 13:08:07 -05:00
Luke Imhoff
398dcfa8cb
Merge branch 'master' into bug/migrations
2013-05-20 12:49:33 -05:00