gergely/pyssb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Use black instead of flake8

Browse Source 
It results in mostly the same style, plus it’s configurable via pyproject.toml.
This commit is contained in:
Gergely Polonkai
2023-11-01 05:04:43 +01:00
parent 50442c56fe
commit d1a0510734
15 changed files with 473 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ssb/feed/__init__.py
View File

@@ -22,4 +22,4 @@
from .models import Feed, LocalFeed, Message, LocalMessage, NoPrivateKeyException
__all__ = ('Feed', 'LocalFeed', 'Message', 'LocalMessage', 'NoPrivateKeyException')
__all__ = ("Feed", "LocalFeed", "Message", "LocalMessage", "NoPrivateKeyException")

36
ssb/feed/models.py
View File

@@ -30,7 +30,7 @@ from simplejson import dumps, loads
from ssb.util import tag
OrderedMsg = namedtuple('OrderedMsg', ('previous', 'author', 'sequence', 'timestamp', 'hash', 'content'))
OrderedMsg = namedtuple("OrderedMsg", ("previous", "author", "sequence", "timestamp", "hash", "content"))
class NoPrivateKeyException(Exception):
@@ -52,10 +52,10 @@ class Feed(object):
@property
def id(self):
return tag(self.public_key).decode('ascii')
return tag(self.public_key).decode("ascii")
def sign(self, msg):
raise NoPrivateKeyException('Cannot use remote identity to sign (no private key!)')
raise NoPrivateKeyException("Cannot use remote identity to sign (no private key!)")
class LocalFeed(Feed):
@@ -90,24 +90,26 @@ class Message(object):
@classmethod
def parse(cls, data, feed):
obj = loads(data, object_pairs_hook=OrderedDict)
msg = cls(feed, obj['content'], timestamp=obj['timestamp'])
msg = cls(feed, obj["content"], timestamp=obj["timestamp"])
return msg
def serialize(self, add_signature=True):
return dumps(self.to_dict(add_signature=add_signature), indent=2).encode('utf-8')
return dumps(self.to_dict(add_signature=add_signature), indent=2).encode("utf-8")
def to_dict(self, add_signature=True):
obj = to_ordered({
'previous': self.previous.key if self.previous else None,
'author': self.feed.id,
'sequence': self.sequence,
'timestamp': self.timestamp,
'hash': 'sha256',
'content': self.content
})
obj = to_ordered(
{
"previous": self.previous.key if self.previous else None,
"author": self.feed.id,
"sequence": self.sequence,
"timestamp": self.timestamp,
"hash": "sha256",
"content": self.content,
}
)
if add_signature:
obj['signature'] = self.signature
obj["signature"] = self.signature
return obj
def verify(self, signature):
@@ -116,11 +118,11 @@ class Message(object):
@property
def hash(self):
hash = sha256(self.serialize()).digest()
return b64encode(hash).decode('ascii') + '.sha256'
return b64encode(hash).decode("ascii") + ".sha256"
@property
def key(self):
return '%' + self.hash
return "%" + self.hash
class LocalMessage(Message):
@@ -144,4 +146,4 @@ class LocalMessage(Message):
def _sign(self):
# ensure ordering of keys and indentation of 2 characters, like ssb-keys
data = self.serialize(add_signature=False)
return (b64encode(bytes(self.feed.sign(data))) + b'.sig.ed25519').decode('ascii')
return (b64encode(bytes(self.feed.sign(data))) + b".sig.ed25519").decode("ascii")

40
ssb/muxrpc.py
View File

