dash/rdpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add string readlen arg to avoid recurcive loop

Browse Source
This commit is contained in:
speyrefitte
2013-12-10 12:06:23 +01:00
parent e32def4f50
commit fcf853e823
6 changed files with 238 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rdpy/protocol/rdp/gcc.py
View File

@@ -18,6 +18,7 @@ class ServerToClientMessage(object):
'''
Server to Client block
gcc conference messages
@see: http://msdn.microsoft.com/en-us/library/cc240509.aspx
'''
SC_CORE = 0x0C01
SC_SECURITY = 0x0C02
@@ -29,6 +30,7 @@ class ClientToServerMessage(object):
'''
Client to Server block
gcc conference messages
@see: http://msdn.microsoft.com/en-us/library/cc240509.aspx
'''
CS_CORE = 0xC001
CS_SECURITY = 0xC002
@@ -41,6 +43,7 @@ class ClientToServerMessage(object):
class ColorDepth(object):
'''
depth color
@see: http://msdn.microsoft.com/en-us/library/cc240510.aspx
'''
RNS_UD_COLOR_8BPP = 0xCA01
RNS_UD_COLOR_16BPP_555 = 0xCA02
@@ -52,6 +55,7 @@ class ColorDepth(object):
class HighColor(object):
'''
high color of client
@see: http://msdn.microsoft.com/en-us/library/cc240510.aspx
'''
HIGH_COLOR_4BPP = 0x0004
HIGH_COLOR_8BPP = 0x0008
@@ -64,6 +68,7 @@ class HighColor(object):
class Support(object):
'''
support depth flag
@see: http://msdn.microsoft.com/en-us/library/cc240510.aspx
'''
RNS_UD_24BPP_SUPPORT = 0x0001
RNS_UD_16BPP_SUPPORT = 0x0002
@@ -74,8 +79,8 @@ class Support(object):
@TypeAttributes(UInt16Le)
class CapabilityFlags(object):
'''
@see: http://msdn.microsoft.com/en-us/library/cc240510.aspx
for more details on each flags click above
@see: http://msdn.microsoft.com/en-us/library/cc240510.aspx
'''
RNS_UD_CS_SUPPORT_ERRINFO_PDU = 0x0001
RNS_UD_CS_WANT_32BPP_SESSION = 0x0002
@@ -110,6 +115,7 @@ class ConnectionType(object):
class Version(object):
'''
supported version of RDP
@see: http://msdn.microsoft.com/en-us/library/cc240510.aspx
'''
RDP_VERSION_4 = 0x00080001
RDP_VERSION_5_PLUS = 0x00080004
@@ -125,6 +131,7 @@ class Encryption(object):
'''
encryption method supported
@deprecated: because rdpy use ssl but need to send to server...
@see: http://msdn.microsoft.com/en-us/library/cc240511.aspx
'''
ENCRYPTION_FLAG_40BIT = 0x00000001
ENCRYPTION_FLAG_128BIT = 0x00000002
@@ -153,6 +160,7 @@ class ChannelOptions(object):
class ClientCoreSettings(CompositeType):
'''
class that represent core setting of client
@see: http://msdn.microsoft.com/en-us/library/cc240510.aspx
'''
def __init__(self):
CompositeType.__init__(self)
@@ -163,18 +171,18 @@ class ClientCoreSettings(CompositeType):
self.sasSequence = Sequence.RNS_UD_SAS_DEL
self.kbdLayout = UInt32Le(0x409)
self.clientBuild = UInt32Le(3790)
self.clientName = UniString("rdpy" + "\x00"*11)
self.clientName = UniString("rdpy" + "\x00"*11, readLen = UInt8(30))
self.keyboardType = UInt32Le(4)
self.keyboardSubType = UInt32Le(0)
self.keyboardFnKeys = UInt32Le(12)
self.imeFileName = String("\x00"*64)
self.imeFileName = String("\x00"*64, readLen = UInt8(64))
self.postBeta2ColorDepth = ColorDepth.RNS_UD_COLOR_8BPP
self.clientProductId = UInt16Le(1)
self.serialNumber = UInt32Le(0)
self.highColorDepth = HighColor.HIGH_COLOR_24BPP
self.supportedColorDepths = Support.RNS_UD_24BPP_SUPPORT | Support.RNS_UD_16BPP_SUPPORT | Support.RNS_UD_15BPP_SUPPORT
self.earlyCapabilityFlags = CapabilityFlags.RNS_UD_CS_SUPPORT_ERRINFO_PDU
self.clientDigProductId = String("\x00"*64)
self.clientDigProductId = String("\x00"*64, readLen = UInt8(64))
self.connectionType = UInt8()
self.pad1octet = UInt8()
self.serverSelectedProtocol = UInt32Le()
@@ -182,6 +190,7 @@ class ClientCoreSettings(CompositeType):
class ServerCoreSettings(CompositeType):
'''
server side core settings structure
@see: http://msdn.microsoft.com/en-us/library/cc240517.aspx
'''
def __init__(self):
CompositeType.__init__(self)
@@ -192,6 +201,7 @@ class ClientSecuritySettings(CompositeType):
'''
client security setting
@deprecated: because we use ssl
@see: http://msdn.microsoft.com/en-us/library/cc240511.aspx
'''
def __init__(self):
CompositeType.__init__(self)
@@ -204,6 +214,7 @@ class ServerSecuritySettings(CompositeType):
may be ignore because rdpy don't use
RDP security level
@deprecated: because we use ssl
@see: http://msdn.microsoft.com/en-us/library/cc240518.aspx
'''
def __init__(self):
CompositeType.__init__(self)
@@ -215,11 +226,13 @@ class ClientRequestedChannel(CompositeType):
'''
channels structure share between
client and server
@see: http://msdn.microsoft.com/en-us/library/cc240512.aspx
@see: http://msdn.microsoft.com/en-us/library/cc240513.aspx
'''
def __init__(self, name = "", options = UInt32Le()):
CompositeType.__init__(self)
#name of channel
self.name = String(name[0:8] + "\x00" * (8 - len(name)))
self.name = String(name[0:8] + "\x00" * (8 - len(name)), readLen = UInt8(8))
#unknown
self.options = options
@@ -355,6 +368,7 @@ def readServerSecurityData(s):
read all channels accepted by server by server
@param s: Stream
@return: list of channel id selected by server
@see: http://msdn.microsoft.com/en-us/library/cc240522.aspx
'''
channelsId = []
channelId = UInt16Le()

