chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: add minimum client version validation in websocket connection establishment

This commit is contained in:
Bartosz Sypytkowski 2024-08-26 14:14:04 +02:00
parent 952a918895
commit 11bbb70d54
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
services/appflowy-collaborate/src/api.rs
View File

@ -3,9 +3,9 @@ use std::str::FromStr;
use std::time::Duration; use std::time::Duration;
use actix::Addr; use actix::Addr;
use actix_http::header::{HeaderMap, AUTHORIZATION}; use actix_http::header::{AUTHORIZATION, HeaderMap};
use actix_web::{HttpRequest, HttpResponse, Result, Scope, web};
use actix_web::web::{Data, Json, Payload, PayloadConfig}; use actix_web::web::{Data, Json, Payload, PayloadConfig};
use actix_web::{web, HttpRequest, HttpResponse, Result, Scope};
use actix_web_actors::ws; use actix_web_actors::ws;
use anyhow::anyhow; use anyhow::anyhow;
use bytes::{Bytes, BytesMut}; use bytes::{Bytes, BytesMut};
@ -18,8 +18,9 @@ use tokio_stream::StreamExt;
use tracing::{debug, error, event, instrument, trace}; use tracing::{debug, error, event, instrument, trace};
use app_error::AppError; use app_error::AppError;
use collab_rt_entity::user::{AFUserChange, RealtimeUser, UserMessage}; use authentication::jwt::{authorization_from_token, UserUuid};
use collab_rt_entity::{HttpRealtimeMessage, RealtimeMessage}; use collab_rt_entity::{HttpRealtimeMessage, RealtimeMessage};
use collab_rt_entity::user::{AFUserChange, RealtimeUser, UserMessage};
use shared_entity::response::{AppResponse, AppResponseError}; use shared_entity::response::{AppResponse, AppResponseError};
use crate::actix_ws::client::RealtimeClient; use crate::actix_ws::client::RealtimeClient;
@ -28,10 +29,9 @@ use crate::actix_ws::server::RealtimeServerActor;
use crate::collab::access_control::RealtimeCollabAccessControlImpl; use crate::collab::access_control::RealtimeCollabAccessControlImpl;
use crate::collab::storage::CollabAccessControlStorage; use crate::collab::storage::CollabAccessControlStorage;
use crate::compression::{ use crate::compression::{
decompress, CompressionType, X_COMPRESSION_BUFFER_SIZE, X_COMPRESSION_TYPE, CompressionType, decompress, X_COMPRESSION_BUFFER_SIZE, X_COMPRESSION_TYPE,
}; };
use crate::state::AppState; use crate::state::AppState;
use authentication::jwt::{authorization_from_token, UserUuid};
pub fn ws_scope() -> Scope { pub fn ws_scope() -> Scope {
web::scope("/ws").service(web::resource("/v1").route(web::get().to(establish_ws_connection_v1))) web::scope("/ws").service(web::resource("/v1").route(web::get().to(establish_ws_connection_v1)))
@ -76,6 +76,10 @@ pub async fn establish_ws_connection_v1(
}, },
}; };
if client_version < state.config.websocket.min_client_version {
return Err(AppError::Connect("Client version is too low".to_string()).into());
}
start_connect( start_connect(
&request, &request,
payload, payload,

3
services/appflowy-collaborate/src/config.rs
View File

@ -3,6 +3,7 @@ use std::str::FromStr;
use anyhow::Context; use anyhow::Context;
use secrecy::Secret; use secrecy::Secret;
use semver::Version;
use serde::Deserialize; use serde::Deserialize;
use sqlx::postgres::{PgConnectOptions, PgSslMode}; use sqlx::postgres::{PgConnectOptions, PgSslMode};
@ -70,6 +71,7 @@ impl AISettings {
pub struct WebsocketSetting { pub struct WebsocketSetting {
pub heartbeat_interval: u8, pub heartbeat_interval: u8,
pub client_timeout: u8, pub client_timeout: u8,
pub min_client_version: Version,
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@ -140,6 +142,7 @@ pub fn get_configuration() -> Result<Config, anyhow::Error> {
websocket: WebsocketSetting { websocket: WebsocketSetting {
heartbeat_interval: get_env_var("APPFLOWY_WEBSOCKET_HEARTBEAT_INTERVAL", "6").parse()?, heartbeat_interval: get_env_var("APPFLOWY_WEBSOCKET_HEARTBEAT_INTERVAL", "6").parse()?,
client_timeout: get_env_var("APPFLOWY_WEBSOCKET_CLIENT_TIMEOUT", "60").parse()?, client_timeout: get_env_var("APPFLOWY_WEBSOCKET_CLIENT_TIMEOUT", "60").parse()?,
min_client_version: get_env_var("APPFLOWY_WEBSOCKET_CLIENT_MIN_VERSION", "0.5.0").parse()?,
}, },
db_settings: DatabaseSetting { db_settings: DatabaseSetting {
pg_conn_opts: PgConnectOptions::from_str(&get_env_var( pg_conn_opts: PgConnectOptions::from_str(&get_env_var(