Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

move AP server event/exports to __init__.py

Browse source
This commit is contained in:
jesopo 2019-09-15 11:06:00 +01:00
parent 74b9fd5cf3
commit 71896f8081
3 changed files with 48 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/fediverse/__init__.py
View file

@ -1,6 +1,6 @@
import urllib.parse import urllib.parse
from src import IRCBot, ModuleManager, utils from src import IRCBot, ModuleManager, utils
from . import ap_actor, ap_utils from . import ap_actor, ap_server, ap_utils
def _format_username(username, instance): def _format_username(username, instance):
return "@%s@%s" % (username, instance) return "@%s@%s" % (username, instance)
@ -10,11 +10,29 @@ def _setting_parse(s):
return _format_username(username, instance) return _format_username(username, instance)
return None return None
@utils.export("botset", utils.FunctionSetting(_setting_parse,
"fediverse-server", "The bot's local fediverse server username",
example="@bot@bitbot.dev"))
@utils.export("set", utils.FunctionSetting(_setting_parse, "fediverse", @utils.export("set", utils.FunctionSetting(_setting_parse, "fediverse",
help="Set your fediverse account", example="@gargron@mastodon.social")) help="Set your fediverse account", example="@gargron@mastodon.social"))
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
_name = "Fedi" _name = "Fedi"
def on_load(self):
server_username = self.bot.get_setting("fediverse-server", None)
if server_username:
server_username, instance = ap_utils.split_username(server_username)
self.server = ap_server.Server(server_username, instance)
self.events.on("api.get.ap-webfinger").hook(
self.server.ap_webfinger, authenticated=False)
self.events.on("api.get.ap-user").hook(
self.server.ap_user, authenticated=False)
self.events.on("api.post.ap-inbox").hook(
self.server.ap_inbox, authenticated=False)
self.events.on("api.get.ap-outbox").hook(
self.server.ap_outbox, authenticated=False)
@utils.hook("received.command.fediverse") @utils.hook("received.command.fediverse")
@utils.hook("received.command.fedi", alias_of="fediverse") @utils.hook("received.command.fedi", alias_of="fediverse")
@utils.kwarg("help", "Get someone's latest toot") @utils.kwarg("help", "Get someone's latest toot")

0
modules/fediverse/security.py → modules/fediverse/ap_security.py
View file

94
modules/fediverse/server.py → modules/fediverse/ap_server.py
View file