37
rdpy/protocol/rdp/gdl.py
View File

@@ -8,6 +8,7 @@ from rdpy.utils.const import ConstAttributes, TypeAttributes
from rdpy.protocol.network.error import InvalidExpectedDataException
import gcc
import lic
@ConstAttributes
@TypeAttributes(UInt16Le)
@@ -70,7 +71,7 @@ class RDPInfo(CompositeType):
client informations
contains credentials (very important packet)
'''
def __init__(self, initForWrite, extendedInfoConditional):
def __init__(self, extendedInfoConditional):
CompositeType.__init__(self)
#code page
self.codePage = UInt32Le()
@@ -86,37 +87,36 @@ class RDPInfo(CompositeType):
self.cbAlternateShell = UInt16Le(lambda:sizeof(self.alternateShell) - 2)
#length of working directory unistring less 2 byte null terminate
self.cbWorkingDir = UInt16Le(lambda:sizeof(self.workingDir) - 2)
#to avoid recurcive loop init differ from reading and writing
#microsoft domain
self.domain = UniString("" if initForWrite else lambda:"\x00" * self.cbDomain.value)
self.domain = UniString(readLen = self.cbDomain)
#session username
self.userName = UniString("" if initForWrite else lambda:"\x00" * self.cbUserName.value)
self.userName = UniString(readLen = self.cbUserName)
#associate password
self.password = UniString("" if initForWrite else lambda:"\x00" * self.cbPassword.value)
self.password = UniString(readLen = self.cbPassword)
#shell execute at start of session
self.alternateShell = UniString("" if initForWrite else lambda:"\x00" * self.cbAlternateShell.value)
self.alternateShell = UniString(readLen = self.cbAlternateShell)
#working directory for session
self.workingDir = UniString("" if initForWrite else lambda:"\x00" * self.cbWorkingDir.value)
self.workingDir = UniString(readLen = self.cbWorkingDir)
#more client informations
self.extendedInfo = RDPExtendedInfo(initForWrite, conditional = extendedInfoConditional)
self.extendedInfo = RDPExtendedInfo(conditional = extendedInfoConditional)
class RDPExtendedInfo(CompositeType):
'''
add more client informations
use for performance flag!!!
'''
def __init__(self, initForWrite, conditional):
def __init__(self, conditional):
CompositeType.__init__(self, conditional = conditional)
#is an ip v4 or v6 adresse
self.clientAddressFamily = AfInet.AF_INET
#len of adress field
self.cbClientAddress = UInt16Le(lambda:sizeof(self.clientAddress))
#adress of client
self.clientAddress = UniString("" if initForWrite else lambda:"\x00" * self.cbClientAddress.value)
self.clientAddress = UniString(readLen = self.cbClientAddress)
#len of client directory
self.cbClientDir = UInt16Le(lambda:sizeof(self.clientDir))
#self client directory
self.clientDir = UniString("" if initForWrite else lambda:"\x00" * self.cbClientDir.value)
self.clientDir = UniString(readLen = self.cbClientDir)
#TODO make tiomezone
#self.performanceFlags = PerfFlag.PERF_DISABLE_WALLPAPER | PerfFlag.PERF_DISABLE_MENUANIMATIONS | PerfFlag.PERF_DISABLE_CURSOR_SHADOW
@@ -134,7 +134,7 @@ class GDL(LayerAutomata):
#set by mcs layer channel init
self._channelId = UInt16Be()
#logon info send from client to server
self._info = RDPInfo(initForWrite = True, extendedInfoConditional = lambda:self._transport._serverSettings.core.rdpVersion == gcc.Version.RDP_VERSION_5_PLUS)
self._info = RDPInfo(extendedInfoConditional = lambda:self._transport._serverSettings.core.rdpVersion == gcc.Version.RDP_VERSION_5_PLUS)
def connect(self):
'''
@@ -147,7 +147,7 @@ class GDL(LayerAutomata):
def sendInfoPkt(self):
'''
send a logon info packet for RDP version 5 protocol
send a logon info packet
'''
#always send extended info because rdpy only accept rdp version 5 and more
self._transport.send(self._channelId, (SecurityFlag.SEC_INFO_PKT, UInt16Le(), self._info))
@@ -158,4 +158,13 @@ class GDL(LayerAutomata):
data.readType((securityFlag, securityFlagHi))
if securityFlag & SecurityFlag.SEC_LICENSE_PKT != SecurityFlag.SEC_LICENSE_PKT:
raise InvalidExpectedDataException("waiting license packet")
raise InvalidExpectedDataException("waiting license packet")
validClientPdu = lic.LicPacket()
data.readType(validClientPdu)
if not validClientPdu.errorMessage._is_readed:
raise InvalidExpectedDataException("waiting valid client pdu : rdpy doesn't support licensing neg")
if not (validClientPdu.errorMessage.dwErrorCode == lic.ErrorCode.STATUS_VALID_CLIENT and validClientPdu.errorMessage.dwStateTransition == lic.StateTransition.ST_NO_TRANSITION):
raise InvalidExpectedDataException("server refuse licensing negotiation")

