andras/vault-link
1
0
Fork 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 1

Add comments

Browse source
This commit is contained in:
Andras Schmelczer 2025-03-30 12:24:08 +01:00
parent 86dead5266
commit 23ba0d2c82
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/sync_server/src/server/auth.rs
View file

@ -1,3 +1,5 @@
use log::info;
use crate::{ use crate::{
app_state::{AppState, database::models::VaultId}, app_state::{AppState, database::models::VaultId},
config::user_config::{AllowListedVaults, User, VaultAccess}, config::user_config::{AllowListedVaults, User, VaultAccess},
@ -13,10 +15,16 @@ pub fn auth(app_state: &AppState, token: &str, vault: &VaultId) -> Result<User,
.cloned() .cloned()
.ok_or_else(|| unauthenticated_error(anyhow::anyhow!("Invalid token")))?; .ok_or_else(|| unauthenticated_error(anyhow::anyhow!("Invalid token")))?;
info!("User `{}` authenticated", user.name);
if match user.vault_access { if match user.vault_access {
VaultAccess::AllowAccessToAll => true, VaultAccess::AllowAccessToAll => true,
VaultAccess::AllowList(AllowListedVaults { ref allowed }) => allowed.contains(vault), VaultAccess::AllowList(AllowListedVaults { ref allowed }) => allowed.contains(vault),
} { } {
info!(
"User `{}` is authorised to access to vault `{}`",
user.name, vault
);
Ok(user) Ok(user)
} else { } else {
Err(permission_denied_error(anyhow::anyhow!( Err(permission_denied_error(anyhow::anyhow!(

3
frontend/sync-client/src/sync-operations/syncer.ts
View file

@ -266,6 +266,8 @@ export class Syncer {
wsUri.protocol = wsUri.protocol === "https" ? "wss" : "ws"; wsUri.protocol = wsUri.protocol === "https" ? "wss" : "ws";
wsUri.pathname = `/vaults/${settings.vaultName}/ws`; wsUri.pathname = `/vaults/${settings.vaultName}/ws`;
this.logger.info(`Connecting to WebSocket at ${wsUri.toString()}`);
if ( if (
typeof globalThis !== "undefined" && typeof globalThis !== "undefined" &&
typeof globalThis.WebSocket === "undefined" typeof globalThis.WebSocket === "undefined"
@ -288,6 +290,7 @@ export class Syncer {
// The JS WebSocket API doesn't support setting headers, so we have to send the token as a message // The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
this.applyRemoteChangesWebSocket.onopen = (): void => { this.applyRemoteChangesWebSocket.onopen = (): void => {
this.logger.info("WebSocket connection opened");
this.applyRemoteChangesWebSocket?.send(settings.token); this.applyRemoteChangesWebSocket?.send(settings.token);
this.webSocketStatusChangeListeners.forEach((listener) => { this.webSocketStatusChangeListeners.forEach((listener) => {
listener(); listener();