Browse Source

Implement authorization for a moderated Hivemind network (#255)

This PR implements the protocol from #253.
Aleksandr Borzunov 4 years ago
parent
commit
971c142628

+ 13 - 49
hivemind/dht/crypto.py

@@ -1,13 +1,10 @@
-import base64
 import dataclasses
 import re
-
-from cryptography.exceptions import InvalidSignature
-from cryptography.hazmat.primitives import hashes, serialization
-from cryptography.hazmat.primitives.asymmetric import padding, rsa
+from typing import Optional
 
 from hivemind.dht.validation import DHTRecord, RecordValidatorBase
 from hivemind.utils import MSGPackSerializer, get_logger
+from hivemind.utils.crypto import RSAPrivateKey, RSAPublicKey
 
 
 logger = get_logger(__name__)
@@ -31,26 +28,13 @@ class RSASignatureValidator(RecordValidatorBase):
 
     _cached_private_key = None
 
-    def __init__(self, *, ignore_cached_key=False):
-        if self._cached_private_key is None or ignore_cached_key:
-            # Since generating a private key takes ~100 ms, we cache it for future validator
-            # instances in the same process (unless ignore_cached_key=True)
-            self._private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
-            if not ignore_cached_key:
-                RSASignatureValidator._cached_private_key = self._private_key
-        else:
-            self._private_key = RSASignatureValidator._cached_private_key
-
-        serialized_public_key = self._private_key.public_key().public_bytes(
-            encoding=serialization.Encoding.OpenSSH, format=serialization.PublicFormat.OpenSSH)
-        self._local_public_key = self.PUBLIC_KEY_FORMAT.replace(b'_key_', serialized_public_key)
-
-        self._init_signature_params()
+    def __init__(self, private_key: Optional[RSAPrivateKey]=None):
+        if private_key is None:
+            private_key = RSAPrivateKey.process_wide()
+        self._private_key = private_key
 
-    def _init_signature_params(self) -> None:
-        self._padding = padding.PSS(mgf=padding.MGF1(hashes.SHA256()),
-                                    salt_length=padding.PSS.MAX_LENGTH)
-        self._hash_algorithm = hashes.SHA256()
+        serialized_public_key = private_key.get_public_key().to_bytes()
+        self._local_public_key = self.PUBLIC_KEY_FORMAT.replace(b'_key_', serialized_public_key)
 
     @property
     def local_public_key(self) -> bytes:
@@ -66,31 +50,25 @@ class RSASignatureValidator(RecordValidatorBase):
         if len(set(public_keys)) > 1:
             logger.debug(f"Key and subkey can't contain different public keys in {record}")
             return False
-        public_key = serialization.load_ssh_public_key(public_keys[0])
+        public_key = RSAPublicKey.from_bytes(public_keys[0])
 
         signatures = self._SIGNATURE_RE.findall(record.value)
         if len(signatures) != 1:
             logger.debug(f"Record should have exactly one signature in {record}")
             return False
-        signature = base64.b64decode(signatures[0])
+        signature = signatures[0]
 
         stripped_record = dataclasses.replace(record, value=self.strip_value(record))
-        try:
-            # verify() returns None iff the signature is correct
-            public_key.verify(signature, self._serialize_record(stripped_record),
-                              self._padding, self._hash_algorithm)
-            return True
-        except InvalidSignature:
+        if not public_key.verify(self._serialize_record(stripped_record), signature):
             logger.debug(f'Signature is invalid in {record}')
             return False
+        return True
 
     def sign_value(self, record: DHTRecord) -> bytes:
         if self._local_public_key not in record.key and self._local_public_key not in record.subkey:
             return record.value
 
-        signature = self._private_key.sign(self._serialize_record(record),
-                                           self._padding, self._hash_algorithm)
-        signature = base64.b64encode(signature)
+        signature = self._private_key.sign(self._serialize_record(record))
         return record.value + self.SIGNATURE_FORMAT.replace(b'_value_', signature)
 
     def strip_value(self, record: DHTRecord) -> bytes:
@@ -112,17 +90,3 @@ class RSASignatureValidator(RecordValidatorBase):
         # Ignore another RSASignatureValidator instance (it doesn't make sense to have several
         # instances of this class) and report successful merge
         return True
-
-    def __getstate__(self):
-        state = self.__dict__.copy()
-        # Serializes the private key to make the class instances picklable
-        state['_private_key'] = self._private_key.private_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PrivateFormat.OpenSSH,
-            encryption_algorithm=serialization.NoEncryption())
-        return state
-
-    def __setstate__(self, state):
-        self.__dict__.update(state)
-        self._private_key = serialization.load_ssh_private_key(self._private_key, password=None)
-        self._init_signature_params()