48
rdpy/protocol/rdp/lic.py
View File

@@ -1,12 +1,15 @@
'''
@author: sylvain
'''
from rdpy.protocol.network.type import CompositeType, UInt8, UInt16Le, sizeof
from rdpy.protocol.network.type import CompositeType, UInt8, UInt16Le, UInt32Le, String, sizeof
from rdpy.utils.const import ConstAttributes, TypeAttributes
@ConstAttributes
@TypeAttributes(UInt8)
class MessageType(object):
'''
License packet message type
'''
LICENSE_REQUEST = 0x01
PLATFORM_CHALLENGE = 0x02
NEW_LICENSE = 0x03
@@ -15,11 +18,54 @@ class MessageType(object):
NEW_LICENSE_REQUEST = 0x13
PLATFORM_CHALLENGE_RESPONSE = 0x15
ERROR_ALERT = 0xFF
@ConstAttributes
@TypeAttributes(UInt32Le)
class ErrorCode(object):
'''
license error message code
'''
ERR_INVALID_SERVER_CERTIFICATE = 0x00000001
ERR_NO_LICENSE = 0x00000002
ERR_INVALID_SCOPE = 0x00000004
ERR_NO_LICENSE_SERVER = 0x00000006
STATUS_VALID_CLIENT = 0x00000007
ERR_INVALID_CLIENT = 0x00000008
ERR_INVALID_PRODUCTID = 0x0000000B
ERR_INVALID_MESSAGE_LEN = 0x0000000C
ERR_INVALID_MAC = 0x00000003
@ConstAttributes
@TypeAttributes(UInt32Le)
class StateTransition(object):
'''
automata state transition
'''
ST_TOTAL_ABORT = 0x00000001
ST_NO_TRANSITION = 0x00000002
ST_RESET_PHASE_TO_START = 0x00000003
ST_RESEND_LAST_MESSAGE = 0x00000004
class LicenceBinaryBlob(CompositeType):
def __init__(self):
CompositeType.__init__(self)
self.wBlobType = UInt16Le()
self.wBlobLen = UInt16Le(lambda:sizeof(self.blobData))
self.blobData = String(readLen = self.wBlobLen, conditional = lambda:self.wBlobLen.value > 0)
class LicensingErrorMessage(CompositeType):
def __init__(self, conditional = lambda:True):
CompositeType.__init__(self, conditional = conditional)
self.dwErrorCode = UInt32Le()
self.dwStateTransition = UInt32Le()
self.blob = LicenceBinaryBlob()
class LicPacket(CompositeType):
def __init__(self):
CompositeType.__init__(self)
#preambule
self.bMsgtype = UInt8()
self.flag = UInt8()
self.wMsgSize = UInt16Le(lambda: sizeof(self))
self.errorMessage = LicensingErrorMessage(conditional = lambda:self.bMsgtype == MessageType.ERROR_ALERT)

