Dietzi

Untitled

Aug 7th, 2017
584
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.56 KB | None | 0 0
  1. diff --git a/yowsup/layers/protocol_media/mediauploader.py b/yowsup/layers/protocol_media/mediauploader.py
  2. index da9b3d1..e2ea835 100644
  3. --- a/yowsup/layers/protocol_media/mediauploader.py
  4. +++ b/yowsup/layers/protocol_media/mediauploader.py
  5. @@ -5,6 +5,18 @@ from time import sleep
  6.  import threading
  7.  import logging
  8.  from yowsup.common.tools import MimeTools
  9. +from axolotl.kdf.hkdfv3 import HKDFv3
  10. +import binascii
  11. +from axolotl.util.byteutil import ByteUtil
  12. +import Crypto.Cipher.AES as AES
  13. +from axolotl.ecc.curve import Curve
  14. +from axolotl.sessionbuilder import SessionBuilder
  15. +from axolotl.state.sessionstate import SessionState
  16. +from axolotl.protocol.whispermessage import WhisperMessage
  17. +from axolotl.protocol.prekeywhispermessage import PreKeyWhisperMessage
  18. +from axolotl.nosessionexception import NoSessionException
  19. +from axolotl.invalidmessageexception import InvalidMessageException
  20. +from axolotl.duplicatemessagexception import DuplicateMessageException
  21.  
  22.  logger = logging.getLogger(__name__)
  23.  
  24. @@ -29,6 +41,20 @@ class MediaUploader(WARequest, threading.Thread):
  25.  
  26.          self.sock = socket.socket()
  27.  
  28. +    def pad(self, s):
  29. +        return s + ((16-len(s) % 16) * '{')
  30. +
  31. +    def encryptImg(self, img):
  32. +        refkey = binascii.hexlify(os.urandom(112))
  33. +        img = self.pad(img)
  34. +        derivative = HKDFv3().deriveSecrets(binascii.unhexlify(refkey), binascii.unhexlify("576861747341707020496d616765204b657973"), 112)
  35. +        parts = ByteUtil.split(derivative, 16, 32)
  36. +        iv = parts[0]
  37. +        cipherKey = parts[1]
  38. +        cipher = AES.new(key=cipherKey, mode=AES.MODE_CBC, IV=iv)
  39. +        imgEnc=cipher.encrypt(img)
  40. +        return imgEnc[:-6]
  41. +
  42.      def start(self):
  43.          if self.async:
  44.              threading.Thread.__init__(self)
  45. @@ -89,7 +115,8 @@ class MediaUploader(WARequest, threading.Thread):
  46.              totalsent = 0
  47.              buf = 1024
  48.              f = open(sourcePath, 'rb')
  49. -            stream = f.read()
  50. +            stream1 = f.read()
  51. +            stream = self.encryptImg(stream1)
  52.              f.close()
  53.              status = 0
  54.              lastEmit = 0
  55. diff --git a/yowsup/layers/protocol_media/protocolentities/iq_requestupload.py b/yowsup/layers/protocol_media/protocolentities/iq_requestupload.py
  56. index bdd1e69..7a2a1a8 100644
  57. --- a/yowsup/layers/protocol_media/protocolentities/iq_requestupload.py
  58. +++ b/yowsup/layers/protocol_media/protocolentities/iq_requestupload.py
  59. @@ -62,7 +62,7 @@ class RequestUploadIqProtocolEntity(IqProtocolEntity):
  60.          }
  61.          if self.origHash:
  62.              attribs["orighash"] = self.origHash
  63. -        mediaNode = ProtocolTreeNode("media", attribs)
  64. +        mediaNode = ProtocolTreeNode("encr_media", attribs)
  65.          node.addChild(mediaNode)
  66.          return node
  67.  
  68. @@ -71,7 +71,7 @@ class RequestUploadIqProtocolEntity(IqProtocolEntity):
  69.          assert node.getAttributeValue("type") == "set", "Expected set as iq type in request upload, got %s" % node.getAttributeValue("type")
  70.          entity = IqProtocolEntity.fromProtocolTreeNode(node)
  71.          entity.__class__ = RequestUploadIqProtocolEntity
  72. -        mediaNode = node.getChild("media")
  73. +        mediaNode = node.getChild("encr_media")
  74.          entity.setRequestArguments(
  75.              mediaNode.getAttributeValue("type"),
  76.              mediaNode.getAttributeValue("hash"),
  77. diff --git a/yowsup/layers/protocol_media/protocolentities/iq_requestupload_result.py b/yowsup/layers/protocol_media/protocolentities/iq_requestupload_result.py
  78. index 45e7eb8..2ca58c4 100644
  79. --- a/yowsup/layers/protocol_media/protocolentities/iq_requestupload_result.py
  80. +++ b/yowsup/layers/protocol_media/protocolentities/iq_requestupload_result.py
  81. @@ -35,7 +35,7 @@ class ResultRequestUploadIqProtocolEntity(ResultIqProtocolEntity):
  82.          node = super(ResultRequestUploadIqProtocolEntity, self).toProtocolTreeNode()
  83.  
  84.          if not self.isDuplicate():
  85. -            mediaNode = ProtocolTreeNode("media", {"url": self.url})
  86. +            mediaNode = ProtocolTreeNode("encr_media", {"url": self.url})
  87.              if self.ip:
  88.                  mediaNode["ip"] = self.ip
  89.  
  90. @@ -51,7 +51,7 @@ class ResultRequestUploadIqProtocolEntity(ResultIqProtocolEntity):
  91.      def fromProtocolTreeNode(node):
  92.          entity= ResultIqProtocolEntity.fromProtocolTreeNode(node)
  93.          entity.__class__ = ResultRequestUploadIqProtocolEntity
  94. -        mediaNode = node.getChild("media")
  95. +        mediaNode = node.getChild("encr_media")
  96.          if mediaNode:
  97.              entity.setUploadProps(mediaNode["url"], mediaNode["ip"], mediaNode["resume"])
  98.          else:
Advertisement
Add Comment
Please, Sign In to add comment