From f27a002c913c8d49df58f1f4f2ec977f41d6bec1 Mon Sep 17 00:00:00 2001
From: funman300 <root@vscode.infinity>
Date: Wed, 29 Apr 2026 00:54:53 +0000
Subject: [PATCH] fix(server,core): use SmartIpKeyExtractor for rate limiter,
 collapse nested if

- tower_governor: switch from PeerIpKeyExtractor (socket address) to
  SmartIpKeyExtractor so x-forwarded-for headers are honoured in tests
  and behind reverse proxies. Fixes auth_rate_limit_returns_429 test
  returning 500 instead of 429.
- solitaire_core: collapse nested if/if-let per clippy::collapsible_if.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 solitaire_core/src/game_state.rs | 5 ++---
 solitaire_server/src/lib.rs      | 7 ++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/solitaire_core/src/game_state.rs b/solitaire_core/src/game_state.rs
index 37faa7a..49bacf1 100644
--- a/solitaire_core/src/game_state.rs
+++ b/solitaire_core/src/game_state.rs
@@ -289,10 +289,9 @@ impl GameState {
             .ok_or(MoveError::InvalidSource)?
             .cards
             .last_mut()
+            && !top.face_up
         {
-            if !top.face_up {
-                top.face_up = true;
-            }
+            top.face_up = true;
         }
 
         self.piles.get_mut(&to).ok_or(MoveError::InvalidDestination)?.cards.append(&mut moved);
diff --git a/solitaire_server/src/lib.rs b/solitaire_server/src/lib.rs
index 6cdfff5..1977a4e 100644
--- a/solitaire_server/src/lib.rs
+++ b/solitaire_server/src/lib.rs
@@ -19,7 +19,11 @@ use axum::{
 };
 use sqlx::SqlitePool;
 use std::sync::Arc;
-use tower_governor::{governor::GovernorConfigBuilder, GovernorLayer};
+use tower_governor::{
+    governor::GovernorConfigBuilder,
+    key_extractor::SmartIpKeyExtractor,
+    GovernorLayer,
+};
 
 /// Shared application state injected into every Axum handler via [`axum::extract::State`].
 ///
@@ -80,6 +84,7 @@ fn build_router_inner(state: AppState, rate_limit: bool) -> Router {
         // burst_size = 10, replenish every 6 seconds = 10/min steady-state.
         let governor_conf = Arc::new(
             GovernorConfigBuilder::default()
+                .key_extractor(SmartIpKeyExtractor)
                 .per_second(6)
                 .burst_size(10)
                 .finish()