Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature addition: Multi-Factor Authentication #401

Draft
wants to merge 32 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9c748f3
Ported from branch OIDC
chesspro13 Sep 7, 2024
e232c66
TOTP working
chesspro13 Sep 7, 2024
37b4bf6
Fixed login errors
chesspro13 Sep 7, 2024
494721f
Changed Verification order.
chesspro13 Sep 7, 2024
1a8625b
Added package-lock.json
chesspro13 Sep 7, 2024
c74da18
OAuth working
chesspro13 Sep 7, 2024
df3cbf8
Removed references to disconnecting OpenID Accounts. For now.
chesspro13 Sep 7, 2024
d763960
Removed unused script
chesspro13 Sep 7, 2024
13937a2
Removed outdated comments
chesspro13 Sep 7, 2024
9dd185e
Removed unused files/code/imports/comments.
chesspro13 Sep 7, 2024
ede7bbd
Fixed recovery code refresh bug.
chesspro13 Sep 7, 2024
06da11f
Disabled TOTP checkbox
chesspro13 Sep 7, 2024
55b0f0e
Simplified .env
chesspro13 Sep 7, 2024
d8c8fe0
Added check for running both OpenID and TOTP at the same time.
chesspro13 Sep 9, 2024
953f539
Changed wording from "Regerate TOTP Secret" to "Generate TOTP Secret"
chesspro13 Sep 9, 2024
fa5c5ce
Added OpenID and TOTP to readme
chesspro13 Sep 9, 2024
2e21a45
Merge branch 'develop' into feature/MFA
chesspro13 Sep 9, 2024
d928202
Fixed problem with using existing databases.
chesspro13 Sep 14, 2024
120f167
Removed unused import
chesspro13 Sep 14, 2024
2eb4d4f
Merge remote-tracking branch 'origin/develop' into feature/MFA
eliandoran Dec 24, 2024
e20e53f
feat(client/mfa): improve layout by separating into multiple sections
eliandoran Dec 24, 2024
0916d87
feat(client/mfa): improve headings
eliandoran Dec 24, 2024
8df1e32
Merge branch 'develop' into feature/MFA
JYC333 Mar 22, 2025
fdc10d0
feat: 🎸 fix ts error
JYC333 Mar 22, 2025
0871d16
feat: 🎸 remove conflict code
JYC333 Mar 22, 2025
b320553
feat: 🎸 fix open_id error
JYC333 Mar 22, 2025
c8164c8
feat: 🎸 fix recovery_codes error
JYC333 Mar 22, 2025
9d49546
feat: 🎸 Fix ts compile error
JYC333 Mar 22, 2025
c3d3ab4
Merge branch 'develop' into feature/MFA
JYC333 Mar 22, 2025
54a5f81
feat: 🎸 Fix option defintions
JYC333 Mar 22, 2025
717ad3b
feat: 🎸 Port MFA to ts
JYC333 Mar 22, 2025
e3fb871
feat: 🎸 Reformat MFA option page
JYC333 Mar 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ images/app-icons/mac/*.png
/playwright/.cache/
/playwright/.auth/

.env
data-docs/backup
data-docs/log
data-docs/session
data-docs/session_secret.txt
data-docs/document.*
data-docs/document.*
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Feel free to join our official conversations. We would love to hear what feature
* Fast and easy [navigation between notes](https://triliumnext.github.io/Docs/Wiki/note-navigation), full text search and [note hoisting](https://triliumnext.github.io/Docs/Wiki/note-hoisting)
* Seamless [note versioning](https://triliumnext.github.io/Docs/Wiki/note-revisions)
* Note [attributes](https://triliumnext.github.io/Docs/Wiki/attributes) can be used for note organization, querying and advanced [scripting](https://triliumnext.github.io/Docs/Wiki/scripts)
* Direct OpenID and TOTP integration for more secure login
* [Synchronization](https://triliumnext.github.io/Docs/Wiki/synchronization) with self-hosted sync server
* there's a [3rd party service for hosting synchronisation server](https://trilium.cc/paid-hosting)
* [Sharing](https://triliumnext.github.io/Docs/Wiki/sharing) (publishing) notes to public internet
Expand Down
13 changes: 13 additions & 0 deletions db/schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,19 @@ CREATE TABLE IF NOT EXISTS "attachments"
utcDateScheduledForErasureSince TEXT DEFAULT NULL,
isDeleted INT not null,
deleteId TEXT DEFAULT NULL);
CREATE TABLE IF NOT EXISTS "user_data"
(
tmpID INT,
username TEXT,
email TEXT,
userIDEcnryptedDataKey TEXT,
userIDVerificationHash TEXT,
salt TEXT,
derivedKey TEXT,
isSetup TEXT DEFAULT "false",
UNIQUE (tmpID),
PRIMARY KEY (tmpID)
);
CREATE INDEX IDX_attachments_ownerId_role
on attachments (ownerId, role);

Expand Down
7 changes: 7 additions & 0 deletions example.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SSO_ENABLED="false"
BASE_URL="http://localhost:8080"
CLIENT_ID="1234"
SECRET="I-Like-Trilium-Notes"

TOTP_ENABLED="false"
TOTP_SECRET="Trilium-Notes-is-the-best"
Loading
Loading