engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ssh-wrapper: added extra logging in case of failed user fetch

Browse source
This commit is contained in:
RhodeCode Admin 2025-01-06 12:09:22 +01:00
parent e726cb73f3
commit d79877ff23
4 changed files with 208 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

53
rhodecode/api/views/service_api.py
View file

@ -34,13 +34,9 @@ def service_get_data_for_ssh_wrapper(request, apiuser, user_id, repo_name, key_i
from rhodecode.model.meta import raw_query_executor, Base
if key_id:
table = Table('user_ssh_keys', Base.metadata, autoload=False)
atime = datetime.datetime.utcnow()
stmt = (
table.update()
.where(table.c.ssh_key_id == key_id)
.values(accessed_on=atime)
)
table = Table("user_ssh_keys", Base.metadata, autoload=False)
atime = datetime.datetime.now(datetime.UTC)
stmt = table.update().where(table.c.ssh_key_id == key_id).values(accessed_on=atime)
res_count = None
with raw_query_executor() as session:
@ -49,38 +45,38 @@ def service_get_data_for_ssh_wrapper(request, apiuser, user_id, repo_name, key_i
res_count = result.rowcount
if res_count:
log.debug(f'Update key id:{key_id} access time')
log.debug(f"Update key id:{key_id} access time")
db_user = User.get(user_id)
if not db_user:
return None
return {}
auth_user = db_user.AuthUser()
return {
'user_id': db_user.user_id,
'username': db_user.username,
'repo_permissions': auth_user.permissions['repositories'],
"user_id": db_user.user_id,
"username": db_user.username,
"repo_permissions": auth_user.permissions["repositories"],
"branch_permissions": auth_user.get_branch_permissions(repo_name),
"repos_path": ScmModel().repos_path
"repos_path": ScmModel().repos_path,
}
@jsonrpc_method()
def service_get_repo_name_by_id(request, apiuser, repo_id):
from rhodecode.model.repo import RepoModel
by_id_match = RepoModel().get_repo_by_id(repo_id)
if by_id_match:
repo_name = by_id_match.repo_name
return {
'repo_name': repo_name
}
return {"repo_name": repo_name}
return None
@jsonrpc_method()
def service_mark_for_invalidation(request, apiuser, repo_name):
from rhodecode.model.scm import ScmModel
ScmModel().mark_for_invalidation(repo_name)
return {'msg': "Applied"}
return {"msg": "Applied"}
@jsonrpc_method()
@ -92,16 +88,15 @@ def service_config_to_hgrc(request, apiuser, cli_flags, repo_name):
ui = VcsSettingsModel(repo=repo_name).get_ui_settings(section=None, key=None)
default_hooks = [
('pretxnchangegroup.ssh_auth', 'python:vcsserver.hooks.pre_push_ssh_auth'),
('pretxnchangegroup.ssh', 'python:vcsserver.hooks.pre_push_ssh'),
('changegroup.ssh', 'python:vcsserver.hooks.post_push_ssh'),
('preoutgoing.ssh', 'python:vcsserver.hooks.pre_pull_ssh'),
('outgoing.ssh', 'python:vcsserver.hooks.post_pull_ssh'),
("pretxnchangegroup.ssh_auth", "python:vcsserver.hooks.pre_push_ssh_auth"),
("pretxnchangegroup.ssh", "python:vcsserver.hooks.pre_push_ssh"),
("changegroup.ssh", "python:vcsserver.hooks.post_push_ssh"),
("preoutgoing.ssh", "python:vcsserver.hooks.pre_pull_ssh"),
("outgoing.ssh", "python:vcsserver.hooks.post_pull_ssh"),
]
for k, v in default_hooks:
ui_sections['hooks'].append((k, v))
ui_sections["hooks"].append((k, v))
for entry in ui:
if not entry.active:
@ -111,15 +106,15 @@ def service_config_to_hgrc(request, apiuser, cli_flags, repo_name):
if sec in cli_flags:
# we want only custom hooks, so we skip builtins
if sec == 'hooks' and key in RhodeCodeUi.HOOKS_BUILTIN:
if sec == "hooks" and key in RhodeCodeUi.HOOKS_BUILTIN:
continue
ui_sections[sec].append([key, entry.value])
flags = []
for _sec, key_val in ui_sections.items():
flags.append(' ')
flags.append(f'[{_sec}]')
flags.append(" ")
flags.append(f"[{_sec}]")
for key, val in key_val:
flags.append(f'{key}= {val}')
return {'flags': flags}
flags.append(f"{key}= {val}")
return {"flags": flags}