Merge branch 'pilip/remove-revocation' into 'master'

Pilip/remove revocation

See merge request TankerHQ/sdk-python!224

Author: blastrock

cffi_defs.h

@@ -205,14 +205,6 @@ enum tanker_status
   TANKER_STATUS_LAST
 };
 
-enum tanker_event
-{
-  TANKER_EVENT_SESSION_CLOSED,
-  TANKER_EVENT_DEVICE_REVOKED,
-
-  TANKER_EVENT_LAST,
-};
-
 enum tanker_verification_method_type
 {
   TANKER_VERIFICATION_METHOD_EMAIL = 0x1,
@@ -288,9 +280,6 @@ struct tanker_log_record
 
 typedef void (*tanker_log_handler_t)(tanker_log_record_t const* record);
 
-typedef struct tanker_connection tanker_connection_t;
-typedef void (*tanker_event_callback_t)(void* arg, void* data);
-
 struct tanker_options
 {
   uint8_t version;
@@ -391,14 +380,6 @@ tanker_future_t* tanker_create(tanker_options_t const* options);
 
 tanker_future_t* tanker_destroy(tanker_t* tanker);
 
-tanker_expected_t* tanker_event_connect(tanker_t* tanker,
-                                        enum tanker_event event,
-                                        tanker_event_callback_t cb,
-                                        void* data);
-
-tanker_expected_t* tanker_event_disconnect(tanker_t* tanker,
-                                           enum tanker_event event);
-
 tanker_future_t* tanker_start(tanker_t* tanker, char const* identity);
 
 tanker_expected_t* tanker_enroll_user(tanker_t* tanker,
@@ -462,8 +443,6 @@ tanker_future_t* tanker_attach_provisional_identity(
 tanker_future_t* tanker_verify_provisional_identity(
     tanker_t* ctanker, tanker_verification_t const* verification);
 
-tanker_future_t* tanker_revoke_device(tanker_t* session, char const* device_id);
-
 void tanker_free_buffer(void const* buffer);
 
 void tanker_free_device_list(tanker_device_list_t* list);
@@ -548,7 +527,6 @@ tanker_future_t* tanker_encryption_session_stream_encrypt(
 
 // cffi specific
 extern "Python" void log_handler(tanker_log_record_t*);
-extern "Python" void revoke_callback(void* arg, void* data);
 extern "Python" void stream_input_source_callback(
     uint8_t* buffer,
     int64_t buffer_size,

tankersdk/tanker.py

@@ -3,7 +3,7 @@
 import warnings
 import weakref
 from enum import Enum
-from typing import Any, Callable, List, Optional, cast
+from typing import Any, List, Optional, cast
 
 import typing_extensions
 from _tanker import ffi
@@ -35,13 +35,6 @@ def log_handler(record: CData) -> None:
 tankerlib.tanker_set_log_handler(tankerlib.log_handler)
 
 
-@ffi.def_extern()  # type: ignore
-def revoke_callback(args: CData, data: CData) -> None:
-    tanker_instance = ffi.from_handle(data)()  # data is a weakref.ref
-    if tanker_instance and tanker_instance.on_revoked:
-        tanker_instance.on_revoked()
-
-
 class Status(Enum):
     """Represent the status of a Tanker session"""
 
@@ -204,9 +197,6 @@ def verification_method_from_c(c_verification_method: CData) -> VerificationMeth
     return res
 
 
-RevokeFunc = Callable[[], None]
-
-
 class AttachResult:
     """Represent the result of a call to `attach_provisional_identity`
 
@@ -631,8 +621,6 @@ def __init__(
         self.c_tanker = None
 
         self._create_tanker_obj()
-        self._set_event_callbacks()
-        self.on_revoked = None  # type: Optional[RevokeFunc]
 
     def __del__(self) -> None:
         if getattr(self, "c_tanker", None):
@@ -695,19 +683,6 @@ def _create_tanker_obj(self) -> None:
         c_voidp = tankerlib.tanker_future_get_voidptr(create_fut)
         self.c_tanker = ffi.cast("tanker_t*", c_voidp)
 
-    def _set_event_callbacks(self) -> None:
-        # userdata must live as long as self, and userdata must not hold a
-        # reference on self
-        userdata = ffi.new_handle(weakref.ref(self))
-        _GLOBAL_TANKERS[self] = userdata
-        c_future_connect = tankerlib.tanker_event_connect(
-            self.c_tanker,
-            tankerlib.TANKER_EVENT_DEVICE_REVOKED,
-            tankerlib.revoke_callback,
-            userdata,
-        )
-        ffihelpers.wait_fut_or_raise(c_future_connect)
-
     @property
     def status(self) -> Status:
         """Retrieve the status of the current session, as a :py:class:`Status` instance"""
@@ -846,6 +821,11 @@ async def decrypt_stream(self, encrypted_stream: Stream) -> Stream:
 
     async def device_id(self) -> str:
         """:return: the current device id"""
+        warnings.warn(
+            'The "device_id" method is deprecated, it will be removed in the future',
+            DeprecationWarning,
+        )
+
         c_future = tankerlib.tanker_device_id(self.c_tanker)
         c_voidp = await ffihelpers.handle_tanker_future(c_future)
         c_str = ffi.cast("char*", c_voidp)
@@ -858,6 +838,11 @@ async def get_device_list(self) -> List[Device]:
 
         :returns: a list of :py:class`Device` instances
         """
+        warnings.warn(
+            'The "get_device_list" method is deprecated, it will be removed in the future',
+            DeprecationWarning,
+        )
+
         c_future = tankerlib.tanker_get_device_list(self.c_tanker)
         c_voidp = await ffihelpers.handle_tanker_future(c_future)
         c_list = ffi.cast("tanker_device_list_t*", c_voidp)
@@ -871,16 +856,6 @@ async def get_device_list(self) -> List[Device]:
         tankerlib.tanker_free_device_list(c_list)
         return res
 
-    async def revoke_device(self, device_id: str) -> None:
-        """Revoke the given device"""
-        warnings.warn(
-            'The "revoke_device" method is deprecated, it will be removed in the future',
-            DeprecationWarning,
-        )
-        c_device_id = ffihelpers.str_to_c_string(device_id)
-        c_future = tankerlib.tanker_revoke_device(self.c_tanker, c_device_id)
-        await ffihelpers.handle_tanker_future(c_future)
-
     def get_resource_id(self, encrypted_data: bytes) -> str:
         """Get resource ID from `encrypted` data"""
         c_expected = tankerlib.tanker_get_resource_id(

test/test_tanker.py

@@ -1,4 +1,3 @@
-import asyncio
 import base64
 import io
 import json
@@ -624,43 +623,17 @@ async def test_add_device(tmp_path: Path, app: Dict[str, str]) -> None:
     await phone.stop()
 
 
-@pytest.mark.asyncio
-async def test_revoke_device(tmp_path: Path, app: Dict[str, str]) -> None:
-    _, laptop, phone = await create_two_devices(tmp_path, app)
-    laptop_id = await laptop.device_id()
-    laptop_revoked = asyncio.Event()
-    loop = asyncio.get_event_loop()
-
-    def on_revoked() -> None:
-        async def cb() -> None:
-            laptop_revoked.set()
-
-        asyncio.run_coroutine_threadsafe(cb(), loop)
-
-    laptop.on_revoked = on_revoked
-    await phone.revoke_device(laptop_id)
-    with pytest.raises(error.DeviceRevoked):
-        await laptop.encrypt(b"will fail")
-    # Check callback is called
-    await asyncio.wait_for(laptop_revoked.wait(), timeout=1)
-    assert laptop.status == TankerStatus.STOPPED
-
-
 @pytest.mark.asyncio
 async def test_get_device_list(tmp_path: Path, app: Dict[str, str]) -> None:
     _, laptop, phone = await create_two_devices(tmp_path, app)
     laptop_id = await laptop.device_id()
     phone_id = await phone.device_id()
 
-    await phone.revoke_device(laptop_id)
-
     actual_list = await phone.get_device_list()
     actual_ids = [x.device_id for x in actual_list]
     assert set(actual_ids) == set([laptop_id, phone_id])
     revoked = [x for x in actual_list if x.is_revoked]
-    assert len(revoked) == 1
-    actual_revoked_id = revoked[0].device_id
-    assert actual_revoked_id == laptop_id
+    assert len(revoked) == 0
 
 
 @pytest.mark.asyncio
@@ -1138,14 +1111,6 @@ async def test_group_not_found(tmp_path: Path, app: Dict[str, str]) -> None:
         )
 
 
-@pytest.mark.asyncio
-async def test_device_not_found(tmp_path: Path, app: Dict[str, str]) -> None:
-    device_id = encode("*" * 32)
-    alice = await create_user_session(tmp_path, app)
-    with pytest.raises(error.InvalidArgument):
-        await alice.session.revoke_device(device_id)
-
-
 @pytest.mark.asyncio
 async def test_get_verification_methods(tmp_path: Path, app: Dict[str, str]) -> None:
     tanker = create_tanker(app["id"], persistent_path=tmp_path)