Fix share access to attachments for notes protected by login:password #7828
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| import crypto from "crypto"; | ||
| import SNote from "./snote"; | ||
| import utils from "../../../services/utils"; | ||
|
|
||
| const DefaultAccessTimeoutSec = 10 * 60; // 10 minutes | ||
|
|
||
| export class ContentAccessor { | ||
| note: SNote; | ||
| token: string; | ||
| timestamp: number; | ||
| type: string; | ||
| timeout: number; | ||
| key: Buffer; | ||
|
|
||
| constructor(note: SNote) { | ||
| this.note = note; | ||
| this.key = crypto.randomBytes(32); | ||
| this.token = ""; | ||
| this.timestamp = 0; | ||
| this.timeout = Number(this.note.getAttributeValue("label", "shareAccessTokenTimeout") || DefaultAccessTimeoutSec) | ||
|
|
||
| switch (this.note.getAttributeValue("label", "shareContentAccess")) { | ||
| case "basic": this.type = "basic"; break | ||
| case "query": this.type = "query"; break | ||
| default: this.type = "cookie"; break | ||
| }; | ||
|
|
||
| } | ||
|
|
||
| __encrypt(text: string) { | ||
| const iv = crypto.randomBytes(16); | ||
| const cipher = crypto.createCipheriv('aes-256-cbc', this.key, iv); | ||
| let encrypted = cipher.update(text, 'utf8', 'hex'); | ||
| encrypted += cipher.final('hex'); | ||
| return iv.toString('hex') + encrypted; | ||
| } | ||
|
|
||
| __decrypt(encryptedText: string) { | ||
| try { | ||
| const iv = Buffer.from(encryptedText.slice(0, 32), 'hex'); | ||
| const decipher = crypto.createDecipheriv('aes-256-cbc', this.key, iv); | ||
| let decrypted = decipher.update(encryptedText.slice(32), 'hex', 'utf8'); | ||
| decrypted += decipher.final('utf8'); | ||
| return decrypted; | ||
| } catch { | ||
| return "" | ||
| } | ||
| } | ||
|
|
||
| __compare(originalText: string, encryptedText: string) { | ||
| return originalText === this.__decrypt(encryptedText) | ||
| } | ||
|
|
||
| update() { | ||
| if (new Date().getTime() < this.timestamp + this.getTimeout() * 1000) return | ||
| this.token = utils.randomString(36); | ||
| this.key = crypto.randomBytes(32); | ||
| this.timestamp = new Date().getTime(); | ||
| } | ||
|
|
||
| isTokenValid(encToken: string) { | ||
| return this.__compare(this.token, encToken) && new Date().getTime() < this.timestamp + this.getTimeout() * 1000; | ||
| } | ||
|
|
||
| getToken() { | ||
| return this.__encrypt(this.token); | ||
| } | ||
|
|
||
| getTokenExpiration() { | ||
| return (this.timestamp + (this.timeout * 1000) - new Date().getTime()) /1000; | ||
| } | ||
|
|
||
| getTimeout() { | ||
| return this.timeout; | ||
| } | ||
|
|
||
| getContentAccessType() { | ||
| return this.type; | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's enough to do
pnpm --filter=share-theme buildinstead ofpnpm run server:buildbecause that one takes a lot longer to execute.