+ 7 - 2
hivemind/dht/protocol.py

@@ -13,6 +13,7 @@ from hivemind.dht.storage import DHTLocalStorage, DictionaryDHTValue
 from hivemind.proto import dht_pb2, dht_pb2_grpc as dht_grpc
 from hivemind.utils import Endpoint, get_logger, replace_port, MSGPackSerializer, ChannelCache, ValueWithExpiration
 from hivemind.utils import get_dht_time, GRPC_KEEPALIVE_OPTIONS, MAX_DHT_TIME_DISCREPANCY_SECONDS
+from hivemind.utils.auth import AuthRole, AuthRPCWrapper, AuthorizerBase
 
 logger = get_logger(__name__)
 
@@ -34,6 +35,7 @@ class DHTProtocol(dht_grpc.DHTServicer):
             parallel_rpc: Optional[int] = None, cache_size: Optional[int] = None,
             listen=True, listen_on='0.0.0.0:*', endpoint: Optional[Endpoint] = None,
             record_validator: Optional[RecordValidatorBase] = None,
+            authorizer: Optional[AuthorizerBase] = None,
             channel_options: Sequence[Tuple[str, Any]] = (), **kwargs) -> DHTProtocol:
         """
         A protocol that allows DHT nodes to request keys/neighbors from other DHT nodes.
@@ -54,11 +56,13 @@ class DHTProtocol(dht_grpc.DHTServicer):
         self.routing_table = RoutingTable(node_id, bucket_size, depth_modulo)
         self.rpc_semaphore = asyncio.Semaphore(parallel_rpc if parallel_rpc is not None else float('inf'))
         self.record_validator = record_validator
+        self.authorizer = authorizer
 
         if listen:  # set up server to process incoming rpc requests
             grpc.aio.init_grpc_aio()
             self.server = grpc.aio.server(**kwargs, options=GRPC_KEEPALIVE_OPTIONS)
-            dht_grpc.add_DHTServicer_to_server(self, self.server)
+            servicer = AuthRPCWrapper(self, AuthRole.SERVICER, self.authorizer)
+            dht_grpc.add_DHTServicer_to_server(servicer, self.server)
 
             self.port = self.server.add_insecure_port(listen_on)
             assert self.port != 0, f"Failed to listen to {listen_on}"
@@ -89,7 +93,8 @@ class DHTProtocol(dht_grpc.DHTServicer):
 
     def _get_dht_stub(self, peer: Endpoint) -> dht_grpc.DHTStub:
         """ get a DHTStub that sends requests to a given peer """
-        return ChannelCache.get_stub(peer, dht_grpc.DHTStub, aio=True, options=self.channel_options)
+        stub = ChannelCache.get_stub(peer, dht_grpc.DHTStub, aio=True, options=self.channel_options)
+        return AuthRPCWrapper(stub, AuthRole.CLIENT, self.authorizer, service_public_key=None)
 
     async def call_ping(self, peer: Endpoint, validate: bool = False, strict: bool = True) -> Optional[DHTID]:
         """

+ 22 - 0
hivemind/proto/auth.proto

@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+message AccessToken {
+    string username = 1;
+    bytes public_key = 2;
+    string expiration_time = 3;
+    bytes signature = 4;
+}
+
+message RequestAuthInfo {
+    AccessToken client_access_token = 1;
+    bytes service_public_key = 2;
+    double time = 3;
+    bytes nonce = 4;
+    bytes signature = 5;
+}
+
+message ResponseAuthInfo {
+    AccessToken service_access_token = 1;
+    bytes nonce = 2;
+    bytes signature = 3;
+}

