mirror of
https://github.com/Termix-SSH/Termix.git
synced 2026-10-31 07:35:24 +00:00
v26.10.3 (#1692)
* feat: shell controller, TabStage, layout and theme plugins with repair view * feat: move the classic layout into its own bundled plugin * feat: move color themes into a bundled themes plugin * fix: plugin tests and type checks work with a linked sdk * fix: home tab, layout switch and missing layout fallbacks for looks * chore: add classic layout and themes to the readme * chore: drop example plugin links from the plugin guide * feat: plugin filters by type, paged browse, hide plugins needing newer termix * feat: move desktop, status, import, audit and branding features into plugins * feat: host lock api so a plugin can load hosts from a config file (#1581) * chore: add hosts config to the plugin table * feat: login policy hook for plugins and optional https redirect (#1584) * chore: add login security to the plugin table * feat: api key socket tickets so a master can open remote sessions (#1654) * feat: sync moves to a plugin, desktop gets multiple accounts (#1580, #1654) * chore: add sync to the plugin table * feat: move the sync screens and wizard out of core into the plugin (#1580) * fix: add a neutral linked desktop hook for plugins (#1580) * fix: show the linked account's name and admin flag in the app (#1580) * feat: ssh transport providers, core ssh relay and plugin folders api * feat: support FIDO2 security keys through ssh agent * feat: add companion panels beside host tabs * feat: mTLS client certificates for desktop server links * feat: native web view for plugins in the desktop app * fix: detect the desktop link window by Electron's default user agent Fixes #1675 * fix: changelog for desktop link fix * fix: keep text primary keys in the plugin data export * fix: ship sharp binaries for Windows arm64 builds * feat: client cert on the sync link types (sdk 1.0.18) * chore: update translations * feat: themed title bar for the desktop app (#1690) * chore: changelog for the themed title bar * fix: draw the title bar in the sidebar color * feat: per host layout for the terminal panel bar * chore: sdk 1.0.19 for the panel bar layout * chore: bundle all 43 plugins for 26.10.3 * chore: update translations --------- Co-authored-by: SirHephaistos <60616553+SirHephaistos@users.noreply.github.com> Co-authored-by: Giovanny Aranda <garanda21@gmail.com>
This commit is contained in:
577 files changed
+76479
-101831
No files matched your search
@@ -26,6 +26,12 @@ import {
|
||||
isSecondFactorAfterExternalLoginEnabled,
|
||||
} from "./core-auth.js";
|
||||
import { findOrProvisionExternalUser } from "./provisioning.js";
|
||||
import {
|
||||
SECOND_FACTOR_SETUP,
|
||||
evaluateAuthPolicy,
|
||||
hasAuthPolicies,
|
||||
rememberDeviceAllowed,
|
||||
} from "./policy.js";
|
||||
import {
|
||||
getLoginMethod,
|
||||
getSecondFactor,
|
||||
@@ -122,12 +128,15 @@ export async function evaluateSecondFactors(
|
||||
* governs external methods (SSO, LDAP) alone.
|
||||
*/
|
||||
function shouldRunSecondFactors(methodId: string): boolean {
|
||||
ensureCoreLoginProviders();
|
||||
const method = getLoginMethod(methodId);
|
||||
if (!method?.external) return true;
|
||||
if (!isExternalMethod(methodId)) return true;
|
||||
return isSecondFactorAfterExternalLoginEnabled();
|
||||
}
|
||||
|
||||
function isExternalMethod(methodId: string): boolean {
|
||||
ensureCoreLoginProviders();
|
||||
return !!getLoginMethod(methodId)?.external;
|
||||
}
|
||||
|
||||
export const TRUST_DEVICE_COOKIE = "termix_trust_device";
|
||||
const TRUST_TOKEN_PATTERN = /^[a-f0-9]{64}$/;
|
||||
const TRUST_TOKEN_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1000;
|
||||
@@ -294,9 +303,40 @@ export async function runLogin(
|
||||
`${context.methodId}_role_shared_credentials`,
|
||||
);
|
||||
|
||||
const factors = shouldRunSecondFactors(context.methodId)
|
||||
? await evaluateSecondFactors(user.id)
|
||||
: { required: [], blocked: [] };
|
||||
// A login policy may want a factor where core would skip it, so it always
|
||||
// sees the full picture.
|
||||
const runFactors = shouldRunSecondFactors(context.methodId);
|
||||
const factors =
|
||||
runFactors || hasAuthPolicies()
|
||||
? await evaluateSecondFactors(user.id)
|
||||
: { required: [], blocked: [] };
|
||||
const trusted =
|
||||
factors.required.length > 0 || hasAuthPolicies()
|
||||
? await isTrustedDevice(req, user.id)
|
||||
: false;
|
||||
const policy = await evaluateAuthPolicy({
|
||||
userId: user.id,
|
||||
methodId: context.methodId,
|
||||
external: isExternalMethod(context.methodId),
|
||||
deviceType,
|
||||
trustedDevice: trusted,
|
||||
mfaSatisfied: !!identity.mfaSatisfied,
|
||||
secondFactors: listSecondFactors().map((factor) => ({
|
||||
id: factor.id,
|
||||
pluginId: factor.pluginId,
|
||||
enrolled: factors.required.some(
|
||||
(required) =>
|
||||
required.id === factor.id && required.pluginId === factor.pluginId,
|
||||
),
|
||||
})),
|
||||
});
|
||||
if (!runFactors && !policy.secondFactor) {
|
||||
factors.required = [];
|
||||
factors.blocked = [];
|
||||
}
|
||||
const rememberMe = context.rememberMe && policy.allowRememberDevice;
|
||||
const skipByDevice =
|
||||
trusted && policy.allowRememberDevice && policy.secondFactor !== "always";
|
||||
if (factors.blocked.length > 0) {
|
||||
authLogger.warn("Login refused: an enrolled second factor is unavailable", {
|
||||
operation: "second_factor_unavailable",
|
||||
@@ -324,11 +364,7 @@ export async function runLogin(
|
||||
|
||||
const ssoClaims = { externalSession: identity.externalSession ?? null };
|
||||
|
||||
if (
|
||||
factors.required.length > 0 &&
|
||||
!identity.mfaSatisfied &&
|
||||
!(await isTrustedDevice(req, user.id))
|
||||
) {
|
||||
if (factors.required.length > 0 && !identity.mfaSatisfied && !skipByDevice) {
|
||||
const tempToken = await AuthManager.getInstance().generateJWTToken(
|
||||
user.id,
|
||||
{ pendingTOTP: true, expiresIn: "10m" },
|
||||
@@ -337,14 +373,17 @@ export async function runLogin(
|
||||
pendingLogins.set(pendingKey(tempToken), {
|
||||
userId: user.id,
|
||||
methodId: context.methodId,
|
||||
rememberMe: context.rememberMe,
|
||||
rememberMe,
|
||||
allowRememberDevice: policy.allowRememberDevice,
|
||||
maxSessionSeconds: policy.maxSessionSeconds,
|
||||
idleTimeoutSeconds: policy.idleTimeoutSeconds,
|
||||
...ssoClaims,
|
||||
createdAt: Date.now(),
|
||||
});
|
||||
return {
|
||||
kind: "second-factor",
|
||||
tempToken,
|
||||
rememberMe: context.rememberMe,
|
||||
rememberMe,
|
||||
factors: factors.required.map((factor) => ({
|
||||
id: factor.id,
|
||||
pluginId: factor.pluginId,
|
||||
@@ -353,11 +392,22 @@ export async function runLogin(
|
||||
};
|
||||
}
|
||||
|
||||
// Required but nothing set up yet: a session that can only set one up.
|
||||
const needsSetup =
|
||||
!!policy.secondFactor &&
|
||||
factors.required.length === 0 &&
|
||||
!identity.mfaSatisfied &&
|
||||
!skipByDevice;
|
||||
|
||||
const session = await issueSession(req, user, {
|
||||
methodId: context.methodId,
|
||||
rememberMe: context.rememberMe,
|
||||
rememberMe,
|
||||
rateLimitUsername: context.rateLimitUsername ?? identity.rateLimitUsername,
|
||||
longLivedForApps: identity.kind === "external",
|
||||
longLivedForApps:
|
||||
identity.kind === "external" && policy.allowRememberDevice,
|
||||
maxAgeSeconds: policy.maxSessionSeconds,
|
||||
idleTimeoutSeconds: policy.idleTimeoutSeconds,
|
||||
restriction: needsSetup ? SECOND_FACTOR_SETUP : null,
|
||||
...ssoClaims,
|
||||
});
|
||||
return { kind: "session", ...session };
|
||||
@@ -510,10 +560,15 @@ export async function verifySecondFactorAndRespond(
|
||||
}
|
||||
loginRateLimiter.resetTOTPAttempts(user.id);
|
||||
|
||||
// A pending entry lost to a restart falls back to the current policy.
|
||||
const allowRemember = lookup.pending
|
||||
? lookup.pending.allowRememberDevice !== false
|
||||
: rememberDeviceAllowed();
|
||||
const rememberMe =
|
||||
typeof req.body?.rememberMe === "boolean"
|
||||
allowRemember &&
|
||||
(typeof req.body?.rememberMe === "boolean"
|
||||
? req.body.rememberMe
|
||||
: (lookup.pending?.rememberMe ?? false);
|
||||
: (lookup.pending?.rememberMe ?? false));
|
||||
|
||||
let trustToken: string | null = null;
|
||||
if (rememberMe) {
|
||||
@@ -545,6 +600,8 @@ export async function verifySecondFactorAndRespond(
|
||||
methodId: pending?.methodId ?? "password",
|
||||
rememberMe,
|
||||
externalSession: pending?.externalSession ?? null,
|
||||
maxAgeSeconds: pending?.maxSessionSeconds ?? null,
|
||||
idleTimeoutSeconds: pending?.idleTimeoutSeconds ?? null,
|
||||
});
|
||||
|
||||
if (trustToken && isNativeAppRequest(req)) {
|
||||
|
||||
Reference in new issue
Block a user