Compare commits

..

3 Commits

16 changed files with 77 additions and 58 deletions

View File

@@ -128,12 +128,6 @@ body.backdrop-effects-disabled {
font-size: 0.9rem !important;
}
.dropdown-menu.tn-dropdown-menu-scrollable {
/* Note: scrollable dropdowns does not support submenus */
max-height: 90vh;
overflow: scroll;
}
body.desktop .dropdown-menu::before,
:root .ck.ck-dropdown__panel::before,
:root .excalidraw .popover::before,

View File

@@ -653,8 +653,7 @@ body a.tn-link:focus-visible,
}
body a.tn-link:hover,
.use-tn-links a:hover,
.use-tn-links a.ck-widget_selected {
.use-tn-links a:hover {
box-shadow: 0 0 0 4px var(--link-hover-background);
--background: var(--link-hover-background);
color: var(--link-hover-color);

View File

@@ -670,33 +670,16 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
color: var(--main-text-color);
}
/* Links */
.ck-content a.ck-widget {
outline: none;
}
.ck-content a.ck-widget.ck-widget_selected,
.ck-content a.ck-link_selected {
outline: 2px solid var(--input-focus-outline-color);
outline-offset: 2px;
background: var(--link-hover-background);
}
/* Reference link */
.ck-content a.reference-link,
.ck-content a.reference-link:hover {
/* Apply underline only to the span inside the link so it can follow the
* target note's user defined color */
text-decoration: none;
text-decoration: none;
}
.ck-content a.reference-link > span {
color: var(--custom-color, inherit);
}
.ck-content a.reference-link:hover > span {
text-decoration: underline;
}

View File

@@ -1230,7 +1230,7 @@ body.layout-vertical .tab-row-widget-is-sorting .note-tab.note-tab-is-dragging .
margin-bottom: 2px;
}
body.layout-vertical #rest-pane > .classic-toolbar-widget {
body.vertical-layout #rest-pane > .classic-toolbar-widget {
border-start-start-radius: var(--center-pane-border-radius);
}

View File

@@ -1934,10 +1934,7 @@
},
"highlights_list_2": {
"title": "Lista wyróżnień",
"options": "Opcje",
"modal_title": "Konfiguracja listy wyróżnień",
"menu_configure": "Konfiguracja listy wyróżnień...",
"no_highlights": "Nie znaleziono wyróżnień."
"options": "Opcje"
},
"quick-search": {
"placeholder": "Szybkie wyszukiwanie",

View File

@@ -189,11 +189,10 @@ interface BreadcrumbSeparatorProps {
function BreadcrumbSeparator(props: BreadcrumbSeparatorProps) {
return (
<Dropdown
text={<Icon icon="bx bxs-chevron-right" />}
text={<Icon icon="bx bx-chevron-right" />}
noSelectButtonStyle
buttonClassName="icon-action"
hideToggleArrow
dropdownContainerClassName="tn-dropdown-menu-scrollable"
dropdownOptions={{ popperConfig: { strategy: "fixed", placement: "top" } }}
>
<BreadcrumbSeparatorDropdownContent {...props} />

View File

@@ -155,6 +155,11 @@
}
}
.dropdown-code-note-switcher {
max-height: 90vh;
overflow: scroll;
}
.backlinks-widget > .dropdown-menu {
--menu-padding-size: .9em;
@@ -255,8 +260,4 @@
}
}
button.select-button:not(:focus-visible) {
outline: none;
}
}

View File

