From 0486502cd28290cc331bd09ce78fc058a3f2448d Mon Sep 17 00:00:00 2001
From: Dan van der Ster <dan.vanderster@clyso.com>
Date: Wed, 14 Oct 2026 08:48:38 -0700
Subject: [PATCH 1/4] mgr/cephadm: give nvmeof gateways a key they can use

Since 19.2.6 cephadm creates daemon keys as aes256k (ROTATION_CIPHER).
The nvmeof gateway images for squid (quay.io/ceph/nvmeof 1.2.x, the
default 1.2.1, and the squid line 1.4.x up to 1.4.28) carry their own
librados, built before aes256k (19.0.0 dev, 19.2.3), and cannot connect
with such a key: the gateway crash-loops with "RADOS I/O error (error
connecting to the cluster)" and "Unable to create OMAP, exiting!", and
the service never comes up (orch:cephadm:smoke-roleless 2-services/nvmeof
times out on "nvmeof.foo has 0/1").

Create and rotate nvmeof keys with the previous key type (aes): a
per-daemon-type key type in utils (key_type_for), used by the nvmeof
service's keyring and by key_rotate (ceph orch daemon rotate-key). A
gateway already deployed with an aes256k key gets its key rotated to aes
on its next deploy, so `ceph orch redeploy nvmeof.<svc>` heals a failed
service.

Reproduced on a cephadm cluster: with an aes256k key, python3-rados in
quay.io/ceph/nvmeof:1.2.1, 1.2.5 and 1.4.28 fails to connect ([errno 5]);
in 1.7 (librados 20.2.4) and 2.0.0 it connects.

Fixes: https://tracker.ceph.com/issues/81778
Assisted-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Signed-off-by: Dan van der Ster <dan.vanderster@clyso.com>
---
 src/pybind/mgr/cephadm/module.py              |  2 +-
 .../mgr/cephadm/services/cephadmservice.py    |  5 +-
 src/pybind/mgr/cephadm/services/nvmeof.py     | 22 ++++-
 .../mgr/cephadm/tests/test_nvmeof_key_type.py | 87 +++++++++++++++++++
 src/pybind/mgr/cephadm/utils.py               | 42 +++++++++
 5 files changed, 153 insertions(+), 5 deletions(-)
 create mode 100644 src/pybind/mgr/cephadm/tests/test_nvmeof_key_type.py

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index a76c4b463e73..54eed392cf03 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2475,7 +2475,7 @@ def key_rotate(self, daemon_spec: CephadmDaemonDeploySpec) -> None:
             'prefix': 'auth rotate',
             'entity': daemon_spec.entity_name(),
             'format': 'json',
