gsathecat
/
fediseer
mirror of https://github.com/Fediseer/fediseer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Prevent lemmy switching to mastodon proxy:

pull/36/head
db0 2023-09-26 00:05:19 +02:00
parent 9f4c10310e
commit 9846206191
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fediseer/apis/v1/whitelist.py
View File

@ -170,6 +170,7 @@ class WhitelistDomain(Resource):
raise e.Forbidden("You have not yet claimed an instance. Use the POST method to do so.") raise e.Forbidden("You have not yet claimed an instance. Use the POST method to do so.")
instance = database.find_instance_by_user(user) instance = database.find_instance_by_user(user)
requestor_instance = instance requestor_instance = instance
instance_to_reset = database.find_instance_by_domain(domain)
changed = False changed = False
new_key = None new_key = None
if self.args.sysadmins is not None and instance.sysadmins != self.args.sysadmins: if self.args.sysadmins is not None and instance.sysadmins != self.args.sysadmins:
@ -180,9 +181,11 @@ class WhitelistDomain(Resource):
changed = True changed = True
if self.args.pm_proxy is not None: if self.args.pm_proxy is not None:
proxy = enums.PMProxy[self.args.pm_proxy] proxy = enums.PMProxy[self.args.pm_proxy]
if instance.pm_proxy != proxy: if instance_to_reset.software == "lemmy" and proxy == enums.PMProxy.MASTODON:
activitypub_pm.pm_new_proxy_switch(proxy,instance.pm_proxy,instance,user.username) raise e.BadRequest("I'm sorry Dave, I can't let you do that. Lemmy is not capable of receiving mastodon PMs.")
instance.pm_proxy = proxy if instance_to_reset.pm_proxy != proxy:
activitypub_pm.pm_new_proxy_switch(proxy,instance_to_reset.pm_proxy,instance_to_reset,user.username)
instance_to_reset.pm_proxy = proxy
changed = True changed = True
if self.args.visibility_endorsements is not None: if self.args.visibility_endorsements is not None:
visibility = enums.ListVisibility[self.args.visibility_endorsements] visibility = enums.ListVisibility[self.args.visibility_endorsements]
@ -205,7 +208,7 @@ class WhitelistDomain(Resource):
requestor = user.username requestor = user.username
instance_to_reset = database.find_instance_by_account(f"@{self.args.admin_username}@{domain}") instance_to_reset = database.find_instance_by_account(f"@{self.args.admin_username}@{domain}")
if instance_to_reset is None: if instance_to_reset is None:
raise e.NotFound(f"No Instance found matching provided domain. Have you remembered to register it?") raise e.NotFound(f"No admin '{self.args.admin_username}' found in instance {domain}. Have you remembered to claim it as that admin?")
if instance != instance_to_reset and user.username != "fediseer": if instance != instance_to_reset and user.username != "fediseer":
raise e.BadRequest("Only other admins of the same instance or the fediseer can request API key reset for others.") raise e.BadRequest("Only other admins of the same instance or the fediseer can request API key reset for others.")

4
fediseer/database/functions.py
View File

@ -220,6 +220,10 @@ def find_instance_by_account(user_account):
).first() ).first()
return instance return instance
def find_instance_by_domain(domain):
instance = Instance.query.filter_by(domain=domain).first()
return instance
def find_admins_by_instance(instance): def find_admins_by_instance(instance):
users = User.query.join( users = User.query.join(
Claim Claim