Skip to content

Commit 213d061

Browse files
committed
don't deleted secret if used as sshkey
1 parent 3f28b3d commit 213d061

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/api/handlers/projects/secrets.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,14 @@ def delete(self, project_id, secret_id):
9696
if num_secrets == 0:
9797
return abort(400, 'Such secret does not exist.')
9898

99+
num_keys = g.db.execute_one("""
100+
SELECT COUNT(*) FROM sshkey
101+
WHERE project_id = %s and secret_id = %s
102+
""", [project_id, secret_id])[0]
103+
104+
if num_keys == 0:
105+
return abort(400, 'Secret is still used SSH Key.')
106+
99107
g.db.execute("""
100108
DELETE FROM secret WHERE project_id = %s and id = %s
101109
""", [project_id, secret_id])

src/scheduler/kubernetes/scheduler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ def kube_job(self, job_id, cpu, mem, services=None):
634634
cursor.close()
635635

636636
for r in result:
637-
private_key += '\n%s' decrypt_secret(r[0])
637+
private_key += '\n%s' % decrypt_secret(r[0])
638638

639639
if private_key:
640640
env += [{

0 commit comments

Comments
 (0)