From 4793667435923fd7db5c92007b30eab2839aaca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= Date: Wed, 15 Mar 2017 10:54:06 +0100 Subject: [PATCH] * Fixed signatures && rdp transport direct now works fine again --- client/src/UDSClient.py | 2 +- server/src/uds/transports/RDP/BaseRDPTransport.py | 15 ++++++++------- server/src/uds/transports/RDP/RDPTransport.py | 3 --- .../RDP/scripts/linux/direct.py.signature | 2 +- .../RDP/scripts/macosx/direct.py.signature | 2 +- .../RDP/scripts/macosx/tunnel.py.signature | 2 +- .../uds/transports/RDP/scripts/windows/direct.py | 2 +- .../RDP/scripts/windows/direct.py.signature | 2 +- 8 files changed, 14 insertions(+), 16 deletions(-) diff --git a/client/src/UDSClient.py b/client/src/UDSClient.py index 25dfa1a1b..55242a38f 100755 --- a/client/src/UDSClient.py +++ b/client/src/UDSClient.py @@ -32,7 +32,7 @@ ''' from __future__ import unicode_literals -from PyQt4 import QtCore, QtGui +from PyQt4 import QtCore, QtGui # @UnresolvedImport from uds.rest import RestRequest from uds.forward import forward # @UnusedImport diff --git a/server/src/uds/transports/RDP/BaseRDPTransport.py b/server/src/uds/transports/RDP/BaseRDPTransport.py index 91cede61e..b334fe260 100644 --- a/server/src/uds/transports/RDP/BaseRDPTransport.py +++ b/server/src/uds/transports/RDP/BaseRDPTransport.py @@ -40,7 +40,7 @@ from uds.core.transports import protocols import logging import os -__updated__ = '2017-03-10' +__updated__ = '2017-03-15' logger = logging.getLogger(__name__) @@ -117,12 +117,13 @@ class BaseRDPTransport(Transport): if self.withoutDomain.isTrue(): domain = '' - if '.' in domain: # Dotter domain form - username = username + '@' + domain - domain = '' - else: # In case of a NETBIOS domain (not recomended), join it so processUserPassword can deal with it - username = domain + '\\' + username - domain = '' + if domain != '': # If has domain + if '.' in domain: # Dotter domain form + username = username + '@' + domain + domain = '' + else: # In case of a NETBIOS domain (not recomended), join it so processUserPassword can deal with it + username = domain + '\\' + username + domain = '' # Temporal "fix" to check if we do something on processUserPassword diff --git a/server/src/uds/transports/RDP/RDPTransport.py b/server/src/uds/transports/RDP/RDPTransport.py index 1f09fb379..a1a48f141 100644 --- a/server/src/uds/transports/RDP/RDPTransport.py +++ b/server/src/uds/transports/RDP/RDPTransport.py @@ -103,9 +103,6 @@ class RDPTransport(BaseRDPTransport): r.smartcardString = self.smartcardString.value r.printerString = self.printerString.value - logger.debug('username: {}, pass: {pass}'.format(username, password)) - return '', '', '' - # data # data = { # 'os': os['OS'], diff --git a/server/src/uds/transports/RDP/scripts/linux/direct.py.signature b/server/src/uds/transports/RDP/scripts/linux/direct.py.signature index 846a48c5f..80ba920a4 100644 --- a/server/src/uds/transports/RDP/scripts/linux/direct.py.signature +++ b/server/src/uds/transports/RDP/scripts/linux/direct.py.signature @@ -1 +1 @@ -il0AeNGd2PwU8jovjM8EPVgs1ja3kVJHcTdJyPCFKfO190Ixzc/tZdzYxVVXML2yLc+7evhZtt/hP63VeFVvD4IT6IWrNmaLZpef67RBSQ9B4Yqcf9P6AavDZkLd0dZO+L0NHI56FTg1yymGE/ohLczikzjfEpT/1hEJcjz0Gu5uLeuyhiNOSw2A8bW14haPDgWl0edneJzNET3nZC2wBOW7rRtrREoYE5d1tpW/0ehiCgDBuUEyypmgoZ0lYDdKIbNaarind444RTGqG+uJhUzDu2NANuqwl5MdQlmgAuWCV/1WFGhovzDpJ/slweqNsuUeCHdxd0RrxxTXPKelx+Kka34L5MUIO7CDnyZVcN9lu45UEjuL0Aw9dqZvdvWP+oq3rhAngx3fLr9hccoKP2mcdAE3GsQN3lxZf2YnK/W2Q07xh+qeSwxBNfmJaA71+NokGB7IWIQMOTJDBiILTsKjcWMQdcwmVGQAb2VmG7m7SIp5URx++F7FDxwJpMvL1UqLSObPFmLcoeOMiKp5njukslL6Ug0YWc7b6l7K7NXEyMnVEqf/pcSbCG7q3g7fPArva+giMHrTujgDSTxq4RIuQ0ki9zt/ztbVGi5lUv7l93w5b7HCCXMGeRR7f/uxSL8lkYm5XV1ARFAiFuPvZ9mg+hx4kM+j3DkOn5eTiGw= \ No newline at end of file +KlTjgG2SYVml5sm3/pc7FYwnPFAzWVRMvP0bCyvl9BTjVKf1te5wM1+j3Ht7fkHcBkBt9VcG9/e90EsgtP7qBDbQJYwK1JVQVdr+pdCRSzB+KO5tX2lYsm4Af6m8YcbqV76c45S6kg4vd5W90E6aJqGAe8dNDR39fD5KiH9k2Nz4MKHTtZwJw7yKNOX7pApAGVnVMCD/zFUJZ5eKcqF34FNZm5vYrriA3Olq37X9WOrE+B+v8qZMrvuCWkPsA1Gl5tIa7eApq7Y5K7Md3feyeoTfNKv/c9QgjUcX9ispEXbTe8K0RuJiVo4yym0BZqmL81PBfqeDkMkUogAMOn2lZLEEiA+OAgstLfPStod0++pcLkAp+3ga6TAXn048Z6Pxo9PyTaiXlj8ZWXJr0ejoGg8nmD73R8MjwYtuhXLrUTNUrKaJNVUb6EReN68LDdRkLZp+W2OSMcXNoJ1pQMRoMLMH6PvKp+893yeNsoBAtVlhylA0BktUPitBM/PNGi1DQJPZp1kzWgp3sVBedIWXlcu1UE1STO4RTe6kOltnHQ/EcE0L4avEzP9NofON8XtXJVMG1vFPISLvQl7OZW45Cx2ZSFZe7/a8NqhtDX4S4YPl8MbX/YlyN/vlMltjTsiHxm0SIbNjT6Nsak/rOKy5WZ8EwHQpLPI1V4gEUNc96+8= \ No newline at end of file diff --git a/server/src/uds/transports/RDP/scripts/macosx/direct.py.signature b/server/src/uds/transports/RDP/scripts/macosx/direct.py.signature index e8aff94ed..5fea01f62 100644 --- a/server/src/uds/transports/RDP/scripts/macosx/direct.py.signature +++ b/server/src/uds/transports/RDP/scripts/macosx/direct.py.signature @@ -1 +1 @@ -I9wIw2jnOvdKH8kJVE4ikNKl9mzH2pJpefunD9JGl6Be8kqQODlaC6KOAqLlk0hpMHgYS9/f+OdWNgeQVAwcTNZ3IPl6FmbbVbwhoosa7a9t/I2Ho0jcwY8HUEqu8HS5XWzWl6Qxa1sUJeUa7SXh2/CpoIGWVkaZur1fpC4d3SmylbuQ+kkJKtMNmDn0gypIQ7RtgWq6Lf23jfHD95UYpga/fgT/oG2dB696NHUQrRsLwYxFcFIjWf9nS1JlJ5E1fkIjdQ2v3R5w+CfkazFl4l+ShGTG6b7+iIIiv5z1xMbQ5MkWHGCbqlMUq8HPalIeaTcl8BkUqr5j7T7tV9ovTe7lBVz4NuXcbfvXZWMOW/73N+K64MRcxbSyqb7fLC8sfMbHy6RrBoUltXltAIuDpetIhzf5w/dVliGiL9j0DH/152k6l48GUfUI9jkxeywgze9fZCBg/2jF5/lsQ0xWpWjDNKXHRwBxqyjatRSoyL4WWQ2cCd0P+oQoIL2y4cb+zDNu1ilIn1Yf8XVJ5pkDhhDmH0wlXJOpUp+qIck9w2VeOW8DAR5wyagpGwa0IaZ+lH6XPSkMC3FDDVg9W0GeGk1KZPt4d0/a2aOBFZQyr2wU9E/PF+winkvacxZJDN6YlKcwfFZGtEXI6efmupZNSEA2oylEQ20Fopwd0ZgxVR0= \ No newline at end of file +BZWRJIMqqPqIaCXHIf/MwSAadsvEhtTbeNuzL2IJ/ZgvQXAvxdDXwTuh+l/lslME4Miij8HqSZ/J/xcBCMhWNYGW7syHDI3hzLTvtYZN3BLAa6dSzllyvQ9NrvxiaEeiCaHxvcV+LdMsMtt6ec5EgQ8uDbhnFuQlaTMS3hf+HsF57AUiojdE+At20+OiLOemjqScW8wS7Pe/vYp4cBb0YfULRV+FwSn/ULAr30RNtcdElOjK1wcMovLdYghQmPxpc3AWQ5Vu7PQZzF0A8rPqp3h8SBzybRtLs7LGNvMzYBhPc1a3dPwpOQtMC3W3leDpBpbE/gBwh0ptOdppDFiLtNpB5bXcDc8X+Tu9UZqKaKWgTArZOOljE6MPuDpSy1BodyJoXliECp9OmMnpz7LgV869QfRI2AcGe/DXrRbaCvARz7X50bnI4kGMJFcC30Yi0tdUHz+Xc+bXWXcNXkRPdc+YaRZ8fsTSiyO6hCZraZ4S9H52SseWHgwFc77wqMllmWuMz0M1pToM+jMyo9XZzSgQKNB7i/SJVPDSQPVY6tRb/ddwdPiEb8T2TBaFmy0VYoFxQ43waSdN3n/kDQ2MCQaAvJ/CHYCutPqdf6Vl+/qWT4+x05CaHoYTblvZv9xmhI5wLbp85zg1xiEEOFeU7t09TSiCxk9kAPw8BoyfwFY= \ No newline at end of file diff --git a/server/src/uds/transports/RDP/scripts/macosx/tunnel.py.signature b/server/src/uds/transports/RDP/scripts/macosx/tunnel.py.signature index a4b8db488..0f94bfe50 100644 --- a/server/src/uds/transports/RDP/scripts/macosx/tunnel.py.signature +++ b/server/src/uds/transports/RDP/scripts/macosx/tunnel.py.signature @@ -1 +1 @@ -lomZRSNddb2cwE+njxooDiS0EN/61fk0xoBG5HhYbmcHtFDCTKCn1BO7aK5sV57E/IhBiLsqSZumv+r9j6yG0wtUop6UbxEkYLkC0sXbQpoIO4jSLtFwUBua53AMdLRWEqhKdihInQuy0XXZaVZgWMChd1EgE96HVfIDJYcDBHsANK+5zl8VtB5fzFA2KRGeVO5j9FqzudXddrvNzj/C9s4J05eKiObn6nDzStyi4faGzRJW4vOe0NNv5r/JYZFd4h/rN7j3MK1M6lKGEgvGTviRCTlEk/x/DuUFD/slw+JEFc54J50BYrxSRX3wlfu9da4HyvExKWma1fpzKhJTOQ0UE4Q+OI9SkG/6TnhhuOOCnnglzOINyDpPZEyQnm/gxro5CuaZ1FSjptgP9vS7UE8btlAFgS1NptZ0DWcOkLNiOEq7/QrnNnBiEfousBuErOcsiN+eEgBMV4cLGD74YpWoZU1p6SIWbYUvMswuAMoxxQF4lVqFHT1y4AWP0PQBdAsH00bW2b5TbFkCNpJY67wWaWNzew48AQN+CU2t5eX8dGi/W99NAlvCJ5CDxQUrjwwVNHrcU3fseKuYA7E4GuZmFBvMqGh3WnSSI7DVmmjIcyv4I2/LXhp3Cthzq560KmcRrbTbU1tKu5l7eUZf/eEqA1TR6a5rd9bR+Cn7j0U= \ No newline at end of file +O0XFwaLQ1iv31M65Wv82mPp4mawZR9PzXLL5N245eqi7tG04lc9Lf9BHyynw676orjq0VtYN1JiC3eem8EFIUKTQnUA2S+ogETSt2UCUn+njV2DWqg7N/S1unaOwPq1Ucy5MD3bdq2LxTwXeT+rtkTEmOXx/gi36uuvh5lJ4M/6dDVBdqd/OrjylU72FMHxvn+Eeinh6JsF1ZatPfvWYJFSr8KKTivTDY4AEVaEI4tDUx7GZsvr+y1is/asL+rEY4Rt2G+OvJMWgZzOTeGomvm6zHF4Ka6iyonx4Bmj9d0rcVAEdph8LXxHwxQFpHqi1Ygt3tzWYatX79DvGbNEeODw8nLsOkecMilCnajtY3VvtZm2kKOLPHqHbEoTNll1x3S7HoMPpgLE89KZ5T/Lpobjyr1rk1SgYUbJUQO2Gs7UGxLHiWsCauxjdzprhfMmWCfSuQi0Ivm2d+CWs0WMz7N36qDxjC+iL5ejO3p0j7xv792UJscFJVJ3dqu0oRxaUOyitkCBLrM59MQkH+HmW8ZqFPXjVthMnHBy8CMsPzpdgPYQj5O/CV+buaU5ZgFEQVcIshD0UqPzZd1DCOJGEzemoh3RsBwqlQCeTr9yXSXNZbPnMpZi0nnGt/XmnhwZRJ/NJrs21CElkTcdfV69ClXLbi2yxfr1zrEh4gMT/beA= \ No newline at end of file diff --git a/server/src/uds/transports/RDP/scripts/windows/direct.py b/server/src/uds/transports/RDP/scripts/windows/direct.py index ef458c8c1..5fe511fea 100644 --- a/server/src/uds/transports/RDP/scripts/windows/direct.py +++ b/server/src/uds/transports/RDP/scripts/windows/direct.py @@ -15,4 +15,4 @@ theFile = sp['as_file'].format(password=win32crypt.CryptProtectData(six.binary_t filename = tools.saveTempFile(theFile) executable = tools.findApp('mstsc.exe') subprocess.Popen([executable, filename]) -# tools.addFileToUnlink(filename) +tools.addFileToUnlink(filename) diff --git a/server/src/uds/transports/RDP/scripts/windows/direct.py.signature b/server/src/uds/transports/RDP/scripts/windows/direct.py.signature index 41a3ca4cd..56cc9dc98 100644 --- a/server/src/uds/transports/RDP/scripts/windows/direct.py.signature +++ b/server/src/uds/transports/RDP/scripts/windows/direct.py.signature @@ -1 +1 @@ -j43vMYCTxoiEUFBImGwZEvwwa/s0c3N/CslEjVuqgaRAL9e3piv8juUi5Gg/c68kpOZSvsFyWTZQQQ93sd3HLa+VfJVngaScOZ//Ip8A1DnAvXbF+CsWnddbghEr3/rPdvXk+q2OYuHNNIEqVNEawNJnjnx25AACiAtP30sMMA7KHOYYTMc8OxLzgghHwgBeErJ0N2IWNnLI4+p/Ltlnd6ce4pwEZc+T3p06lJFGlGnisE7AC/nTZivKA3AiUsN2h7TolWO7KFscxkPZBHgWXqpBm7FwzxC4sAerMXKfeIQYH125wBpMj2n57sLrlL6Qx7Mdm3VFk5PlK5KR7I5ByEG/K4NjvGUp766YZcFAjJLmeRGbPhQA88gQLoREE4dGmFAHSfEJIN+QQq7/h5j0+Zodnn5wsMOJiqy0CKD+/qQKeP5MJ+ouWaWxB7rLDi3Jm9QGaIkfEZ5WiFSCcndQZEjpMF9QSWgDbCFb8R1798ycYXFfnrF/dW06UFcXxXH0hmaEodFVojTrg5r/5oTFv+yv+3zCdAYK/OrdKLLUIK7VsdW77Vm/3BzUGz9927tiYsEI9PFiKR6D4UvQCZtjV+mDJX1hZQ1WHzSbL6R+j6dkwhFzdh380Qw1kiMu5Yxz/BF3o0LI7L++oSLtjQZA6g5c5q2si7qJsaNZmf33BIA= \ No newline at end of file +A5F1SfFaVpN9gvhRNwPeZG96ZBMQzJOx037G5E/JJ4fBTFjyfyL1WerQnBJli95Vaxx80PDqlAYFWKOGSfQsznCj7B/ngwE9gSKmDFf0dHlICKeOr5j4NN+y48EnHVGnEOeIZKLrxJSymiU3wWJ3GYe3+YhZJLauHu2KrUypqh9SuPm2vAk1bI6/Z6f2gfHHTiFHLjkJE/q7eyDC0DsgvEvx2T0GM+2JU+OwVtrbdYJKtUHxULvVccWLmdFIpz4RWbRj1Rtuw5pe9pCioha2VoFQxT4fLMjIHEEtiLEjJjAUxwirc13U6jUo4jQd6Fh1qQK8/9mkCte5RfuaQfFo2SkqQF18De87yNEVv6NKVeSN4OTw74WGnWigTVDBZqOXZiz3W3dbdAdQiRcHGTTFhrSm/EH4kqMSoqS7B8UX84DGcOGN/PpoYlpVPh8JpKLZawLYA/QPs3J+NYjpXXUIFuTkbgeO263ywLZqIxJX4aDDA+0oMJMAqaWhwFycbpobGum/GFHjRXSLsDwKTODm1fbumXYe1FTX3rIEQ0MThbcZUY2VI7P3Q/PR7stRGhVcxQQnaKx64Ntzx0eiJoEDcmL0+32qqnnl+i5+Vbb+myfQ6LpfxGcDNiNiLVp+2NX+97lTmYdTKx/jc+lkiXVTFllZ149UoSkQ1QKK0kmWq6w= \ No newline at end of file