Ethica/Termix
1
0
Fork 0
mirror of https://github.com/Termix-SSH/Termix.git synced 2026-07-16 05:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #776 from ZacharyZcR/feat/per-user-shared-host-credentials

Browse Source 
feat: support per-user credentials on shared hosts
This commit is contained in:
ZacharyZcR
2026-05-18 04:36:33 +08:00
committed by GitHub
parent cfb9e4bcaa 5c9d8bfa34
commit 396a672a1c
4 changed files with 117 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/ssh/host-resolver.ts
+45 -1
View File
@@ -75,8 +75,52 @@ export async function resolveHostById(
if (host.credentialId) {
const ownerId = (host.userId || userId) as string;
try {
// Try shared credential first for non-owner users
// Try user's own override credential first
if (userId !== ownerId) {
try {
const { hostAccess } = await import("../database/db/schema.js");
const accessRecords = await db
.select()
.from(hostAccess)
.where(
and(
eq(hostAccess.hostId, hostId),
eq(hostAccess.userId, userId),
),
)
.limit(1);
const overrideCredId = accessRecords[0]?.overrideCredentialId as number | null;
if (overrideCredId) {
const userCreds = await SimpleDBOps.select(
db
.select()
.from(sshCredentials)
.where(
and(
eq(sshCredentials.id, overrideCredId),
eq(sshCredentials.userId, userId),
),
),
"ssh_credentials",
userId,
);
if (userCreds.length > 0) {
const cred = userCreds[0] as Record<string, unknown>;
host.password = cred.password;
host.key = cred.key;
host.keyPassword = cred.keyPassword;
host.keyType = cred.keyType;
if (!host.overrideCredentialUsername) {
host.username = cred.username;
}
host.authType = cred.key ? "key" : cred.password ? "password" : "none";
return host as unknown as SSHHost;
}
}
} catch {
// fall through to shared credential
}
try {
const { SharedCredentialManager } =
await import("../utils/shared-credential-manager.js");