Skip to content

Revert "connect_lvol: stop unconditionally injecting pool DHCHAP keys" #1074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hamdy-khader merged 1 commit into from
Jun 2, 2026
Merged

Revert "connect_lvol: stop unconditionally injecting pool DHCHAP keys" #1074

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions simplyblock_core/controllers/lvol_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1865,16 +1865,9 @@ def connect_lvol(uuid, ctrl_loss_tmo=constants.LVOL_NVME_CONNECT_CTRL_LOSS_TMO,
for h in lvol.allowed_hosts:
if h["nqn"] == host_nqn:
host_entry = h
# Do NOT inject pool DHCHAP keys into host_entry here.
# Pool-level keys are registered on the target's nvmf
# keyring via _register_pool_dhchap_keys_on_node and
# used during in-band auth; embedding them in the
# connect string overrides explicit host-level keys,
# injects keys when the pool has no DHCHAP configured,
# and conflicts with hosts using PSK/TLS. Contract is
# pinned by tests in tests/test_dhchap_pool_level.py
# (test_host_with_psk_sets_tls_flag,
# test_pool_level_dhchap_lvol_has_no_secret_in_connect_cmd).
pool = db_controller.get_pool_by_id(lvol.pool_uuid)
host_entry["dhchap_key"] = pool.dhchap_key
host_entry["dhchap_ctrlr_key"] = pool.dhchap_ctrlr_key
break
if not host_entry:
return False, f"Host NQN {host_nqn} not found in allowed hosts for volume {uuid}"
Expand Down
Loading