mreg-cli 1.12.0__tar.gz → 1.12.2__tar.gz

{mreg_cli-1.12.0 → mreg_cli-1.12.2}/CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- ## Unreleased -->
 
+## [1.12.2](https://github.com/unioslo/mreg-cli/releases/tag/1.12.2) - 2026-10-16
+
+### Changed
+
+- Updated `mreg-api` dependency to 0.8.0.
+
+### Fixed
+
+- Commands that resolve hosts and networks throwing generic "not found" error instead of prompting for re-login on expired token.
+
+## [1.12.1](https://github.com/unioslo/mreg-cli/releases/tag/1.12.1) - 2026-10-08
+
+### Changed
+
+- Updated `mreg-api` dependency to 0.6.1. This removes some custom error handling code for M2M errors (hostgroups->owners,hosts; roles->atoms,hosts) and instead uses the server's own error messages.
+
 ## [1.12.0](https://github.com/unioslo/mreg-cli/releases/tag/1.12.0) - 2026-10-05
 
 ### Changed

{mreg_cli-1.12.0 → mreg_cli-1.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mreg-cli
-Version: 1.12.0
+Version: 1.12.2
 Summary: MREG interactive command line client
 Author: Others (see AUTHORS)
 Author-email: Øyvind Kolbu <oyvind.kolbu@usit.uio.no>, Safet A <amedov@usit.uio.no>, Magnus Hirth <mhmorgan42@gmail.com>, Nico <nicolaydmohebi@gmail.com>, Marius Bakke <marius.bakke@usit.uio.no>, Fredrik Larsen <fredrik.larsen@usit.uio.no>, Paal Braathen <paal.braathen@usit.uio.no>, Nils Hiorth <nils@nls.me>, Dmytro Karpenko <dmytrok@usit.uio.no>
@@ -26,7 +26,7 @@ Requires-Dist: pydantic-extra-types>=2.1.0
 Requires-Dist: platformdirs>=4.3.0
 Requires-Dist: pydantic-settings>=2.10.1
 Requires-Dist: rich>=13.9.4
-Requires-Dist: mreg-api<0.7.0,>=0.6.0
+Requires-Dist: mreg-api<0.9.0,>=0.8.0
 Dynamic: license-file
 
 # MREG CLI [![Build Status](https://github.com/unioslo/mreg-cli/actions/workflows/test.yml/badge.svg)](https://github.com/unioslo/mreg-cli/actions/workflows/test.yml)

{mreg_cli-1.12.0 → mreg_cli-1.12.2}/ci/testsuite-result.json

@@ -9898,10 +9898,10 @@
     "command_filter_negate": false,
     "command_issued": "host add somehost -ip 10.0.1.20 -contact support@example.org -force # should fail because ip is in excluded range",
     "ok": [],
-    "warning": [
+    "warning": [],
+    "error": [
       "400 Bad Request: POST http://127.0.0.1:8000/api/v1/hosts/\n1 error:\n  non_field_errors: IP 10.0.1.20 in an excluded range: 10.0.1.0/24 -> [10.0.1.20 -> [10.0.1.30]  (invalid)"
     ],
-    "error": [],
     "output": [],
     "api_requests": [
       {
@@ -9945,18 +9945,18 @@
           "zone": {
             "nameservers": [
               {
-                "created_at": "2026-09-23T14:32:35.657121+02:00",
-                "updated_at": "2026-09-23T14:32:35.657200+02:00",
+                "created_at": "2026-10-16T12:53:57.454405+02:00",
+                "updated_at": "2026-10-16T12:53:57.454474+02:00",
                 "name": "ns2.example.org",
                 "ttl": null
               }
             ],
-            "created_at": "2026-09-23T14:32:33.995871+02:00",
-            "updated_at": "2026-09-23T14:32:41.586500+02:00",
+            "created_at": "2026-10-16T12:53:57.061219+02:00",
+            "updated_at": "2026-10-16T12:54:02.548724+02:00",
             "updated": true,
             "primary_ns": "ns2.example.org",
             "email": "hostperson@example.org",
-            "serialno_updated_at": "2026-09-23T14:32:37.698376+02:00",
+            "serialno_updated_at": "2026-10-16T12:53:57.561895+02:00",
             "refresh": 360,
             "retry": 1800,
             "expire": 2400,
@@ -9974,8 +9974,8 @@
         "response": {
           "excluded_ranges": [
             {
-              "created_at": "2026-09-23T14:32:42.228959+02:00",
-              "updated_at": "2026-09-23T14:32:42.229024+02:00",
+              "created_at": "2026-10-16T12:54:03.158958+02:00",
+              "updated_at": "2026-10-16T12:54:03.159059+02:00",
               "start_ip": "10.0.1.20",
               "end_ip": "10.0.1.30",
               "network": 3
@@ -9983,8 +9983,8 @@
           ],
           "policy": null,
           "communities": [],
-          "created_at": "2026-09-23T14:32:41.879909+02:00",
-          "updated_at": "2026-09-23T14:32:41.990455+02:00",
+          "created_at": "2026-10-16T12:54:02.849972+02:00",
+          "updated_at": "2026-10-16T12:54:02.949770+02:00",
           "network": "10.0.1.0/24",
           "description": "Frozzzen",
           "vlan": null,
@@ -11176,10 +11176,10 @@
     "command_filter_negate": false,
     "command_issued": "host add otherhost -ip 10.0.1.20 -contact support@example.org  # fails because reserved range",
     "ok": [],
-    "warning": [
+    "warning": [],
+    "error": [
       "400 Bad Request: POST http://127.0.0.1:8000/api/v1/hosts/\n1 error:\n  non_field_errors: IP 10.0.1.20 in an excluded range: 10.0.1.0/24 -> [10.0.1.20 -> [10.0.1.30]  (invalid)"
     ],
-    "error": [],
     "output": [],
     "api_requests": [
       {
@@ -11223,18 +11223,18 @@
           "zone": {
             "nameservers": [
               {
-                "created_at": "2026-09-23T14:32:35.657121+02:00",
-                "updated_at": "2026-09-23T14:32:35.657200+02:00",
+                "created_at": "2026-10-16T12:53:57.454405+02:00",
+                "updated_at": "2026-10-16T12:53:57.454474+02:00",
                 "name": "ns2.example.org",
                 "ttl": null
               }
             ],
-            "created_at": "2026-09-23T14:32:33.995871+02:00",
-            "updated_at": "2026-09-23T14:32:46.806823+02:00",
+            "created_at": "2026-10-16T12:53:57.061219+02:00",
+            "updated_at": "2026-10-16T12:54:06.763646+02:00",
             "updated": true,
             "primary_ns": "ns2.example.org",
             "email": "hostperson@example.org",
-            "serialno_updated_at": "2026-09-23T14:32:37.698376+02:00",
+            "serialno_updated_at": "2026-10-16T12:53:57.561895+02:00",
             "refresh": 360,
             "retry": 1800,
             "expire": 2400,
@@ -11252,8 +11252,8 @@
         "response": {
           "excluded_ranges": [
             {
-              "created_at": "2026-09-23T14:32:42.228959+02:00",
-              "updated_at": "2026-09-23T14:32:42.229024+02:00",
+              "created_at": "2026-10-16T12:54:03.158958+02:00",
+              "updated_at": "2026-10-16T12:54:03.159059+02:00",
               "start_ip": "10.0.1.20",
               "end_ip": "10.0.1.30",
               "network": 3
@@ -11261,8 +11261,8 @@
           ],
           "policy": null,
           "communities": [],
-          "created_at": "2026-09-23T14:32:41.879909+02:00",
-          "updated_at": "2026-09-23T14:32:46.986540+02:00",
+          "created_at": "2026-10-16T12:54:02.849972+02:00",
+          "updated_at": "2026-10-16T12:54:06.888787+02:00",
           "network": "10.0.1.0/24",
           "description": "Frozen but has one host",
           "vlan": 1234,
@@ -11862,10 +11862,10 @@
     "command_filter_negate": false,
     "command_issued": "host add somehost -ip 2001:db8::20 -contact support@example.org -force # should fail, because the address is in a reserved range",
     "ok": [],
-    "warning": [
+    "warning": [],
+    "error": [
       "400 Bad Request: POST http://127.0.0.1:8000/api/v1/hosts/\n1 error:\n  non_field_errors: IP 2001:db8::20 in an excluded range: 2001:db8::/64 -> [2001:db8::20 -> [2001:db8::30]  (invalid)"
     ],
-    "error": [],
     "output": [],
     "api_requests": [
       {
@@ -11909,18 +11909,18 @@
           "zone": {
             "nameservers": [
               {
-                "created_at": "2026-09-23T14:32:35.657121+02:00",
-                "updated_at": "2026-09-23T14:32:35.657200+02:00",
+                "created_at": "2026-10-16T12:53:57.454405+02:00",
+                "updated_at": "2026-10-16T12:53:57.454474+02:00",
                 "name": "ns2.example.org",
                 "ttl": null
               }
             ],
-            "created_at": "2026-09-23T14:32:33.995871+02:00",
-            "updated_at": "2026-09-23T14:32:49.223843+02:00",
+            "created_at": "2026-10-16T12:53:57.061219+02:00",
+            "updated_at": "2026-10-16T12:54:08.066493+02:00",
             "updated": true,
             "primary_ns": "ns2.example.org",
             "email": "hostperson@example.org",
-            "serialno_updated_at": "2026-09-23T14:32:37.698376+02:00",
+            "serialno_updated_at": "2026-10-16T12:53:57.561895+02:00",
             "refresh": 360,
             "retry": 1800,
             "expire": 2400,
@@ -11938,8 +11938,8 @@
         "response": {
           "excluded_ranges": [
             {
-              "created_at": "2026-09-23T14:32:49.735938+02:00",
-              "updated_at": "2026-09-23T14:32:49.736006+02:00",
+              "created_at": "2026-10-16T12:54:08.538757+02:00",
+              "updated_at": "2026-10-16T12:54:08.538830+02:00",
               "start_ip": "2001:db8::20",
               "end_ip": "2001:db8::30",
               "network": 4
@@ -11947,8 +11947,8 @@
           ],
           "policy": null,
           "communities": [],
-          "created_at": "2026-09-23T14:32:49.397695+02:00",
-          "updated_at": "2026-09-23T14:32:49.502026+02:00",
+          "created_at": "2026-10-16T12:54:08.253602+02:00",
+          "updated_at": "2026-10-16T12:54:08.349296+02:00",
           "network": "2001:db8::/64",
           "description": "Lorem ipsum dolor sit amet",
           "vlan": null,
@@ -22009,10 +22009,10 @@
     "command_filter_negate": false,
     "command_issued": "host set_contact bar \"I'm the contact\"   # fails because invalid email address",
     "ok": [],
-    "warning": [
+    "warning": [],
+    "error": [
       "400 Bad Request: PATCH http://127.0.0.1:8000/api/v1/hosts/bar.example.org\n1 error:\n  contacts: Invalid email address(es): I'm the contact  (invalid)"
     ],
-    "error": [],
     "output": [],
     "api_requests": [
       {
@@ -22024,8 +22024,8 @@
           "ipaddresses": [
             {
               "macaddress": "11:22:33:aa:bb:cc",
-              "created_at": "2026-09-24T12:38:16.662475+02:00",
-              "updated_at": "2026-09-24T12:38:16.872318+02:00",
+              "created_at": "2026-10-16T12:54:34.323181+02:00",
+              "updated_at": "2026-10-16T12:54:34.531313+02:00",
               "ipaddress": "10.0.0.10",
               "host": 19
             }
@@ -22034,8 +22034,8 @@
           "mxs": [],
           "txts": [
             {
-              "created_at": "2026-09-24T12:38:16.484425+02:00",
-              "updated_at": "2026-09-24T12:38:16.484490+02:00",
+              "created_at": "2026-10-16T12:54:34.189966+02:00",
+              "updated_at": "2026-10-16T12:54:34.190031+02:00",
               "txt": "v=spf1 -all",
               "host": 19
             }
@@ -22053,12 +22053,12 @@
           "contacts": [
             {
               "email": "hi@ho.com",
-              "created_at": "2026-09-24T12:38:16.505257+02:00",
-              "updated_at": "2026-09-24T12:38:16.505343+02:00"
+              "created_at": "2026-10-16T12:54:34.213061+02:00",
+              "updated_at": "2026-10-16T12:54:34.213129+02:00"
             }
           ],
-          "created_at": "2026-09-24T12:38:16.471534+02:00",
-          "updated_at": "2026-09-24T12:38:20.920521+02:00",
+          "created_at": "2026-10-16T12:54:34.177486+02:00",
+          "updated_at": "2026-10-16T12:54:37.163243+02:00",
           "name": "bar.example.org",
           "ttl": null,
           "comment": "This is the comment",
@@ -26113,10 +26113,10 @@
     "command_filter_negate": false,
     "command_issued": "host srv_add -name \"whatever\" -priority 1 -weight 1 -port 80 -host baz  # doesn't work",
     "ok": [],
-    "warning": [
+    "warning": [],
+    "error": [
       "400 Bad Request: POST http://127.0.0.1:8000/api/v1/srvs/\n1 error:\n  name: Must match: ^_[a-z0-9]+(([a-z0-9][_-]?)+[a-z0-9]+)?._(tcp|tls|udp)\\.  (invalid)"
     ],
-    "error": [],
     "output": [],
     "api_requests": [
       {
@@ -26128,15 +26128,15 @@
           "ipaddresses": [
             {
               "macaddress": "11:22:33:aa:bb:cc",
-              "created_at": "2026-09-24T12:38:16.662475+02:00",
-              "updated_at": "2026-09-24T12:38:25.375340+02:00",
+              "created_at": "2026-10-16T12:54:34.323181+02:00",
+              "updated_at": "2026-10-16T12:54:40.816516+02:00",
               "ipaddress": "10.0.0.10",
               "host": 20
             },
             {
               "macaddress": "11:22:33:44:55:67",
-              "created_at": "2026-09-24T12:38:26.218910+02:00",
-              "updated_at": "2026-09-24T12:38:29.491713+02:00",
+              "created_at": "2026-10-16T12:54:41.501492+02:00",
+              "updated_at": "2026-10-16T12:54:43.873479+02:00",
               "ipaddress": "2001:db8::14",
               "host": 20
             }
@@ -26145,8 +26145,8 @@
           "mxs": [],
           "txts": [
             {
-              "created_at": "2026-09-24T12:38:24.816917+02:00",
-              "updated_at": "2026-09-24T12:38:24.816973+02:00",
+              "created_at": "2026-10-16T12:54:40.368541+02:00",
+              "updated_at": "2026-10-16T12:54:40.368622+02:00",
               "txt": "v=spf1 -all",
               "host": 20
             }
@@ -26162,8 +26162,8 @@
           "bacnetid": null,
           "communities": [],
           "contacts": [],
-          "created_at": "2026-09-24T12:38:24.804365+02:00",
-          "updated_at": "2026-09-24T12:38:24.804423+02:00",
+          "created_at": "2026-10-16T12:54:40.355234+02:00",
+          "updated_at": "2026-10-16T12:54:40.355299+02:00",
           "name": "baz.example.org",
           "ttl": null,
           "comment": "",
@@ -26180,18 +26180,18 @@
           "zone": {
             "nameservers": [
               {
-                "created_at": "2026-09-24T12:37:29.215087+02:00",
-                "updated_at": "2026-09-24T12:37:29.215169+02:00",
+                "created_at": "2026-10-16T12:53:57.454405+02:00",
+                "updated_at": "2026-10-16T12:53:57.454474+02:00",
                 "name": "ns2.example.org",
                 "ttl": null
               }
             ],
-            "created_at": "2026-09-24T12:37:28.770845+02:00",
-            "updated_at": "2026-09-24T12:38:36.267338+02:00",
+            "created_at": "2026-10-16T12:53:57.061219+02:00",
+            "updated_at": "2026-10-16T12:54:49.256682+02:00",
             "updated": true,
             "primary_ns": "ns2.example.org",
             "email": "hostperson@example.org",
-            "serialno_updated_at": "2026-09-24T12:37:32.222443+02:00",
+            "serialno_updated_at": "2026-10-16T12:53:57.561895+02:00",
             "refresh": 360,
             "retry": 1800,
             "expire": 2400,
@@ -26210,18 +26210,18 @@
           "zone": {
             "nameservers": [
               {
-                "created_at": "2026-09-24T12:37:29.215087+02:00",
-                "updated_at": "2026-09-24T12:37:29.215169+02:00",
+                "created_at": "2026-10-16T12:53:57.454405+02:00",
+                "updated_at": "2026-10-16T12:53:57.454474+02:00",
                 "name": "ns2.example.org",
                 "ttl": null
               }
             ],
-            "created_at": "2026-09-24T12:37:28.770845+02:00",
-            "updated_at": "2026-09-24T12:38:36.267338+02:00",
+            "created_at": "2026-10-16T12:53:57.061219+02:00",
+            "updated_at": "2026-10-16T12:54:49.256682+02:00",
             "updated": true,
             "primary_ns": "ns2.example.org",
             "email": "hostperson@example.org",
-            "serialno_updated_at": "2026-09-24T12:37:32.222443+02:00",
+            "serialno_updated_at": "2026-10-16T12:53:57.561895+02:00",
             "refresh": 360,
             "retry": 1800,
             "expire": 2400,
@@ -36964,10 +36964,10 @@
     "command_filter_negate": false,
     "command_issued": "network community_host_add tinierhost guests",
     "ok": [],
-    "warning": [
+    "warning": [],
+    "error": [
       "406 Not Acceptable: POST http://127.0.0.1:8000/api/v1/networks/10.0.2.0/28/communities/1/hosts/\n1 error:\n  The IP must have a MAC address to bind it to a community.  (not_acceptable)"
     ],
-    "error": [],
     "output": [],
     "api_requests": [
       {
@@ -36979,8 +36979,8 @@
           "ipaddresses": [
             {
               "macaddress": "",
-              "created_at": "2026-09-24T12:39:13.141038+02:00",
-              "updated_at": "2026-09-24T12:39:13.141093+02:00",
+              "created_at": "2026-10-16T12:55:17.277750+02:00",
+              "updated_at": "2026-10-16T12:55:17.277816+02:00",
               "ipaddress": "10.0.2.5",
               "host": 31
             }
@@ -36989,8 +36989,8 @@
           "mxs": [],
           "txts": [
             {
-              "created_at": "2026-09-24T12:39:12.984388+02:00",
-              "updated_at": "2026-09-24T12:39:12.984445+02:00",
+              "created_at": "2026-10-16T12:55:17.136938+02:00",
+              "updated_at": "2026-10-16T12:55:17.136998+02:00",
               "txt": "v=spf1 -all",
               "host": 31
             }
@@ -37008,12 +37008,12 @@
           "contacts": [
             {
               "email": "tinierhost@example.org",
-              "created_at": "2026-09-24T12:39:13.009905+02:00",
-              "updated_at": "2026-09-24T12:39:13.009988+02:00"
+              "created_at": "2026-10-16T12:55:17.156360+02:00",
+              "updated_at": "2026-10-16T12:55:17.156429+02:00"
             }
           ],
-          "created_at": "2026-09-24T12:39:12.969826+02:00",
-          "updated_at": "2026-09-24T12:39:12.969886+02:00",
+          "created_at": "2026-10-16T12:55:17.125199+02:00",
+          "updated_at": "2026-10-16T12:55:17.125265+02:00",
           "name": "tinierhost.example.org",
           "ttl": null,
           "comment": "",

{mreg_cli-1.12.0 → mreg_cli-1.12.2}/mreg_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.12.0'
-__version_tuple__ = version_tuple = (1, 12, 0)
+__version__ = version = '1.12.2'
+__version_tuple__ = version_tuple = (1, 12, 2)
 
-__commit_id__ = commit_id = 'g28d209847'
+__commit_id__ = commit_id = 'gf1f8228d3'

{mreg_cli-1.12.0 → mreg_cli-1.12.2}/mreg_cli/cli.py

@@ -40,7 +40,7 @@ from mreg_cli.commands.zone import ZoneCommands
 from mreg_cli.config import MregCliConfig
 
 # Import other mreg_cli modules
-from mreg_cli.exceptions import CliError, CliExit, CliWarning, handle_exception, handle_exceptions
+from mreg_cli.exceptions import CliError, CliExit, CliWarning, handle_and_exit, handle_exception
 from mreg_cli.help_formatter import CustomHelpFormatter
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import CommandFunc, Flag
@@ -198,7 +198,7 @@ class Command(Completer):
             if isinstance(exc, mreg_api.exceptions.ResponseError):
                 # Retry command after re-authenticating if we got a 401 Unauthorized
                 if exc.response.status_code == 401 and interactive and not retry:
-                    with handle_exceptions(json=False):
+                    with handle_and_exit(json=False):
                         prompt_for_password_and_try_update_token()
                     return self.parse(command, interactive=interactive, retry=True)
             handle_exception(exc)

{mreg_cli-1.12.0 → mreg_cli-1.12.2}/mreg_cli/client.py

@@ -176,7 +176,7 @@ class MregCliClient(MregClient, metaclass=_AutoListenersMeta):
                 host = getter(ident_str)
                 if host is not None:
                     return host
-            except Exception:
+            except ValueError:  # invalid identifier for this getter
                 pass
 
         # Fall back to CNAME
@@ -230,25 +230,18 @@ class MregCliClient(MregClient, metaclass=_AutoListenersMeta):
         Resolution order: IP address → CIDR / network address → numeric id.
         """
         network: Network | None = None
+
         try:
-            # Try as IP first
             network = self.network.get_by_ip(identifier, required=False)
-        except Exception:
+        except ValueError:  # invalid IP address
             pass
 
         if network is None:
-            try:
-                # Try as CIDR / network address
-                network = self.network.get(identifier, required=False)
-            except Exception:
-                pass
+            # Try as CIDR / network address
+            network = self.network.get(identifier, required=False)
 
         if network is None and identifier.isdecimal():
-            try:
-                network = self.network.first(id=int(identifier), required=False)
-                # network = self.network.get(int(identifier), required=False)
-            except Exception:
-                pass
+            network = self.network.first(id=int(identifier), required=False)
 
         if network is None and required:
             raise CliEntityNotFound(f"Network {identifier!r} not found.")

{mreg_cli-1.12.0 → mreg_cli-1.12.2}/mreg_cli/exceptions.py

@@ -106,32 +106,28 @@ class TooManyResults(CliWarning):
     """API returned too many results."""
 
 
-# FIXME: Inconsistent handling of HTTP errors in the original CLI implementation
-#        DELETE errors were considered errors, while other HTTP errors were
-#        considered warnings.
 _MREG_API_ERROR_EXCEPTIONS = (
-    mreg_api.exceptions.DeleteError,
+    mreg_api.exceptions.ResponseError,
     mreg_api.exceptions.InternalError,
     mreg_api.exceptions.MregValidationError,
 )
 
 
-def is_error(exc: Exception) -> bool:
+def is_error(exc: BaseException) -> bool:
     """Determine if an exception should produce an error or warning."""
     # mreg_cli errors
     if isinstance(exc, CliError):
         return True
     elif isinstance(exc, CliWarning):
         return False
-
     # mreg_api exceptions that should be treated as errors
-    if isinstance(exc, _MREG_API_ERROR_EXCEPTIONS):
+    elif isinstance(exc, _MREG_API_ERROR_EXCEPTIONS):
         return True
 
     return False
 
 
-def get_exception_message(exc: Exception, *, json: bool = False) -> str:
+def get_exception_message(exc: BaseException, *, json: bool = False) -> str:
     """Get the plain text message from an exception.
 
     :param exc: The exception to get the message from.
@@ -159,14 +155,15 @@ class ExceptionHandler:
         is_validation_error: True if the exception is a ValidationError.
         message: The plain text message from the exception.
         formatted_message: HTML-formatted message for prompt_toolkit display.
+        json: Whether to display mreg_api exceptions as their original JSON representation.
 
     """
 
-    def __init__(self, exc: Exception, *, json: bool = False) -> None:
+    def __init__(self, exc: BaseException, *, json: bool = False) -> None:
         """Initialize the handler with an exception.
 
         :param exc: The exception to handle.
-        :param json: Whether to include JSON details for mreg_api exceptions.
+        :param json: Display mreg_api exceptions as their original JSON representation.
         """
         self.original_exception = exc
         self.exception = self._transform_exception(exc)
@@ -180,7 +177,7 @@ class ExceptionHandler:
         self.message = get_exception_message(self.exception, json=self._json)
         self.formatted_message = self.get_formatted_message()
 
-    def _transform_exception(self, exc: Exception) -> Exception:
+    def _transform_exception(self, exc: BaseException) -> BaseException:
         """Transform an exception into an appropriate mreg_cli exception if needed."""
         if isinstance(exc, ValidationError):
             return mreg_api.exceptions.MregValidationError.from_pydantic(exc)
@@ -235,7 +232,7 @@ class ExceptionHandler:
         self.print()
 
 
-def handle_exception(exc: Exception) -> None:
+def handle_exception(exc: BaseException, json: bool = False) -> None:
     """Log and print an exception with appropriate formatting.
 
     This is the main entry point for exception handling.
@@ -244,17 +241,24 @@ def handle_exception(exc: Exception) -> None:
     """
     # TODO: add JSON toggle via config here
     # possibly via verbosity level/debug flag
-    ExceptionHandler(exc).handle()
+    ExceptionHandler(exc, json=json).handle()
 
 
 @contextmanager
-def handle_exceptions(json: bool = False) -> Generator[None, None, None]:
+def handle_and_exit(
+    *exc_cls: type[BaseException], json: bool = False
+) -> Generator[None, None, None]:
     """Context manager to handle exceptions using ExceptionHandler and exit.
 
+    Suppresses traceback and shows a formatted message in the console.
+
+    :param exc_cls: The exception class(es) to handle. Defaults to (Exception,).
     :param json: Whether to include JSON details for mreg_api exceptions.
     """
+    if not exc_cls:
+        exc_cls = (Exception,)
     try:
         yield
-    except Exception as exc:
-        ExceptionHandler(exc, json=json).handle()
+    except exc_cls as exc:
+        handle_exception(exc, json=json)
         sys.exit(1)

{mreg_cli-1.12.0 → mreg_cli-1.12.2}/mreg_cli/main.py

@@ -14,7 +14,7 @@ from mreg_cli.__about__ import __version__
 from mreg_cli.cli import cli, get_cli_history, source
 from mreg_cli.client import init_client
 from mreg_cli.config import MregCliConfig
-from mreg_cli.exceptions import CliException, LoginFailedError, handle_exception
+from mreg_cli.exceptions import CliException, handle_and_exit, handle_exception
 from mreg_cli.log import MregCliLogger
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.prompt import get_prompt_message
@@ -183,18 +183,12 @@ def main():
     # Bootstrap the application-wide client object
     client = init_client(config)
 
-    try:
+    with handle_and_exit(Exception, KeyboardInterrupt):
         try_token_or_login(
             config.user,
             config.url,
             fail_without_token=config.token_only,
         )
-    except (EOFError, KeyboardInterrupt, LoginFailedError) as e:
-        if isinstance(e, LoginFailedError):
-            handle_exception(e)
-        else:
-            print(e)
-        raise SystemExit() from None
 
     if not client.get_token():
         logger.error("No valid token after login, exiting")

{mreg_cli-1.12.0 → mreg_cli-1.12.2}/mreg_cli/utilities/api.py

@@ -117,7 +117,9 @@ def auth_and_update_token(username: str, password: str) -> None:
     except httpx.HTTPError as e:
         raise CliError(str(e)) from e  # should be unreachable
     except mreg_api.exceptions.LoginFailedError as e:
+        # wrap the server API error in a CliError to classify as error + hide URL & drf details
         raise LoginFailedError(e.error_message) from e
+    # Other MREG API exceptions fall through
     else:
         TokenFile.set_entry(username, base_url, token)
         logger.info("Token updated for %s @ %s", username, tokenurl)