mirror of
https://github.com/moghtech/komodo.git
synced 2025-12-05 19:17:36 -06:00
* start 1.18.5 * prevent empty additional permission check (ie for new resources) * dev-2 * bump rust to 1.88 * tweaks * repo based stack commit happens from core repo cache rather than on server to simplify * clippy auto fix * clippy lints periphery * clippy fix komodo_client * dev-3 * emphasize ferret version pinning * bump svi with PR fix * dev-4 * webhook disabled early return * Fix missing alert types for whitelist * add "ScheduleRun" * fix status cache not cleaning on resource delete * dev-5 * forgot to pipe through poll in previous refactor * refetch given in ms * fix configure build extra args * reorder resource sync config * Implement ability to run actions at startup (#664) * Implement ability to run actions at startup * run post-startup actions after server is listening * startup use action query * fmt * Fix Google Login enabled message (#668) - it was showing "Github Login" instead of "Google Login" * Allow CIDR ranges in Allowed IPs (#666) * Allow CIDR ranges in Allowed IPs * Catch mixed IPv4/IPv6 mappings that are probably intended to match * forgiving vec * dev-6 * forgiving vec log. allowed ips docs * server stats UI: move current disk breakdown above charts * searchable container stats, toggle collaple container / disk sections * Add Clear repo cache method * fix execute usage docs * Komodo managed env-file should take precedence in all cases (ie come last in env file list) * tag include unused flag for future use * combine users page search * util backup / restore * refactor backup/restore duplication * cleanup restore * core image include util binary * dev-7 * back to LinesCodec * dev-8 * clean up * clean up logs * rename to komodo-util * dev-9 * enable_fance_toml * dev-10 enable fancy toml * add user agent to oidc requests (#701) Co-authored-by: eleith <online-github@eleith.com> * fmt * use database library * clippy lint * consolidate and standardize cli * dev-11 * dev-12 implement backup using cli * dev-13 logs * command variant fields need to be #[arg] * tweak cli * gen client * fix terminal reconnect issue * rename cli to `km` * tweaks for the cli logs * wait for enter on --yes empty println * fix --yes * dev-15 * bump deps * update croner to latest, use static parser * dev-16 * cli execute polls updates until complete before logging * remove repo cache mount * cli nice * /backup -> /backups * dev-17 config loading preserves CONFIG_PATHS precedence * update dockerfile default docker cli config keywords * dev-18 * support .kmignore * add ignores log * Implement automatic backup pruning, default 14 backups before prune * db copy / restore uses idempotent upsert * cli update variable - "km set var VAR value" * improve cli initial logs * time the executions * implement update for most resources * dev 20 * add update page * dev 21 support cli update link * dev-22 test the deploy * dev-23 use indexmap * install-cli.py * Frontend mobile fixes (#714) * Allow ResourcePageHeader items to wrap * Allow CardHeader items to wrap * Increase z-index of sticky TableHeader, fixes #690 * Remove fixed widths from ActionButton, let them flex more to fit more layouts * Make Section scroll overflow * Remove grid class from Tabs, seems to prevent them from overflowing at small sizes * deploy 1.18.5-dev-24 * auto version increment and deploy * cli: profiles support aliases and merge on top of Default (root) config * fix page set titles * rust 1.89 and improve config logs * skip serializing for proper merge * fix clippy lints re 1.89 * remove layouts overflow-x-scroll * deploy 1.18.5-dev-25 * 1.89 docker images not ready yet * km cfg -a (print all profiles) * include commit variables * skip serializing profiles when empty * skip serialize default db / log configs * km cfg --debug print mode * correct defaults for CLI and only can pass restore folder from cli arg * some more skip serialization * db restore / copy index optional * add runfile command aliases * remove second schedule updating loop, can causes some schedules to be missed * deploy 1.18.5-dev-26 * add log when target db indexing disabled * cli: user password reset, update user super admin * Add manual network interface configuration for multi-NIC Docker environments (#719) * Add iproute2 to debian-debs * feat: Add manual network interface configuration for multi-NIC support Complete implementation of manual interface configuration: - Add internet_interface config option - Implement manual gateway routing - Add NET_ADMIN capability requirement - Clean up codebase changes * fix: Update internet interface handling for multi-NIC support * refactor: Enhance error messages and logging in networking module * refactor: Simplify interface argument handling and improve logging in network configuration and cleanup * refactor(network): simplify startup integration and improve error handling - Move config access and error handling into network::configure_internet_gateway() - Simplify startup.rs to single function call without parameters - Remove redundant check_network_privileges() function - Improve error handling by checking actual command output instead of pre-validation - Better separation of concerns between startup and network modules Addresses feedback from PR discussion: https://github.com/moghtech/komodo/pull/719#discussion_r2261542921 * fix(config): update default internet interface setting Addresses feedback from PR discussion: https://github.com/moghtech/komodo/pull/719#discussion_r2261552279 * fix(config): remove custom default for internet interface in CoreConfig * move mod.rs -> network.rs Addresses feedback from PR discussion: https://github.com/moghtech/komodo/pull/719#discussion_r2261558332 * add internet interface example * docs(build-images): document multi-platform builds with Docker Buildx (#721) * docs(build-images): add multi-platform buildx guide to builders.md * docs(build-images): add multi-platform buildx guide and clarify platform selection in Komodo UI Extra Args field * move to 1.19.0 * core support reading from multiple config files * config support yaml * deploy 1.19.0-dev-1 * deploy 1.19.0-dev-2 * add default komodo cli config * better config merge with base * no need to panic if empty config paths * improve km --help * prog on cli docs * tweak cli docs * tweak doc * split the runfile commands * update docsite deps * km ps initial * km ls * list resource apis * km con inspect * deploy 1.19.0-dev-3 * fix: need serde default * dev-4 fix container parsing issue * tweak * use include-based file finding for much faster discovery * just move to standard config dir .config/komodo/komodo.cli.* * update fe w/ new contianer info minimal serialization * add links to table names * deploy 1.19.0-dev-5 * links in tables * backend for Action arguments * deploy 1.19.0-dev-6 * deploy 1.19.0-dev-7 * deploy 1.19.0-dev-8 * no space at front of KeyValue default args * webhook branch / body optional * The incoming arguments * deploy 1.19.0-dev-9 * con -> cn * add config -> cf alias * .kmignore * .peripheryinclude * outdated * optional links, configurable table format * table_format -> table_borders * get types * include docsite in yarn install * update runnables command in docs * tweak * improve km ls only show important stuff * Add BackupCoreDatabase * deploy 1.19.0-dev-10 * backup command needs "--yes" * deploy 1.19.0-dev-11 * update rustc 1.89.0 * cli tweak * try chef * Fix chef (after dependencies) * try other compile command * fix * fix comment * cleanup stats page * ensure database backup procedure * UI allow configure Backup Core Database in Procedures * procedure description * deploy 1.19.0-dev-12 * deploy 1.19.0-dev-13 * GlobalAutoUpdate * deploy 1.19.0-dev-14 * default tags and global auto update procedure * deploy 1.19.0-dev-15 * trim the default procedure descriptions * deploy 1.19.0-dev-16 * in "system" theme, also poll for updates to the theme based on time. * Add next run to Action / Procedure column * km ls support filter by templates * fix procedure toml serialization when params = {} * deploy 1.19.0-dev-17 * KOMODO_INIT_ADMIN_USERNAME * KOMODO_FIRST_SERVER_NAME * add server.config.external_address for use with links * deploy 1.19.0-dev-18 * improve auto prune * fix system theme auto update * deploy 1.19.0-dev-19 * rename auth/CreateLocalUser -> SignUpLocalUser. Add write/CreateLocalUser for in-ui initialization. * deploy 1.19.0-dev-20 * UI can handle multiple active logins * deploy 1.19.0-dev-21 * fix * add logout function * fix oauth redirect * fix multi user exchange token function * default external address * just Add * style account switcher * backup and restore docs * rework docsite file / sidebar structure, start auto update docs * auto update docs * tweak * fix doc links * only pull / update running stacks / deployments images * deploy 1.19.0-dev-22 * deploy 1.19.0-dev-23 * fix #737 * community docs * add BackupCoreDatabase link to docs * update ferret v2 update guide using komodo-cli * fix data table headers overlapping topbar * don't alert when deploying * CommitSync returns Update * deploy 1.19.0-dev-24 * trim the decoded branch * action uses file contents deserializer * deploy 1.19.0-dev-25 * remove Toml from action args format * clarify External Address purpose * Fix podman compatibility in `get_container_stats` (#739) * Add podman compability for querying stats Podman and docker stats differ in results in significant ways but this filter change they will output the same stats * syntax fix * feat(dashboard): display CPU, memory, and disk usage on server cards (#729) * feat: mini-stats-card: Expose Server CPU , Memory, Disk Usage to Dashboard View * comment: resolved * Feat: fix overflow card , DRY stats-mini, add unreachable mini stats * lint: fix * deploy 1.19.0-dev-26 * 1.19.0 * linux, macos container install * cli main config --------- Co-authored-by: Brian Bradley <brian.bradley.p@gmail.com> Co-authored-by: Daniel <daniel.barabasa@gmail.com> Co-authored-by: eleith <eleith@users.noreply.github.com> Co-authored-by: eleith <online-github@eleith.com> Co-authored-by: Sam Edwards <sam@samedwards.ca> Co-authored-by: Marcel Pfennig <82059270+MP-Tool@users.noreply.github.com> Co-authored-by: itsmesid <693151+arevindh@users.noreply.github.com> Co-authored-by: mbecker20 <max@mogh.tech> Co-authored-by: Rhyn <Rhyn@users.noreply.github.com> Co-authored-by: Anh Nguyen <tuananh131001@gmail.com>
325 lines
9.4 KiB
Rust
325 lines
9.4 KiB
Rust
use std::sync::OnceLock;
|
|
|
|
use anyhow::{Context, anyhow};
|
|
use axum::{
|
|
Router, extract::Query, response::Redirect, routing::get,
|
|
};
|
|
use client::oidc_client;
|
|
use dashmap::DashMap;
|
|
use database::mungos::mongodb::bson::{Document, doc};
|
|
use komodo_client::entities::{
|
|
komodo_timestamp,
|
|
user::{User, UserConfig},
|
|
};
|
|
use openidconnect::{
|
|
AccessTokenHash, AuthorizationCode, CsrfToken,
|
|
EmptyAdditionalClaims, Nonce, OAuth2TokenResponse,
|
|
PkceCodeChallenge, PkceCodeVerifier, Scope, TokenResponse,
|
|
core::{CoreAuthenticationFlow, CoreGenderClaim},
|
|
};
|
|
use reqwest::StatusCode;
|
|
use serde::Deserialize;
|
|
use serror::AddStatusCode;
|
|
|
|
use crate::{
|
|
config::core_config,
|
|
helpers::random_string,
|
|
state::{db_client, jwt_client},
|
|
};
|
|
|
|
use super::RedirectQuery;
|
|
|
|
pub mod client;
|
|
|
|
static APP_USER_AGENT: &str =
|
|
concat!("Komodo/", env!("CARGO_PKG_VERSION"),);
|
|
|
|
fn reqwest_client() -> &'static reqwest::Client {
|
|
static REQWEST: OnceLock<reqwest::Client> = OnceLock::new();
|
|
REQWEST.get_or_init(|| {
|
|
reqwest::Client::builder()
|
|
.redirect(reqwest::redirect::Policy::none())
|
|
.user_agent(APP_USER_AGENT)
|
|
.build()
|
|
.expect("Invalid OIDC reqwest client")
|
|
})
|
|
}
|
|
|
|
/// CSRF tokens can only be used once from the callback,
|
|
/// and must be used within this timeframe
|
|
const CSRF_VALID_FOR_MS: i64 = 120_000; // 2 minutes for user to log in.
|
|
|
|
type RedirectUrl = Option<String>;
|
|
/// Maps the csrf secrets to other information added in the "login" method (before auth provider redirect).
|
|
/// This information is retrieved in the "callback" method (after auth provider redirect).
|
|
type VerifierMap =
|
|
DashMap<String, (PkceCodeVerifier, Nonce, RedirectUrl, i64)>;
|
|
fn verifier_tokens() -> &'static VerifierMap {
|
|
static VERIFIERS: OnceLock<VerifierMap> = OnceLock::new();
|
|
VERIFIERS.get_or_init(Default::default)
|
|
}
|
|
|
|
pub fn router() -> Router {
|
|
Router::new()
|
|
.route(
|
|
"/login",
|
|
get(|query| async {
|
|
login(query).await.status_code(StatusCode::UNAUTHORIZED)
|
|
}),
|
|
)
|
|
.route(
|
|
"/callback",
|
|
get(|query| async {
|
|
callback(query).await.status_code(StatusCode::UNAUTHORIZED)
|
|
}),
|
|
)
|
|
}
|
|
|
|
#[instrument(name = "OidcRedirect", level = "debug")]
|
|
async fn login(
|
|
Query(RedirectQuery { redirect }): Query<RedirectQuery>,
|
|
) -> anyhow::Result<Redirect> {
|
|
let client = oidc_client().load();
|
|
let client =
|
|
client.as_ref().context("OIDC Client not configured")?;
|
|
|
|
let (pkce_challenge, pkce_verifier) =
|
|
PkceCodeChallenge::new_random_sha256();
|
|
|
|
// Generate the authorization URL.
|
|
let (auth_url, csrf_token, nonce) = client
|
|
.authorize_url(
|
|
CoreAuthenticationFlow::AuthorizationCode,
|
|
CsrfToken::new_random,
|
|
Nonce::new_random,
|
|
)
|
|
.set_pkce_challenge(pkce_challenge)
|
|
.add_scope(Scope::new("openid".to_string()))
|
|
.add_scope(Scope::new("profile".to_string()))
|
|
.add_scope(Scope::new("email".to_string()))
|
|
.url();
|
|
|
|
// Data inserted here will be matched on callback side for csrf protection.
|
|
verifier_tokens().insert(
|
|
csrf_token.secret().clone(),
|
|
(
|
|
pkce_verifier,
|
|
nonce,
|
|
redirect,
|
|
komodo_timestamp() + CSRF_VALID_FOR_MS,
|
|
),
|
|
);
|
|
|
|
let config = core_config();
|
|
let redirect = if !config.oidc_redirect_host.is_empty() {
|
|
let auth_url = auth_url.as_str();
|
|
let (protocol, rest) = auth_url
|
|
.split_once("://")
|
|
.context("Invalid URL: Missing protocol (eg 'https://')")?;
|
|
let host = rest
|
|
.split_once(['/', '?'])
|
|
.map(|(host, _)| host)
|
|
.unwrap_or(rest);
|
|
Redirect::to(&auth_url.replace(
|
|
&format!("{protocol}://{host}"),
|
|
&config.oidc_redirect_host,
|
|
))
|
|
} else {
|
|
Redirect::to(auth_url.as_str())
|
|
};
|
|
|
|
Ok(redirect)
|
|
}
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
struct CallbackQuery {
|
|
state: Option<String>,
|
|
code: Option<String>,
|
|
error: Option<String>,
|
|
}
|
|
|
|
#[instrument(name = "OidcCallback", level = "debug")]
|
|
async fn callback(
|
|
Query(query): Query<CallbackQuery>,
|
|
) -> anyhow::Result<Redirect> {
|
|
let client = oidc_client().load();
|
|
let client =
|
|
client.as_ref().context("OIDC Client not initialized successfully. Is the provider properly configured?")?;
|
|
|
|
if let Some(e) = query.error {
|
|
return Err(anyhow!("Provider returned error: {e}"));
|
|
}
|
|
|
|
let code = query.code.context("Provider did not return code")?;
|
|
let state = CsrfToken::new(
|
|
query.state.context("Provider did not return state")?,
|
|
);
|
|
|
|
let (_, (pkce_verifier, nonce, redirect, valid_until)) =
|
|
verifier_tokens()
|
|
.remove(state.secret())
|
|
.context("CSRF token invalid")?;
|
|
|
|
if komodo_timestamp() > valid_until {
|
|
return Err(anyhow!(
|
|
"CSRF token invalid (Timed out). The token must be used within 2 minutes."
|
|
));
|
|
}
|
|
|
|
let reqwest_client = reqwest_client();
|
|
let token_response = client
|
|
.exchange_code(AuthorizationCode::new(code))
|
|
.context("Failed to get Oauth token at exchange code")?
|
|
.set_pkce_verifier(pkce_verifier)
|
|
.request_async(reqwest_client)
|
|
.await
|
|
.context("Failed to get Oauth token")?;
|
|
|
|
// Extract the ID token claims after verifying its authenticity and nonce.
|
|
let id_token = token_response
|
|
.id_token()
|
|
.context("OIDC Server did not return an ID token")?;
|
|
|
|
// Some providers attach additional audiences, they must be added here
|
|
// so token verification succeeds.
|
|
let verifier = client.id_token_verifier();
|
|
let additional_audiences = &core_config().oidc_additional_audiences;
|
|
let verifier = if additional_audiences.is_empty() {
|
|
verifier
|
|
} else {
|
|
verifier.set_other_audience_verifier_fn(|aud| {
|
|
additional_audiences.contains(aud)
|
|
})
|
|
};
|
|
|
|
let claims = id_token
|
|
.claims(&verifier, &nonce)
|
|
.context("Failed to verify token claims. This issue may be temporary (60 seconds max).")?;
|
|
|
|
// Verify the access token hash to ensure that the access token hasn't been substituted for
|
|
// another user's.
|
|
if let Some(expected_access_token_hash) = claims.access_token_hash()
|
|
{
|
|
let actual_access_token_hash = AccessTokenHash::from_token(
|
|
token_response.access_token(),
|
|
id_token.signing_alg()?,
|
|
id_token.signing_key(&verifier)?,
|
|
)?;
|
|
if actual_access_token_hash != *expected_access_token_hash {
|
|
return Err(anyhow!("Invalid access token"));
|
|
}
|
|
}
|
|
|
|
let user_id = claims.subject().as_str();
|
|
|
|
let db_client = db_client();
|
|
let user = db_client
|
|
.users
|
|
.find_one(doc! {
|
|
"config.data.provider": &core_config().oidc_provider,
|
|
"config.data.user_id": user_id
|
|
})
|
|
.await
|
|
.context("failed at find user query from database")?;
|
|
|
|
let jwt = match user {
|
|
Some(user) => jwt_client()
|
|
.encode(user.id)
|
|
.context("failed to generate jwt")?,
|
|
None => {
|
|
let ts = komodo_timestamp();
|
|
let no_users_exist =
|
|
db_client.users.find_one(Document::new()).await?.is_none();
|
|
let core_config = core_config();
|
|
if !no_users_exist && core_config.disable_user_registration {
|
|
return Err(anyhow!("User registration is disabled"));
|
|
}
|
|
|
|
// Fetch user info
|
|
let user_info = client
|
|
.user_info(
|
|
token_response.access_token().clone(),
|
|
claims.subject().clone().into(),
|
|
)
|
|
.context("Invalid user info request")?
|
|
.request_async::<EmptyAdditionalClaims, _, CoreGenderClaim>(
|
|
reqwest_client,
|
|
)
|
|
.await
|
|
.context("Failed to fetch user info for new user")?;
|
|
|
|
// Will use preferred_username, then email, then user_id if it isn't available.
|
|
let mut username = user_info
|
|
.preferred_username()
|
|
.map(|username| username.to_string())
|
|
.unwrap_or_else(|| {
|
|
let email = user_info
|
|
.email()
|
|
.map(|email| email.as_str())
|
|
.unwrap_or(user_id);
|
|
if core_config.oidc_use_full_email {
|
|
email
|
|
} else {
|
|
email
|
|
.split_once('@')
|
|
.map(|(username, _)| username)
|
|
.unwrap_or(email)
|
|
}
|
|
.to_string()
|
|
});
|
|
|
|
// Modify username if it already exists
|
|
if db_client
|
|
.users
|
|
.find_one(doc! { "username": &username })
|
|
.await
|
|
.context("Failed to query users collection")?
|
|
.is_some()
|
|
{
|
|
username += "-";
|
|
username += &random_string(5);
|
|
};
|
|
|
|
let user = User {
|
|
id: Default::default(),
|
|
username,
|
|
enabled: no_users_exist || core_config.enable_new_users,
|
|
admin: no_users_exist,
|
|
super_admin: no_users_exist,
|
|
create_server_permissions: no_users_exist,
|
|
create_build_permissions: no_users_exist,
|
|
updated_at: ts,
|
|
last_update_view: 0,
|
|
recents: Default::default(),
|
|
all: Default::default(),
|
|
config: UserConfig::Oidc {
|
|
provider: core_config.oidc_provider.clone(),
|
|
user_id: user_id.to_string(),
|
|
},
|
|
};
|
|
|
|
let user_id = db_client
|
|
.users
|
|
.insert_one(user)
|
|
.await
|
|
.context("failed to create user on database")?
|
|
.inserted_id
|
|
.as_object_id()
|
|
.context("inserted_id is not ObjectId")?
|
|
.to_string();
|
|
|
|
jwt_client()
|
|
.encode(user_id)
|
|
.context("failed to generate jwt")?
|
|
}
|
|
};
|
|
let exchange_token = jwt_client().create_exchange_token(jwt).await;
|
|
let redirect_url = if let Some(redirect) = redirect {
|
|
let splitter = if redirect.contains('?') { '&' } else { '?' };
|
|
format!("{redirect}{splitter}token={exchange_token}")
|
|
} else {
|
|
format!("{}?token={exchange_token}", core_config().host)
|
|
};
|
|
Ok(Redirect::to(&redirect_url))
|
|
}
|