GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests Projects Releases 323 Packages Wiki Activity Actions
botserver/src/core/oauth/routes.rs

560 lines
16 KiB
Rust
Raw Normal View History

feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
use crate::shared::state::AppState;
use axum::{
extract::{Path, Query, State},
http::{header, StatusCode},
response::{Html, IntoResponse, Redirect, Response},
routing::get,
Json, Router,
};
use log::{debug, error, info, warn};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::sync::Arc;
use uuid::Uuid;
use super::{
providers::{get_enabled_providers, load_oauth_config},
OAuthProvider, OAuthState, OAuthUserInfo,
};
#[derive(Debug, Deserialize)]
pub struct OAuthStartParams {
pub redirect: Option<String>,
}
#[derive(Debug, Deserialize)]
pub struct OAuthCallbackParams {
pub code: Option<String>,
Remove all code comments and fix ratatui version
2025-12-23 18:40:58 -03:00
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
pub state: Option<String>,
Remove all code comments and fix ratatui version
2025-12-23 18:40:58 -03:00
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
pub error: Option<String>,
Remove all code comments and fix ratatui version
2025-12-23 18:40:58 -03:00
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
pub error_description: Option<String>,
}
#[derive(Debug, Serialize)]
pub struct EnabledProvidersResponse {
pub providers: Vec<ProviderInfo>,
}
#[derive(Debug, Serialize)]
pub struct ProviderInfo {
pub id: String,
pub name: String,
pub icon: String,
pub login_url: String,
}
pub fn configure() -> Router<Arc<AppState>> {
Router::new()
.route("/auth/oauth/providers", get(list_providers))
feat(auth): Add OTP password display on bootstrap and fix Zitadel login flow - Add generate_secure_password() for OTP generation during admin bootstrap - Display admin credentials (username/password) in console on first run - Save credentials to ~/.gb-setup-credentials file - Fix Zitadel client to support PAT token authentication - Replace OAuth2 password grant with Zitadel Session API for login - Fix get_current_user to fetch user data from Zitadel session - Return session_id as access_token for proper authentication - Set email as verified on user creation to skip verification - Add password grant type to OAuth application config - Update directory_setup to include proper redirect URIs
2026-01-06 22:56:35 -03:00
.route("/auth/oauth/:provider", get(start_oauth))
.route("/auth/oauth/:provider/callback", get(oauth_callback))
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
}
async fn list_providers(State(state): State<Arc<AppState>>) -> impl IntoResponse {
let bot_config = get_bot_config(&state).await;
let base_url = get_base_url(&state);
let enabled = get_enabled_providers(&bot_config, &base_url);
let providers: Vec<ProviderInfo> = enabled
.iter()
.map(|config| ProviderInfo {
id: config.provider.to_string().to_lowercase(),
name: config.provider.display_name().to_string(),
icon: config.provider.icon().to_string(),
login_url: format!("/auth/oauth/{}", config.provider.to_string().to_lowercase()),
})
.collect();
Json(EnabledProvidersResponse { providers })
}
async fn start_oauth(
State(state): State<Arc<AppState>>,
Path(provider_name): Path<String>,
Query(params): Query<OAuthStartParams>,
) -> Response {
feat(autotask): Implement AutoTask system with intent classification and app generation - Add IntentClassifier with 7 intent types (APP_CREATE, TODO, MONITOR, ACTION, SCHEDULE, GOAL, TOOL) - Add AppGenerator with LLM-powered app structure analysis - Add DesignerAI for modifying apps through conversation - Add app_server for serving generated apps with clean URLs - Add db_api for CRUD operations on bot database tables - Add ask_later keyword for pending info collection - Add migration 6.1.1 with tables: pending_info, auto_tasks, execution_plans, task_approvals, task_decisions, safety_audit_log, generated_apps, intent_classifications, designer_changes - Write apps to S3 drive and sync to SITE_ROOT for serving - Clean URL structure: /apps/{app_name}/ - Integrate with DriveMonitor for file sync Based on Chapter 17 - Autonomous Tasks specification
2025-12-27 21:10:09 -03:00
let Some(provider) = OAuthProvider::parse(&provider_name) else {
Fix clippy warnings: match arms, async/await, Debug impls, formatting - Fix match arms with identical bodies by consolidating patterns - Fix case-insensitive file extension comparisons using eq_ignore_ascii_case - Fix unnecessary Debug formatting in log/format macros - Fix clone_from usage instead of clone assignment - Fix let...else patterns where appropriate - Fix format! append to String using write! macro - Fix unwrap_or with function calls to use unwrap_or_else - Add missing fields to manual Debug implementations - Fix duplicate code in if blocks - Add type aliases for complex types - Rename struct fields to avoid common prefixes - Various other clippy warning fixes Note: Some 'unused async' warnings remain for functions that are called with .await but don't contain await internally - these are kept async for API compatibility.
2025-12-26 08:59:25 -03:00
return (
StatusCode::BAD_REQUEST,
Html(format!(
r#"<!DOCTYPE html>
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
<html>
<head><title>Error</title></head>
<body>
<h1>Invalid OAuth Provider</h1>
<p>Provider '{}' is not supported.</p>
<p>Supported providers: Google, Discord, Reddit, Twitter, Microsoft, Facebook</p>
<a href="/auth/login">Back to Login</a>
</body>
</html>"#,
Fix clippy warnings: match arms, async/await, Debug impls, formatting - Fix match arms with identical bodies by consolidating patterns - Fix case-insensitive file extension comparisons using eq_ignore_ascii_case - Fix unnecessary Debug formatting in log/format macros - Fix clone_from usage instead of clone assignment - Fix let...else patterns where appropriate - Fix format! append to String using write! macro - Fix unwrap_or with function calls to use unwrap_or_else - Add missing fields to manual Debug implementations - Fix duplicate code in if blocks - Add type aliases for complex types - Rename struct fields to avoid common prefixes - Various other clippy warning fixes Note: Some 'unused async' warnings remain for functions that are called with .await but don't contain await internally - these are kept async for API compatibility.
2025-12-26 08:59:25 -03:00
provider_name
)),
)
.into_response();
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
};
let bot_config = get_bot_config(&state).await;
let base_url = get_base_url(&state);
let config = match load_oauth_config(provider, &bot_config, &base_url) {
Some(c) if c.is_valid() => c,
_ => {
warn!("OAuth provider {} is not configured or enabled", provider);
return (
StatusCode::SERVICE_UNAVAILABLE,
Html(format!(
r#"<!DOCTYPE html>
<html>
<head><title>Error</title></head>
<body>
<h1>OAuth Provider Not Configured</h1>
<p>Login with {} is not currently enabled.</p>
<p>Please contact your administrator to configure OAuth credentials.</p>
<a href="/auth/login">Back to Login</a>
</body>
</html>"#,
provider.display_name()
)),
)
.into_response();
}
};
let oauth_state = OAuthState::new(provider, params.redirect);
let state_encoded = oauth_state.encode();
debug!("OAuth state created for provider {}", provider);
let auth_url = provider.build_auth_url(&config, &state_encoded);
info!(
"Starting OAuth flow for {} - redirecting to provider",
provider
);
Redirect::temporary(&auth_url).into_response()
}
async fn oauth_callback(
State(state): State<Arc<AppState>>,
Path(provider_name): Path<String>,
Query(params): Query<OAuthCallbackParams>,
) -> Response {
if let Some(error) = &params.error {
let description = params
.error_description
.as_deref()
.unwrap_or("Unknown error");
warn!("OAuth error from provider: {} - {}", error, description);
return (
StatusCode::UNAUTHORIZED,
Html(format!(
r#"<!DOCTYPE html>
<html>
<head><title>Login Failed</title></head>
<body>
<h1>Login Failed</h1>
<p>The OAuth provider returned an error: {}</p>
<p>{}</p>
<a href="/auth/login">Try Again</a>
</body>
</html>"#,
error, description
)),
)
.into_response();
}
Fix clippy warnings: match arms, async/await, Debug impls, formatting - Fix match arms with identical bodies by consolidating patterns - Fix case-insensitive file extension comparisons using eq_ignore_ascii_case - Fix unnecessary Debug formatting in log/format macros - Fix clone_from usage instead of clone assignment - Fix let...else patterns where appropriate - Fix format! append to String using write! macro - Fix unwrap_or with function calls to use unwrap_or_else - Add missing fields to manual Debug implementations - Fix duplicate code in if blocks - Add type aliases for complex types - Rename struct fields to avoid common prefixes - Various other clippy warning fixes Note: Some 'unused async' warnings remain for functions that are called with .await but don't contain await internally - these are kept async for API compatibility.
2025-12-26 08:59:25 -03:00
let Some(code) = &params.code else {
return (
StatusCode::BAD_REQUEST,
Html(
r#"<!DOCTYPE html>
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
<html>
<head><title>Error</title></head>
<body>
<h1>Missing Authorization Code</h1>
<p>The OAuth callback did not include an authorization code.</p>
<a href="/auth/login">Try Again</a>
</body>
</html>"#
Fix clippy warnings: match arms, async/await, Debug impls, formatting - Fix match arms with identical bodies by consolidating patterns - Fix case-insensitive file extension comparisons using eq_ignore_ascii_case - Fix unnecessary Debug formatting in log/format macros - Fix clone_from usage instead of clone assignment - Fix let...else patterns where appropriate - Fix format! append to String using write! macro - Fix unwrap_or with function calls to use unwrap_or_else - Add missing fields to manual Debug implementations - Fix duplicate code in if blocks - Add type aliases for complex types - Rename struct fields to avoid common prefixes - Various other clippy warning fixes Note: Some 'unused async' warnings remain for functions that are called with .await but don't contain await internally - these are kept async for API compatibility.
2025-12-26 08:59:25 -03:00
.to_string(),
),
)
.into_response();
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
};
Fix clippy warnings: match arms, async/await, Debug impls, formatting - Fix match arms with identical bodies by consolidating patterns - Fix case-insensitive file extension comparisons using eq_ignore_ascii_case - Fix unnecessary Debug formatting in log/format macros - Fix clone_from usage instead of clone assignment - Fix let...else patterns where appropriate - Fix format! append to String using write! macro - Fix unwrap_or with function calls to use unwrap_or_else - Add missing fields to manual Debug implementations - Fix duplicate code in if blocks - Add type aliases for complex types - Rename struct fields to avoid common prefixes - Various other clippy warning fixes Note: Some 'unused async' warnings remain for functions that are called with .await but don't contain await internally - these are kept async for API compatibility.
2025-12-26 08:59:25 -03:00
let Some(state_param) = &params.state else {
return (
StatusCode::BAD_REQUEST,
Html(
r#"<!DOCTYPE html>
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
<html>
<head><title>Error</title></head>
<body>
<h1>Missing State Parameter</h1>
<p>The OAuth callback did not include a state parameter.</p>
<a href="/auth/login">Try Again</a>
</body>
</html>"#
Fix clippy warnings: match arms, async/await, Debug impls, formatting - Fix match arms with identical bodies by consolidating patterns - Fix case-insensitive file extension comparisons using eq_ignore_ascii_case - Fix unnecessary Debug formatting in log/format macros - Fix clone_from usage instead of clone assignment - Fix let...else patterns where appropriate - Fix format! append to String using write! macro - Fix unwrap_or with function calls to use unwrap_or_else - Add missing fields to manual Debug implementations - Fix duplicate code in if blocks - Add type aliases for complex types - Rename struct fields to avoid common prefixes - Various other clippy warning fixes Note: Some 'unused async' warnings remain for functions that are called with .await but don't contain await internally - these are kept async for API compatibility.
2025-12-26 08:59:25 -03:00
.to_string(),
),
)
.into_response();
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
};
Fix clippy warnings: match arms, async/await, Debug impls, formatting - Fix match arms with identical bodies by consolidating patterns - Fix case-insensitive file extension comparisons using eq_ignore_ascii_case - Fix unnecessary Debug formatting in log/format macros - Fix clone_from usage instead of clone assignment - Fix let...else patterns where appropriate - Fix format! append to String using write! macro - Fix unwrap_or with function calls to use unwrap_or_else - Add missing fields to manual Debug implementations - Fix duplicate code in if blocks - Add type aliases for complex types - Rename struct fields to avoid common prefixes - Various other clippy warning fixes Note: Some 'unused async' warnings remain for functions that are called with .await but don't contain await internally - these are kept async for API compatibility.
2025-12-26 08:59:25 -03:00
let Some(oauth_state) = OAuthState::decode(state_param) else {
warn!("Failed to decode OAuth state parameter");
return (
StatusCode::BAD_REQUEST,
Html(
r#"<!DOCTYPE html>
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
<html>
<head><title>Error</title></head>
<body>
<h1>Invalid State</h1>
<p>The OAuth state parameter could not be validated.</p>
<a href="/auth/login">Try Again</a>
</body>
</html>"#
Fix clippy warnings: match arms, async/await, Debug impls, formatting - Fix match arms with identical bodies by consolidating patterns - Fix case-insensitive file extension comparisons using eq_ignore_ascii_case - Fix unnecessary Debug formatting in log/format macros - Fix clone_from usage instead of clone assignment - Fix let...else patterns where appropriate - Fix format! append to String using write! macro - Fix unwrap_or with function calls to use unwrap_or_else - Add missing fields to manual Debug implementations - Fix duplicate code in if blocks - Add type aliases for complex types - Rename struct fields to avoid common prefixes - Various other clippy warning fixes Note: Some 'unused async' warnings remain for functions that are called with .await but don't contain await internally - these are kept async for API compatibility.
2025-12-26 08:59:25 -03:00
.to_string(),
),
)
.into_response();
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
};
if oauth_state.is_expired() {
warn!("OAuth state expired");
return (
StatusCode::BAD_REQUEST,
Html(
r#"<!DOCTYPE html>
<html>
<head><title>Session Expired</title></head>
<body>
<h1>Session Expired</h1>
<p>The login session has expired. Please try again.</p>
<a href="/auth/login">Try Again</a>
</body>
</html>"#
.to_string(),
),
)
.into_response();
}
feat(autotask): Implement AutoTask system with intent classification and app generation - Add IntentClassifier with 7 intent types (APP_CREATE, TODO, MONITOR, ACTION, SCHEDULE, GOAL, TOOL) - Add AppGenerator with LLM-powered app structure analysis - Add DesignerAI for modifying apps through conversation - Add app_server for serving generated apps with clean URLs - Add db_api for CRUD operations on bot database tables - Add ask_later keyword for pending info collection - Add migration 6.1.1 with tables: pending_info, auto_tasks, execution_plans, task_approvals, task_decisions, safety_audit_log, generated_apps, intent_classifications, designer_changes - Write apps to S3 drive and sync to SITE_ROOT for serving - Clean URL structure: /apps/{app_name}/ - Integrate with DriveMonitor for file sync Based on Chapter 17 - Autonomous Tasks specification
2025-12-27 21:10:09 -03:00
let Some(provider) = OAuthProvider::parse(&provider_name) else {
Fix clippy warnings: match arms, async/await, Debug impls, formatting - Fix match arms with identical bodies by consolidating patterns - Fix case-insensitive file extension comparisons using eq_ignore_ascii_case - Fix unnecessary Debug formatting in log/format macros - Fix clone_from usage instead of clone assignment - Fix let...else patterns where appropriate - Fix format! append to String using write! macro - Fix unwrap_or with function calls to use unwrap_or_else - Add missing fields to manual Debug implementations - Fix duplicate code in if blocks - Add type aliases for complex types - Rename struct fields to avoid common prefixes - Various other clippy warning fixes Note: Some 'unused async' warnings remain for functions that are called with .await but don't contain await internally - these are kept async for API compatibility.
2025-12-26 08:59:25 -03:00
return (
StatusCode::BAD_REQUEST,
Html("Invalid provider".to_string()),
)
.into_response();
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
};
if provider != oauth_state.provider {
warn!(
"Provider mismatch: URL says {}, state says {}",
provider, oauth_state.provider
);
return (
StatusCode::BAD_REQUEST,
Html(
r#"<!DOCTYPE html>
<html>
<head><title>Error</title></head>
<body>
<h1>Provider Mismatch</h1>
<p>The OAuth callback doesn't match the expected provider.</p>
<a href="/auth/login">Try Again</a>
</body>
</html>"#
.to_string(),
),
)
.into_response();
}
let bot_config = get_bot_config(&state).await;
let base_url = get_base_url(&state);
Fix clippy warnings: match arms, async/await, Debug impls, formatting - Fix match arms with identical bodies by consolidating patterns - Fix case-insensitive file extension comparisons using eq_ignore_ascii_case - Fix unnecessary Debug formatting in log/format macros - Fix clone_from usage instead of clone assignment - Fix let...else patterns where appropriate - Fix format! append to String using write! macro - Fix unwrap_or with function calls to use unwrap_or_else - Add missing fields to manual Debug implementations - Fix duplicate code in if blocks - Add type aliases for complex types - Rename struct fields to avoid common prefixes - Various other clippy warning fixes Note: Some 'unused async' warnings remain for functions that are called with .await but don't contain await internally - these are kept async for API compatibility.
2025-12-26 08:59:25 -03:00
let Some(config) = load_oauth_config(provider, &bot_config, &base_url) else {
return (
StatusCode::SERVICE_UNAVAILABLE,
Html("OAuth provider not configured".to_string()),
)
.into_response();
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
};
let http_client = reqwest::Client::new();
let token = match provider.exchange_code(&config, code, &http_client).await {
Ok(t) => t,
Err(e) => {
error!("Failed to exchange OAuth code: {}", e);
return (
StatusCode::INTERNAL_SERVER_ERROR,
Html(format!(
r#"<!DOCTYPE html>
<html>
<head><title>Login Failed</title></head>
<body>
<h1>Login Failed</h1>
<p>Failed to complete the OAuth login: {}</p>
<a href="/auth/login">Try Again</a>
</body>
</html>"#,
e
)),
)
.into_response();
}
};
let user_info = match provider
.fetch_user_info(&token.access_token, &http_client)
.await
{
Ok(info) => info,
Err(e) => {
error!("Failed to fetch user info: {}", e);
return (
StatusCode::INTERNAL_SERVER_ERROR,
Html(format!(
r#"<!DOCTYPE html>
<html>
<head><title>Login Failed</title></head>
<body>
<h1>Login Failed</h1>
<p>Failed to retrieve user information: {}</p>
<a href="/auth/login">Try Again</a>
</body>
</html>"#,
e
)),
)
.into_response();
}
};
info!(
"OAuth login successful for {} user: {} ({})",
provider,
user_info.name.as_deref().unwrap_or("unknown"),
user_info.email.as_deref().unwrap_or("no email")
);
let user_id = match create_or_get_oauth_user(&state, &user_info).await {
Ok(id) => id,
Err(e) => {
error!("Failed to create/get user: {}", e);
return (
StatusCode::INTERNAL_SERVER_ERROR,
Html("Failed to create user account".to_string()),
)
.into_response();
}
};
let session_token = match create_user_session(&state, user_id).await {
Ok(token) => token,
Err(e) => {
error!("Failed to create session: {}", e);
return (
StatusCode::INTERNAL_SERVER_ERROR,
Html("Failed to create session".to_string()),
)
.into_response();
}
};
let redirect_url = oauth_state
.redirect_after
.unwrap_or_else(|| "/".to_string());
debug!(
"OAuth complete, redirecting to {} with session {}",
redirect_url, session_token
);
Response::builder()
.status(StatusCode::SEE_OTHER)
Security audit: Remove all production .unwrap()/.expect(), add SafeCommand, ErrorSanitizer - Phase 1 Critical: All 115 .unwrap() verified in test code only - Phase 1 Critical: All runtime .expect() converted to proper error handling - Phase 2 H1: Antivirus commands now use SafeCommand (added which/where to whitelist) - Phase 2 H2: db_api.rs error responses use log_and_sanitize() - Phase 2 H5: Removed duplicate sanitize_identifier (re-exports from sql_guard) 32 files modified for security hardening. Moon deployment criteria: 10/10 met
2025-12-28 21:26:08 -03:00
.header(header::LOCATION, redirect_url.clone())
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
.header(
header::SET_COOKIE,
format!(
"session={}; Path=/; HttpOnly; SameSite=Lax; Max-Age=86400",
session_token
),
)
.body(axum::body::Body::empty())
Security audit: Remove all production .unwrap()/.expect(), add SafeCommand, ErrorSanitizer - Phase 1 Critical: All 115 .unwrap() verified in test code only - Phase 1 Critical: All runtime .expect() converted to proper error handling - Phase 2 H1: Antivirus commands now use SafeCommand (added which/where to whitelist) - Phase 2 H2: db_api.rs error responses use log_and_sanitize() - Phase 2 H5: Removed duplicate sanitize_identifier (re-exports from sql_guard) 32 files modified for security hardening. Moon deployment criteria: 10/10 met
2025-12-28 21:26:08 -03:00
.unwrap_or_else(|e| {
log::error!("Failed to build OAuth redirect response: {}", e);
Response::builder()
.status(StatusCode::INTERNAL_SERVER_ERROR)
.body(axum::body::Body::empty())
.unwrap_or_default()
})
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
}
async fn get_bot_config(state: &AppState) -> HashMap<String, String> {
let conn = state.conn.clone();
match tokio::task::spawn_blocking(move || {
let mut db_conn = conn.get().ok()?;
use diesel::prelude::*;
let bot_result: Option<Uuid> = {
use crate::shared::models::schema::bots::dsl as bots_dsl;
bots_dsl::bots
.filter(bots_dsl::is_active.eq(true))
.select(bots_dsl::id)
.first(&mut db_conn)
.optional()
.ok()?
};
let active_bot_id = bot_result?;
let configs: Vec<(String, String)> = {
use crate::shared::models::schema::bot_configuration::dsl as cfg_dsl;
cfg_dsl::bot_configuration
.filter(cfg_dsl::bot_id.eq(active_bot_id))
.select((cfg_dsl::config_key, cfg_dsl::config_value))
.load(&mut db_conn)
.ok()?
};
Some(configs.into_iter().collect::<HashMap<_, _>>())
})
.await
{
Ok(Some(config)) => config,
_ => HashMap::new(),
}
}
fn get_base_url(state: &AppState) -> String {
let _ = state;
Move Directory (Zitadel) to port 8300 - Directory/Zitadel: 8080 -> 8300 - BotServer API remains on 8080 - Updated all references in bootstrap, installer, oauth, config
2025-12-11 08:43:28 -03:00
"http://localhost:8300".to_string()
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
}
async fn create_or_get_oauth_user(
state: &AppState,
user_info: &OAuthUserInfo,
) -> anyhow::Result<Uuid> {
let conn = state.conn.clone();
let provider_id = user_info.provider_id.clone();
let provider = user_info.provider.to_string().to_lowercase();
let user_email = user_info.email.clone();
let display_name = user_info
.name
.clone()
.unwrap_or_else(|| "OAuth User".to_string());
tokio::task::spawn_blocking(move || {
let mut db_conn = conn
.get()
.map_err(|e| anyhow::anyhow!("DB connection error: {}", e))?;
use crate::shared::models::schema::users::dsl::*;
use diesel::prelude::*;
let existing_user: Option<Uuid> = if let Some(ref email_addr) = user_email {
users
.filter(email.eq(email_addr))
.select(id)
.first(&mut db_conn)
.optional()
.map_err(|e| anyhow::anyhow!("DB error: {}", e))?
} else {
let oauth_username = format!("{}_{}", provider, provider_id);
users
.filter(username.eq(&oauth_username))
.select(id)
.first(&mut db_conn)
.optional()
.map_err(|e| anyhow::anyhow!("DB error: {}", e))?
};
if let Some(user_id) = existing_user {
return Ok(user_id);
}
let new_user_id = Uuid::new_v4();
Remove all code comments and fix ratatui version
2025-12-23 18:40:58 -03:00
feat(auth): Add OAuth login for Google, Discord, Reddit, Twitter, Microsoft, Facebook - Create core/oauth module with OAuthProvider enum and shared types - Implement providers.rs with auth URLs, token exchange, user info endpoints - Add routes for /auth/oauth/providers, /auth/oauth/{provider}, and callbacks - Update login.html with OAuth button grid and dynamic provider loading - Add OAuth config settings to config.csv with setup documentation and links - Uses HTMX for login form, minimal JS for OAuth provider visibility
2025-12-04 22:53:40 -03:00
let sanitized_name: String = display_name
.chars()
.filter(|c| c.is_alphanumeric() || *c == '_' || *c == '-')
.take(20)
.collect();
let oauth_username = if sanitized_name.is_empty() {
format!("{}_{}", provider, &provider_id[..8.min(provider_id.len())])
} else {
format!(
"{}_{}",
sanitized_name,
&provider_id[..6.min(provider_id.len())]
)
};
let user_email_value =
user_email.unwrap_or_else(|| format!("{}@oauth.local", oauth_username));
diesel::insert_into(users)
.values((
id.eq(new_user_id),
username.eq(&oauth_username),
email.eq(&user_email_value),
password_hash.eq("OAUTH_USER_NO_PASSWORD"),
is_active.eq(true),
is_admin.eq(false),
created_at.eq(diesel::dsl::now),
updated_at.eq(diesel::dsl::now),
))
.execute(&mut db_conn)
.map_err(|e| anyhow::anyhow!("Failed to create user: {}", e))?;
debug!(
"Created OAuth user: {} ({}) for provider {}",
oauth_username, user_email_value, provider
);
Ok(new_user_id)
})
.await
.map_err(|e| anyhow::anyhow!("Task error: {}", e))?
}
async fn create_user_session(state: &AppState, user_id: Uuid) -> anyhow::Result<String> {
let mut sm = state.session_manager.lock().await;
let bot_id = {
let conn = state.conn.clone();
tokio::task::spawn_blocking(move || {
let mut db_conn = conn.get().ok()?;
use crate::shared::models::schema::bots::dsl::*;
use diesel::prelude::*;
bots.filter(is_active.eq(true))
.select(id)
.first::<Uuid>(&mut db_conn)
.optional()
.ok()?
})
.await
.ok()
.flatten()
.unwrap_or(Uuid::nil())
};
let session = sm
.get_or_create_user_session(user_id, bot_id, "OAuth Login")
.map_err(|e| anyhow::anyhow!("Session error: {}", e))?
.ok_or_else(|| anyhow::anyhow!("Failed to create session"))?;
Ok(session.id.to_string())
}
Reference in a new issue Copy permalink