+ 25 - 20
hivemind/proto/dht.proto

@@ -1,4 +1,5 @@
 syntax = "proto3";
+import "auth.proto";
 
 // this protocol defines how Hivemind nodes form a distributed hash table.
 // For more info, see https://learning-at-home.readthedocs.io/en/latest/modules/dht.html or help(hivemind.dht.DHTNode)
@@ -23,35 +24,40 @@ message NodeInfo {
 }
 
 message PingRequest {
-  NodeInfo peer = 1;                   // (optional) sender's own node info, same behavior as in DHT.rpc_ping
-  bool validate = 2;                   // set to True if sender wants to validate that he is accessible and synchronized
+  RequestAuthInfo auth = 1;
+  NodeInfo peer = 2;                   // (optional) sender's own node info, same behavior as in DHT.rpc_ping
+  bool validate = 3;                   // set to True if sender wants to validate that he is accessible and synchronized
 }
 
 message PingResponse {
-  NodeInfo peer = 1;                   // respondent's node id, for you to update routing table
-  string sender_endpoint = 2;          // echo sender's visible endpoint - used to infer his ip address
-  double dht_time = 3;                 // recipient's local DHT time - used to soft-synchronize peers
-  bool available = 4;                  // if validate = True, this flag asserts that the sender is available for ping
+  ResponseAuthInfo auth = 1;
+  NodeInfo peer = 2;                   // respondent's node id, for you to update routing table
+  string sender_endpoint = 3;          // echo sender's visible endpoint - used to infer his ip address
+  double dht_time = 4;                 // recipient's local DHT time - used to soft-synchronize peers
+  bool available = 5;                  // if validate = True, this flag asserts that the sender is available for ping
 }
 
 message StoreRequest {
+  RequestAuthInfo auth = 1;
   // three lists of the same length representing dht keys, dht values and expiration
-  repeated bytes keys = 1;             // keys in the form of DHTID.generate(raw_key).to_bytes()
-  repeated bytes subkeys = 2;          // serialized subkeys for DictionaryDHTValue type. None means no subkey
-  repeated bytes values = 3;           // serialized value for i-th key
-  repeated double expiration_time = 4; // expirations for i-th key (type = DHTExpiration)
-  repeated bool in_cache = 5;          // if in_cache[i], store i-th key in cache, else store normally
-  NodeInfo peer = 6;                   // (optional) sender's own node info, same behavior as in DHT.rpc_ping
+  repeated bytes keys = 2;             // keys in the form of DHTID.generate(raw_key).to_bytes()
+  repeated bytes subkeys = 3;          // serialized subkeys for DictionaryDHTValue type. None means no subkey
+  repeated bytes values = 4;           // serialized value for i-th key
+  repeated double expiration_time = 5; // expirations for i-th key (type = DHTExpiration)
+  repeated bool in_cache = 6;          // if in_cache[i], store i-th key in cache, else store normally
+  NodeInfo peer = 7;                   // (optional) sender's own node info, same behavior as in DHT.rpc_ping
 }
 
 message StoreResponse {
-  repeated bool store_ok = 1;          // for every key, True means store accepted, False means store rejected/failed
-  NodeInfo peer = 2;                   // respondent's node id, for you to update routing table
+  ResponseAuthInfo auth = 1;
+  repeated bool store_ok = 2;          // for every key, True means store accepted, False means store rejected/failed
+  NodeInfo peer = 3;                   // respondent's node id, for you to update routing table
 }
 
 message FindRequest {
-  repeated bytes keys = 1;             // a list of DHTID search keys encoded as bytes
-  NodeInfo peer = 2;                   // optional, same behavior as in DHT.ping
+  RequestAuthInfo auth = 1;
+  repeated bytes keys = 2;             // a list of DHTID search keys encoded as bytes
+  NodeInfo peer = 3;                   // optional, same behavior as in DHT.ping
 }
 
 enum ResultType {NOT_FOUND = 0; FOUND_REGULAR = 1; FOUND_DICTIONARY = 2;}