6
rdpy/protocol/rdp/tpdu.py
View File

@@ -77,6 +77,9 @@ class TPDUDataHeader(CompositeType):
class Negotiation(CompositeType):
'''
negociation request message
@see: request -> http://msdn.microsoft.com/en-us/library/cc240500.aspx
@see: response -> http://msdn.microsoft.com/en-us/library/cc240506.aspx
@see: failure ->http://msdn.microsoft.com/en-us/library/cc240507.aspx
'''
def __init__(self, optional = False):
CompositeType.__init__(self, optional = optional)
@@ -118,6 +121,8 @@ class TPDU(LayerAutomata):
next state is recvData
call connect on presentation layer if all is good
@param data: Stream that contain connection confirm
@see: response -> http://msdn.microsoft.com/en-us/library/cc240506.aspx
@see: failure ->http://msdn.microsoft.com/en-us/library/cc240507.aspx
'''
message = TPDUConnectMessage()
data.readType(message)
@@ -161,6 +166,7 @@ class TPDU(LayerAutomata):
'''
write connection request message
next state is recvConnectionConfirm
@see: http://msdn.microsoft.com/en-us/library/cc240500.aspx
'''
message = TPDUConnectMessage()
message.code = MessageType.X224_TPDU_CONNECTION_REQUEST