@@ -422,7 +422,7 @@ function CodeNoteSwitcher({ note }: StatusBarContext) {
icon="bx bx-code-curly"
text={correspondingMimeType?.title}
title={t("status_bar.code_note_switcher")}
dropdownContainerClassName="dropdown-code-note-switcher tn-dropdown-menu-scrollable"
dropdownContainerClassName="dropdown-code-note-switcher"
>
<NoteTypeCodeNoteList
currentMimeType={currentNoteMime}

View File

@@ -108,7 +108,7 @@ function loginSync(req: Request) {
const givenHash = req.body.hash;
if (expectedHash !== givenHash) {
if (!utils.constantTimeCompare(expectedHash, givenHash)) {
return [400, { message: "Sync login credentials are incorrect. It looks like you're trying to sync two different initialized documents which is not possible." }];
}

View File

@@ -1,3 +1,4 @@
import crypto from "crypto";
import utils from "../services/utils.js";
import optionService from "../services/options.js";
import myScryptService from "../services/encryption/my_scrypt.js";
@@ -160,7 +161,11 @@ function verifyPassword(submittedPassword: string) {
const guess_hashed = myScryptService.getVerificationHash(submittedPassword);
return guess_hashed.equals(hashed_password);
// Use constant-time comparison to prevent timing attacks
if (hashed_password.length !== guess_hashed.length) {
return false;
}
return crypto.timingSafeEqual(guess_hashed, hashed_password);
}
function sendLoginError(req: Request, res: Response, errorType: 'password' | 'totp' = 'password') {

View File

@@ -1,5 +1,5 @@
import myScryptService from "./my_scrypt.js";
import utils from "../utils.js";
import utils, { constantTimeCompare } from "../utils.js";
import dataEncryptionService from "./data_encryption.js";
import sql from "../sql.js";
import sqlInit from "../sql_init.js";
@@ -87,8 +87,7 @@ function verifyOpenIDSubjectIdentifier(subjectIdentifier: string) {
return undefined;
}
console.log("Matches: " + givenHash === savedHash);
return givenHash === savedHash;
return constantTimeCompare(givenHash, savedHash as string);
}
function setDataKey(

View File

@@ -1,6 +1,6 @@
import optionService from "../options.js";
import myScryptService from "./my_scrypt.js";
import { toBase64 } from "../utils.js";
import { toBase64, constantTimeCompare } from "../utils.js";
import dataEncryptionService from "./data_encryption.js";
function verifyPassword(password: string) {
@@ -12,7 +12,7 @@ function verifyPassword(password: string) {
return false;
}
return givenPasswordHash === dbPasswordHash;
return constantTimeCompare(givenPasswordHash, dbPasswordHash);
}
function setDataKey(password: string, plainTextDataKey: string | Buffer) {

View File

@@ -1,6 +1,7 @@
import crypto from 'crypto';
import optionService from '../options.js';
import sql from '../sql.js';
import { constantTimeCompare } from '../utils.js';
function isRecoveryCodeSet() {
return optionService.getOptionBool('encryptedRecoveryCodes');
@@ -55,13 +56,22 @@ function verifyRecoveryCode(recoveryCodeGuess: string) {
const recoveryCodes = getRecoveryCodes();
let loginSuccess = false;
recoveryCodes.forEach((recoveryCode) => {
if (recoveryCodeGuess === recoveryCode) {
removeRecoveryCode(recoveryCode);
let matchedCode: string | null = null;
// Check ALL codes to prevent timing attacks - do not short-circuit
for (const recoveryCode of recoveryCodes) {
if (constantTimeCompare(recoveryCodeGuess, recoveryCode)) {
matchedCode = recoveryCode;
loginSuccess = true;
return;
// Continue checking all codes to maintain constant time
}
});
}
// Remove the matched code only after checking all codes
if (matchedCode) {
removeRecoveryCode(matchedCode);
}
return loginSuccess;
}

View File

@@ -1,6 +1,6 @@
import optionService from "../options.js";
import myScryptService from "./my_scrypt.js";
import { randomSecureToken, toBase64 } from "../utils.js";
import { randomSecureToken, toBase64, constantTimeCompare } from "../utils.js";
import dataEncryptionService from "./data_encryption.js";
import type { OptionNames } from "@triliumnext/commons";
@@ -18,7 +18,7 @@ function verifyTotpSecret(secret: string): boolean {
return false;
}
return givenSecretHash === dbSecretHash;
return constantTimeCompare(givenSecretHash, dbSecretHash);
}
function setTotpSecret(secret: string) {

View File

@@ -1,5 +1,5 @@
import becca from "../becca/becca.js";
import { fromBase64, randomSecureToken } from "./utils.js";
import { fromBase64, randomSecureToken, constantTimeCompare } from "./utils.js";
import BEtapiToken from "../becca/entities/betapi_token.js";
import crypto from "crypto";
@@ -83,15 +83,16 @@ function isValidAuthHeader(auth: string | undefined) {
return false;
}
return etapiToken.tokenHash === authTokenHash;
return constantTimeCompare(etapiToken.tokenHash, authTokenHash);
} else {
// Check ALL tokens to prevent timing attacks - do not short-circuit
let isValid = false;
for (const etapiToken of becca.getEtapiTokens()) {
if (etapiToken.tokenHash === authTokenHash) {
return true;
if (constantTimeCompare(etapiToken.tokenHash, authTokenHash)) {
isValid = true;
}
}
return false;
return isValid;
}
}

View File

@@ -74,6 +74,36 @@ export function hmac(secret: any, value: any) {
return hmac.digest("base64");
}
/**
* Constant-time string comparison to prevent timing attacks.
* Uses crypto.timingSafeEqual to ensure comparison time is independent
* of how many characters match.
*
* @param a First string to compare
* @param b Second string to compare
* @returns true if strings are equal, false otherwise
* @note Returns false for null/undefined/non-string inputs. Empty strings are considered equal.
*/
export function constantTimeCompare(a: string | null | undefined, b: string | null | undefined): boolean {
// Handle null/undefined/non-string cases safely
if (typeof a !== "string" || typeof b !== "string") {
return false;
}
const bufA = Buffer.from(a, "utf-8");
const bufB = Buffer.from(b, "utf-8");
// If lengths differ, we still do a constant-time comparison
// to avoid leaking length information through timing
if (bufA.length !== bufB.length) {
// Compare bufA against itself to maintain constant time behavior
crypto.timingSafeEqual(bufA, bufA);
return false;
}
return crypto.timingSafeEqual(bufA, bufB);
}
export function hash(text: string) {
text = text.normalize();
@@ -486,6 +516,7 @@ function slugify(text: string) {
export default {
compareVersions,
constantTimeCompare,
crash,
envToBoolean,
escapeHtml,