@@ -66,9 +72,8 @@ message FindResult {
   repeated string nearest_endpoints = 5;    // e.g. 123.123.123.123:1337 or [2a21:6с8:b192:2105]:8888
 }
 
-
 message FindResponse {
-  repeated FindResult results = 1;       // for each item, return value/expiration (if found) and nearest peers
-  NodeInfo peer = 2;                   // respondent's node id, for you to update routing table
+  ResponseAuthInfo auth = 1;
+  repeated FindResult results = 2;       // for each item, return value/expiration (if found) and nearest peers
+  NodeInfo peer = 3;                   // respondent's node id, for you to update routing table
 }
-

+ 215 - 0
hivemind/utils/auth.py

@@ -0,0 +1,215 @@
+import asyncio
+import functools
+import secrets
+import threading
+import time
+from abc import ABC, abstractmethod
+from enum import Enum
+from datetime import timedelta
+from typing import Optional, Tuple
+
+import grpc
+
+from hivemind.proto.auth_pb2 import AccessToken, RequestAuthInfo, ResponseAuthInfo
+from hivemind.utils.crypto import RSAPrivateKey, RSAPublicKey
+from hivemind.utils.logging import get_logger
+from hivemind.utils.timed_storage import TimedStorage, get_dht_time
+
+
+logger = get_logger(__name__)
+
+
+class AuthorizedRequestBase:
+    """
+    Interface for protobufs with the ``RequestAuthInfo auth`` field. Used for type annotations only.
+    """
+
+    auth: RequestAuthInfo
+
+
+class AuthorizedResponseBase:
+    """
+    Interface for protobufs with the ``ResponseAuthInfo auth`` field. Used for type annotations only.
+    """
+
+    auth: ResponseAuthInfo
+
+
+class AuthorizerBase(ABC):
+    @abstractmethod
+    async def sign_request(self, request: AuthorizedRequestBase, service_public_key: Optional[RSAPublicKey]) -> None:
+        ...
+
+    @abstractmethod
+    async def validate_request(self, request: AuthorizedRequestBase) -> bool:
+        ...
+
+    @abstractmethod
+    async def sign_response(self, response: AuthorizedResponseBase, request: AuthorizedRequestBase) -> None:
+        ...
+
+    @abstractmethod
+    async def validate_response(self, response: AuthorizedResponseBase, request: AuthorizedRequestBase) -> bool:
+        ...
+
+
+class TokenAuthorizerBase(AuthorizerBase):
+    """
+    Implements the authorization protocol for a moderated Hivemind network.
+    See https://github.com/learning-at-home/hivemind/issues/253
+    """
+
+    def __init__(self, local_private_key: Optional[RSAPrivateKey]=None):
+        if local_private_key is None:
+            local_private_key = RSAPrivateKey.process_wide()
+        self._local_private_key = local_private_key
+        self._local_public_key = local_private_key.get_public_key()
+
+        self._local_access_token = None
+        self._refresh_lock = asyncio.Lock()
+
+        self._recent_nonces = TimedStorage()
+
+    @abstractmethod
+    async def get_token(self) -> AccessToken:
+        ...
+
+    @abstractmethod
+    def is_token_valid(self, access_token: AccessToken) -> bool:
+        ...
+
+    @abstractmethod
+    def does_token_need_refreshing(self, access_token: AccessToken) -> bool:
+        ...
+
+    async def refresh_token_if_needed(self) -> None:
+        if self._local_access_token is None or self.does_token_need_refreshing(self._local_access_token):
+            async with self._refresh_lock:
+                if self._local_access_token is None or self.does_token_need_refreshing(self._local_access_token):
+                    self._local_access_token = await self.get_token()
+                    assert self.is_token_valid(self._local_access_token)
+
+    @property
+    def local_public_key(self) -> RSAPublicKey:
+        return self._local_public_key
+
+    async def sign_request(self, request: AuthorizedRequestBase, service_public_key: Optional[RSAPublicKey]) -> None:
+        await self.refresh_token_if_needed()
+        auth = request.auth
+
+        auth.client_access_token.CopyFrom(self._local_access_token)
+
+        if service_public_key is not None:
+            auth.service_public_key = service_public_key.to_bytes()
+        auth.time = get_dht_time()
+        auth.nonce = secrets.token_bytes(8)
+
+        assert auth.signature == b''
+        auth.signature = self._local_private_key.sign(request.SerializeToString())
+
+    _MAX_CLIENT_SERVICER_TIME_DIFF = timedelta(minutes=1)
+
+    async def validate_request(self, request: AuthorizedRequestBase) -> bool:
+        await self.refresh_token_if_needed()
+        auth = request.auth
+
+        if not self.is_token_valid(auth.client_access_token):
+            logger.debug('Client failed to prove that it (still) has access to the network')
+            return False
+
+        client_public_key = RSAPublicKey.from_bytes(auth.client_access_token.public_key)
+        signature = auth.signature
+        auth.signature = b''
+        if not client_public_key.verify(request.SerializeToString(), signature):
+            logger.debug('Request has invalid signature')
+            return False
+
+        if auth.service_public_key and auth.service_public_key != self._local_public_key.to_bytes():
+            logger.debug('Request is generated for a peer with another public key')
+            return False
+
+        with self._recent_nonces.freeze():
+            current_time = get_dht_time()
+            if abs(auth.time - current_time) > self._MAX_CLIENT_SERVICER_TIME_DIFF.total_seconds():
+                logger.debug('Clocks are not synchronized or a previous request is replayed again')
+                return False
+            if auth.nonce in self._recent_nonces:
+                logger.debug('Previous request is replayed again')
+                return False
+
+        self._recent_nonces.store(auth.nonce, None,
+                                  current_time + self._MAX_CLIENT_SERVICER_TIME_DIFF.total_seconds() * 3)
+        return True
+
+    async def sign_response(self, response: AuthorizedResponseBase, request: AuthorizedRequestBase) -> None:
+        await self.refresh_token_if_needed()
+        auth = response.auth
+
+        auth.service_access_token.CopyFrom(self._local_access_token)
+        auth.nonce = request.auth.nonce
+
+        assert auth.signature == b''
+        auth.signature = self._local_private_key.sign(response.SerializeToString())
+
+    async def validate_response(self, response: AuthorizedResponseBase, request: AuthorizedRequestBase) -> bool:
+        await self.refresh_token_if_needed()
+        auth = response.auth
+
+        if not self.is_token_valid(auth.service_access_token):
+            logger.debug('Service failed to prove that it (still) has access to the network')
+            return False
+
+        service_public_key = RSAPublicKey.from_bytes(auth.service_access_token.public_key)
+        signature = auth.signature
+        auth.signature = b''
+        if not service_public_key.verify(response.SerializeToString(), signature):
+            logger.debug('Response has invalid signature')
+            return False
+
+        if auth.nonce != request.auth.nonce:
+            logger.debug('Response is generated for another request')
+            return False
+
+        return True
+
+
+class AuthRole(Enum):
+    CLIENT = 0
+    SERVICER = 1
+
+
+class AuthRPCWrapper:
+    def __init__(self, stub, role: AuthRole,
+                 authorizer: Optional[AuthorizerBase], service_public_key: Optional[RSAPublicKey]=None):
+        self._stub = stub
+        self._role = role
+        self._authorizer = authorizer
+        self._service_public_key = service_public_key
+
+    def __getattribute__(self, name: str):
+        if not name.startswith('rpc_'):
+            return object.__getattribute__(self, name)
+
+        method = getattr(self._stub, name)
+
+        @functools.wraps(method)
+        async def wrapped_rpc(request: AuthorizedRequestBase, *args, **kwargs):
+            if self._authorizer is not None:
+                if self._role == AuthRole.CLIENT:
+                    await self._authorizer.sign_request(request, self._service_public_key)
+                elif self._role == AuthRole.SERVICER:
+                    if not await self._authorizer.validate_request(request):
+                        return None
+
+            response = await method(request, *args, **kwargs)
+
+            if self._authorizer is not None:
+                if self._role == AuthRole.SERVICER:
+                    await self._authorizer.sign_response(response, request)
+                elif self._role == AuthRole.CLIENT:
+                    if not await self._authorizer.validate_response(response, request):
+                        return None
+
+            return response
+
+        return wrapped_rpc

