ccproxy-api 0.2.2__py3-none-any.whl → 0.2.3__py3-none-any.whl

ccproxy/core/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.2'
-__version_tuple__ = version_tuple = (0, 2, 2)
+__version__ = version = '0.2.3'
+__version_tuple__ = version_tuple = (0, 2, 3)
 
 __commit_id__ = commit_id = None

ccproxy/plugins/oauth_claude/storage.py

@@ -15,6 +15,77 @@ from .models import ClaudeCredentials, ClaudeProfileInfo
 logger = get_plugin_logger()
 
 
+# Keychain service name used by Claude Code
+KEYCHAIN_SERVICE = "Claude Code"
+KEYCHAIN_ACCOUNT = "credentials"
+
+
+def _is_keyring_available() -> bool:
+    """Check if keyring library is available."""
+    try:
+        import keyring  # noqa: F401
+
+        return True
+    except ImportError:
+        return False
+
+
+async def _read_from_keychain() -> dict[str, Any] | None:
+    """Read Claude credentials from system keychain.
+
+    Claude Code stores OAuth credentials in the system keychain and intentionally
+    deletes the plain text ~/.claude/.credentials.json file for security.
+    See: https://github.com/anthropics/claude-code/issues/1414
+
+    Uses the keyring library which supports:
+    - macOS Keychain
+    - Windows Credential Manager
+    - Linux Secret Service (GNOME Keyring, KDE Wallet)
+
+    Returns:
+        Parsed credentials dict or None if not found or keyring unavailable
+    """
+    if not _is_keyring_available():
+        logger.debug(
+            "keyring_not_available",
+            hint="Install keyring package for system keychain support",
+            category="auth",
+        )
+        return None
+
+    def read_keychain() -> dict[str, Any] | None:
+        try:
+            import keyring
+
+            password = keyring.get_password(KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT)
+            if password:
+                parsed = json.loads(password)
+                if isinstance(parsed, dict):
+                    return parsed
+                logger.debug(
+                    "keychain_invalid_format",
+                    expected="dict",
+                    got=type(parsed).__name__,
+                    category="auth",
+                )
+        except json.JSONDecodeError as e:
+            logger.debug(
+                "keychain_json_decode_error",
+                error=str(e),
+                category="auth",
+            )
+        except Exception as e:
+            logger.debug(
+                "keychain_read_error",
+                error=str(e),
+                error_type=type(e).__name__,
+                category="auth",
+            )
+        return None
+
+    return await asyncio.to_thread(read_keychain)
+
+
 class ClaudeOAuthStorage(BaseJsonStorage[ClaudeCredentials]):
     """Claude OAuth-specific token storage implementation."""
 
@@ -61,24 +132,48 @@ class ClaudeOAuthStorage(BaseJsonStorage[ClaudeCredentials]):
             return False
 
     async def load(self) -> ClaudeCredentials | None:
