Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

http2: rename module and refactor as strategy

This commit is contained in:
Thomas Kriechbaumer 2015-06-04 19:44:48 +02:00
parent 623dd850e0
commit f003f87197
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
netlib/h2/__init__.py → netlib/http2/__init__.py
View File

@ -41,24 +41,27 @@ class HTTP2Protocol(object):
SettingsFrame.SETTINGS.SETTINGS_MAX_HEADER_LIST_SIZE: None, SettingsFrame.SETTINGS.SETTINGS_MAX_HEADER_LIST_SIZE: None,
} }
def __init__(self): def __init__(self, tcp_client):
self.tcp_client = tcp_client
self.http2_settings = self.HTTP2_DEFAULT_SETTINGS.copy() self.http2_settings = self.HTTP2_DEFAULT_SETTINGS.copy()
self.current_stream_id = None self.current_stream_id = None
self.encoder = Encoder() self.encoder = Encoder()
self.decoder = Decoder() self.decoder = Decoder()
def check_alpn(self): def check_alpn(self):
alp = self.get_alpn_proto_negotiated() alp = self.tcp_client.get_alpn_proto_negotiated()
if alp != self.ALPN_PROTO_H2: if alp != self.ALPN_PROTO_H2:
raise NotImplementedError( raise NotImplementedError(
"H2Client can not handle unknown ALP: %s" % alp) "H2Client can not handle unknown ALP: %s" % alp)
log.debug("ALP 'h2' successfully negotiated.") log.debug("ALP 'h2' successfully negotiated.")
def send_connection_preface(self): def send_connection_preface(self):
self.wfile.write(bytes(self.CLIENT_CONNECTION_PREFACE.decode('hex'))) self.tcp_client.wfile.write(
bytes(self.CLIENT_CONNECTION_PREFACE.decode('hex')))
self.send_frame(SettingsFrame(state=self)) self.send_frame(SettingsFrame(state=self))
frame = Frame.from_file(self.rfile, self) frame = Frame.from_file(self.tcp_client.rfile, self)
assert isinstance(frame, SettingsFrame) assert isinstance(frame, SettingsFrame)
self._apply_settings(frame.settings) self._apply_settings(frame.settings)
self.read_frame() # read setting ACK frame self.read_frame() # read setting ACK frame
@ -74,11 +77,11 @@ class HTTP2Protocol(object):
def send_frame(self, frame): def send_frame(self, frame):
raw_bytes = frame.to_bytes() raw_bytes = frame.to_bytes()
self.wfile.write(raw_bytes) self.tcp_client.wfile.write(raw_bytes)
self.wfile.flush() self.tcp_client.wfile.flush()
def read_frame(self): def read_frame(self):
frame = Frame.from_file(self.rfile, self) frame = Frame.from_file(self.tcp_client.rfile, self)
if isinstance(frame, SettingsFrame): if isinstance(frame, SettingsFrame):
self._apply_settings(frame.settings) self._apply_settings(frame.settings)

2
netlib/h2/frame.py → netlib/http2/frame.py
View File

@ -7,9 +7,11 @@ from .. import utils
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class FrameSizeError(Exception): class FrameSizeError(Exception):
pass pass
class Frame(object): class Frame(object):
""" """

2
test/h2/test_frames.py
View File

@ -1,6 +1,6 @@
import tutils import tutils
from nose.tools import assert_equal from nose.tools import assert_equal
from netlib.h2.frame import * from netlib.http2.frame import *
class FileAdapter(object): class FileAdapter(object):