-            'key_type': utils.ROTATION_CIPHER
+            'key_type': utils.key_type_for(daemon_spec.daemon_type)
         })
         if rc:
             raise OrchestratorError(
diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py
index 114f4d5dac7c..c41eb10a983b 100644
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@ -303,14 +303,15 @@ def get_active_daemon(self, daemon_descrs: List[DaemonDescription]) -> DaemonDes
         # defined, return empty Daemon Desc
         return DaemonDescription()
 
-    def get_keyring_with_caps(self, entity: AuthEntity, caps: List[str]) -> str:
+    def get_keyring_with_caps(self, entity: AuthEntity, caps: List[str],
+                              key_type: str = utils.ROTATION_CIPHER) -> str:
         # try with newer cipher first, it's possible this isn't supported
         # early in an upgrade
         ret, keyring, err = self.mgr.mon_command({
             'prefix': 'auth get-or-create',
             'entity': entity,
             'caps': caps,
-            'key_type': utils.ROTATION_CIPHER
+            'key_type': key_type
         })
         if err:
             ret, keyring, err = self.mgr.mon_command({
diff --git a/src/pybind/mgr/cephadm/services/nvmeof.py b/src/pybind/mgr/cephadm/services/nvmeof.py
index f3eb623d61a2..746a6486b6b7 100644
--- a/src/pybind/mgr/cephadm/services/nvmeof.py
+++ b/src/pybind/mgr/cephadm/services/nvmeof.py
@@ -30,9 +30,27 @@ def prepare_create(self, daemon_spec: CephadmDaemonDeploySpec) -> CephadmDaemonD
         nvmeof_gw_id = daemon_spec.daemon_id
         host_ip = self.mgr.inventory.get_addr(daemon_spec.host)
 
-        keyring = self.get_keyring_with_caps(self.get_auth_entity(nvmeof_gw_id),
+        entity = self.get_auth_entity(nvmeof_gw_id)
+        key_type = utils.key_type_for(self.TYPE)
+        keyring = self.get_keyring_with_caps(entity,
                                              ['mon', 'profile rbd',
-                                              'osd', 'profile rbd'])
+                                              'osd', 'profile rbd'],
+                                             key_type=key_type)
+        if key_type != utils.ROTATION_CIPHER and \
+                utils.keyring_key_type(keyring) == utils.ROTATION_CIPHER:
+            # a gateway deployed with an aes256k key (cephadm did so from
+            # 19.2.6 on) never started: give it a key it can use
+            logger.info(f'rotating {entity} to a {key_type} key: the nvmeof '
+                        'gateway image cannot use an aes256k key')
+            ret, out, err = self.mgr.mon_command({
+                'prefix': 'auth rotate', 'entity': entity,
+                'format': 'json', 'key_type': key_type})
+            if ret == 0:
+                keyring = self.get_keyring_with_caps(
+                    entity, ['mon', 'profile rbd', 'osd', 'profile rbd'],
+                    key_type=key_type)
+            else:
+                logger.warning(f'could not rotate {entity}: {err}')
 
         # TODO: check if we can force jinja2 to generate dicts with double quotes instead of using json.dumps
         transport_tcp_options = json.dumps(spec.transport_tcp_options) if spec.transport_tcp_options else None
diff --git a/src/pybind/mgr/cephadm/tests/test_nvmeof_key_type.py b/src/pybind/mgr/cephadm/tests/test_nvmeof_key_type.py
new file mode 100644
index 000000000000..62f6db304254
--- /dev/null
+++ b/src/pybind/mgr/cephadm/tests/test_nvmeof_key_type.py
@@ -0,0 +1,87 @@
+"""
+nvmeof gateways get a key of the previous type (aes): the gateway images of
+this release carry a librados from before aes256k and cannot connect with
+an aes256k key.
+"""
+import base64
+import struct
+from unittest.mock import MagicMock
+
+from ceph.deployment.service_spec import NvmeofServiceSpec
+
+from cephadm import utils
+from cephadm.services.cephadmservice import CephadmDaemonDeploySpec
+from cephadm.services.nvmeof import NvmeofService
+
+
+def keyring(entity: str, key_type: int) -> str:
+    raw = struct.pack('<H', key_type) + b'\0' * 8 + \
+        struct.pack('<H', 16 if key_type == 1 else 32) + \
+        b'k' * (16 if key_type == 1 else 32)
+    return f'[{entity}]\n\tkey = {base64.b64encode(raw).decode()}\n'
+
+
+def test_key_type_for():
+    assert utils.key_type_for('nvmeof') == 'aes'
+    for t in ('osd', 'mds', 'mgr', 'mon', 'crash', 'rgw'):
+        assert utils.key_type_for(t) == utils.ROTATION_CIPHER == 'aes256k'
+
+
+def test_keyring_key_type():
+    assert utils.keyring_key_type(keyring('client.x', 1)) == 'aes'
+    assert utils.keyring_key_type(keyring('client.x', 2)) == 'aes256k'
+    assert utils.keyring_key_type('') is None
+    assert utils.keyring_key_type('[client.x]\n\tkey = !!!\n') is None
+
+
+def test_key_rotate_keeps_nvmeof_on_the_legacy_type():
+    from cephadm.module import CephadmOrchestrator
+    mgr = MagicMock()
+    mgr.mon_command.return_value = (0, '', '')
+    for daemon_type, want in (('nvmeof', 'aes'), ('osd', 'aes256k')):
+        spec = CephadmDaemonDeploySpec(host='h', daemon_id='a.b',
+                                       service_name=f'{daemon_type}.a',
+                                       daemon_type=daemon_type)
+        CephadmOrchestrator.key_rotate(mgr, spec)
+        assert mgr.mon_command.call_args[0][0]['key_type'] == want
+
+
+def _service(keyrings):
+    mgr = MagicMock()
+    spec = NvmeofServiceSpec(service_id='a', pool='p')
+    mgr.spec_store.__getitem__.return_value.spec = spec
+    mgr.inventory.get_addr.return_value = '10.0.0.1'
+    mgr.mon_command.return_value = (0, '', '')
+    svc = NvmeofService(mgr)
+    svc.get_keyring_with_caps = MagicMock(side_effect=keyrings)
+    return mgr, svc
+
+
+def _deploy(svc):
+    ds = CephadmDaemonDeploySpec(host='h', daemon_id='a.h.xyz',
+                                 service_name='nvmeof.a', daemon_type='nvmeof')
+    try:
+        svc.prepare_create(ds)
+    except Exception:
+        # past the keyring, prepare_create renders the gateway config from
+        # the mocked mgr; only the key handling is under test here
+        pass
+
+
+def test_new_gateway_key_is_legacy():
+    mgr, svc = _service([keyring('client.nvmeof.a.h.xyz', 1)])
+    _deploy(svc)
+    assert svc.get_keyring_with_caps.call_args.kwargs['key_type'] == 'aes'
+    assert not any(c[0][0].get('prefix') == 'auth rotate'
+                   for c in mgr.mon_command.call_args_list)
+
+
+def test_gateway_with_an_aes256k_key_is_rotated_back():
+    entity = 'client.nvmeof.a.h.xyz'
+    mgr, svc = _service([keyring(entity, 2), keyring(entity, 1)])
+    _deploy(svc)
+    rot = [c[0][0] for c in mgr.mon_command.call_args_list
+           if c[0][0].get('prefix') == 'auth rotate']
+    assert rot == [{'prefix': 'auth rotate', 'entity': entity,
+                    'format': 'json', 'key_type': 'aes'}]
+    assert svc.get_keyring_with_caps.call_count == 2
diff --git a/src/pybind/mgr/cephadm/utils.py b/src/pybind/mgr/cephadm/utils.py
index 4541b3725520..827754a07a86 100644
--- a/src/pybind/mgr/cephadm/utils.py
+++ b/src/pybind/mgr/cephadm/utils.py
@@ -48,6 +48,48 @@ class CephadmNoImage(Enum):
 # ROTATION_CIPHER is the cipher the new keys will be set
 # up with after we rotate them
 ROTATION_CIPHER = 'aes256k'
+# The nvmeof gateway images of this release (quay.io/ceph/nvmeof 1.2.x, and
+# 1.4.x, the squid line) carry their own librados, from before aes256k: with
+# an aes256k key the gateway cannot connect at all ("RADOS I/O error (error
+# connecting to the cluster)", "Unable to create OMAP, exiting!").  Give the
+# daemons whose images lag behind a key of the previous type, until their
+# images know the new one.
+LEGACY_CIPHER = 'aes'
+LEGACY_CIPHER_DAEMON_TYPES = {'nvmeof'}
+
+
+# CryptoKey type numbers (CEPH_CRYPTO_AES, CEPH_CRYPTO_AES256KRB5)
+CRYPTO_KEY_TYPES = {1: 'aes', 2: 'aes256k'}
+
+
+def keyring_key_type(keyring: str) -> Optional[str]:
+    """
+    The type of the key in a keyring ('aes', 'aes256k'), from the key's
+    first two bytes (CryptoKey: le16 type, utime_t created, le16 len,
+    secret), or None if there is no key to read.
+    """
+    import base64
+    import struct
+    for line in keyring.splitlines():
+        name, _, value = line.partition('=')
+        if name.strip() != 'key':
+            continue
+        try:
+            raw = base64.b64decode(value.strip())
+            t = struct.unpack('<H', raw[:2])[0]
+        except Exception:
+            return None
+        return CRYPTO_KEY_TYPES.get(t)
+    return None
+
+
+def key_type_for(daemon_type: str) -> str:
+    """The cephx key type to create or rotate a daemon's key with."""
+    if daemon_type in LEGACY_CIPHER_DAEMON_TYPES:
+        return LEGACY_CIPHER
+    return ROTATION_CIPHER
+
+
 # cipher mons should use by default for service requests
 # Do not set the service cipher until all core (mon/mgr/osd/mds)
 # daemons have been upgraded

From 74bfd8ceea8122b4769742afb6e887ec9be3bee5 Mon Sep 17 00:00:00 2001
From: Tatjana Dehler <tatjana.dehler@clyso.com>
Date: Wed, 21 Oct 2026 13:57:45 +0200
Subject: [PATCH 2/4] mgr/cephadm: re-use already existing constants

CRYPTO_KEY_TYPES spelled both its cipher names and its CryptoKey type
numbers as literals, although LEGACY_CIPHER and ROTATION_CIPHER are
declared right above it. Re-use them, and name the type numbers after
the CEPH_CRYPTO_* macros they copy, pointing at the header that defines
them.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Signed-off-by: Tatjana Dehler <tatjana.dehler@clyso.com>
---
 src/pybind/mgr/cephadm/utils.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pybind/mgr/cephadm/utils.py b/src/pybind/mgr/cephadm/utils.py
index 827754a07a86..75336020d7c6 100644
--- a/src/pybind/mgr/cephadm/utils.py
+++ b/src/pybind/mgr/cephadm/utils.py
@@ -58,8 +58,11 @@ class CephadmNoImage(Enum):
 LEGACY_CIPHER_DAEMON_TYPES = {'nvmeof'}
 
 
-# CryptoKey type numbers (CEPH_CRYPTO_AES, CEPH_CRYPTO_AES256KRB5)
-CRYPTO_KEY_TYPES = {1: 'aes', 2: 'aes256k'}
+# CryptoKey type numbers, c.f. CEPH_CRYPTO_* in src/include/ceph_fs.h
+CEPH_CRYPTO_AES = 0x1
+CEPH_CRYPTO_AES256KRB5 = 0x2
+CRYPTO_KEY_TYPES = {CEPH_CRYPTO_AES: LEGACY_CIPHER,
+                    CEPH_CRYPTO_AES256KRB5: ROTATION_CIPHER}
 
 
 def keyring_key_type(keyring: str) -> Optional[str]:

From c1bd10889c2b50a8a1362e33ebdd57733228902b Mon Sep 17 00:00:00 2001
From: Tatjana Dehler <tatjana.dehler@clyso.com>
Date: Thu, 22 Oct 2026 09:39:10 +0200
Subject: [PATCH 3/4] mgr/tox.ini: update quay.io images count unit test

The unit test has to be updated from 23 to 24 mentiones of the quay.io
images, because as part of 0486502cd28 ("mgr/cephadm: give nvmeof
gateways a key they can use") a new reference has been added in a
comment.

Signed-off-by: Tatjana Dehler <tatjana.dehler@clyso.com>
---
 src/pybind/mgr/tox.ini | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index 3165673cdbcd..68629e0e2d5e 100644
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -177,11 +177,17 @@ modules =
     rbd_support \
     rgw \
     selftest
+# The two greps below count how many lines contain a container registry name,
+# so that a new hardcoded image was added on purpose. They count only the text
+# of 24 quay.io lines, not the code. The value has to be updated from 23 to 24,
+# as a new image reference has been named in a comment in utils.py. The
+# additional name is for the nvmeof image, added as part of 0486502cd28
+# ("mgr/cephadm: give nvmeof gateways a key they can use").
 commands =
     flake8 --config=tox.ini {posargs} \
       {posargs:{[testenv:flake8]modules}}
     bash -c 'test $(git ls-files cephadm | grep ".py$" | grep -v tests | xargs grep "docker.io" | wc -l) == 3'
-    bash -c 'test $(git ls-files cephadm | grep ".py$" | grep -v tests | xargs grep "quay.io" | wc -l) == 23'
+    bash -c 'test $(git ls-files cephadm | grep ".py$" | grep -v tests | xargs grep "quay.io" | wc -l) == 24'
 
 [testenv:jinjalint]
 basepython = python3

From b26e429ed58cb8b6e92ab128a73ef8c7d8305702 Mon Sep 17 00:00:00 2001
From: Tatjana Dehler <tatjana.dehler@clyso.com>
Date: Wed, 21 Oct 2026 10:48:14 +0200
Subject: [PATCH 4/4] release: add backport metadata

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Signed-off-by: Tatjana Dehler <tatjana.dehler@clyso.com>
---
 .../01a15d41-e5b1-7d20-b6e3-e9ebcec19b81.md   | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 release-management/backports/01a15d41-e5b1-7d20-b6e3-e9ebcec19b81.md

diff --git a/release-management/backports/01a15d41-e5b1-7d20-b6e3-e9ebcec19b81.md b/release-management/backports/01a15d41-e5b1-7d20-b6e3-e9ebcec19b81.md
new file mode 100644
index 000000000000..b867bbb53a65
--- /dev/null
+++ b/release-management/backports/01a15d41-e5b1-7d20-b6e3-e9ebcec19b81.md
@@ -0,0 +1,98 @@
+---
+id: 01a15d41-e5b1-7d20-b6e3-e9ebcec19b81
+title: Fix nvmeof gateway startup with aes256k daemon keys
+component: other
+category: fix
+provenance:
+  type: other
+  other: >-
+    Downstream-authored fix. No upstream PR exists yet. Written against
+    cobaltcore-dev/ceph#28 for the squid-19.2.7 effort. Upstream tracker
+    https://tracker.ceph.com/issues/81778 covers the same bug on squid and 
+    tentacle. Related: tracker #79868 and ceph/ceph-nvmeof#2203.
+  upstream_trackers:
+  - https://tracker.ceph.com/issues/81778
+justification:
+  type: engineering
+  refs:
+  - cobaltcore-dev/cloud-storage#623
+  - https://tracker.ceph.com/issues/81778
+risk:
+  blast: availability
+  conflict: substantive
+  coverage: partial
+---
+
+## Justification (public)
+
+Since 19.2.6, cephadm creates daemon cephx keys with the `aes256k` key type.
+The NVMe-oF gateway images for squid bundle their own librados, built before
+`aes256k` existed, so a gateway cannot authenticate with such a key. It fails
+to connect to the cluster and restarts. The nvmeof service never reaches its
+target count.
+
+## Justification (internal)
+
+- https://tracker.ceph.com/issues/81778
+- Teuthology runs #227, #259, #303, ... Surfaced in
+  `orch:cephadm:smoke-roleless/{0-distro/centos_9.stream_runc 0-nvme-loop 1-start 2-services/nvmeof 3-final}`,
+  job 3763 (2026-10-10): the mon grants `client.nvmeof.foo.vm06.qoywko` a key
+  with `"key_type": "aes256k"`. The gateway logs `rados.IOError: [errno 5] RADOS I/O error`
+  on each of 5 starts, then `Unable to create OMAP, exiting!`, and no mon ever
+  sees a connection attempt. Ends in `MaxWhileTries` after 300s.
+
+## Risk notes
+
+- **blast: availability** — the patch changes which cephx key type cephadm
+  requests per daemon (`utils.key_type_for()`). nvmeof gets the previous `aes`,
+  every other daemon type keeps `aes256k`. A regression in that dispatch would
+  hand a daemon a key type its image cannot use. The same failure mode this
+  fixes, i.e. a daemon that will not start. No data path is touched and no
+  on-disk format changes, so nothing can be silently corrupted.
+- **conflict: substantive** — fully custom downstream patch, not a cherry-pick
+  (rubric: "substantive conflicts requiring code change, OR fully custom"). It
+  applies cleanly to the effort branch, but it carries no upstream review
+  behind it; the code is new on this line.
+- **coverage: partial** — new
+  `src/pybind/mgr/cephadm/tests/test_nvmeof_key_type.py` (5 tests) covers the
+  per-daemon dispatch, key creation and `key_rotate`. 
+- **Removal condition** — `LEGACY_CIPHER_DAEMON_TYPES` has to go back to empty
+  once a squid-line gateway image ships librados that understands `aes256k`.
+  The 1.7 and 2.0.0 images already do, but those are tentacle-related images.
+  Until that happens, every carry-forward of this patch re-applies the
+  downgrade.
+
+## Behavior change
+
+NVMe-oF gateway daemon keys are created with key type `aes` instead of
+`aes256k`. All other daemon types are unchanged, including the post-upgrade key
+rotation, which only covers mon/mgr/osd/mds. `ceph orch daemon rotate-key` on a
+gateway also produces an `aes` key.
+
+This is a deliberate downgrade to a weaker cipher for one daemon type. `aes`
+(`CEPH_CRYPTO_AES`) is AES-128-CBC with a fixed IV and a 16-byte key; `aes256k`
+(`CEPH_CRYPTO_AES256KRB5`) is AES256-CTS-HMAC-SHA384-192 with a 32-byte key. So
+the gateway's key loses both the longer key and the HMAC integrity. It is the
+key type every daemon used before 19.2.6 and is still in `ALLOWED_CIPHERS`, not
+a new weak mode. Exposure is limited to the `client.nvmeof.*` entity, whose
+caps are `mon profile rbd` / `osd profile rbd`.
+
+A gateway already deployed with an `aes256k` key has its key rotated to `aes`
+on its next deploy, so a failed nvmeof service heals itself on redeploy rather
+than needing manual cephx surgery. That rotation keys on daemon type, not on
+what the running image supports, so redeploying a gateway whose image does
+understand `aes256k` downgrades its key too.
+
+## Upgrade notes
+
+Clusters without an NVMe-oF service: nothing to do.
+
+If an nvmeof service is already stuck from a 19.2.6 or later deploy, redeploy
+it once after the upgrade:
+
+```
+ceph orch redeploy nvmeof.<service>
+```
+
+The gateway's key is rotated to a type its image supports and the service comes
+up.