From d9b940c21e7729da1b6a63d8e82cd3ad4a82f775 Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Wed, 8 Jun 2016 16:37:56 +0530 Subject: Py3: websockets --- pathod/language/websockets.py | 5 +++-- pathod/protocols/websockets.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'pathod') diff --git a/pathod/language/websockets.py b/pathod/language/websockets.py index 9b752b7e..417944af 100644 --- a/pathod/language/websockets.py +++ b/pathod/language/websockets.py @@ -1,10 +1,11 @@ import random import string import netlib.websockets +from netlib import strutils import pyparsing as pp from . import base, generators, actions, message -NESTED_LEADER = "pathod!" +NESTED_LEADER = b"pathod!" class WF(base.CaselessLiteral): @@ -193,7 +194,7 @@ class WebsocketFrame(message.Message): bodygen = self.rawbody.value.get_generator(settings) length = len(self.rawbody.value.get_generator(settings)) elif self.nested_frame: - bodygen = NESTED_LEADER + self.nested_frame.parsed.spec() + bodygen = NESTED_LEADER + strutils.always_bytes(self.nested_frame.parsed.spec()) length = len(bodygen) else: bodygen = None diff --git a/pathod/protocols/websockets.py b/pathod/protocols/websockets.py index 2b60e618..a34e75e8 100644 --- a/pathod/protocols/websockets.py +++ b/pathod/protocols/websockets.py @@ -37,7 +37,7 @@ class WebsocketsProtocol: if frm.payload.startswith(ld): nest = frm.payload[len(ld):] try: - wf_gen = language.parse_websocket_frame(nest) + wf_gen = language.parse_websocket_frame(nest.decode()) except language.exceptions.ParseException as v: logger.write( "Parse error in reflected frame specifcation:" -- cgit v1.2.3