self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2024-12-14 10:53:30 +02:00
Code Issues Releases Activity

Add support for querying the table in Dovecot proxy

Browse Source
This commit is contained in:
Pierre Jaury 2018-07-15 15:35:35 +02:00
parent 70175f8c28
commit 2b2ab864d1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/postfix/conf/postproxy.py
View File

@ -10,6 +10,7 @@ import aiohttp
import logging import logging
import urllib import urllib
import argparse import argparse
import json
class NetstringProtocol(asyncio.Protocol): class NetstringProtocol(asyncio.Protocol):
@ -108,7 +109,7 @@ class SocketmapProtocol(NetstringProtocol):
return self.send_string(b'TEMP no such map') return self.send_string(b'TEMP no such map')
try: try:
result = await table.get(key) result = await table.get(key)
return self.send_string(b'OK ' + result.encode('utf8')) return self.send_string(b'OK ' + str(result).encode('utf8'))
except KeyError: except KeyError:
return self.send_string(b'NOTFOUND ') return self.send_string(b'NOTFOUND ')
except Exception: except Exception:
@ -157,7 +158,7 @@ class DictProtocol(asyncio.Protocol):
return self.transport.abort() return self.transport.abort()
args = line[1:].strip().split(b"\t") args = line[1:].strip().split(b"\t")
try: try:
command(self, *args) return command(self, *args)
except Exception: except Exception:
logging.exception("Error when processing request") logging.exception("Error when processing request")
return self.transport.abort() return self.transport.abort()
@ -172,9 +173,11 @@ class DictProtocol(asyncio.Protocol):
logging.debug("Value type {}, user {}, dict {}".format( logging.debug("Value type {}, user {}, dict {}".format(
self.value_type, self.user, dict_name)) self.value_type, self.user, dict_name))
def process_lookup(self, key): async def process_lookup(self, key):
logging.debug("Looking up {}".format(key)) logging.debug("Looking up {}".format(key))
self.reply(b"O", json.dumps({})) result = await self.dict.get(key)
response = result if type(result) is str else json.dumps(result)
return self.reply(b"O", response)
def reply(self, command, *args): def reply(self, command, *args):
logging.debug("Replying {} with {}".format(command, args)) logging.debug("Replying {} with {}".format(command, args))
@ -210,7 +213,7 @@ class UrlTable(object):
async with aiohttp.ClientSession() as session: async with aiohttp.ClientSession() as session:
async with session.get(self.url_pattern.format(key)) as request: async with session.get(self.url_pattern.format(key)) as request:
if request.status == 200: if request.status == 200:
result = await request.text() result = await request.json()
return result return result