mirror of
https://github.com/streetwriters/notesnook-sync-server.git
synced 2026-10-04 19:46:50 +02:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8b610e0952 | ||
|
|
0a3ee07b95 |
No files matched your search
@@ -127,6 +127,24 @@ namespace Notesnook.API.Controllers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[HttpGet("verifier")]
|
||||||
|
public async Task<IActionResult> GetEncryptionVerifier()
|
||||||
|
{
|
||||||
|
var userId = User.GetUserId();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var response = await UserService.GetEncryptionVerifier(userId);
|
||||||
|
if (response == null) return NotFound();
|
||||||
|
return Ok(response);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Failed to get encryption verifier for user id: {UserId}", userId);
|
||||||
|
return BadRequest(new { error = ex.Message });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[HttpPost("reset")]
|
[HttpPost("reset")]
|
||||||
public async Task<IActionResult> Reset([FromForm] bool removeAttachments)
|
public async Task<IActionResult> Reset([FromForm] bool removeAttachments)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ namespace Notesnook.API.Interfaces
|
|||||||
Task DeleteUserAsync(string userId, string? jti, string password);
|
Task DeleteUserAsync(string userId, string? jti, string password);
|
||||||
Task<bool> ResetUserAsync(string userId, bool removeAttachments);
|
Task<bool> ResetUserAsync(string userId, bool removeAttachments);
|
||||||
Task<UserResponse> GetUserAsync(string userId);
|
Task<UserResponse> GetUserAsync(string userId);
|
||||||
|
Task<EncryptedData?> GetEncryptionVerifier(string userId);
|
||||||
Task SetUserKeysAsync(string userId, UserKeys keys);
|
Task SetUserKeysAsync(string userId, UserKeys keys);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -36,6 +36,7 @@ using Streetwriters.Common;
|
|||||||
using Streetwriters.Data.DbContexts;
|
using Streetwriters.Data.DbContexts;
|
||||||
using Streetwriters.Data.Interfaces;
|
using Streetwriters.Data.Interfaces;
|
||||||
using Streetwriters.Data.Repositories;
|
using Streetwriters.Data.Repositories;
|
||||||
|
using AspNetCore.Identity.Mongo.Mongo;
|
||||||
|
|
||||||
namespace Notesnook.API.Repositories
|
namespace Notesnook.API.Repositories
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ using Notesnook.API.Helpers;
|
|||||||
using Notesnook.API.Interfaces;
|
using Notesnook.API.Interfaces;
|
||||||
using Notesnook.API.Models;
|
using Notesnook.API.Models;
|
||||||
using Notesnook.API.Models.Responses;
|
using Notesnook.API.Models.Responses;
|
||||||
|
using Notesnook.API.Repositories;
|
||||||
using Streetwriters.Common;
|
using Streetwriters.Common;
|
||||||
using Streetwriters.Common.Accessors;
|
using Streetwriters.Common.Accessors;
|
||||||
using Streetwriters.Common.Enums;
|
using Streetwriters.Common.Enums;
|
||||||
@@ -192,6 +193,26 @@ namespace Notesnook.API.Services
|
|||||||
await Repositories.UsersSettings.UpdateAsync(userSettings.Id, userSettings);
|
await Repositories.UsersSettings.UpdateAsync(userSettings.Id, userSettings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<EncryptedData?> GetEncryptionVerifier(string userId)
|
||||||
|
{
|
||||||
|
SyncItemsRepository[] repositories = [Repositories.Notes, Repositories.Notebooks, Repositories.Shortcuts, Repositories.Contents, Repositories.Settings, Repositories.LegacySettings, Repositories.Attachments, Repositories.Reminders, Repositories.Relations, Repositories.Colors, Repositories.Tags, Repositories.Vaults, Repositories.InboxItemsHistory];
|
||||||
|
foreach (var repo in repositories)
|
||||||
|
{
|
||||||
|
var item = await repo.FindOneAsync((s) => s.UserId == userId && (s.KeyVersion == null || s.KeyVersion == 0));
|
||||||
|
if (item != null)
|
||||||
|
{
|
||||||
|
return new EncryptedData
|
||||||
|
{
|
||||||
|
Cipher = item.Cipher,
|
||||||
|
IV = item.IV,
|
||||||
|
Salt = "",
|
||||||
|
Length = item.Length
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
public async Task DeleteUserAsync(string userId)
|
public async Task DeleteUserAsync(string userId)
|
||||||
{
|
{
|
||||||
logger.LogInformation("Deleting user {UserId}", userId);
|
logger.LogInformation("Deleting user {UserId}", userId);
|
||||||
|
|||||||
+11
-3
@@ -279,8 +279,8 @@ function serveYouTubeEmbed(url: string) {
|
|||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<iframe src="${transformYouTubeUrl(
|
<iframe src="${escapeHtmlAttr(
|
||||||
url,
|
transformYouTubeUrl(url),
|
||||||
)}" allow="accelerometer;autoplay;clipboard-write;encrypted-media;gyroscope;picture-in-picture;web-share" allowfullscreen referrerpolicy="strict-origin-when-cross-origin" title="Video player"></iframe>
|
)}" allow="accelerometer;autoplay;clipboard-write;encrypted-media;gyroscope;picture-in-picture;web-share" allowfullscreen referrerpolicy="strict-origin-when-cross-origin" title="Video player"></iframe>
|
||||||
</body>
|
</body>
|
||||||
</html>`;
|
</html>`;
|
||||||
@@ -299,6 +299,14 @@ function isYouTubeEmbed(urlString: string) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function escapeHtmlAttr(str: string): string {
|
||||||
|
return str
|
||||||
|
.replace(/&/g, "&")
|
||||||
|
.replace(/"/g, """)
|
||||||
|
.replace(/</g, "<")
|
||||||
|
.replace(/>/g, ">");
|
||||||
|
}
|
||||||
|
|
||||||
// Transform YouTube URLs to use youtube-nocookie.com for enhanced privacy
|
// Transform YouTube URLs to use youtube-nocookie.com for enhanced privacy
|
||||||
function transformYouTubeUrl(urlString: string): string {
|
function transformYouTubeUrl(urlString: string): string {
|
||||||
try {
|
try {
|
||||||
@@ -315,7 +323,7 @@ function transformYouTubeUrl(urlString: string): string {
|
|||||||
return url.toString();
|
return url.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
return urlString;
|
return url.toString();
|
||||||
} catch {
|
} catch {
|
||||||
return urlString;
|
return urlString;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user