+ 102 - 0
hivemind/utils/crypto.py

@@ -0,0 +1,102 @@
+from __future__ import annotations
+
+import base64
+import threading
+from abc import ABC, abstractmethod
+from typing import Optional
+
+from cryptography import exceptions
+from cryptography.hazmat.primitives import hashes, serialization
+from cryptography.hazmat.primitives.asymmetric import padding, rsa
+
+
+class PrivateKey(ABC):
+    @abstractmethod
+    def sign(self, data: bytes) -> bytes:
+        ...
+
+    @abstractmethod
+    def get_public_key(self) -> PublicKey:
+        ...
+
+
+class PublicKey(ABC):
+    @abstractmethod
+    def verify(self, data: bytes, signature: bytes) -> bool:
+        ...
+
+    @abstractmethod
+    def to_bytes(self) -> bytes:
+        ...
+
+    @classmethod
+    @abstractmethod
+    def from_bytes(cls, key: bytes) -> bytes:
+        ...
+
+
+_RSA_PADDING = padding.PSS(mgf=padding.MGF1(hashes.SHA256()), salt_length=padding.PSS.MAX_LENGTH)
+_RSA_HASH_ALGORITHM = hashes.SHA256()
+
+
+class RSAPrivateKey(PrivateKey):
+    def __init__(self):
+        self._private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
+
+    _process_wide_key = None
+    _process_wide_key_lock = threading.RLock()
+
+    @classmethod
+    def process_wide(cls) -> RSAPrivateKey:
+        if cls._process_wide_key is None:
+            with cls._process_wide_key_lock:
+                if cls._process_wide_key is None:
+                    cls._process_wide_key = cls()
+        return cls._process_wide_key
+
+    def sign(self, data: bytes) -> bytes:
+        signature = self._private_key.sign(data, _RSA_PADDING, _RSA_HASH_ALGORITHM)
+        return base64.b64encode(signature)
+
+    def get_public_key(self) -> RSAPublicKey:
+        return RSAPublicKey(self._private_key.public_key())
+
+    def __getstate__(self):
+        state = self.__dict__.copy()
+        # Serializes the private key to make the class instances picklable
+        state['_private_key'] = self._private_key.private_bytes(
+            encoding=serialization.Encoding.PEM,
+            format=serialization.PrivateFormat.OpenSSH,
+            encryption_algorithm=serialization.NoEncryption())
+        return state
+
+    def __setstate__(self, state):
+        self.__dict__.update(state)
+        self._private_key = serialization.load_ssh_private_key(self._private_key, password=None)
+
+
+class RSAPublicKey(PublicKey):
+    def __init__(self, public_key: rsa.RSAPublicKey):
+        self._public_key = public_key
+
+    def verify(self, data: bytes, signature: bytes) -> bool:
+        try:
+            signature = base64.b64decode(signature)
+
+            # Returns None if the signature is correct, raises an exception otherwise
+            self._public_key.verify(signature, data, _RSA_PADDING, _RSA_HASH_ALGORITHM)
+
+            return True
+        except (ValueError, exceptions.InvalidSignature):
+            return False
+
+    def to_bytes(self) -> bytes:
+        return self._public_key.public_bytes(
+            encoding=serialization.Encoding.OpenSSH, format=serialization.PublicFormat.OpenSSH)
+
+    @classmethod
+    def from_bytes(cls, key: bytes) -> RSAPublicKey:
+        key = serialization.load_ssh_public_key(key)
+        if not isinstance(key, rsa.RSAPublicKey):
+            raise ValueError(f'Expected an RSA public key, got {key}')
+        return cls(key)

