Skip to content

Fix circular KSM import #2115

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
craiglurey merged 2 commits into from
Jun 3, 2026
Merged

Fix circular KSM import #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95dd17e
Fix circular KSM import
lthievenaz-keeper Jun 3, 2026
87dafa7
Changed KSM import in pam.gateway_helper
lthievenaz-keeper Jun 3, 2026
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
4 changes: 2 additions & 2 deletions keepercommander/commands/pam/gateway_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from keeper_secrets_manager_core.utils import url_safe_str_to_bytes

from ... import api, utils
from ...commands.utils import KSMCommand
from ...commands.ksm import KSMCommand
from ...loginv3 import CommonHelperMethods
from ...params import KeeperParams
from ...proto import pam_pb2, enterprise_pb2
Expand Down Expand Up @@ -119,4 +119,4 @@ def edit_gateway(params, gateway_uid, gateway_name, node_id):
rq.controllerName = gateway_name
rq.nodeId = node_id
api.communicate_rest(params, rq, 'pam/modify_controller')


6 changes: 3 additions & 3 deletions keepercommander/commands/record.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@

from . import record_edit, base, record_totp, record_file_report
from .base import Command, GroupCommand, RecordMixin, FolderMixin, fields_to_titles
from .ksm import KSMCommand
from .pam import gateway_helper
from .pam.router_helper import router_get_connected_gateways
from .. import api, display, crypto, utils, vault, vault_extensions, subfolder, record_types
from ..breachwatch import BreachWatch
from ..display import bcolors
Expand Down Expand Up @@ -1302,6 +1299,8 @@ def display_rotation_info(self, params, r):


def _resolve_gateways_by_pattern(params, pattern):
from .pam import gateway_helper
from .pam.router_helper import router_get_connected_gateways
"""Resolve a `--device` pattern to a list of Gateway controller objects.

Matches both: exact controllerUid AND case-insensitive substring on
Expand Down Expand Up @@ -1372,6 +1371,7 @@ def _find_pam_configs_for_gateway(params, gateway_uid_str):


def _build_gateway_info(c, connected_instances, params, is_router_down, is_verbose):
from .ksm import KSMCommand
"""Build a dict describing one Gateway, suitable for table or JSON rendering."""
gateway_uid_str = utils.base64_url_encode(c.controllerUid)
ksm_app_uid_str = utils.base64_url_encode(c.applicationUid)
Expand Down
Loading