|
8 | 8 | from enum import Enum |
9 | 9 | import json |
10 | 10 | import logging |
| 11 | +import re |
11 | 12 | import secrets |
12 | 13 | import signal |
13 | 14 | import struct |
@@ -52,6 +53,58 @@ def getMessage(): |
52 | 53 | raise e |
53 | 54 |
|
54 | 55 |
|
| 56 | +class PortalError(Exception): |
| 57 | + def from_string(s: str): |
| 58 | + m = re.match(r"xyz.iinuwa.credentialsd.(\w+): (?:no description|(.*))", s) |
| 59 | + if m: |
| 60 | + (name, message) = m.groups() |
| 61 | + match name: |
| 62 | + case "AbortError": |
| 63 | + return AbortError |
| 64 | + case "ConstraintError": |
| 65 | + return ConstraintError |
| 66 | + case "InvalidStateError": |
| 67 | + return InvalidStateError |
| 68 | + case "NotSupportedError": |
| 69 | + return NotSupportedError |
| 70 | + case "SecurityError": |
| 71 | + return SecurityError |
| 72 | + case "NotAllowedError": |
| 73 | + return NotAllowedError |
| 74 | + case "TypeError": |
| 75 | + return TypeError |
| 76 | + case _: |
| 77 | + return PortalError() |
| 78 | + |
| 79 | + |
| 80 | +class AbortError(PortalError): |
| 81 | + pass |
| 82 | + |
| 83 | + |
| 84 | +class ConstraintError(PortalError): |
| 85 | + pass |
| 86 | + |
| 87 | + |
| 88 | +class InvalidStateError(PortalError): |
| 89 | + pass |
| 90 | + |
| 91 | + |
| 92 | +class NotSupportedError(PortalError): |
| 93 | + pass |
| 94 | + |
| 95 | + |
| 96 | +class SecurityError(PortalError): |
| 97 | + pass |
| 98 | + |
| 99 | + |
| 100 | +class NotAllowedError(PortalError): |
| 101 | + pass |
| 102 | + |
| 103 | + |
| 104 | +class TypeError(PortalError): |
| 105 | + pass |
| 106 | + |
| 107 | + |
55 | 108 | # Encode a message for transmission, |
56 | 109 | # given its content. |
57 | 110 | def encodeMessage(messageContent): |
@@ -113,14 +166,15 @@ def message_handler(msg: Message): |
113 | 166 | if code == 0: |
114 | 167 | future.set_result(value) |
115 | 168 | elif code == 1: |
116 | | - future.set_exception(Exception("Portal request cancelled")) |
| 169 | + logging.error("Request cancelled") |
| 170 | + future.set_exception(AbortError()) |
117 | 171 | raise |
118 | 172 | elif code == 2 and "error" in value: |
119 | | - future.set_exception( |
120 | | - Exception(f"Portal returned an error: {value['error'].value}") |
121 | | - ) |
| 173 | + logging.error(value["error"].value) |
| 174 | + future.set_exception(PortalError.from_string(value["error"].value)) |
122 | 175 | else: |
123 | | - future.set_exception(Exception("Portal returned an unknown error")) |
| 176 | + logging.error("Portal returned an unknown error") |
| 177 | + future.set_exception(PortalError()) |
124 | 178 | return True |
125 | 179 |
|
126 | 180 | def when_done(_fut): |
@@ -459,9 +513,8 @@ async def get_interface(): |
459 | 513 | return INTERFACE |
460 | 514 |
|
461 | 515 |
|
462 | | -async def run(cmd, options, origin, top_origin): |
| 516 | +async def run(interface, cmd, options, origin, top_origin): |
463 | 517 | logging.debug("Executing command") |
464 | | - interface = await get_interface() |
465 | 518 |
|
466 | 519 | if cmd == "create": |
467 | 520 | if "publicKey" in options: |
@@ -519,22 +572,48 @@ async def run(cmd, options, origin, top_origin): |
519 | 572 |
|
520 | 573 | async def main(): |
521 | 574 | logging.info("starting credential_manager_shim") |
| 575 | + cancel_task = asyncio.create_task(quit.wait()) |
522 | 576 |
|
523 | | - while not quit.is_set(): |
524 | | - logging.debug("starting event loop message") |
525 | | - receivedMessage = getMessage() |
526 | | - request_id = receivedMessage["requestId"] |
527 | | - try: |
528 | | - cmd = receivedMessage["cmd"] |
529 | | - options = receivedMessage.get("options", None) |
530 | | - origin = receivedMessage["origin"] |
531 | | - top_origin = receivedMessage["topOrigin"] |
532 | | - auth_data = await run(cmd, options, origin, top_origin) |
| 577 | + receivedMessage = getMessage() |
| 578 | + request_id = receivedMessage["requestId"] |
| 579 | + try: |
| 580 | + interface = await get_interface() |
| 581 | + cmd = receivedMessage["cmd"] |
| 582 | + options = receivedMessage.get("options", None) |
| 583 | + origin = receivedMessage["origin"] |
| 584 | + top_origin = receivedMessage["topOrigin"] |
| 585 | + credentialsd_task = asyncio.create_task( |
| 586 | + run(interface, cmd, options, origin, top_origin) |
| 587 | + ) |
| 588 | + timeout = options.get("timeout", 5 * 60 * 1000) // 1000 |
| 589 | + done, pending = await asyncio.wait( |
| 590 | + {credentialsd_task, cancel_task}, |
| 591 | + timeout=timeout, |
| 592 | + return_when=asyncio.FIRST_COMPLETED, |
| 593 | + ) |
| 594 | + if credentialsd_task in done: |
| 595 | + logging.info("got a response from credentialsd") |
| 596 | + auth_data = credentialsd_task.result() |
533 | 597 | sendMessage(encodeMessage({"requestId": request_id, "data": auth_data})) |
534 | | - except Exception as e: |
535 | | - logging.error("Failed to send message", exc_info=e) |
536 | | - sendMessage(encodeMessage({"requestId": request_id, "error": str(e)})) |
537 | | - logging.debug("Sent error message") |
| 598 | + elif cancel_task in done: |
| 599 | + logging.info("cancelled") |
| 600 | + raise asyncio.CancelledError("Cancelled") |
| 601 | + else: |
| 602 | + logging.info("timed out") |
| 603 | + raise TimeoutError("Timed out") |
| 604 | + interface.bus.disconnect() |
| 605 | + |
| 606 | + except Exception as e: |
| 607 | + logging.error("Failed to send message", exc_info=e) |
| 608 | + sendMessage( |
| 609 | + encodeMessage( |
| 610 | + { |
| 611 | + "requestId": request_id, |
| 612 | + "error": {"name": type(e).__name__, "message": str(e)}, |
| 613 | + } |
| 614 | + ) |
| 615 | + ) |
| 616 | + logging.debug("Sent error message") |
538 | 617 | logging.info("quitting credential_manager_shim") |
539 | 618 |
|
540 | 619 |
|
|
0 commit comments