79d393c5aa
Resolve merge conflicts
...
Conflicts:
lib/msf/core/exploit/smb.rb
lib/msf/core/exploit/tcp.rb
modules/auxiliary/scanner/http/axis_login.rb
2014-10-21 13:06:35 -05:00
85f48a3fb2
Land #3738 , SMBServer file descriptor updates
2014-10-20 12:40:43 -05:00
2986031db5
Move SMBServer into its own file
2014-10-15 14:22:23 -05:00
8fa666b75d
Verbose messages on why a connection is closed
2014-09-28 17:41:21 -07:00
4966082de5
Replace 'rescue nil' with DRY-violating versions :(
2014-09-03 23:06:11 -05:00
85c5de07ec
Fix use of datastore['SMBServerIdleTimeout']
2014-09-02 13:47:01 -05:00
6fcc864942
Reduce the chance of file descriptor leaks in SMBServer
...
This patch addresses three observed error conditions in long-running SMB services.
1. A call to get_once() in on_client_data could raise a Timeout exception and bubble all the way up to the dispatcher. This should technically never happen, but gets triggered for zero-byte writes and clients closing their connections. The fix was to handle the exception and lower the timeout. The change was tested with a number of SMB clients to make sure this didn't introduce any regressions.
2. A client could indefinitely keep a connection to the SMB server. The SMB server now disconnects idle clients after 120 seconds of inactivity (configurable).
3. A client could send a large amount of data that was invalid SMB traffic, using up memory as a potential DoS.
Caveats: The idle client sweep occurs every 100 requests or at an interval equal to the idle timeout. A client could fill up the entire connection table on its own, preventing the sweep from occurring by preventing new connections. Fixing this would require a dedicated thread to sweep for idle connections and is a more aggressive attack than this patch is designed to defend against (accidental connection flooding, basically).
2014-09-02 13:29:37 -05:00
20bbf7837c
Refactor and integrate smb_fingerprint() for Recog support
2014-03-30 05:52:23 -07:00
5606958320
Resolve require order
2014-01-02 23:46:18 +00:00
72dff03426
FixRM #8396 change all lib use of regex to 8-bit pattern
2013-09-12 16:58:49 -05:00
7e5e0f7fc8
Retab lib
2013-08-30 16:28:33 -05:00
4703278183
Move SMB mixins into their own directory
2013-02-19 12:55:06 -06:00
ede804e6af
Make psexec mixin a bit better
...
* Removes copy-pasted code from psexec_command module and uses the mixin
instead
* Uses the SMB protocol to delete files rather than psexec'ing to call
cmd.exe and del
* Replaces several instances of "rescue StandardError" with better
exception handling so we don't accidentally swallow things like
NoMethodError
* Moves file reading and existence checking into the Exploit::SMB mixin
2013-02-19 12:33:19 -06:00
d656e3185f
Mark all libraries as defaulting to 8-bit strings
2012-06-29 00:18:28 -05:00
bf105f48cb
massive removal of spaces at EOL and some bad tabs
2011-11-20 12:32:06 +11:00
9ce47c01bd
Reverting the autoload changes until we can upgrade to a new ActiveSupport library or find a workaround
...
git-svn-id: file:///home/svn/framework3/trunk@12600 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:03:55 +00:00
06779bc8c0
remove unnecessary requires for stuff in rex. autoload and a high-level require 'rex' in lib/msf/core.rb should take care of everything. see #4371 , #4373 , r12587, and r12554.
...
git-svn-id: file:///home/svn/framework3/trunk@12588 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 00:53:33 +00:00
e9372d0e51
add another require
...
git-svn-id: file:///home/svn/framework3/trunk@12501 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 03:40:34 +00:00
19a4a2d88a
move some code from lib/rex/proto/smb/client to lib/rex/proto/ntlm/util and add a mini mixin for ntlm
...
git-svn-id: file:///home/svn/framework3/trunk@12162 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 20:14:56 +00:00
f4ceb83e40
send spn avp by default ; it wont hurt at all
...
git-svn-id: file:///home/svn/framework3/trunk@11992 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 20:01:28 +00:00
91c50f7683
use self.rhost instead of datastore['RHOST']
...
git-svn-id: file:///home/svn/framework3/trunk@11973 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:34:07 +00:00
b7a0a305ee
allow psexec to success when SPN validation level is required on windows seven / 2008r2 servers
...
git-svn-id: file:///home/svn/framework3/trunk@11971 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:12:07 +00:00
fc8c0681de
remove an option present twice
...
git-svn-id: file:///home/svn/framework3/trunk@11905 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 00:42:12 +00:00
e71e609ab0
Rework this option as well
...
git-svn-id: file:///home/svn/framework3/trunk@11903 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 23:46:44 +00:00
c2aede0a59
Revert an overzealous search/replace
...
git-svn-id: file:///home/svn/framework3/trunk@11902 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 23:31:06 +00:00
5c2abe4dd7
This patch reworks some of the new SMB names to match the standard option format
...
git-svn-id: file:///home/svn/framework3/trunk@11901 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 23:29:34 +00:00
5f6995e8d3
enable ntlmv2 and signing for smb client stack (pth implementation is coming), fixes #11678 and #152
...
git-svn-id: file:///home/svn/framework3/trunk@11893 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-07 19:57:53 +00:00
ac651fba6b
Merge code from Alexandre Maloteaux, fixes #3615
...
git-svn-id: file:///home/svn/framework3/trunk@11678 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 19:26:35 +00:00
0204cedca6
Makes the print_status displays more consistent between smb_login and psexec by moving some of the domain display functions up into exploit/smb proper.
...
git-svn-id: file:///home/svn/framework3/trunk@11204 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:29:26 +00:00
bed66d4f64
Change the default domain to "." (local host) from WORKGROUP. Suggestion from Rob Fuller (mubix)
...
git-svn-id: file:///home/svn/framework3/trunk@10952 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 20:07:17 +00:00
040a292181
Create a new mixin that changes SMBUser/SMBPass to normal options, include this mixin within SMB modules that more often than not require authentication
...
git-svn-id: file:///home/svn/framework3/trunk@9981 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-12 15:00:58 +00:00
c3eccf2cb5
Change default to 445, its 2010
...
git-svn-id: file:///home/svn/framework3/trunk@8941 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 21:00:28 +00:00
993ba44fcf
SMB updates, better reporting of SSL status for HTTP
...
git-svn-id: file:///home/svn/framework3/trunk@8459 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 22:37:00 +00:00
0bf2f7dd9e
Clean up trailing whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@7987 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:29:24 +00:00
de7cabaed1
Handle dashes in the version strings and add generic catch-alls for windows
...
git-svn-id: file:///home/svn/framework3/trunk@7986 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:26:24 +00:00
b80ebd45f1
Better parsing of Windows 2008 versions (should handle Hyper-V variants now)
...
git-svn-id: file:///home/svn/framework3/trunk@7985 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:17:35 +00:00
6147db8722
Fixes #696 . Default direct to FALSE if port is 139
...
git-svn-id: file:///home/svn/framework3/trunk@7933 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 19:04:28 +00:00
58711ec7ad
See #509
...
git-svn-id: file:///home/svn/framework3/trunk@7535 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:28:45 +00:00
80ee6157ed
fix a few warnings
...
git-svn-id: file:///home/svn/framework3/trunk@7492 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 20:28:36 +00:00
737dc327a3
Fixes #435 . Resolves a long-standing issue where datastore entries with a default of 'false' were being ignored.
...
git-svn-id: file:///home/svn/framework3/trunk@7334 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 18:09:05 +00:00
3cf4329335
Updates the autopwn matching algorithm to use multiple ports and service names
...
git-svn-id: file:///home/svn/framework3/trunk@7298 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-28 18:04:50 +00:00
0d1098e6bf
Make the SMB connect() method take an optional 'global' argument, allows for secondary SMB connections
...
git-svn-id: file:///home/svn/framework3/trunk@7053 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-22 21:26:20 +00:00
5cbef4983f
Add detection of Windows Storage Server 2008
...
git-svn-id: file:///home/svn/framework3/trunk@6724 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-28 20:23:31 +00:00
8ba889e7be
Add signature for Windows 7
...
git-svn-id: file:///home/svn/framework3/trunk@6723 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-28 14:39:07 +00:00
26b9903b0d
Changes Auxiliary::Scanner to use a new module instance for each thread, updates associated mixins and modules to support this change.
...
git-svn-id: file:///home/svn/framework3/trunk@6401 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 05:49:33 +00:00
9ddc62fc40
Handle cases where RPORT is 139 and the user did not change SMBDirect to false
...
git-svn-id: file:///home/svn/framework3/trunk@6351 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-17 19:11:26 +00:00
69c169bb2f
Replace unicode with raw hex for future compatibility
...
git-svn-id: file:///home/svn/framework3/trunk@6310 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 18:17:08 +00:00
248f1e9fc3
Remove "#{xxx.to_s}" redundancies ('s/\(#{[^}]*\)\.to_s}/\1}/g')
...
git-svn-id: file:///home/svn/framework3/trunk@6022 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 07:11:08 +00:00
0881649f14
The psexec and smb_relay module now automatically cleanup. The ms08-06 module now supports all languages of XP SP3.
...
git-svn-id: file:///home/svn/framework3/trunk@5841 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 22:27:59 +00:00
68b9a2a421
Adds a new submitted fingerprint for Czech
...
git-svn-id: file:///home/svn/framework3/trunk@5836 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 07:13:48 +00:00
sinn3r
Tod Beardsley
James Lee
HD Moore
Meatballs
Tab Assassin
James Lee
Joshua Drake
amaloteaux