Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ serde_with_macros: 3.17.0, "Apache-2.0 OR MIT",
serde_yaml_ng: 0.10.0, "MIT",
serial_test: 3.4.0, "MIT",
serial_test_derive: 3.4.0, "MIT",
server: 0.7.2-edge.1, "Apache-2.0",
server: 0.7.3-edge.1, "Apache-2.0",
sha1: 0.10.6, "Apache-2.0 OR MIT",
sha2: 0.10.9, "Apache-2.0 OR MIT",
sha3: 0.10.8, "Apache-2.0 OR MIT",
Expand Down
2 changes: 1 addition & 1 deletion core/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

[package]
name = "server"
version = "0.7.2-edge.1"
version = "0.7.3-edge.1"
edition = "2024"
license = "Apache-2.0"

Expand Down
6 changes: 4 additions & 2 deletions core/server/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,12 @@ clock_skew = "5 s"
not_before = "0 s"

# Secret key for encoding JWTs.
encoding_secret = "top_secret$iggy123$_jwt_HS256_key#!"
# If left empty, a secure random secret will be generated on each server start.
encoding_secret = ""

# Secret key for decoding JWTs.
decoding_secret = "top_secret$iggy123$_jwt_HS256_key#!"
# If left empty, a secure random secret will be generated on each server start.
decoding_secret = ""

# Indicates if the secret key is base64 encoded.
# `true` means the secret is base64 encoded.
Expand Down
46 changes: 41 additions & 5 deletions core/server/src/http/http_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use crate::shard::task_registry::ShutdownToken;
use crate::shard::tasks::periodic::spawn_jwt_token_cleaner;
use crate::shard::transmission::event::ShardEvent;
use crate::streaming::persistence::persister::PersisterKind;
use crate::streaming::utils::crypto;
use axum::extract::DefaultBodyLimit;
use axum::extract::connect_info::Connected;
use axum::http::Method;
Expand All @@ -45,7 +46,7 @@ use std::path::PathBuf;
use std::rc::Rc;
use std::sync::Arc;
use tower_http::cors::{AllowOrigin, CorsLayer};
use tracing::{error, info};
use tracing::{error, info, warn};

#[derive(Debug, Clone, Copy)]
pub struct CompioSocketAddr(pub SocketAddr);
Expand Down Expand Up @@ -268,12 +269,47 @@ async fn build_app_state(
tokens_path = shard.config.system.get_state_tokens_path();
}

let jwt_manager = JwtManager::from_config(persister, &tokens_path, &config.jwt);
if let Err(e) = jwt_manager {
panic!("Failed to initialize JWT manager: {e}");
let mut jwt_config = config.jwt.clone();
let encoding_empty = jwt_config.encoding_secret.is_empty();
let decoding_empty = jwt_config.decoding_secret.is_empty();
match (encoding_empty, decoding_empty) {
(true, true) => {
let secret = crypto::generate_secret(32..64);
let redacted: String = secret.chars().take(3).collect();
warn!(
"JWT encoding and decoding secrets are not configured - generated a random secret: {redacted}***. JWT tokens will be invalidated on server restart. Set 'encoding_secret' and 'decoding_secret' in the config to use persistent secrets."
);
jwt_config.encoding_secret = secret.clone();
jwt_config.decoding_secret = secret;
}
(true, false) => {
warn!(
"JWT encoding secret is not configured but decoding secret is set - using decoding secret for both. Set 'encoding_secret' in the config to avoid this warning."
);
jwt_config.encoding_secret = jwt_config.decoding_secret.clone();
}
(false, true) => {
warn!(
"JWT decoding secret is not configured but encoding secret is set - using encoding secret for both. Set 'decoding_secret' in the config to avoid this warning."
);
jwt_config.decoding_secret = jwt_config.encoding_secret.clone();
}
(false, false) => {
if jwt_config.encoding_secret != jwt_config.decoding_secret
&& jwt_config.algorithm.starts_with("HS")
{
warn!(
"JWT encoding and decoding secrets are different but algorithm is {} (HMAC) - both secrets must be identical for symmetric algorithms.",
jwt_config.algorithm
);
}
}
}

let jwt_manager = jwt_manager.unwrap();
let jwt_manager = match JwtManager::from_config(persister, &tokens_path, &jwt_config) {
Ok(manager) => manager,
Err(error) => panic!("Failed to initialize JWT manager: {error}"),
};
if jwt_manager.load_revoked_tokens().await.is_err() {
panic!("Failed to load revoked access tokens");
}
Expand Down
Loading