-        """Load Claude credentials.
+        """Load Claude credentials from file or system keychain.
+
+        Claude Code stores credentials in the system keychain and intentionally
+        deletes the plain text file for security. This method tries file first,
+        then falls back to the system keychain (macOS Keychain, Windows Credential
+        Manager, or Linux Secret Service).
 
         Returns:
             Stored credentials or None
         """
         try:
-            # Use parent class's read method
+            # Try file first (works on all platforms, manual setups)
             data = await self._read_json()
-            if not data:
-                return None
+            if data:
+                credentials = ClaudeCredentials.model_validate(data)
+                logger.debug(
+                    "claude_oauth_credentials_loaded",
+                    has_oauth=bool(credentials.claude_ai_oauth),
+                    source="file",
+                    category="auth",
+                )
+                return credentials
+
+            # Fallback to system keychain (where Claude Code stores credentials)
+            keychain_data = await _read_from_keychain()
+            if keychain_data:
+                credentials = ClaudeCredentials.model_validate(keychain_data)
+                logger.debug(
+                    "claude_oauth_credentials_loaded",
+                    has_oauth=bool(credentials.claude_ai_oauth),
+                    source="keychain",
+                    category="auth",
+                )
+                return credentials
 
-            credentials = ClaudeCredentials.model_validate(data)
             logger.debug(
-                "claude_oauth_credentials_loaded",
-                has_oauth=bool(credentials.claude_ai_oauth),
+                "claude_oauth_credentials_not_found",
+                checked_file=str(self.file_path),
+                checked_keychain=_is_keyring_available(),
                 category="auth",
             )
-            return credentials
+            return None
         except Exception as e:
             logger.error(
                 "claude_oauth_credentials_load_error",

{ccproxy_api-0.2.2.dist-info → ccproxy_api-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccproxy-api
-Version: 0.2.2
+Version: 0.2.3
 Summary: API server that provides an Anthropic and OpenAI compatible interface over Claude Code, allowing to use your Claude OAuth account or over the API.
 License-File: LICENSE
 Requires-Python: >=3.11
@@ -20,6 +20,7 @@ Requires-Dist: typing-extensions>=4.0.0
 Requires-Dist: uvicorn>=0.34.0
 Provides-Extra: plugins-claude
 Requires-Dist: claude-agent-sdk>=0.1.0; extra == 'plugins-claude'
+Requires-Dist: keyring>=25.0.0; extra == 'plugins-claude'
 Requires-Dist: qrcode>=8.2; extra == 'plugins-claude'
 Provides-Extra: plugins-codex
 Requires-Dist: pyjwt>=2.10.1; extra == 'plugins-codex'

{ccproxy_api-0.2.2.dist-info → ccproxy_api-0.2.3.dist-info}/RECORD

@@ -67,7 +67,7 @@ ccproxy/config/settings.py,sha256=uva0RV4KfIvv7VApDr7w3oARft7OoBCWf7ZSM4oM2VM,19
 ccproxy/config/toml_generator.py,sha256=_txCYDHI8lXWl-mwOK8P1_TsX1TNiLgkG4iryxOruZc,10034
 ccproxy/config/utils.py,sha256=tuvOPUsMGgznz94MRwuSWw6sZi_AGkB_ri7VWKMVg8Y,11877
 ccproxy/core/__init__.py,sha256=hQgrBogZjdt8ZQlQyZtbL91I3gX9YUTWrenqTPRfwbM,236
-ccproxy/core/_version.py,sha256=o3ZTescp-19Z9cvBGq9dQnbppljgzdUYUf98Nov0spY,704
+ccproxy/core/_version.py,sha256=kBRz0P2plw1eVdIpt70W6m1LMbEIhLY3RyOfVGdubaI,704
 ccproxy/core/async_task_manager.py,sha256=zf_mbbDwomh8q0E-oMNSPzFecHwLRi-ZPbhqsb6IPgM,16888
 ccproxy/core/async_utils.py,sha256=OFCJT8xbgZJO757iDPMAKY5c1Ildyk0PbwuktVF19UI,21676
 ccproxy/core/constants.py,sha256=FSLlbdNqCmZgZC4VAgvmovwXJh4C9WaUf_YBqDbYXXM,1837
@@ -301,7 +301,7 @@ ccproxy/plugins/oauth_claude/manager.py,sha256=0aOTVwPy3nDLhZsX5vcpWRG4kGqkdklOy
 ccproxy/plugins/oauth_claude/models.py,sha256=90BQzi0MVL9sK7NtTYZjwSWR5DGmEPsU2F8zF60Jbgw,9227
 ccproxy/plugins/oauth_claude/plugin.py,sha256=_EybVmwvigoJfuzAMETkknO3kQ-fp59earI7i1yWA-s,4918
 ccproxy/plugins/oauth_claude/provider.py,sha256=lV0RUmBthE8rmnPUNqdtcYuZL_RED95bURBhOOcyDqQ,19500
-ccproxy/plugins/oauth_claude/storage.py,sha256=rzMPn3uyHHe7nxA-EuQAFi-uGWS_pN60z7AMwgrYwPY,6547
+ccproxy/plugins/oauth_claude/storage.py,sha256=JsSSmeGkaQHhtdczhQdQSuTEGv4N6gmXX2YIJVzO68A,9844
 ccproxy/plugins/oauth_codex/README.md,sha256=XgbCxp_JHadpYcq6JW-hC8YvBo9310CLqVbKdprY5Vc,1451
 ccproxy/plugins/oauth_codex/__init__.py,sha256=pA4sU7Ngj0xY2Ppr_G6K_H4boihe-TL7ppvvusoBKEg,345
 ccproxy/plugins/oauth_codex/client.py,sha256=Ry0uFDsdXXFUGdI5ol5i-zDgjEZtaToKdaUAlhmgyu4,7357
@@ -411,8 +411,8 @@ ccproxy/utils/id_generator.py,sha256=k6R_W40lJSPi_it4M99EVg9eRD138oC4bv_8Ua3X8ms
 ccproxy/utils/model_mapper.py,sha256=hnIWc528x8oBuk1y1HuyGHbnwe6dsSxZ2UgA1OYrcJs,3731
 ccproxy/utils/startup_helpers.py,sha256=u1okOVbm2OeSqrNrbhWco_sXBR0usNo7Wv8zvhBLPhc,7492
 ccproxy/utils/version_checker.py,sha256=cGRgjD0PUB3MDZDSAdKPQwYIyqnlzFWue0ROyfGngNE,13452
-ccproxy_api-0.2.2.dist-info/METADATA,sha256=5rWBdjovufqSnrAZSnIIy1HwiwWgP2a9R3xf7yV5WCE,8280
-ccproxy_api-0.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-ccproxy_api-0.2.2.dist-info/entry_points.txt,sha256=bibqQtPpKZJhOY_j5TFvcYzHuR-w7tNovV2i7UcPlU4,1147
-ccproxy_api-0.2.2.dist-info/licenses/LICENSE,sha256=httxSCpTrEOkipisMeGXSrZhTB-4MRIorQU0hS1B6eQ,1066
-ccproxy_api-0.2.2.dist-info/RECORD,,
+ccproxy_api-0.2.3.dist-info/METADATA,sha256=X9RSa7zriZwyjtyM4Qm-Br6D62c0u1aOeW7DfDfJl-Q,8338
+ccproxy_api-0.2.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ccproxy_api-0.2.3.dist-info/entry_points.txt,sha256=bibqQtPpKZJhOY_j5TFvcYzHuR-w7tNovV2i7UcPlU4,1147
+ccproxy_api-0.2.3.dist-info/licenses/LICENSE,sha256=httxSCpTrEOkipisMeGXSrZhTB-4MRIorQU0hS1B6eQ,1066
+ccproxy_api-0.2.3.dist-info/RECORD,,