diff options
| -rw-r--r-- | examples/test_context.py | 2 | ||||
| -rw-r--r-- | examples/test_setup.py | 2 | ||||
| -rw-r--r-- | examples/test_setupall.py | 2 | ||||
| -rw-r--r-- | libpathod/app.py | 4 | ||||
| -rw-r--r-- | libpathod/language/http.py | 12 | ||||
| -rw-r--r-- | libpathod/language/http2.py | 6 | ||||
| -rw-r--r-- | libpathod/pathoc.py | 53 | ||||
| -rw-r--r-- | libpathod/pathoc_cmdline.py | 5 | ||||
| -rw-r--r-- | libpathod/pathod.py | 231 | ||||
| -rw-r--r-- | libpathod/protocols/__init__.py | 1 | ||||
| -rw-r--r-- | libpathod/protocols/http.py | 72 | ||||
| -rw-r--r-- | libpathod/protocols/http2.py | 20 | ||||
| -rw-r--r-- | libpathod/protocols/websockets.py | 54 | ||||
| -rw-r--r-- | test/test_app.py | 24 | ||||
| -rw-r--r-- | test/test_language_http2.py | 8 | ||||
| -rw-r--r-- | test/test_pathoc.py | 15 | ||||
| -rw-r--r-- | test/test_pathod.py | 13 | ||||
| -rw-r--r-- | test/tutils.py | 8 |
18 files changed, 244 insertions, 288 deletions
diff --git a/examples/test_context.py b/examples/test_context.py index 7c0386c1..1f0a7f8b 100644 --- a/examples/test_context.py +++ b/examples/test_context.py @@ -16,7 +16,7 @@ def test_simple(): # Check the returned data assert r.status_code == 200 - assert len(r.content) == 100 + assert len(r.body) == 100 # Check pathod's internal log log = d.last_log()["request"] diff --git a/examples/test_setup.py b/examples/test_setup.py index 39bd96b9..c6e52d00 100644 --- a/examples/test_setup.py +++ b/examples/test_setup.py @@ -24,7 +24,7 @@ class Test: # Check the returned data assert r.status_code == 200 - assert len(r.content) == 100 + assert len(r.body) == 100 # Check pathod's internal log log = self.d.last_log()["request"] diff --git a/examples/test_setupall.py b/examples/test_setupall.py index 631caa76..ddf4d905 100644 --- a/examples/test_setupall.py +++ b/examples/test_setupall.py @@ -29,7 +29,7 @@ class Test: # Check the returned data assert r.status_code == 200 - assert len(r.content) == 100 + assert len(r.body) == 100 # Check pathod's internal log log = self.d.last_log()["request"] diff --git a/libpathod/app.py b/libpathod/app.py index 4a8d2b63..debebaf2 100644 --- a/libpathod/app.py +++ b/libpathod/app.py @@ -4,7 +4,7 @@ import cStringIO import copy from flask import Flask, jsonify, render_template, request, abort, make_response from . import version, language, utils -from netlib import http_uastrings +from netlib.http import user_agents logging.basicConfig(level="DEBUG") EXAMPLE_HOST = "example.com" @@ -76,7 +76,7 @@ def make_app(noapi, debug): def docs_language(): return render( "docs_lang.html", True, - section="docs", uastrings=http_uastrings.UASTRINGS, + section="docs", uastrings=user_agents.UASTRINGS, subsection="lang" ) diff --git a/libpathod/language/http.py b/libpathod/language/http.py index 3c9df484..380a5d64 100644 --- a/libpathod/language/http.py +++ b/libpathod/language/http.py @@ -4,7 +4,7 @@ import abc import pyparsing as pp import netlib.websockets -from netlib import http_status, http_uastrings +from netlib.http import status_codes, user_agents from . import base, exceptions, actions, message @@ -78,13 +78,13 @@ class ShortcutLocation(_HeaderMixin, base.Value): class ShortcutUserAgent(_HeaderMixin, base.OptionsOrValue): preamble = "u" - options = [i[1] for i in http_uastrings.UASTRINGS] + options = [i[1] for i in user_agents.UASTRINGS] key = base.TokValueLiteral("User-Agent") def values(self, settings): value = self.value.val if self.option_used: - value = http_uastrings.get_by_shortcut(value.lower())[2] + value = user_agents.get_by_shortcut(value.lower())[2] return self.format_header( self.key.get_generator(settings), @@ -175,7 +175,7 @@ class Response(_HTTPMessage): l.extend(self.reason.values(settings)) else: l.append( - http_status.RESPONSES.get( + status_codes.RESPONSES.get( code, "Unknown code" ) @@ -194,7 +194,7 @@ class Response(_HTTPMessage): 1, Code(101) ) - hdrs = netlib.websockets.server_handshake_headers( + hdrs = netlib.websockets.WebsocketsProtocol.server_handshake_headers( settings.websocket_key ) for i in hdrs.lst: @@ -306,7 +306,7 @@ class Request(_HTTPMessage): 1, Method("get") ) - for i in netlib.websockets.client_handshake_headers().lst: + for i in netlib.websockets.WebsocketsProtocol.client_handshake_headers().lst: if not get_header(i[0], self.headers): tokens.append( Header( diff --git a/libpathod/language/http2.py b/libpathod/language/http2.py index 6dd93d5f..8aee9931 100644 --- a/libpathod/language/http2.py +++ b/libpathod/language/http2.py @@ -1,6 +1,6 @@ import pyparsing as pp -from netlib import http_status, http_uastrings +from netlib.http import user_agents from . import base, message """ @@ -116,13 +116,13 @@ class ShortcutLocation(_HeaderMixin, base.Value): class ShortcutUserAgent(_HeaderMixin, base.OptionsOrValue): preamble = "u" - options = [i[1] for i in http_uastrings.UASTRINGS] + options = [i[1] for i in user_agents.UASTRINGS] key = base.TokValueLiteral("user-agent") def values(self, settings): value = self.value.val if self.option_used: - value = http_uastrings.get_by_shortcut(value.lower())[2] + value = user_agents.get_by_shortcut(value.lower())[2] return ( self.key.get_generator(settings), diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index 39d3c3d6..e93e6208 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -11,7 +11,8 @@ import threading import OpenSSL.crypto -from netlib import tcp, http, http2, certutils, websockets, socks +from netlib import tcp, http, certutils, websockets, socks +from netlib.http import http1, http2 import language.http import language.websockets @@ -66,25 +67,6 @@ class SSLInfo(object): return "\n".join(parts) -class Response(object): - - def __init__( - self, - httpversion, - status_code, - msg, - headers, - content, - sslinfo - ): - self.httpversion, self.status_code = httpversion, status_code - self.msg = msg - self.headers, self.content = headers, content - self.sslinfo = sslinfo - - def __repr__(self): - return "Response(%s - %s)" % (self.status_code, self.msg) - class WebsocketFrameReader(threading.Thread): @@ -227,8 +209,7 @@ class Pathoc(tcp.TCPClient): ) self.protocol = http2.HTTP2Protocol(self, dump_frames=self.http2_framedump) else: - # TODO: create HTTP or Websockets protocol - self.protocol = None + self.protocol = http1.HTTP1Protocol(self) self.settings = language.Settings( is_client=True, @@ -247,12 +228,12 @@ class Pathoc(tcp.TCPClient): l = self.rfile.readline() if not l: raise PathocError("Proxy CONNECT failed") - parsed = http.parse_response_line(l) + parsed = self.protocol.parse_response_line(l) if not parsed[1] == 200: raise PathocError( "Proxy CONNECT failed: %s - %s" % (parsed[1], parsed[2]) ) - http.read_headers(self.rfile) + self.protocol.read_headers() def socks_connect(self, connect_to): try: @@ -333,11 +314,6 @@ class Pathoc(tcp.TCPClient): if self.timeout: self.settimeout(self.timeout) - def _resp_summary(self, resp): - return "<< %s %s: %s bytes" % ( - resp.status_code, utils.xrepr(resp.msg), len(resp.content) - ) - def stop(self): if self.ws_framereader: self.ws_framereader.terminate.put(None) @@ -427,19 +403,8 @@ class Pathoc(tcp.TCPClient): req = language.serve(r, self.wfile, self.settings) self.wfile.flush() - if self.use_http2: - status_code, headers, body = self.protocol.read_response() - resp = Response("HTTP/2", status_code, "", headers, body, self.sslinfo) - else: - resp = list( - http.read_response( - self.rfile, - req["method"], - None - ) - ) - resp.append(self.sslinfo) - resp = Response(*resp) + resp = self.protocol.read_response(req["method"], None) + resp.sslinfo = self.sslinfo except http.HttpError as v: lg("Invalid server response: %s" % v) raise @@ -451,7 +416,9 @@ class Pathoc(tcp.TCPClient): raise finally: if resp: - lg(self._resp_summary(resp)) + lg("<< %s %s: %s bytes" % ( + resp.status_code, utils.xrepr(resp.msg), len(resp.body) + )) if resp.status_code in self.ignorecodes: lg.suppress() return resp diff --git a/libpathod/pathoc_cmdline.py b/libpathod/pathoc_cmdline.py index 8b25b4a1..58963265 100644 --- a/libpathod/pathoc_cmdline.py +++ b/libpathod/pathoc_cmdline.py @@ -3,7 +3,8 @@ import argparse import os import os.path -from netlib import http_uastrings, tcp +from netlib import tcp +from netlib.http import user_agents from . import pathoc, version, language @@ -16,7 +17,7 @@ def args_pathoc(argv, stdout=sys.stdout, stderr=sys.stderr): pa = preparser.parse_known_args(argv)[0] if pa.showua: print >> stdout, "User agent strings:" - for i in http_uastrings.UASTRINGS: + for i in user_agents.UASTRINGS: print >> stdout, " ", i[1], i[0] sys.exit(0) diff --git a/libpathod/pathod.py b/libpathod/pathod.py index 148fa7b2..5c813cc5 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -6,9 +6,10 @@ import threading import urllib import time -from netlib import tcp, http, http2, wsgi, certutils, websockets, odict +from netlib import tcp, http, wsgi, certutils, websockets, odict +from netlib.http import http1, http2 -from . import version, app, language, utils, log +from . import version, app, language, utils, log, protocols import language.http import language.actions import language.exceptions @@ -84,14 +85,10 @@ class PathodHandler(tcp.BaseHandler): self.use_http2 = False self.http2_framedump = http2_framedump - def _handle_sni(self, connection): + def handle_sni(self, connection): self.sni = connection.get_servername() def http_serve_crafted(self, crafted, logctx): - """ - This method is HTTP/1 and HTTP/2 capable. - """ - error, crafted = self.server.check_policy( crafted, self.settings ) @@ -116,140 +113,33 @@ class PathodHandler(tcp.BaseHandler): return None, response_log return self.handle_http_request, response_log - def handle_websocket(self, logger): - while True: - with logger.ctx() as lg: - started = time.time() - try: - frm = websockets.Frame.from_file(self.rfile) - except tcp.NetLibIncomplete as e: - lg("Error reading websocket frame: %s" % e) - break - ended = time.time() - lg(frm.human_readable()) - retlog = dict( - type="inbound", - protocol="websockets", - started=started, - duration=ended - started, - frame=dict( - ), - cipher=None, - ) - if self.ssl_established: - retlog["cipher"] = self.get_current_cipher() - self.addlog(retlog) - ld = language.websockets.NESTED_LEADER - if frm.payload.startswith(ld): - nest = frm.payload[len(ld):] - try: - wf_gen = language.parse_websocket_frame(nest) - except language.exceptions.ParseException as v: - logger.write( - "Parse error in reflected frame specifcation:" - " %s" % v.msg - ) - return None, None - for frm in wf_gen: - with logger.ctx() as lg: - frame_log = language.serve( - frm, - self.wfile, - self.settings - ) - lg("crafting websocket spec: %s" % frame_log["spec"]) - self.addlog(frame_log) - return self.handle_websocket, None - - def handle_http_connect(self, connect, lg): - """ - This method is HTTP/1 only. - - Handle a CONNECT request. - """ - http.read_headers(self.rfile) - self.wfile.write( - 'HTTP/1.1 200 Connection established\r\n' + - ('Proxy-agent: %s\r\n' % version.NAMEVERSION) + - '\r\n' - ) - self.wfile.flush() - if not self.server.ssloptions.not_after_connect: - try: - cert, key, chain_file_ = self.server.ssloptions.get_cert( - connect[0] - ) - self.convert_to_ssl( - cert, - key, - handle_sni=self._handle_sni, - request_client_cert=self.server.ssloptions.request_client_cert, - cipher_list=self.server.ssloptions.ciphers, - method=self.server.ssloptions.ssl_version, - alpn_select=self.server.ssloptions.alpn_select, - ) - except tcp.NetLibError as v: - s = str(v) - lg(s) - return None, dict(type="error", msg=s) - return self.handle_http_request, None - - def handle_http_app(self, method, path, headers, content, lg): - """ - This method is HTTP/1 only. - - Handle a request to the built-in app. - """ - if self.server.noweb: - crafted = self.make_http_error_response("Access Denied") - language.serve(crafted, self.wfile, self.settings) - return None, dict( - type="error", - msg="Access denied: web interface disabled" - ) - lg("app: %s %s" % (method, path)) - req = wsgi.Request("http", method, path, headers, content) - flow = wsgi.Flow(self.address, req) - sn = self.connection.getsockname() - a = wsgi.WSGIAdaptor( - self.server.app, - sn[0], - self.server.address.port, - version.NAMEVERSION - ) - a.serve(flow, self.wfile) - return self.handle_http_request, None def handle_http_request(self, logger): """ - This method is HTTP/1 and HTTP/2 capable. - Returns a (handler, log) tuple. handler: Handler for the next request, or None to disconnect log: A dictionary, or None """ with logger.ctx() as lg: - if self.use_http2: - self.protocol.perform_server_connection_preface() - stream_id, headers, body = self.protocol.read_request() - method = headers[':method'] - path = headers[':path'] - headers = odict.ODict(headers) - httpversion = "" - else: - req = self.read_http_request(lg) - if 'next_handle' in req: - return req['next_handle'] - if 'errors' in req: - return None, req['errors'] - if 'method' not in req or 'path' not in req: - return None, None - method = req['method'] - path = req['path'] - headers = req['headers'] - body = req['body'] - httpversion = req['httpversion'] + try: + req = self.protocol.read_request() + except http.HttpError as s: + s = str(s) + lg(s) + return None, dict(type="error", msg=s) + + if isinstance(req, http.EmptyRequest): + return None, None + + if req.method == 'CONNECT': + return self.protocol.handle_http_connect([req.host, req.port, req.httpversion], lg) + + method = req.method + path = req.path + httpversion = req.httpversion + headers = req.headers + body = req.body clientcert = None if self.clientcert: @@ -280,7 +170,7 @@ class PathodHandler(tcp.BaseHandler): retlog["cipher"] = self.get_current_cipher() m = utils.MemBool() - websocket_key = websockets.check_client_handshake(headers) + websocket_key = websockets.WebsocketsProtocol.check_client_handshake(headers) self.settings.websocket_key = websocket_key # If this is a websocket initiation, we respond with a proper @@ -320,7 +210,7 @@ class PathodHandler(tcp.BaseHandler): spec = anchor_gen.next() if self.use_http2 and isinstance(spec, language.http2.Response): - spec.stream_id = stream_id + spec.stream_id = req.stream_id lg("crafting spec: %s" % spec) nexthandler, retlog["response"] = self.http_serve_crafted( @@ -328,68 +218,15 @@ class PathodHandler(tcp.BaseHandler): lg ) if nexthandler and websocket_key: - return self.handle_websocket, retlog + self.protocol = protocols.websockets.WebsocketsProtocol(self) + return self.protocol.handle_websocket, retlog else: return nexthandler, retlog else: - return self.handle_http_app(method, path, headers, body, lg) - - def read_http_request(self, lg): - """ - This method is HTTP/1 only. - """ - line = http.get_request_line(self.rfile) - if not line: - # Normal termination - return dict() - - m = utils.MemBool() - if m(http.parse_init_connect(line)): - return dict(next_handle=self.handle_http_connect(m.v, lg)) - elif m(http.parse_init_proxy(line)): - method, _, _, _, path, httpversion = m.v - elif m(http.parse_init_http(line)): - method, path, httpversion = m.v - else: - s = "Invalid first line: %s" % repr(line) - lg(s) - return dict(errors=dict(type="error", msg=s)) - - headers = http.read_headers(self.rfile) - if headers is None: - s = "Invalid headers" - lg(s) - return dict(errors=dict(type="error", msg=s)) - - try: - body = http.read_http_body( - self.rfile, - headers, - None, - method, - None, - True, - ) - except http.HttpError as s: - s = str(s) - lg(s) - return dict(errors=dict(type="error", msg=s)) - - return dict( - method=method, - path=path, - headers=headers, - body=body, - httpversion=httpversion) + return self.protocol.handle_http_app(method, path, headers, body, lg) def make_http_error_response(self, reason, body=None): - """ - This method is HTTP/1 and HTTP/2 capable. - """ - if self.use_http2: - resp = language.http2.make_error_response(reason, body) - else: - resp = language.http.make_error_response(reason, body) + resp = self.protocol.make_error_response(reason, body) resp.is_error_response = True return resp @@ -402,7 +239,7 @@ class PathodHandler(tcp.BaseHandler): self.convert_to_ssl( cert, key, - handle_sni=self._handle_sni, + handle_sni=self.handle_sni, request_client_cert=self.server.ssloptions.request_client_cert, cipher_list=self.server.ssloptions.ciphers, method=self.server.ssloptions.ssl_version, @@ -421,14 +258,12 @@ class PathodHandler(tcp.BaseHandler): alp = self.get_alpn_proto_negotiated() if alp == http2.HTTP2Protocol.ALPN_PROTO_H2: - self.protocol = http2.HTTP2Protocol( - self, is_server=True, dump_frames=self.http2_framedump - ) + self.protocol = protocols.http2.HTTP2Protocol(self) self.use_http2 = True - # if not self.protocol: - # # TODO: create HTTP or Websockets protocol - # self.protocol = None + if not self.protocol: + self.protocol = protocols.http.HTTPProtocol(self) + lr = self.rfile if self.server.logreq else None lw = self.wfile if self.server.logresp else None logger = log.ConnectionLogger(self.logfp, self.server.hexdump, lr, lw) diff --git a/libpathod/protocols/__init__.py b/libpathod/protocols/__init__.py new file mode 100644 index 00000000..1a8c7dab --- /dev/null +++ b/libpathod/protocols/__init__.py @@ -0,0 +1 @@ +from . import http, http2, websockets diff --git a/libpathod/protocols/http.py b/libpathod/protocols/http.py new file mode 100644 index 00000000..ca2b28b4 --- /dev/null +++ b/libpathod/protocols/http.py @@ -0,0 +1,72 @@ +from netlib import tcp, http, wsgi +from netlib.http import http1 +from .. import version, app, language, utils, log + +class HTTPProtocol: + + def __init__(self, pathod_handler): + self.pathod_handler = pathod_handler + self.wire_protocol = http1.HTTP1Protocol( + self.pathod_handler + ) + + def make_error_response(self, reason, body): + return language.http.make_error_response(reason, body) + + def handle_http_app(self, method, path, headers, body, lg): + """ + Handle a request to the built-in app. + """ + if self.pathod_handler.server.noweb: + crafted = self.pathod_handler.make_http_error_response("Access Denied") + language.serve(crafted, self.pathod_handler.wfile, self.pathod_handler.settings) + return None, dict( + type="error", + msg="Access denied: web interface disabled" + ) + lg("app: %s %s" % (method, path)) + req = wsgi.Request("http", method, path, headers, body) + flow = wsgi.Flow(self.pathod_handler.address, req) + sn = self.pathod_handler.connection.getsockname() + a = wsgi.WSGIAdaptor( + self.pathod_handler.server.app, + sn[0], + self.pathod_handler.server.address.port, + version.NAMEVERSION + ) + a.serve(flow, self.pathod_handler.wfile) + return self.pathod_handler.handle_http_request, None + + def handle_http_connect(self, connect, lg): + """ + Handle a CONNECT request. + """ + + self.pathod_handler.wfile.write( + 'HTTP/1.1 200 Connection established\r\n' + + ('Proxy-agent: %s\r\n' % version.NAMEVERSION) + + '\r\n' + ) + self.pathod_handler.wfile.flush() + if not self.pathod_handler.server.ssloptions.not_after_connect: + try: + cert, key, chain_file_ = self.pathod_handler.server.ssloptions.get_cert( + connect[0] + ) + self.pathod_handler.convert_to_ssl( + cert, + key, + handle_sni=self.pathod_handler.handle_sni, + request_client_cert=self.pathod_handler.server.ssloptions.request_client_cert, + cipher_list=self.pathod_handler.server.ssloptions.ciphers, + method=self.pathod_handler.server.ssloptions.ssl_version, + alpn_select=self.pathod_handler.server.ssloptions.alpn_select, + ) + except tcp.NetLibError as v: + s = str(v) + lg(s) + return None, dict(type="error", msg=s) + return self.pathod_handler.handle_http_request, None + + def read_request(self, lg=None): + return self.wire_protocol.read_request(allow_empty=True) diff --git a/libpathod/protocols/http2.py b/libpathod/protocols/http2.py new file mode 100644 index 00000000..82ec5482 --- /dev/null +++ b/libpathod/protocols/http2.py @@ -0,0 +1,20 @@ +from netlib.http import http2 +from .. import version, app, language, utils, log + +class HTTP2Protocol: + + def __init__(self, pathod_handler): + self.pathod_handler = pathod_handler + self.wire_protocol = http2.HTTP2Protocol( + self.pathod_handler, is_server=True, dump_frames=self.pathod_handler.http2_framedump + ) + + def make_error_response(self, reason, body): + return language.http2.make_error_response(reason, body) + + def read_request(self, lg=None): + self.wire_protocol.perform_server_connection_preface() + return self.wire_protocol.read_request() + + def create_response(self, code, stream_id, headers, body): + return self.wire_protocol.create_response(code, stream_id, headers, body) diff --git a/libpathod/protocols/websockets.py b/libpathod/protocols/websockets.py new file mode 100644 index 00000000..890f06c8 --- /dev/null +++ b/libpathod/protocols/websockets.py @@ -0,0 +1,54 @@ +import time + +from netlib import tcp, http, wsgi, certutils, websockets, odict +from .. import version, app, language, utils, log + +class WebsocketsProtocol: + + def __init__(self, pathod_handler): + self.pathod_handler = pathod_handler + + def handle_websocket(self, logger): + while True: + with logger.ctx() as lg: + started = time.time() + try: + frm = websockets.Frame.from_file(self.pathod_handler.rfile) + except tcp.NetLibIncomplete as e: + lg("Error reading websocket frame: %s" % e) + break + ended = time.time() + lg(frm.human_readable()) + retlog = dict( + type="inbound", + protocol="websockets", + started=started, + duration=ended - started, + frame=dict( + ), + cipher=None, + ) + if self.pathod_handler.ssl_established: + retlog["cipher"] = self.pathod_handler.get_current_cipher() + self.pathod_handler.addlog(retlog) + ld = language.websockets.NESTED_LEADER + if frm.payload.startswith(ld): + nest = frm.payload[len(ld):] + try: + wf_gen = language.parse_websocket_frame(nest) + except language.exceptions.ParseException as v: + logger.write( + "Parse error in reflected frame specifcation:" + " %s" % v.msg + ) + return None, None + for frm in wf_gen: + with logger.ctx() as lg: + frame_log = language.serve( + frm, + self.pathod_handler.wfile, + self.pathod_handler.settings + ) + lg("crafting websocket spec: %s" % frame_log["spec"]) + self.pathod_handler.addlog(frame_log) + return self.handle_websocket, None diff --git a/test/test_app.py b/test/test_app.py index 4536db8e..4571617f 100644 --- a/test/test_app.py +++ b/test/test_app.py @@ -7,7 +7,7 @@ class TestApp(tutils.DaemonTests): def test_index(self): r = self.getpath("/") assert r.status_code == 200 - assert r.content + assert r.body def test_about(self): r = self.getpath("/about") @@ -38,48 +38,48 @@ class TestApp(tutils.DaemonTests): def test_response_preview(self): r = self.getpath("/response_preview", params=dict(spec="200")) assert r.status_code == 200 - assert 'Response' in r.content + assert 'Response' in r.body r = self.getpath("/response_preview", params=dict(spec="foo")) assert r.status_code == 200 - assert 'Error' in r.content + assert 'Error' in r.body r = self.getpath("/response_preview", params=dict(spec="200:b@100m")) assert r.status_code == 200 - assert "too large" in r.content + assert "too large" in r.body r = self.getpath("/response_preview", params=dict(spec="200:b@5k")) assert r.status_code == 200 - assert 'Response' in r.content + assert 'Response' in r.body r = self.getpath( "/response_preview", params=dict( spec="200:b<nonexistent")) assert r.status_code == 200 - assert 'File access denied' in r.content + assert 'File access denied' in r.body r = self.getpath("/response_preview", params=dict(spec="200:b<file")) assert r.status_code == 200 - assert 'testfile' in r.content + assert 'testfile' in r.body def test_request_preview(self): r = self.getpath("/request_preview", params=dict(spec="get:/")) assert r.status_code == 200 - assert 'Request' in r.content + assert 'Request' in r.body r = self.getpath("/request_preview", params=dict(spec="foo")) assert r.status_code == 200 - assert 'Error' in r.content + assert 'Error' in r.body r = self.getpath("/request_preview", params=dict(spec="get:/:b@100m")) assert r.status_code == 200 - assert "too large" in r.content + assert "too large" in r.body r = self.getpath("/request_preview", params=dict(spec="get:/:b@5k")) assert r.status_code == 200 - assert 'Request' in r.content + assert 'Request' in r.body r = self.getpath("/request_preview", params=dict(spec="")) assert r.status_code == 200 - assert 'empty spec' in r.content + assert 'empty spec' in r.body diff --git a/test/test_language_http2.py b/test/test_language_http2.py index 3b36c01b..2e941f9a 100644 --- a/test/test_language_http2.py +++ b/test/test_language_http2.py @@ -1,9 +1,11 @@ import cStringIO +import netlib from netlib import tcp +from netlib.http import user_agents + from libpathod import language from libpathod.language import http2, base -import netlib import tutils @@ -18,7 +20,7 @@ def parse_response(s): def default_settings(): return language.Settings( request_host="foo.com", - protocol=netlib.http2.HTTP2Protocol(tcp.TCPClient(('localhost', 1234))) + protocol=netlib.http.http2.HTTP2Protocol(tcp.TCPClient(('localhost', 1234))) ) @@ -121,7 +123,7 @@ class TestRequest: def test_user_agent(self): r = parse_request('GET:/:r:ua') assert len(r.headers) == 1 - assert r.headers[0].values(default_settings()) == ("user-agent", netlib.http_uastrings.get_by_shortcut('a')[2]) + assert r.headers[0].values(default_settings()) == ("user-agent", user_agents.get_by_shortcut('a')[2]) def test_render_with_headers(self): s = cStringIO.StringIO() diff --git a/test/test_pathoc.py b/test/test_pathoc.py index fb8d348a..215f691b 100644 --- a/test/test_pathoc.py +++ b/test/test_pathoc.py @@ -4,13 +4,15 @@ import re import OpenSSL from mock import Mock -from netlib import tcp, http, http2, socks +from netlib import tcp, http, socks +from netlib.http import http1, http2 + from libpathod import pathoc, test, version, pathod, language import tutils def test_response(): - r = pathoc.Response("1.1", 200, "Message", {}, None, None) + r = http.Response("1.1", 200, "Message", {}, None, None) assert repr(r) @@ -43,7 +45,7 @@ class _TestDaemon: ) c.connect() resp = c.request("get:/api/info") - assert tuple(json.loads(resp.content)["version"]) == version.IVERSION + assert tuple(json.loads(resp.body)["version"]) == version.IVERSION def tval( self, @@ -103,7 +105,7 @@ class TestDaemonSSL(_TestDaemon): c.connect() c.request("get:/p/200") r = c.request("get:/api/log") - d = json.loads(r.content) + d = json.loads(r.body) assert d["log"][0]["request"]["sni"] == "foobar.com" def test_showssl(self): @@ -119,7 +121,7 @@ class TestDaemonSSL(_TestDaemon): c.connect() c.request("get:/p/200") r = c.request("get:/api/log") - d = json.loads(r.content) + d = json.loads(r.body) assert d["log"][0]["request"]["clientcert"]["keyinfo"] def test_http2_without_ssl(self): @@ -270,8 +272,7 @@ class TestDaemonHTTP2(_TestDaemon): c = pathoc.Pathoc( ("127.0.0.1", self.d.port), ) - # TODO: change if other protocols get implemented - assert c.protocol is None + assert isinstance(c.protocol, http1.HTTP1Protocol) def test_http2_alpn(self): c = pathoc.Pathoc( diff --git a/test/test_pathod.py b/test/test_pathod.py index 12f7bac0..1f127586 100644 --- a/test/test_pathod.py +++ b/test/test_pathod.py @@ -3,7 +3,7 @@ import cStringIO import OpenSSL from libpathod import pathod, version -from netlib import tcp, http, http2 +from netlib import tcp, http import tutils @@ -51,7 +51,7 @@ class TestNoApi(tutils.DaemonTests): assert self.getpath("/log").status_code == 404 r = self.getpath("/") assert r.status_code == 200 - assert not "Log" in r.content + assert not "Log" in r.body class TestNotAfterConnect(tutils.DaemonTests): @@ -119,7 +119,7 @@ class TestNocraft(tutils.DaemonTests): def test_nocraft(self): r = self.get(r"200:b'\xf0'") assert r.status_code == 800 - assert "Crafting disabled" in r.content + assert "Crafting disabled" in r.body class CommonTests(tutils.DaemonTests): @@ -152,7 +152,7 @@ class CommonTests(tutils.DaemonTests): def test_disconnect(self): rsp = self.get("202:b@100k:d200") - assert len(rsp.content) < 200 + assert len(rsp.body) < 200 def test_parserr(self): rsp = self.get("400:msg,b:") @@ -161,7 +161,7 @@ class CommonTests(tutils.DaemonTests): def test_static(self): rsp = self.get("200:b<file") assert rsp.status_code == 200 - assert rsp.content.strip() == "testfile" + assert rsp.body.strip() == "testfile" def test_anchor(self): rsp = self.getpath("anchor/foo") @@ -201,7 +201,7 @@ class CommonTests(tutils.DaemonTests): def test_source_access_denied(self): rsp = self.get("200:b</foo") assert rsp.status_code == 800 - assert "File access denied" in rsp.content + assert "File access denied" in rsp.body def test_proxy(self): r, _ = self.pathoc([r"get:'http://foo.com/p/202':da"]) @@ -284,5 +284,4 @@ class TestHTTP2(tutils.DaemonTests): def test_http2(self): r, _ = self.pathoc(["GET:/"], ssl=True, use_http2=True) - print(r) assert r[0].status_code == "800" diff --git a/test/tutils.py b/test/tutils.py index f7fcc312..a728e852 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -62,7 +62,7 @@ class DaemonTests(object): def getpath(self, path, params=None): scheme = "https" if self.ssl else "http" - return requests.get( + resp = requests.get( "%s://localhost:%s/%s" % ( scheme, self.d.port, @@ -71,9 +71,13 @@ class DaemonTests(object): verify=False, params=params ) + resp.body = resp.content + return resp def get(self, spec): - return requests.get(self.d.p(spec), verify=False) + resp = requests.get(self.d.p(spec), verify=False) + resp.body = resp.content + return resp def pathoc( self, |