@@ -34,8 +34,8 @@ class MuxRPCAPIException(Exception):
class MuxRPCHandler(object):
def check_message(self, msg):
body = msg.body
if isinstance(body, dict) and 'name' in body and body['name'] == 'Error':
raise MuxRPCAPIException(body['message'])
if isinstance(body, dict) and "name" in body and body["name"] == "Error":
raise MuxRPCAPIException(body["message"])
class MuxRPCRequestHandler(MuxRPCHandler):
@@ -43,7 +43,7 @@ class MuxRPCRequestHandler(MuxRPCHandler):
self.ps_handler = ps_handler
def __await__(self):
msg = (yield from self.ps_handler.__await__())
msg = yield from self.ps_handler.__await__()
self.check_message(msg)
return msg
@@ -63,7 +63,6 @@ class MuxRPCSourceHandler(MuxRPCHandler):
class MuxRPCSinkHandlerMixin(object):
def send(self, msg, msg_type=PSMessageType.JSON, end=False):
self.connection.send(msg, stream=True, msg_type=msg_type, req=self.req, end_err=end)
@@ -82,13 +81,13 @@ class MuxRPCSinkHandler(MuxRPCHandler, MuxRPCSinkHandlerMixin):
def _get_appropriate_api_handler(type_, connection, ps_handler, req):
if type_ in {'sync', 'async'}:
if type_ in {"sync", "async"}:
return MuxRPCRequestHandler(ps_handler)
elif type_ == 'source':
elif type_ == "source":
return MuxRPCSourceHandler(ps_handler)
elif type_ == 'sink':
elif type_ == "sink":
return MuxRPCSinkHandler(connection, req)
elif type_ == 'duplex':
elif type_ == "duplex":
return MuxRPCDuplexHandler(ps_handler, connection, req)
@@ -96,14 +95,14 @@ class MuxRPCRequest(object):
@classmethod
def from_message(cls, message):
body = message.body
return cls('.'.join(body['name']), body['args'])
return cls(".".join(body["name"]), body["args"])
def __init__(self, name, args):
self.name = name
self.args = args
def __repr__(self):
return '<MuxRPCRequest {0.name} {0.args}>'.format(self)
return "<MuxRPCRequest {0.name} {0.args}>".format(self)
class MuxRPCMessage(object):
@@ -115,7 +114,7 @@ class MuxRPCMessage(object):
self.body = body
def __repr__(self):
return '<MuxRPCMessage {0.body}}>'.format(self)
return "<MuxRPCMessage {0.body}}>".format(self)
class MuxRPCAPI(object):
@@ -128,7 +127,7 @@ class MuxRPCAPI(object):
body = req_message.body
if req_message is None:
return
if isinstance(body, dict) and body.get('name'):
if isinstance(body, dict) and body.get("name"):
self.process(self.connection, MuxRPCRequest.from_message(req_message))
def add_connection(self, connection):
@@ -141,22 +140,23 @@ class MuxRPCAPI(object):
@wraps(f)
def _f(*args, **kwargs):
return f(*args, **kwargs)
return f
return _handle
def process(self, connection, request):
handler = self.handlers.get(request.name)
if not handler:
raise MuxRPCAPIException('Method {} not found!'.format(request.name))
raise MuxRPCAPIException("Method {} not found!".format(request.name))
handler(connection, request)
def call(self, name, args, type_='sync'):
def call(self, name, args, type_="sync"):
if not self.connection.is_connected:
raise Exception('not connected')
raise Exception("not connected")
old_counter = self.connection.req_counter
ps_handler = self.connection.send({
'name': name.split('.'),
'args': args,
'type': type_
}, stream=type_ in {'sink', 'source', 'duplex'})
ps_handler = self.connection.send(
{"name": name.split("."), "args": args, "type": type_},
stream=type_ in {"sink", "source", "duplex"},
)
return _get_appropriate_api_handler(type_, self.connection, ps_handler, old_counter)

51
ssb/packet_stream.py
View File

