Merge pull request #710 from madeofpendletonwool/pod-mem

Updates and minor  bugs

Author: madeofpendletonwool

rust-api/Cargo.lock

@@ -6,27 +6,27 @@ rust-version = "1.89"
 
 [dependencies]
 # Web Framework
-axum = { version = "0.8.4", features = ["macros", "multipart", "ws"] }
-tokio = { version = "1.47.1", features = ["full"] }
+axum = { version = "0.8.6", features = ["macros", "multipart", "ws"] }
+tokio = { version = "1.48.0", features = ["full"] }
 tower = { version = "0.5.2", features = ["util", "timeout", "load-shed", "limit"] }
 tower-http = { version = "0.6.6", features = ["fs", "trace", "cors", "compression-gzip"] }
 
 # Serialization
-serde = { version = "1.0.225", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.145"
 
 # Database
 sqlx = { version = "0.8.6", features = ["runtime-tokio-rustls", "postgres", "mysql", "uuid", "chrono", "json", "bigdecimal"] }
-bigdecimal = "0.4.8"
+bigdecimal = "0.4.9"
 
 # Redis/Valkey
-redis = { version = "0.32.5", features = ["aio", "tokio-comp"] }
+redis = { version = "0.32.7", features = ["aio", "tokio-comp"] }
 
 # HTTP Client
-reqwest = { version = "0.12.23", features = ["json", "rustls-tls", "stream", "cookies"] }
+reqwest = { version = "0.12.24", features = ["json", "rustls-tls", "stream", "cookies"] }
 
 # Configuration and Environment
-config = "0.15.16"
+config = "0.15.18"
 dotenvy = "0.15.7"
 
 # Logging
@@ -35,18 +35,18 @@ tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
 
 # Utilities
 uuid = { version = "1.18.1", features = ["v4", "serde"] }
-chrono = { version = "0.4.41", features = ["serde"] }
+chrono = { version = "0.4.42", features = ["serde"] }
 chrono-tz = "0.10.0"
-anyhow = "1.0.99"
-thiserror = "2.0.16"
+anyhow = "1.0.100"
+thiserror = "2.0.17"
 async-trait = "0.1.89"
 base64 = "0.22.1"
 lazy_static = "1.5.0"
 urlencoding = "2.1.3"
 
 # Authentication and Crypto
-argon2 = "0.6.0-rc.0"
-jsonwebtoken = "9.3.1"
+argon2 = "0.6.0-rc.1"
+jsonwebtoken = { version = "10.1.0", features = ["aws_lc_rs"] }
 rand = "0.9.2"
 
 # MFA/TOTP Support
@@ -60,7 +60,7 @@ fernet = "0.2.2"
 # RSS/Feed Processing
 feed-rs = "2.3.1"
 url = "2.5.7"
-regex = "1.11.2"
+regex = "1.12.2"
 
 # Audio metadata tagging
 id3 = "1.16.3"
@@ -74,7 +74,7 @@ lettre = { version = "0.11.18", default-features = false, features = ["tokio1-ru
 hyper = "1.7.0"
 
 # Background Tasks and Task Management
-tokio-cron-scheduler = "0.14.0"
+tokio-cron-scheduler = "0.15.1"
 tokio-stream = "0.1.17"
 futures = "0.3.31"
 

rust-api/Cargo.toml

@@ -14953,15 +14953,24 @@ impl DatabasePool {
     // Subscribe to person - matches Python subscribe_to_person function exactly
     pub async fn subscribe_to_person(&self, user_id: i32, person_id: i32, person_name: &str, person_img: &str, podcast_id: i32) -> AppResult<i32> {
         println!("Subscribing user {} to person {}: {}", user_id, person_id, person_name);
-        
+
         // Check if person already exists for this user and handle accordingly
         let result = match self {
             DatabasePool::Postgres(pool) => {
-                let existing = sqlx::query(r#"SELECT personid FROM "People" WHERE userid = $1 AND peopledbid = $2"#)
-                    .bind(user_id)
-                    .bind(person_id)
-                    .fetch_optional(pool)
-                    .await?;
+                // When peopledbid is 0 or not set, use name for lookup to avoid collisions
+                let existing = if person_id == 0 {
+                    sqlx::query(r#"SELECT personid FROM "People" WHERE userid = $1 AND LOWER(name) = LOWER($2)"#)
+                        .bind(user_id)
+                        .bind(person_name)
+                        .fetch_optional(pool)
+                        .await?
+                } else {
+                    sqlx::query(r#"SELECT personid FROM "People" WHERE userid = $1 AND peopledbid = $2"#)
+                        .bind(user_id)
+                        .bind(person_id)
+                        .fetch_optional(pool)
+                        .await?
+                };
 
                 if let Some(row) = existing {
                     let person_db_id: i32 = row.try_get("personid")?;
@@ -15013,11 +15022,20 @@ impl DatabasePool {
                 }
             }
             DatabasePool::MySQL(pool) => {
-                let existing = sqlx::query("SELECT PersonID FROM People WHERE UserID = ? AND PeopleDBID = ?")
-                    .bind(user_id)
-                    .bind(person_id)
-                    .fetch_optional(pool)
-                    .await?;
+                // When peopledbid is 0 or not set, use name for lookup to avoid collisions
+                let existing = if person_id == 0 {
+                    sqlx::query("SELECT PersonID FROM People WHERE UserID = ? AND LOWER(Name) = LOWER(?)")
+                        .bind(user_id)
+                        .bind(person_name)
+                        .fetch_optional(pool)
+                        .await?
+                } else {
+                    sqlx::query("SELECT PersonID FROM People WHERE UserID = ? AND PeopleDBID = ?")
+                        .bind(user_id)
+                        .bind(person_id)
+                        .fetch_optional(pool)
+                        .await?
+                };
 
                 if let Some(row) = existing {
                     let person_db_id: i32 = row.try_get("PersonID")?;
@@ -15075,24 +15093,44 @@ impl DatabasePool {
     // Unsubscribe from person - matches Python unsubscribe_from_person function exactly
     pub async fn unsubscribe_from_person(&self, user_id: i32, person_id: i32, person_name: &str) -> AppResult<bool> {
         println!("Unsubscribing user {} from person {}: {}", user_id, person_id, person_name);
-        
+
         // Find and delete the person record
         let rows_affected = match self {
             DatabasePool::Postgres(pool) => {
-                sqlx::query(r#"DELETE FROM "People" WHERE userid = $1 AND peopledbid = $2"#)
-                    .bind(user_id)
-                    .bind(person_id)
-                    .execute(pool)
-                    .await?
-                    .rows_affected()
+                // When peopledbid is 0 or not set, use name for lookup to avoid collisions
+                if person_id == 0 {
+                    sqlx::query(r#"DELETE FROM "People" WHERE userid = $1 AND LOWER(name) = LOWER($2)"#)
+                        .bind(user_id)
+                        .bind(person_name)
+                        .execute(pool)
+                        .await?
+                        .rows_affected()
+                } else {
+                    sqlx::query(r#"DELETE FROM "People" WHERE userid = $1 AND peopledbid = $2"#)
+                        .bind(user_id)
+                        .bind(person_id)
+                        .execute(pool)
+                        .await?
+                        .rows_affected()
+                }
             }
             DatabasePool::MySQL(pool) => {
-                sqlx::query("DELETE FROM People WHERE UserID = ? AND PeopleDBID = ?")
-                    .bind(user_id)
-                    .bind(person_id)
-                    .execute(pool)
-                    .await?
-                    .rows_affected()
+                // When peopledbid is 0 or not set, use name for lookup to avoid collisions
+                if person_id == 0 {
+                    sqlx::query("DELETE FROM People WHERE UserID = ? AND LOWER(Name) = LOWER(?)")
+                        .bind(user_id)
+                        .bind(person_name)
+                        .execute(pool)
+                        .await?
+                        .rows_affected()
+                } else {
+                    sqlx::query("DELETE FROM People WHERE UserID = ? AND PeopleDBID = ?")
+                        .bind(user_id)
+                        .bind(person_id)
+                        .execute(pool)
+                        .await?
+                        .rows_affected()
+                }
             }
         };
 

rust-api/src/database.rs

@@ -81,9 +81,12 @@ pub struct RssKeyInfo {
 }
 
 fn extract_domain_from_request(request: &Request<axum::body::Body>) -> String {
-    // Check HOSTNAME environment variable first (includes scheme and port)
-    if let Ok(hostname) = std::env::var("HOSTNAME") {
-        return hostname;
+    // Check SERVER_URL environment variable first (includes scheme and port)
+    // Note: We use SERVER_URL instead of HOSTNAME because Docker automatically sets HOSTNAME to the container ID
+    // The startup script saves the user's HOSTNAME value to SERVER_URL before Docker overwrites it
+    if let Ok(server_url) = std::env::var("SERVER_URL") {
+        tracing::info!("Using SERVER_URL env var: {}", server_url);
+        return server_url;
     }
 
     // Try to get domain from Host header
@@ -95,10 +98,13 @@ fn extract_domain_from_request(request: &Request<axum::body::Body>) -> String {
                 .and_then(|h| h.to_str().ok())
                 .unwrap_or("http");
 
-            return format!("{}://{}", scheme, host_str);
+            let domain = format!("{}://{}", scheme, host_str);
+            tracing::info!("Using Host header: {}", domain);
+            return domain;
         }
     }
 
     // Fallback
+    tracing::info!("Using fallback domain");
     "http://localhost:8041".to_string()
 }

rust-api/src/handlers/feed.rs

@@ -2014,26 +2014,52 @@ pub async fn stream_episode(
     Query(query): Query<StreamQuery>,
 ) -> Result<axum::response::Response, AppError> {
     let api_key = &query.api_key;
-    
-    // Try API key validation first
+    println!("Stream request for episode {} with api_key {} and user_id {}", episode_id, api_key, query.user_id);
+
+    // Try RSS key validation FIRST (RSS keys are used in RSS feeds for streaming)
     let mut is_valid = false;
     let mut is_web_key = false;
     let mut key_user_id = None;
-    
-    if let Ok(_) = validate_api_key(&state, api_key).await {
-        is_valid = true;
-        is_web_key = state.db_pool.is_web_key(api_key).await?;
-        key_user_id = Some(state.db_pool.get_user_id_from_api_key(api_key).await?);
+
+    println!("Trying RSS key validation first");
+    match state.db_pool.get_rss_key_if_valid(api_key, None).await {
+        Ok(Some(rss_info)) => {
+            println!("Valid RSS key for user {}", rss_info.user_id);
+            is_valid = true;
+            // Don't set key_user_id for RSS keys - they don't need permission checks
+        }
+        Ok(None) => {
+            println!("Not an RSS key, trying regular API key");
+        }
+        Err(e) => {
+            println!("RSS key validation error: {}", e);
+        }
     }
-    
-    // If not a valid API key, try RSS key validation
+
+    // If not a valid RSS key, try regular API key validation
     if !is_valid {
-        if let Ok(Some(_rss_info)) = state.db_pool.get_rss_key_if_valid(api_key, None).await {
-            // RSS key is valid - allow access for any user (as per requirements)
-            is_valid = true;
+        match validate_api_key(&state, api_key).await {
+            Ok(_) => {
+                println!("Valid API key");
+                // Try to get user_id, but don't fail if it errors (might be cached RSS key)
+                match state.db_pool.get_user_id_from_api_key(api_key).await {
+                    Ok(user_id) => {
+                        println!("API key user_id: {}", user_id);
+                        is_valid = true;
+                        is_web_key = state.db_pool.is_web_key(api_key).await?;
+                        key_user_id = Some(user_id);
+                    }
+                    Err(e) => {
+                        println!("Failed to get user_id for API key (might be RSS key): {}", e);
+                    }
+                }
+            }
+            Err(e) => {
+                println!("API key validation failed: {}", e);
+            }
         }
     }
-    
+
     if !is_valid {
         return Err(AppError::unauthorized("Invalid API key or RSS key"));
     }

rust-api/src/handlers/podcasts.rs

@@ -32,6 +32,10 @@ export VALKEY_HOST=${VALKEY_HOST:-'valkey'}
 export VALKEY_PORT=${VALKEY_PORT:-'6379'}
 export DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-'en'}
 
+# Save user's HOSTNAME to SERVER_URL before Docker overwrites it with container ID
+# This preserves the user-configured server URL for RSS feed generation
+export SERVER_URL=${HOSTNAME}
+
 # Export OIDC environment variables
 export OIDC_DISABLE_STANDARD_LOGIN=${OIDC_DISABLE_STANDARD_LOGIN:-'false'}
 export OIDC_PROVIDER_NAME=${OIDC_PROVIDER_NAME}