+ 161 - 0
tests/test_auth.py

@@ -0,0 +1,161 @@
+from datetime import datetime, timedelta
+from typing import Optional, Tuple
+
+import pytest
+
+from hivemind.proto import dht_pb2
+from hivemind.proto.auth_pb2 import AccessToken
+from hivemind.utils.auth import AuthRPCWrapper, AuthRole, TokenAuthorizerBase
+from hivemind.utils.crypto import RSAPrivateKey, RSAPublicKey
+from hivemind.utils.logging import get_logger
+
+
+logger = get_logger(__name__)
+
+
+class MockAuthorizer(TokenAuthorizerBase):
+    _authority_private_key = None
+    _authority_public_key = None
+
+    def __init__(self, local_private_key: Optional[RSAPrivateKey], username: str='mock'):
+        super().__init__(local_private_key)
+
+        self._username = username
+        self._authority_public_key = None
+
+    async def get_token(self) -> AccessToken:
+        if MockAuthorizer._authority_private_key is None:
+            MockAuthorizer._authority_private_key = RSAPrivateKey()
+
+        self._authority_public_key = MockAuthorizer._authority_private_key.get_public_key()
+
+        token = AccessToken(username=self._username,
+                            public_key=self.local_public_key.to_bytes(),
+                            expiration_time=str(datetime.utcnow() + timedelta(minutes=1)))
+        token.signature = MockAuthorizer._authority_private_key.sign(self._token_to_bytes(token))
+        return token
+
+    def is_token_valid(self, access_token: AccessToken) -> bool:
+        data = self._token_to_bytes(access_token)
+        if not self._authority_public_key.verify(data, access_token.signature):
+            logger.exception('Access token has invalid signature')
+            return False
+
+        try:
+            expiration_time = datetime.fromisoformat(access_token.expiration_time)
+        except ValueError:
+            logger.exception(
+                f'datetime.fromisoformat() failed to parse expiration time: {access_token.expiration_time}')
+            return False
+        if expiration_time.tzinfo is not None:
+            logger.exception(f'Expected to have no timezone for expiration time: {access_token.expiration_time}')
+            return False
+        if expiration_time < datetime.utcnow():
+            logger.exception('Access token has expired')
+            return False
+
+        return True
+
+    _MAX_LATENCY = timedelta(minutes=1)
+
+    def does_token_need_refreshing(self, access_token: AccessToken) -> bool:
+        expiration_time = datetime.fromisoformat(access_token.expiration_time)
+        return expiration_time < datetime.utcnow() + self._MAX_LATENCY
+
+    @staticmethod
+    def _token_to_bytes(access_token: AccessToken) -> bytes:
+        return f'{access_token.username} {access_token.public_key} {access_token.expiration_time}'.encode()
+
+
+@pytest.mark.asyncio
+async def test_valid_request_and_response():
+    client_authorizer = MockAuthorizer(RSAPrivateKey())
+    service_authorizer = MockAuthorizer(RSAPrivateKey())
+
+    request = dht_pb2.PingRequest()
+    request.peer.endpoint = '127.0.0.1:7777'
+    await client_authorizer.sign_request(request, service_authorizer.local_public_key)
+    assert await service_authorizer.validate_request(request)
+
+    response = dht_pb2.PingResponse()
+    response.sender_endpoint = '127.0.0.1:31337'
+    await service_authorizer.sign_response(response, request)
+    assert await client_authorizer.validate_response(response, request)
+
+
+@pytest.mark.asyncio
+async def test_invalid_access_token():
+    client_authorizer = MockAuthorizer(RSAPrivateKey())
+    service_authorizer = MockAuthorizer(RSAPrivateKey())
+
+    request = dht_pb2.PingRequest()
+    request.peer.endpoint = '127.0.0.1:7777'
+    await client_authorizer.sign_request(request, service_authorizer.local_public_key)
+
+    # Break the access token signature
+    request.auth.client_access_token.signature = b'broken'
+
+    assert not await service_authorizer.validate_request(request)
+
+    response = dht_pb2.PingResponse()
+    response.sender_endpoint = '127.0.0.1:31337'
+    await service_authorizer.sign_response(response, request)
+
+    # Break the access token signature
+    response.auth.service_access_token.signature = b'broken'
+
+    assert not await client_authorizer.validate_response(response, request)
+
+
+@pytest.mark.asyncio
+async def test_invalid_signatures():
+    client_authorizer = MockAuthorizer(RSAPrivateKey())
+    service_authorizer = MockAuthorizer(RSAPrivateKey())
+
+    request = dht_pb2.PingRequest()
+    request.peer.endpoint = '127.0.0.1:7777'
+    await client_authorizer.sign_request(request, service_authorizer.local_public_key)
+
+    # A man-in-the-middle attacker changes the request content
+    request.peer.endpoint = '127.0.0.2:7777'
+
+    assert not await service_authorizer.validate_request(request)
+
+    response = dht_pb2.PingResponse()
+    response.sender_endpoint = '127.0.0.1:31337'
+    await service_authorizer.sign_response(response, request)
+
+    # A man-in-the-middle attacker changes the response content
+    response.sender_endpoint = '127.0.0.2:31337'
+
+    assert not await client_authorizer.validate_response(response, request)
+
+
+@pytest.mark.asyncio
+async def test_auth_rpc_wrapper():
+    class Servicer:
+        async def rpc_increment(self, request: dht_pb2.PingRequest) -> dht_pb2.PingResponse:
+            assert request.peer.endpoint == '127.0.0.1:1111'
+            assert request.auth.client_access_token.username == 'alice'
+
+            response = dht_pb2.PingResponse()
+            response.sender_endpoint = '127.0.0.1:2222'
+            return response
+
+    class Client:
+        def __init__(self, servicer: Servicer):
+            self._servicer = servicer
+
+        async def rpc_increment(self, request: dht_pb2.PingRequest) -> dht_pb2.PingResponse:
+            return await self._servicer.rpc_increment(request)
+
+    servicer = AuthRPCWrapper(Servicer(), AuthRole.SERVICER, MockAuthorizer(RSAPrivateKey(), 'bob'))
+    client = AuthRPCWrapper(Client(servicer), AuthRole.CLIENT, MockAuthorizer(RSAPrivateKey(), 'alice'))
+
+    request = dht_pb2.PingRequest()
+    request.peer.endpoint = '127.0.0.1:1111'
+
+    response = await client.rpc_increment(request)
+
+    assert response.sender_endpoint == '127.0.0.1:2222'
+    assert response.auth.service_access_token.username == 'bob'

