ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-02 01:08:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

It actually works(?!) now.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2022-06-22 10:23:23 -04:00
parent e1daa192fb
commit 7910867be6
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/allmydata/protocol_switch.py
View File

@ -10,8 +10,10 @@ from twisted.python.failure import Failure
from foolscap.negotiate import Negotiation from foolscap.negotiate import Negotiation
class ProtocolMode(Enum): class ProtocolMode(Enum):
"""Listening mode.""" """Listening mode."""
UNDECIDED = 0 UNDECIDED = 0
FOOLSCAP = 1 FOOLSCAP = 1
HTTP = 2 HTTP = 2
@ -30,6 +32,7 @@ class FoolscapOrHttp(Protocol, metaclass=PretendToBeNegotiation):
Pretends to be a ``foolscap.negotiate.Negotiation`` instance. Pretends to be a ``foolscap.negotiate.Negotiation`` instance.
""" """
_foolscap: Optional[Negotiation] = None _foolscap: Optional[Negotiation] = None
_protocol_mode: ProtocolMode = ProtocolMode.UNDECIDED _protocol_mode: ProtocolMode = ProtocolMode.UNDECIDED
_buffer: bytes = b"" _buffer: bytes = b""
@ -38,7 +41,13 @@ class FoolscapOrHttp(Protocol, metaclass=PretendToBeNegotiation):
self._foolscap = Negotiation(*args, **kwargs) self._foolscap = Negotiation(*args, **kwargs)
def __setattr__(self, name, value): def __setattr__(self, name, value):
if name in {"_foolscap", "_protocol_mode", "_buffer", "transport"}: if name in {
"_foolscap",
"_protocol_mode",
"_buffer",
"transport",
"__class__",
}:
object.__setattr__(self, name, value) object.__setattr__(self, name, value)
else: else:
setattr(self._foolscap, name, value) setattr(self._foolscap, name, value)
@ -50,13 +59,15 @@ class FoolscapOrHttp(Protocol, metaclass=PretendToBeNegotiation):
Protocol.makeConnection(self, transport) Protocol.makeConnection(self, transport)
self._foolscap.makeConnection(transport) self._foolscap.makeConnection(transport)
def initServer(self, *args, **kwargs):
return self._foolscap.initServer(*args, **kwargs)
def initClient(self, *args, **kwargs): def initClient(self, *args, **kwargs):
# After creation, a Negotiation instance either has initClient() or
# initServer() called. SInce this is a client, we're never going to do
# HTTP. Relying on __getattr__/__setattr__ doesn't work, for some
# reason, so just mutate ourselves appropriately.
assert not self._buffer assert not self._buffer
self._protocol_mode = ProtocolMode.FOOLSCAP self.__class__ = Negotiation
return self._foolscap.initClient(*args, **kwargs) self.__dict__ = self._foolscap.__dict__
return self.initClient(*args, **kwargs)
def dataReceived(self, data: bytes) -> None: def dataReceived(self, data: bytes) -> None:
if self._protocol_mode == ProtocolMode.FOOLSCAP: if self._protocol_mode == ProtocolMode.FOOLSCAP:
@ -69,7 +80,7 @@ class FoolscapOrHttp(Protocol, metaclass=PretendToBeNegotiation):
if len(self._buffer) < 8: if len(self._buffer) < 8:
return return
# Check if it looks like Foolscap request. If so, it can handle this # Check if it looks like a Foolscap request. If so, it can handle this
# and later data: # and later data:
if self._buffer.startswith(b"GET /id/"): if self._buffer.startswith(b"GET /id/"):
self._protocol_mode = ProtocolMode.FOOLSCAP self._protocol_mode = ProtocolMode.FOOLSCAP