@@ -33,7 +33,7 @@ from async_generator import async_generator, yield_
from secret_handshake import SHSClient, SHSServer
logger = logging.getLogger('packet_stream')
logger = logging.getLogger("packet_stream")
class PSMessageType(Enum):
@@ -85,13 +85,12 @@ class PSRequestHandler(object):
class PSMessage(object):
@classmethod
def from_header_body(cls, flags, req, body):
type_ = PSMessageType(flags & 0x03)
if type_ == PSMessageType.TEXT:
body = body.decode('utf-8')
body = body.decode("utf-8")
elif type_ == PSMessageType.JSON:
body = simplejson.loads(body)
@@ -100,9 +99,9 @@ class PSMessage(object):
@property
def data(self):
if self.type == PSMessageType.TEXT:
return self.body.encode('utf-8')
return self.body.encode("utf-8")
elif self.type == PSMessageType.JSON:
return simplejson.dumps(self.body).encode('utf-8')
return simplejson.dumps(self.body).encode("utf-8")
return self.body
def __init__(self, type_, body, stream, end_err, req=None):
@@ -114,12 +113,16 @@ class PSMessage(object):
def __repr__(self):
if self.type == PSMessageType.BUFFER:
body = '{} bytes'.format(len(self.body))
body = "{} bytes".format(len(self.body))
else:
body = self.body
return '<PSMessage ({}): {}{} {}{}>'.format(self.type.name, body,
'' if self.req is None else ' [{}]'.format(self.req),
'~' if self.stream else '', '!' if self.end_err else '')
return "<PSMessage ({}): {}{} {}{}>".format(
self.type.name,
body,
"" if self.req is None else " [{}]".format(self.req),
"~" if self.stream else "",
"!" if self.end_err else "",
)
class PacketStream(object):
@@ -147,27 +150,27 @@ class PacketStream(object):
async def __await__(self):
async for data in self:
logger.info('RECV: %r', data)
logger.info("RECV: %r", data)
if data is None:
return
async def _read(self):
try:
header = await self.connection.read()
if not header or header == b'\x00' * 9:
if not header or header == b"\x00" * 9:
return
flags, length, req = struct.unpack('>BIi', header)
flags, length, req = struct.unpack(">BIi", header)
n_packets = ceil(length / 4096)
body = b''
body = b""
for n in range(n_packets):
body += await self.connection.read()
logger.debug('READ %s %s', header, len(body))
logger.debug("READ %s %s", header, len(body))
return PSMessage.from_header_body(flags, req, body)
except StopAsyncIteration:
logger.debug('DISCONNECT')
logger.debug("DISCONNECT")
self.connection.disconnect()
return None
@@ -179,21 +182,25 @@ class PacketStream(object):
if msg.req < 0:
t, handler = self._event_map[-msg.req]
await handler.process(msg)
logger.info('RESPONSE [%d]: %r', -msg.req, msg)
logger.info("RESPONSE [%d]: %r", -msg.req, msg)
if msg.end_err:
await handler.stop()
del self._event_map[-msg.req]
logger.info('RESPONSE [%d]: EOS', -msg.req)
logger.info("RESPONSE [%d]: EOS", -msg.req)
return msg
def _write(self, msg):
logger.info('SEND [%d]: %r', msg.req, msg)
header = struct.pack('>BIi', (int(msg.stream) << 3) | (int(msg.end_err) << 2) | msg.type.value, len(msg.data),
msg.req)
logger.info("SEND [%d]: %r", msg.req, msg)
header = struct.pack(
">BIi",
(int(msg.stream) << 3) | (int(msg.end_err) << 2) | msg.type.value,
len(msg.data),
msg.req,
)
self.connection.write(header)
self.connection.write(msg.data)
logger.debug('WRITE HDR: %s', header)
logger.debug('WRITE DATA: %s', msg.data)
logger.debug("WRITE HDR: %s", header)
logger.debug("WRITE DATA: %s", msg.data)
def send(self, data, msg_type=PSMessageType.JSON, stream=False, end_err=False, req=None):
update_counter = False

15
ssb/util.py
View File

@@ -33,19 +33,16 @@ class ConfigException(Exception):
def tag(key):
"""Create tag from publick key."""
return b'@' + b64encode(bytes(key)) + b'.ed25519'
return b"@" + b64encode(bytes(key)) + b".ed25519"
def load_ssb_secret():
"""Load SSB keys from ~/.ssb"""
with open(os.path.expanduser('~/.ssb/secret')) as f:
with open(os.path.expanduser("~/.ssb/secret")) as f:
config = yaml.load(f, Loader=yaml.SafeLoader)
if config['curve'] != 'ed25519':
raise ConfigException('Algorithm not known: ' + config['curve'])
if config["curve"] != "ed25519":
raise ConfigException("Algorithm not known: " + config["curve"])
server_prv_key = b64decode(config['private'][:-8])
return {
'keypair': SigningKey(server_prv_key[:32]),
'id': config['id']
}
server_prv_key = b64decode(config["private"][:-8])
return {"keypair": SigningKey(server_prv_key[:32]), "id": config["id"]}