only client to server comm must be masked

Lawouach · Lawouach · commit 19cfdb191ce1 · 2011-09-07T21:25:23.000+02:00
diff --git a/ws4py/client/__init__.py b/ws4py/client/__init__.py
@@ -122,21 +122,21 @@ def close_connection(self):
     def send(self, payload, binary=False):
         if isinstance(payload, basestring):
             if not binary:
-                self.write_to_connection(self.stream.text_message(payload).single())
+                self.write_to_connection(self.stream.text_message(payload).single(mask=True))
             else:
-                self.write_to_connection(self.stream.binary_message(payload).single())
+                self.write_to_connection(self.stream.binary_message(payload).single(mask=True))
                 
         elif type(payload) == types.GeneratorType:
             bytes = payload.next()
             first = True
             for chunk in payload:
                 if not binary:
-                    self.write_to_connection(self.stream.text_message(bytes).fragment(first=first))
+                    self.write_to_connection(self.stream.text_message(bytes).fragment(first=first, mask=True))
                 else:
-                    self.write_to_connection(self.stream.binary_message(payload).fragment(first=first))
+                    self.write_to_connection(self.stream.binary_message(payload).fragment(first=first, mask=True))
                 bytes = chunk
                 first = False
             if not binary:
-                self.write_to_connection(self.stream.text_message(bytes).fragment(last=True))
+                self.write_to_connection(self.stream.text_message(bytes).fragment(last=True, mask=True))
             else:
-                self.write_to_connection(self.stream.text_message(bytes).fragment(last=True))
+                self.write_to_connection(self.stream.text_message(bytes).fragment(last=True, mask=True))
diff --git a/ws4py/messaging.py b/ws4py/messaging.py
@@ -32,14 +32,15 @@ def __init__(self, opcode, data='', encoding='utf-8'):
             
         self.encoding = encoding
         
-    def single(self):
+    def single(self, mask=False):
         """
         Returns a frame bytes with the fin bit set and a random mask.
         """
+        mask = os.urandom(4) if mask else None
         return Frame(body=self.data or '', opcode=self.opcode,
-                     masking_key=os.urandom(4), fin=1).build()
+                     masking_key=mask, fin=1).build()
 
-    def fragment(self, first=False, last=False):
+    def fragment(self, first=False, last=False, mask=False):
         """
         Returns a frame bytes as part of a fragmented message.
 
@@ -49,8 +50,9 @@ def fragment(self, first=False, last=False):
         """
         fin = 1 if last is True else 0
         opcode = self.opcode if first is True else OPCODE_CONTINUATION
+        mask = os.urandom(4) if mask else None
         return Frame(body=self.data or '', opcode=opcode,
-                     masking_key=os.urandom(4), fin=fin).build()
+                     masking_key=mask, fin=fin).build()
 
     @property
     def completed(self):
