calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-06-07 08:08:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Push mode and sign key adjustments for native mode

Browse Source
This commit is contained in:
Owen
2026-05-31 21:18:57 -07:00
parent bf79768e05
commit d11a244caa
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/private/routers/ssh/signSshKey.ts
View File

@@ -467,14 +467,14 @@ export async function signSshKey(
const validFor = 300n; const validFor = 300n;
expiresIn = Number(validFor); // seconds expiresIn = Number(validFor); // seconds
const cert = signPublicKey(caKeys.privateKeyPem, publicKey, { cert = signPublicKey(caKeys.privateKeyPem, publicKey, {
keyId: `${usernameToUse}@${resource.niceId}`, keyId: `${usernameToUse}@${resource.niceId}`,
validPrincipals: [usernameToUse, resource.niceId], validPrincipals: [usernameToUse, resource.niceId],
validAfter: now - 60n, // Start 1 min ago for clock skew validAfter: now - 60n, // Start 1 min ago for clock skew
validBefore: now + validFor validBefore: now + validFor
}); });
const messageIds: number[] = []; messageIds = [];
for (const siteId of siteIds) { for (const siteId of siteIds) {
// get the site // get the site
const [newt] = await db const [newt] = await db

2
server/routers/resource/getUserResources.ts
View File

@@ -386,7 +386,7 @@ export type GetUserResourcesResponse = {
domain: string; domain: string;
enabled: boolean; enabled: boolean;
protected: boolean; protected: boolean;
mode: string; ode: string;
}>; }>;
siteResources: Array<{ siteResources: Array<{
siteResourceId: number; siteResourceId: number;

1
server/routers/siteResource/listAllSiteResourcesByOrg.ts
View File

@@ -196,6 +196,7 @@ function querySiteResourcesBase() {
disableIcmp: siteResources.disableIcmp, disableIcmp: siteResources.disableIcmp,
authDaemonMode: siteResources.authDaemonMode, authDaemonMode: siteResources.authDaemonMode,
authDaemonPort: siteResources.authDaemonPort, authDaemonPort: siteResources.authDaemonPort,
pamMode: siteResources.pamMode,
subdomain: siteResources.subdomain, subdomain: siteResources.subdomain,
domainId: siteResources.domainId, domainId: siteResources.domainId,
fullDomain: siteResources.fullDomain, fullDomain: siteResources.fullDomain,

2
src/components/MemberResourcesPortal.tsx
View File

@@ -49,7 +49,7 @@ type Resource = {
domain: string; domain: string;
enabled: boolean; enabled: boolean;
protected: boolean; protected: boolean;
mode: string; // "http", "tcp", "udp", "rdp", "vnc", "ssh" // mode: string; // "http", "tcp", "udp", "rdp", "vnc", "ssh"
// Auth method fields // Auth method fields
sso?: boolean; sso?: boolean;
password?: boolean; password?: boolean;