Luke Imhoff
a745c3a4a0
metasploit_data_models 0.3.0 installed in gemcache
2012-11-01 08:56:00 -05:00
Luke Imhoff
558b8b0fcf
File renames and restructuring for metasploit_data_models 0.3.0
2012-11-01 08:43:06 -05:00
Luke Imhoff
6aed38f309
Update metasploit_data_models paths for version 0.3.0
2012-11-01 08:39:18 -05:00
jvazquez-r7
c27a4d5de2
Merge branch 'master' into bug/handle-100-continue
2012-10-31 18:56:33 +01:00
James Lee
d0650dfb25
Put a bandaid over getsockname
...
Depending on how a socket was created, #getsockname will return either a
struct sockaddr as a String (the default ruby Socket behavior) or an
Array (the extend'd Rex::Socket::Tcp behavior). Avoid the ambiguity when
generating SSL certificates for meterpreter handlers by always picking a
random hostname.
This is by no means a proper fix for the underlying problem of
Socket#getsockname having ambiguous behavior before and after being
extended with Rex::Socket::Tcp. It does, however, solve the immediate
problem of not being able to create tunneled meterpreter sessions over
http(s) sessions.
[SeeRM #7350 ]
2012-10-29 22:45:46 -05:00
HD Moore
6ec392c4cf
Add Rex::Text.sha1 and Rex::Text.sha1_raw
2012-10-28 23:49:21 -05:00
HD Moore
adc9532ec7
Reset this back to master's copy, fixes this pull
2012-10-28 23:13:32 -05:00
HD Moore
43fe219a05
This improves handling of 100-continue responses
2012-10-28 22:57:18 -05:00
sinn3r
7a1c3e7cf6
Merge branch 'dmaloney-r7-WinRM_piecemeal'
2012-10-27 18:55:24 -05:00
scriptjunkie
3efa4186df
Fix search error when platform not in target name
2012-10-27 16:28:38 -05:00
David Maloney
bfbae5fbb7
Merge branch 'upstream-master' into WinRM_piecemeal
...
Conflicts:
lib/msf/core/exploit/winrm.rb
2012-10-24 14:12:28 -05:00
David Maloney
1dcbbdf162
changed indent level
2012-10-24 13:50:44 -05:00
David Maloney
a15c35091d
Add the WinRM login module
2012-10-24 11:25:39 -05:00
sinn3r
77c8548855
Merge branch 'dmaloney-r7-WinRM_piecemeal'
2012-10-23 16:33:16 -05:00
sinn3r
8c1304557f
Code cleanup
2012-10-23 16:32:26 -05:00
sinn3r
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
David Maloney
e19f2d235c
Actually use the timeout in winrm cmd
2012-10-23 11:29:32 -05:00
sinn3r
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
David Maloney
04fd990741
bad indent
2012-10-22 17:03:40 -05:00
David Maloney
e08cedec2e
Requested revisions/cleanup
...
minor fixes to spacing, some typos, and abse64 switched to Rex
2012-10-22 17:01:00 -05:00
sinn3r
af918b84a0
Merge branch 'standardize_authorship' of git://github.com/mubix/metasploit-framework into mubix-standardize_authorship
2012-10-22 16:47:03 -05:00
Rob Fuller
28f47e9aa0
fix spacing for all authors
2012-10-22 17:22:37 -04:00
Rob Fuller
a13a88ce28
fix spacing
2012-10-22 17:07:58 -04:00
Rob Fuller
7437d9844b
standardizing author info
2012-10-22 17:01:58 -04:00
James Lee
dafb56f6b6
Merge branch 'dmaloney-r7-findpids' into rapid7
...
[Closes #950 ]
2012-10-22 15:52:07 -05:00
James Lee
651f9b9c8f
Use opts.usage instead of a Table
2012-10-22 15:16:55 -05:00
HD Moore
2436ac3a58
Revert "Merge branch 'migrator' of git://github.com/scriptjunkie/metasploit-framework into scriptjunkie-migrator"
...
This reverts commit ca07bdbad6
, reversing
changes made to ed3f87b738
.
2012-10-20 22:38:31 -05:00
HD Moore
04e1856a4f
Fix a copypasta error triggered by a failed load
2012-10-20 15:00:11 -05:00
sinn3r
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
David Maloney
57514e5407
Msftidyness
2012-10-19 16:56:52 -05:00
sinn3r
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
sinn3r
ca07bdbad6
Merge branch 'migrator' of git://github.com/scriptjunkie/metasploit-framework into scriptjunkie-migrator
2012-10-19 15:25:45 -05:00
David Maloney
56cbe6a67e
Some minor fixups
2012-10-19 15:25:03 -05:00
David Maloney
3a8dd261ae
WinRM mixin and basic discovery module
2012-10-19 15:08:58 -05:00
Tod Beardsley
b7652b44d5
Adding prepend_migrate?
2012-10-19 14:24:13 -05:00
James Lee
ffa4373242
Merge branch 'rapid7' into wchen-r7-print_warning
...
[Closes #899 ]
2012-10-19 13:49:32 -05:00
jvazquez-r7
205dc8870a
Merge branch 'prependsetguid' of https://github.com/mephos/metasploit-framework into mephos-prependsetguid
2012-10-19 10:33:56 +02:00
Meatballs
e1a4ec2fcc
Fix to SMB Client when using find_first on a directory with exactly 20 files.
2012-10-17 21:58:20 +01:00
scriptjunkie
0564a6eaa7
Add migrate stub option to Windows x86 payloads.
...
Migrate stub spawns payload in new process.
2012-10-16 20:53:36 -05:00
Tod Beardsley
dd1a352ae1
Merge remote branch 'jlee-r7/dont-require-dot-rb'
2012-10-15 18:41:16 -05:00
James Lee
45a60b6bdd
Clarify why we need to sleep.
...
[Closes #911 ][FixRM #7344 ]
2012-10-15 17:54:18 -05:00
Raphael Mudge
f4b151f63d
Detect and mitigate CPU starvation condition [SeeRM #7344 ]
2012-10-15 17:54:18 -05:00
James Lee
46ed888ffe
Don't require .rb
2012-10-15 17:27:23 -05:00
Tod Beardsley
932b8ba841
Require, not load, msf, not lib/msf
2012-10-15 07:11:15 -05:00
sinn3r
d36f642edc
Add print_warning()
2012-10-12 21:48:15 -05:00
James Lee
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
Tod Beardsley
7d848c7147
Merge remote branch 'origin/bug/fastlib-nested-pathnames'
2012-10-10 17:31:36 -05:00
m m
90b948ffb3
add PrependSet[re]gid support for unix payloads
2012-10-10 12:14:00 +02:00
sinn3r
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
sinn3r
1ba57af00a
Merge branch 'master' into bug/windows-pro-modules
2012-10-09 11:15:45 -05:00