nobigtech
/
pleroma-relay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use urllib.parse.urlsplit instead of regex

This commit is contained in:
Tristan Mahé 2018-11-01 13:14:37 -07:00
parent fb669f124f
commit 39a255375e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
relay/actor.py
View File

@ -3,9 +3,9 @@ import aiohttp.web
import asyncio import asyncio
import logging import logging
import uuid import uuid
import re
import urllib.parse import urllib.parse
import simplejson as json import simplejson as json
import re
import cgi import cgi
from Crypto.PublicKey import RSA from Crypto.PublicKey import RSA
from .database import DATABASE from .database import DATABASE
@ -186,7 +186,7 @@ async def handle_follow(actor, data, request):
following = DATABASE.get('relay-list', []) following = DATABASE.get('relay-list', [])
inbox = get_actor_inbox(actor) inbox = get_actor_inbox(actor)
if re.search('https://(.*)/inbox',inbox).group(1) in AP_CONFIG['blocked_instances']: if urllib.parse.urlsplit(inbox).hostname in AP_CONFIG['blocked_instances']:
return return
if inbox not in following: if inbox not in following:

4
relay/database.py
View File

@ -1,6 +1,6 @@
import asyncio import asyncio
import logging import logging
import re import urllib.parse
import simplejson as json import simplejson as json
@ -16,7 +16,7 @@ except:
following = DATABASE.get('relay-list', []) following = DATABASE.get('relay-list', [])
for inbox in following: for inbox in following:
if re.search('https://(.*)/inbox',inbox).group(1) in CONFIG['ap']['blocked_instances']: if urllib.parse.urlsplit(inbox).hostname in CONFIG['ap']['blocked_instances']:
following.remove(inbox) following.remove(inbox)
DATABASE['relay-list'] = following DATABASE['relay-list'] = following