+ 6 - 5
tests/test_dht_crypto.py

@@ -9,12 +9,13 @@ from hivemind.dht import get_dht_time
 from hivemind.dht.crypto import RSASignatureValidator
 from hivemind.dht.node import LOCALHOST
 from hivemind.dht.validation import DHTRecord
+from hivemind.utils.crypto import RSAPrivateKey
 
 
 def test_rsa_signature_validator():
     receiver_validator = RSASignatureValidator()
-    sender_validator = RSASignatureValidator(ignore_cached_key=True)
-    mallory_validator = RSASignatureValidator(ignore_cached_key=True)
+    sender_validator = RSASignatureValidator(RSAPrivateKey())
+    mallory_validator = RSASignatureValidator(RSAPrivateKey())
 
     plain_record = DHTRecord(key=b'key', subkey=b'subkey', value=b'value',
                              expiration_time=get_dht_time() + 10)
@@ -52,7 +53,7 @@ def test_cached_key():
     second_validator = RSASignatureValidator()
     assert first_validator.local_public_key == second_validator.local_public_key
 
-    third_validator = RSASignatureValidator(ignore_cached_key=True)
+    third_validator = RSASignatureValidator(RSAPrivateKey())
     assert first_validator.local_public_key != third_validator.local_public_key
 
 
@@ -105,10 +106,10 @@ def test_signing_in_different_process():
 async def test_dhtnode_signatures():
     alice = await hivemind.DHTNode.create(record_validator=RSASignatureValidator())
     bob = await hivemind.DHTNode.create(
-        record_validator=RSASignatureValidator(ignore_cached_key=True),
+        record_validator=RSASignatureValidator(RSAPrivateKey()),
         initial_peers=[f"{LOCALHOST}:{alice.port}"])
     mallory = await hivemind.DHTNode.create(
-        record_validator=RSASignatureValidator(ignore_cached_key=True),
+        record_validator=RSASignatureValidator(RSAPrivateKey()),
         initial_peers=[f"{LOCALHOST}:{alice.port}"])
 
     key = b'key'