@ -1,34 +1,14 @@
#--require-config tls-certificate
import base64, binascii, os, urllib.parse import base64, binascii, os, urllib.parse
from src import ModuleManager, utils from src import ModuleManager, utils
from . import actor as ap_actor from . import ap_activities, ap_actor, ap_security
from . import activities as ap_activities
from . import security as ap_security
ACTIVITY_SETTING_PREFIX = "ap-activity-" ACTIVITY_SETTING_PREFIX = "ap-activity-"
def _parse_username(s): class Server(object):
username, _, instance = s.rpartition("@") def __init__(self, username, instance):
if username.startswith("@"): self.username = username
username = username[1:] self.instance = instance
if username and instance:
return username, instance
return None, None
def _format_username(username, instance):
return "@%s@%s" % (username, instance)
def _setting_parse(s):
username, instance = _parse_username(s)
if username and instance:
return _format_username(username, instance)
return None
@utils.export("botset", utils.FunctionSetting(_setting_parse, "fediverse",
help="Set the bot's fediverse server account",
example="@gargron@mastodon.social"))
class Module(ModuleManager.BaseModule):
_name = "Fedi"
def _random_id(self): def _random_id(self):
return binascii.hexlify(os.urandom(3)).decode("ascii") return binascii.hexlify(os.urandom(3)).decode("ascii")
@ -61,11 +41,10 @@ class Module(ModuleManager.BaseModule):
pass pass
def _toot(self, activity_id): def _toot(self, activity_id):
our_username, our_instance = self._ap_self()
content, timestamp = self.bot.get_setting( content, timestamp = self.bot.get_setting(
"ap-activity-%s" % activity_id) "ap-activity-%s" % activity_id)
url_for = self.exports.get_one("url-for") url_for = self.exports.get_one("url-for")
self_id = self._ap_self_url(url_for, our_username) self_id = self._ap_self_url(url_for)
activity_url = self._ap_activity_url(url_for, activity_id) activity_url = self._ap_activity_url(url_for, activity_id)
object = { object = {
@ -85,39 +64,32 @@ class Module(ModuleManager.BaseModule):
actor.load() actor.load()
actor.inbox.send(activity, private_key) actor.inbox.send(activity, private_key)
def _ap_self(self):
our_username = self.bot.get_setting("fediverse", None)
return _parse_username(our_username)
def _ap_url(self, url_for, fragment, kwargs): def _ap_url(self, url_for, fragment, kwargs):
return "https://%s" % url_for("api", fragment, kwargs) return "https://%s" % url_for("api", fragment, kwargs)
def _ap_self_url(self, url_for, our_username): def _ap_self_url(self, url_for):
return self._ap_url(url_for, "ap-user", {"u": our_username}) return self._ap_url(url_for, "ap-user", {"u": self.username})
def _ap_inbox_url(self, url_for, our_username): def _ap_inbox_url(self, url_for):
return self._ap_url(url_for, "ap-inbox", {"u": our_username}) return self._ap_url(url_for, "ap-inbox", {"u": self.username})
def _ap_outbox_url(self, url_for, our_username): def _ap_outbox_url(self, url_for):
return self._ap_url(url_for, "ap-outbox", {"u": our_username}) return self._ap_url(url_for, "ap-outbox", {"u": self.username})
def _ap_activity_url(self, url_for, activity_id): def _ap_activity_url(self, url_for, activity_id):
return self._ap_url(url_for, "ap-activity", {"a": activity_id}) return self._ap_url(url_for, "ap-activity", {"a": activity_id})
def _ap_keyid_url(self, url_for, our_username): def _ap_keyid_url(self, url_for):
return "%s#key" % self._ap_self_url(url_for, our_username) return "%s#key" % self._ap_self_url(url_for)
@utils.hook("api.get.ap-webfinger")
@utils.kwarg("authenticated", False)
def ap_webfinger(self, event): def ap_webfinger(self, event):
our_username, our_instance = self._ap_self()
resource = event["params"].get("resource", None) resource = event["params"].get("resource", None)
if resource.startswith("acct:"): if resource.startswith("acct:"):
resource = resource.split(":", 1)[1] resource = resource.split(":", 1)[1]
if resource: if resource:
requested_username, requested_instance = _parse_username(resource) requested_username, requested_instance = ap_utils.split_username(
resource)
if (requested_username == our_username and if (requested_username == self.username and
requested_instance == our_instance): requested_instance == self.instance):
self_id = self._ap_self_url(event["url_for"], our_username) self_id = self._ap_self_url(event["url_for"], self.username)
event["response"].content_type = consts.JRD_TYPE event["response"].content_type = consts.JRD_TYPE
event["response"].write_json({ event["response"].write_json({
@ -134,16 +106,13 @@ class Module(ModuleManager.BaseModule):
else: else:
event["response"].code = 400 event["response"].code = 400
@utils.hook("api.get.ap-user")
@utils.kwarg("authenticated", False)
def ap_user(self, event): def ap_user(self, event):
our_username, our_instance = self._ap_self()
username = event["params"].get("u", None) username = event["params"].get("u", None)
if username and username == our_username: if username and username == self.username:
self_id = self._ap_self_url(event["url_for"], our_username) self_id = self._ap_self_url(event["url_for"])
inbox = self._ap_inbox_url(event["url_for"], our_username) inbox = self._ap_inbox_url(event["url_for"])
outbox = self._ap_outbox_url(event["url_for"], our_username) outbox = self._ap_outbox_url(event["url_for"])
cert_filename = self.bot.config["tls-certificate"] cert_filename = self.bot.config["tls-certificate"]
with open(cert_filename) as cert_file: with open(cert_filename) as cert_file:
@ -155,7 +124,7 @@ class Module(ModuleManager.BaseModule):
"id": self_id, "url": self_id, "id": self_id, "url": self_id,
"type": "Person", "type": "Person",
"summary": "beep boop", "summary": "beep boop",
"preferredUsername": our_username, "name": our_username, "preferredUsername": self.username, "name": self.username,
"inbox": inbox, "inbox": inbox,
"outbox": outbox, "outbox": outbox,
"publicKey": { "publicKey": {
@ -182,14 +151,11 @@ class Module(ModuleManager.BaseModule):
"type": "Note", "type": "Note",
} }
@utils.hook("api.get.ap-outbox")
@utils.kwarg("authenticated", False)
def ap_outbox(self, event): def ap_outbox(self, event):
our_username, our_instance = self._ap_self()
username = event["params"].get("u", None) username = event["params"].get("u", None)
if username and username == our_username: if username and username == self.username:
self_id = self._ap_self_url(event["url_for"], our_username) self_id = self._ap_self_url(event["url_for"])
outbox = self._ap_outbox_url(event["url_for"], our_username) outbox = self._ap_outbox_url(event["url_for"])
activities = [] activities = []
for activity_id, content, timestamp in self._get_activities(): for activity_id, content, timestamp in self._get_activities():
@ -217,15 +183,13 @@ class Module(ModuleManager.BaseModule):
event["response"].code = 404 event["response"].code = 404
def _private_key(self): def _private_key(self):
id = self._ap_keyid_url(url_for, our_username) id = self._ap_keyid_url(url_for)
filename = security.private_key(self.bot.config["tls-certificate"]) filename = security.private_key(self.bot.config["tls-certificate"])
return ap_security.PrivateKey(filename, id) return ap_security.PrivateKey(filename, id)
@utils.hook("api.post.ap-inbox")
@utils.kwarg("authenticated", False)
def ap_inbox(self, event): def ap_inbox(self, event):
data = json.loads(event["data"]) data = json.loads(event["data"])
self_id = self._ap_self_url(event["url_for"], our_username) self_id = self._ap_self_url(event["url_for"])
if data["type"] == "Follow": if data["type"] == "Follow":
if data["object"] == self_id: if data["object"] == self_id: