2497: Upgrade to alpine 3.16.2 r=mergify[bot] a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

This may fix the build issues on arm (troubles building cryptography)

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
main
bors[bot] 2 years ago committed by GitHub
commit 62c919da09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,7 +1,7 @@
# syntax=docker/dockerfile-upstream:1.4.3 # syntax=docker/dockerfile-upstream:1.4.3
# base system image (intermediate) # base system image (intermediate)
ARG DISTRO=alpine:3.14.5 ARG DISTRO=alpine:3.16.2
FROM $DISTRO as system FROM $DISTRO as system
ENV TZ=Etc/UTC LANG=C.UTF-8 ENV TZ=Etc/UTC LANG=C.UTF-8

@ -33,6 +33,8 @@ class DictProtocol(asyncio.Protocol):
self.dict = None self.dict = None
# Dictionary of active transaction lists per transaction id # Dictionary of active transaction lists per transaction id
self.transactions = {} self.transactions = {}
# Dictionary of user per transaction id
self.transactions_user = {}
super(DictProtocol, self).__init__() super(DictProtocol, self).__init__()
def connection_made(self, transport): def connection_made(self, transport):
@ -75,15 +77,15 @@ class DictProtocol(asyncio.Protocol):
logging.debug("Client {}.{} type {}, user {}, dict {}".format( logging.debug("Client {}.{} type {}, user {}, dict {}".format(
self.major, self.minor, self.value_type, self.user, dict_name)) self.major, self.minor, self.value_type, self.user, dict_name))
async def process_lookup(self, key): async def process_lookup(self, key, user=None):
""" Process a dict lookup message """ Process a dict lookup message
""" """
logging.debug("Looking up {}".format(key)) logging.debug("Looking up {} for {}".format(key, user))
# Priv and shared keys are handled slighlty differently # Priv and shared keys are handled slighlty differently
key_type, key = key.decode("utf8").split("/", 1) key_type, key = key.decode("utf8").split("/", 1)
try: try:
result = await self.dict.get( result = await self.dict.get(
key, ns=(self.user if key_type == "priv" else None) key, ns=((user.decode("utf8") if user else self.user) if key_type == "priv" else None)
) )
if type(result) is str: if type(result) is str:
response = result.encode("utf8") response = result.encode("utf8")
@ -95,10 +97,11 @@ class DictProtocol(asyncio.Protocol):
except KeyError: except KeyError:
return self.reply(b"N") return self.reply(b"N")
def process_begin(self, transaction_id): def process_begin(self, transaction_id, user=None):
""" Process a dict begin message """ Process a dict begin message
""" """
self.transactions[transaction_id] = {} self.transactions[transaction_id] = {}
self.transactions_user[transaction_id] = user.decode("utf8") if user else self.user
def process_set(self, transaction_id, key, value): def process_set(self, transaction_id, key, value):
""" Process a dict set message """ Process a dict set message
@ -116,10 +119,11 @@ class DictProtocol(asyncio.Protocol):
key_type, key = key.decode("utf8").split("/", 1) key_type, key = key.decode("utf8").split("/", 1)
result = await self.dict.set( result = await self.dict.set(
key, json.loads(value), key, json.loads(value),
ns=(self.user if key_type == "priv" else None) ns=(self.transactions_user[transaction_id] if key_type == "priv" else None)
) )
# Remove stored transaction # Remove stored transaction
del self.transactions[transaction_id] del self.transactions[transaction_id]
del self.transactions_user[transaction_id]
return self.reply(b"O", transaction_id) return self.reply(b"O", transaction_id)
def reply(self, command, *args): def reply(self, command, *args):

@ -0,0 +1 @@
Upgrade to alpine 3.16.2
Loading…
Cancel
Save