feat: Major directory reorganization and cleanup

Reorganized project structure for better maintainability and reduced
disk usage by 95.9% (11 GB -> 451 MB).

Directory Reorganization (85% reduction in root files):
- Created docs/ with subdirectories (deployment, testing, database, etc.)
- Created infrastructure/vpn-configs/ for VPN scripts
- Moved 90+ files from root to organized locations
- Archived obsolete documentation (context system, offline mode, zombie debugging)
- Moved all test files to tests/ directory
- Root directory: 119 files -> 18 files

Disk Cleanup (10.55 GB recovered):
- Deleted Rust build artifacts: 9.6 GB (target/ directories)
- Deleted Python virtual environments: 161 MB (venv/ directories)
- Deleted Python cache: 50 KB (__pycache__/)

New Structure:
- docs/ - All documentation organized by category
- docs/archives/ - Obsolete but preserved documentation
- infrastructure/ - VPN configs and SSH setup
- tests/ - All test files consolidated
- logs/ - Ready for future logs

Benefits:
- Cleaner root directory (18 vs 119 files)
- Logical organization of documentation
- 95.9% disk space reduction
- Faster navigation and discovery
- Better portability (build artifacts excluded)

Build artifacts can be regenerated:
- Rust: cargo build --release (5-15 min per project)
- Python: pip install -r requirements.txt (2-3 min)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
2026-01-18 20:42:28 -07:00
parent 89e5118306
commit 06f7617718
96 changed files with 54 additions and 2639 deletions

View File

@@ -0,0 +1,424 @@
# Credentials Management API - Implementation Summary
## Overview
Successfully implemented a comprehensive Credentials Management system for ClaudeTools with secure encryption, audit logging, and full CRUD operations across three primary domains:
1. **Credentials** - Secure storage of passwords, API keys, OAuth secrets, tokens, and connection strings
2. **Credential Audit Logs** - Complete audit trail of all credential operations
3. **Security Incidents** - Security incident tracking and remediation management
## Implementation Details
### Part 1: Pydantic Schemas
Created three schema modules with full request/response validation:
#### 1. **api/schemas/credential.py**
- `CredentialBase` - Shared fields for all credential operations
- `CredentialCreate` - Creation schema with plaintext sensitive fields
- `CredentialUpdate` - Update schema (all fields optional)
- `CredentialResponse` - Response schema with automatic decryption
- **Critical Feature**: Field validators automatically decrypt encrypted database fields
- Decrypts: `password`, `api_key`, `client_secret`, `token`, `connection_string`
- Never exposes raw encrypted bytes to API consumers
**Security Features:**
- Plaintext passwords accepted in Create/Update requests
- Automatic decryption in Response schemas using Pydantic validators
- No encrypted_value fields exposed in response schemas
#### 2. **api/schemas/credential_audit_log.py**
- `CredentialAuditLogBase` - Core audit log fields
- `CredentialAuditLogCreate` - For creating audit entries
- `CredentialAuditLogUpdate` - Minimal (audit logs are mostly immutable)
- `CredentialAuditLogResponse` - Read-only response schema
**Audit Actions Tracked:**
- `view` - Credential retrieved
- `create` - Credential created
- `update` - Credential modified
- `delete` - Credential deleted
- `rotate` - Password rotated
- `decrypt` - Sensitive field decrypted
#### 3. **api/schemas/security_incident.py**
- `SecurityIncidentBase` - Shared incident fields
- `SecurityIncidentCreate` - Creation with required fields
- `SecurityIncidentUpdate` - Update schema (all optional)
- `SecurityIncidentResponse` - Full incident details with timestamps
**Incident Types Supported:**
- BEC (Business Email Compromise)
- Backdoor
- Malware
- Unauthorized Access
- Data Breach
- Phishing
- Ransomware
- Brute Force
**Updated:** `api/schemas/__init__.py` - Exported all new schemas
---
### Part 2: Service Layer (Business Logic)
Implemented three service modules with encryption and audit logging:
#### 1. **api/services/credential_service.py**
**Core Functions:**
- `get_credentials(db, skip, limit)` - Paginated list of all credentials
- `get_credential_by_id(db, credential_id, user_id)` - Single credential retrieval (with audit)
- `get_credentials_by_client(db, client_id, skip, limit)` - Filter by client
- `create_credential(db, credential_data, user_id, ip_address, user_agent)` - Create with encryption
- `update_credential(db, credential_id, credential_data, user_id, ...)` - Update with re-encryption
- `delete_credential(db, credential_id, user_id, ...)` - Delete with audit
**Internal Helper:**
- `_create_audit_log()` - Creates audit log entries for all operations
**Encryption Implementation:**
- Encrypts before storage: `password`, `api_key`, `client_secret`, `token`, `connection_string`
- Stores as UTF-8 encoded bytes in `*_encrypted` fields
- Uses `encrypt_string()` from `api/utils/crypto.py`
- Re-encrypts on update if sensitive fields change
**Audit Logging:**
- Logs all CRUD operations automatically
- Captures: user_id, IP address, user agent, timestamp
- Records changed fields in details JSON
- **Never logs decrypted passwords**
#### 2. **api/services/credential_audit_log_service.py**
**Functions (Read-Only):**
- `get_credential_audit_logs(db, skip, limit)` - All audit logs
- `get_credential_audit_log_by_id(db, log_id)` - Single log entry
- `get_credential_audit_logs_by_credential(db, credential_id, skip, limit)` - Logs for a credential
- `get_credential_audit_logs_by_user(db, user_id, skip, limit)` - Logs for a user
**Design Note:** Audit logs are read-only through the API. Only the credential_service creates them automatically.
#### 3. **api/services/security_incident_service.py**
**Core Functions:**
- `get_security_incidents(db, skip, limit)` - All incidents
- `get_security_incident_by_id(db, incident_id)` - Single incident
- `get_security_incidents_by_client(db, client_id, skip, limit)` - Filter by client
- `get_security_incidents_by_status(db, status_filter, skip, limit)` - Filter by status
- `create_security_incident(db, incident_data)` - Create new incident
- `update_security_incident(db, incident_id, incident_data)` - Update incident
- `delete_security_incident(db, incident_id)` - Delete incident
**Status Workflow:**
- `investigating``contained``resolved` / `monitoring`
**Updated:** `api/services/__init__.py` - Exported all new service modules
---
### Part 3: API Routers (REST Endpoints)
Implemented three router modules with full CRUD operations:
#### 1. **api/routers/credentials.py**
**Endpoints:**
```
GET /api/credentials - List all credentials (paginated)
GET /api/credentials/{credential_id} - Get credential by ID (with decryption)
POST /api/credentials - Create new credential (encrypts on save)
PUT /api/credentials/{credential_id} - Update credential (re-encrypts if changed)
DELETE /api/credentials/{credential_id} - Delete credential (audited)
GET /api/credentials/by-client/{client_id} - Get credentials for a client
```
**Security Features:**
- All endpoints require JWT authentication (`get_current_user`)
- Request context captured for audit logging (IP, user agent)
- Automatic encryption/decryption handled by service layer
- Response schemas automatically decrypt sensitive fields
**Helper Function:**
- `_get_user_context(request, current_user)` - Extracts user info for audit logs
#### 2. **api/routers/credential_audit_logs.py**
**Endpoints (Read-Only):**
```
GET /api/credential-audit-logs - List all audit logs
GET /api/credential-audit-logs/{log_id} - Get log by ID
GET /api/credential-audit-logs/by-credential/{credential_id} - Logs for a credential
GET /api/credential-audit-logs/by-user/{user_id} - Logs for a user
```
**Design Note:** No POST/PUT/DELETE - audit logs are immutable and auto-created.
#### 3. **api/routers/security_incidents.py**
**Endpoints:**
```
GET /api/security-incidents - List all incidents
GET /api/security-incidents/{incident_id} - Get incident by ID
POST /api/security-incidents - Create new incident
PUT /api/security-incidents/{incident_id} - Update incident
DELETE /api/security-incidents/{incident_id} - Delete incident
GET /api/security-incidents/by-client/{client_id} - Incidents for client
GET /api/security-incidents/by-status/{status} - Filter by status
```
#### 4. **Updated api/main.py**
Added all three routers:
```python
app.include_router(credentials.router, prefix="/api/credentials", tags=["Credentials"])
app.include_router(credential_audit_logs.router, prefix="/api/credential-audit-logs", tags=["Credential Audit Logs"])
app.include_router(security_incidents.router, prefix="/api/security-incidents", tags=["Security Incidents"])
```
---
## Security Implementation
### Encryption System
**Module:** `api/utils/crypto.py`
**Functions Used:**
- `encrypt_string(plaintext)` - AES-256-GCM encryption via Fernet
- `decrypt_string(ciphertext, default=None)` - Authenticated decryption
**Encryption Key:**
- Stored in `.env` as `ENCRYPTION_KEY`
- 64-character hex string (32 bytes)
- Generated via `generate_encryption_key()` utility
- Current key: `c20cd4e5cfb3370272b2bc81017d975277097781d3a8d66e40395c71a3e733f5`
**Encrypted Fields:**
1. `password_encrypted` - User passwords
2. `api_key_encrypted` - API keys and tokens
3. `client_secret_encrypted` - OAuth client secrets
4. `token_encrypted` - Bearer/access tokens
5. `connection_string_encrypted` - Database connection strings
**Security Properties:**
- **Authenticated Encryption**: Fernet includes HMAC for integrity
- **Unique Ciphertexts**: Each encryption produces different output (random IV)
- **Safe Defaults**: Decryption returns None on failure (no exceptions)
- **No Logging**: Decrypted values never appear in logs
### Audit Trail
**Complete Audit Logging:**
- Every credential operation logged automatically
- Captures: action, user, IP address, user agent, timestamp, context
- Logs survive credential deletion (no CASCADE on audit_log table)
- Immutable records for compliance
**Actions Logged:**
- `create` - New credential created
- `view` - Credential retrieved (including decrypted values)
- `update` - Credential modified (tracks changed fields)
- `delete` - Credential removed
**Context Details:**
```json
{
"service_name": "Gitea Admin",
"credential_type": "password",
"changed_fields": ["password", "last_rotated_at"]
}
```
---
## Testing
### Test Suite: `test_credentials_api.py`
**Tests Implemented:**
1. **test_encryption_decryption()** - Basic crypto operations
2. **test_credential_lifecycle()** - Full CRUD with audit verification
3. **test_multiple_credential_types()** - Different credential types
**Test Results:**
```
============================================================
CREDENTIALS API TEST SUITE
============================================================
=== Testing Encryption/Decryption ===
[PASS] Encryption/decryption test passed
=== Testing Credential Lifecycle ===
[PASS] Created credential ID
[PASS] Password correctly encrypted and decrypted
[PASS] Audit logs created
[PASS] Retrieved credential
[PASS] View action logged
[PASS] Updated credential
[PASS] New password correctly encrypted
[PASS] Update action logged
[PASS] Credential deleted successfully
[PASS] All credential lifecycle tests passed!
=== Testing Multiple Credential Types ===
[PASS] Created API Key credential
[PASS] API key correctly encrypted
[PASS] Created OAuth credential
[PASS] Client secret correctly encrypted
[PASS] Created Connection String credential
[PASS] Connection string correctly encrypted
[PASS] Cleaned up 3 credentials
[PASS] All multi-type credential tests passed!
============================================================
[PASS] ALL TESTS PASSED!
============================================================
```
---
## Database Schema
### Tables Utilized
**credentials** (from `api/models/credential.py`)
- Supports 8 credential types: password, api_key, oauth, ssh_key, shared_secret, jwt, connection_string, certificate
- Foreign keys: `client_id`, `service_id`, `infrastructure_id`
- Encrypted fields: `password_encrypted`, `api_key_encrypted`, `client_secret_encrypted`, `token_encrypted`, `connection_string_encrypted`
- Metadata: URLs, ports, VPN/2FA requirements, expiration tracking
**credential_audit_log** (from `api/models/credential_audit_log.py`)
- Links to credentials via `credential_id` (CASCADE delete)
- Tracks: action, user_id, ip_address, user_agent, timestamp, details (JSON)
- Indexed on: credential_id, user_id, timestamp
**security_incidents** (from `api/models/security_incident.py`)
- Links to: `client_id`, `service_id`, `infrastructure_id`
- Fields: incident_type, incident_date, severity, description, findings, remediation_steps, status, resolved_at
- Workflow: investigating → contained → resolved/monitoring
---
## Files Created/Modified
### Created Files (10):
1. `api/schemas/credential.py` - Credential schemas with decryption validators
2. `api/schemas/credential_audit_log.py` - Audit log schemas
3. `api/schemas/security_incident.py` - Security incident schemas
4. `api/services/credential_service.py` - Credential business logic with encryption
5. `api/services/credential_audit_log_service.py` - Audit log queries
6. `api/services/security_incident_service.py` - Incident management logic
7. `api/routers/credentials.py` - Credentials REST API
8. `api/routers/credential_audit_logs.py` - Audit logs REST API
9. `api/routers/security_incidents.py` - Security incidents REST API
10. `test_credentials_api.py` - Comprehensive test suite
### Modified Files (4):
1. `api/schemas/__init__.py` - Added new schema exports
2. `api/services/__init__.py` - Added new service exports
3. `api/main.py` - Registered three new routers
4. `.env` - Updated `ENCRYPTION_KEY` to valid 32-byte key
---
## API Documentation
### Swagger/OpenAPI
Available at: `http://localhost:8000/api/docs`
**Tags:**
- **Credentials** - 6 endpoints for credential management
- **Credential Audit Logs** - 4 read-only endpoints for audit trail
- **Security Incidents** - 7 endpoints for incident tracking
### Example Usage
**Create Password Credential:**
```bash
curl -X POST "http://localhost:8000/api/credentials" \
-H "Authorization: Bearer <token>" \
-H "Content-Type: application/json" \
-d '{
"credential_type": "password",
"service_name": "Gitea Admin",
"username": "admin",
"password": "SuperSecure123!",
"external_url": "https://git.example.com",
"requires_2fa": true
}'
```
**Retrieve Credential (Decrypted):**
```bash
curl -X GET "http://localhost:8000/api/credentials/{id}" \
-H "Authorization: Bearer <token>"
```
Response includes decrypted password:
```json
{
"id": "uuid",
"service_name": "Gitea Admin",
"credential_type": "password",
"username": "admin",
"password": "SuperSecure123!", // Decrypted
"external_url": "https://git.example.com",
"requires_2fa": true,
"created_at": "2024-01-16T...",
"updated_at": "2024-01-16T..."
}
```
**View Audit Trail:**
```bash
curl -X GET "http://localhost:8000/api/credential-audit-logs/by-credential/{id}" \
-H "Authorization: Bearer <token>"
```
---
## Critical Security Requirements ✓
All requirements met:
**Encryption:** Always use `encrypt_string()` before storing passwords
**Decryption:** Always use `decrypt_string()` when returning to authenticated users
**Audit Logging:** All credential operations logged (create, update, delete, view)
**No Plaintext Logs:** Decrypted passwords never logged
**Authentication:** All endpoints require valid JWT token
**Response Schema:** `encrypted_value` fields NOT exposed; only decrypted values
---
## Next Steps
### Recommended Enhancements:
1. **Password Rotation Reminders** - Alert on expired credentials
2. **Access Control** - Role-based permissions for sensitive credentials
3. **Backup/Export** - Secure credential export for disaster recovery
4. **Integration** - Auto-populate credentials in infrastructure provisioning
5. **Secrets Manager Integration** - AWS Secrets Manager / Azure Key Vault backend
6. **Multi-Factor Access** - Require 2FA for viewing sensitive credentials
### Monitoring:
- Track failed decryption attempts (potential key rotation needed)
- Alert on mass credential access (potential breach)
- Review audit logs regularly for anomalous patterns
---
## Summary
Successfully implemented a production-ready Credentials Management API with:
- ✅ 3 complete Pydantic schema modules
- ✅ 3 service layers with encryption and audit logging
- ✅ 3 REST API routers (17 total endpoints)
- ✅ AES-256-GCM encryption for all sensitive fields
- ✅ Complete audit trail for compliance
- ✅ Comprehensive test suite (100% passing)
- ✅ Full integration with existing ClaudeTools infrastructure
- ✅ Security-first design with no plaintext storage
The system is ready for production use with proper authentication, encryption, and audit capabilities.

View File

@@ -0,0 +1,583 @@
# Credential Scanner and Importer Guide
**Module:** `api/utils/credential_scanner.py`
**Purpose:** Scan for credential files and import them into the ClaudeTools credential vault with automatic encryption
**Status:** Production Ready
---
## Overview
The Credential Scanner and Importer provides automated discovery and secure import of credentials from structured files into the ClaudeTools database. All credentials are automatically encrypted using AES-256-GCM before storage, and comprehensive audit logs are created for compliance.
### Key Features
- **Multi-format support**: Markdown, .env, text files
- **Automatic encryption**: Uses existing `credential_service` for AES-256-GCM encryption
- **Type detection**: Auto-detects API keys, passwords, connection strings, tokens
- **Audit logging**: Every import operation is logged with full traceability
- **Client association**: Optional linking to specific clients
- **Safe parsing**: Never logs plaintext credential values
---
## Supported File Formats
### 1. Markdown Files (`.md`)
Structured format using headers and key-value pairs:
```markdown
## Gitea Admin
Username: admin
Password: SecurePass123!
URL: https://git.example.com
Notes: Main admin account
## Database Server
Type: connection_string
Connection String: mysql://dbuser:dbpass@192.168.1.50:3306/mydb
Notes: Production database
## OpenAI API
API Key: sk-1234567890abcdefghijklmnopqrstuvwxyz
Notes: Production API key
```
**Recognized keys:**
- `Username`, `User`, `Login` → username field
- `Password`, `Pass`, `Pwd` → password field
- `API Key`, `API_Key`, `ApiKey`, `Key` → api_key field
- `Token`, `Access Token`, `Bearer` → token field
- `Client Secret`, `Secret` → client_secret field
- `Connection String`, `Conn_Str` → connection_string field
- `URL`, `Host`, `Server`, `Address` → url (auto-detects internal/external)
- `Port` → custom_port field
- `Notes`, `Description` → notes field
- `Type`, `Credential_Type` → credential_type field
### 2. Environment Files (`.env`)
Standard environment variable format:
```bash
# Database Configuration
DATABASE_URL=mysql://user:pass@host:3306/db
# API Keys
OPENAI_API_KEY=sk-1234567890abcdefghij
GITHUB_TOKEN=ghp_abc123def456ghi789
# Secrets
SECRET_KEY=super_secret_key_12345
```
**Behavior:**
- Each `KEY=value` pair creates a separate credential
- Service name derived from KEY (e.g., `DATABASE_URL` → "Database Url")
- Credential type auto-detected from value pattern
### 3. Text Files (`.txt`)
Same format as Markdown, but uses `.txt` extension:
```text
# Server Passwords
## Web Server
Username: webadmin
Password: Web@dmin2024!
Host: 192.168.1.100
Port: 22
## Backup Server
Username: backup
Password: BackupSecure789
Host: 10.0.0.50
```
---
## Credential Type Detection
The scanner automatically detects credential types based on value patterns:
| Pattern | Detected Type | Field |
|---------|--------------|-------|
| `sk-*` (20+ chars) | `api_key` | api_key |
| `api_*` (20+ chars) | `api_key` | api_key |
| `ghp_*` (36 chars) | `api_key` | api_key |
| `gho_*` (36 chars) | `api_key` | api_key |
| `xoxb-*` | `api_key` | api_key |
| `-----BEGIN * PRIVATE KEY-----` | `ssh_key` | password |
| `mysql://...` | `connection_string` | connection_string |
| `postgresql://...` | `connection_string` | connection_string |
| `Server=...;Database=...` | `connection_string` | connection_string |
| JWT (3 parts, 50+ chars) | `jwt` | token |
| `ya29.*`, `ey*`, `oauth*` | `oauth` | token |
| Default | `password` | password |
---
## API Reference
### Function 1: `scan_for_credential_files(base_path: str)`
Find all credential files in a directory tree.
**Parameters:**
- `base_path` (str): Root directory to search from
**Returns:**
- `List[str]`: Absolute paths to credential files found
**Scanned file names:**
- `credentials.md`, `credentials.txt`
- `passwords.md`, `passwords.txt`
- `secrets.md`, `secrets.txt`
- `auth.md`, `auth.txt`
- `.env`, `.env.local`, `.env.production`, `.env.development`, `.env.staging`
**Excluded directories:**
- `.git`, `.svn`, `node_modules`, `venv`, `__pycache__`, `.venv`, `dist`, `build`
**Example:**
```python
from api.utils.credential_scanner import scan_for_credential_files
files = scan_for_credential_files("C:/Projects/ClientA")
# Returns: ["C:/Projects/ClientA/credentials.md", "C:/Projects/ClientA/.env"]
```
---
### Function 2: `parse_credential_file(file_path: str)`
Extract credentials from a file and return structured data.
**Parameters:**
- `file_path` (str): Absolute path to credential file
**Returns:**
- `List[Dict]`: List of credential dictionaries
**Credential Dictionary Format:**
```python
{
"service_name": "Gitea Admin",
"credential_type": "password",
"username": "admin",
"password": "SecurePass123!", # or api_key, token, etc.
"internal_url": "192.168.1.100",
"custom_port": 3000,
"notes": "Main admin account"
}
```
**Example:**
```python
from api.utils.credential_scanner import parse_credential_file
creds = parse_credential_file("C:/Projects/credentials.md")
for cred in creds:
print(f"Service: {cred['service_name']}")
print(f"Type: {cred['credential_type']}")
```
---
### Function 3: `import_credentials_to_db(db, credentials, client_id=None, user_id="system_import", ip_address=None)`
Import credentials into the database with automatic encryption.
**Parameters:**
- `db` (Session): SQLAlchemy database session
- `credentials` (List[Dict]): List of credential dictionaries from `parse_credential_file()`
- `client_id` (Optional[str]): UUID string to associate credentials with a client
- `user_id` (str): User ID for audit logging (default: "system_import")
- `ip_address` (Optional[str]): IP address for audit logging
**Returns:**
- `int`: Count of successfully imported credentials
**Security:**
- All sensitive fields automatically encrypted using AES-256-GCM
- Audit log entry created for each import (action: "create")
- Never logs plaintext credential values
- Uses existing `credential_service` encryption infrastructure
**Example:**
```python
from api.database import SessionLocal
from api.utils.credential_scanner import parse_credential_file, import_credentials_to_db
db = SessionLocal()
try:
creds = parse_credential_file("C:/Projects/credentials.md")
count = import_credentials_to_db(
db=db,
credentials=creds,
client_id="a1b2c3d4-e5f6-7890-abcd-ef1234567890",
user_id="mike@example.com",
ip_address="192.168.1.100"
)
print(f"Imported {count} credentials")
finally:
db.close()
```
---
### Function 4: `scan_and_import_credentials(base_path, db, client_id=None, user_id="system_import", ip_address=None)`
Scan for credential files and import all found credentials in one operation.
**Parameters:**
- `base_path` (str): Root directory to scan
- `db` (Session): Database session
- `client_id` (Optional[str]): Client UUID to associate credentials with
- `user_id` (str): User ID for audit logging
- `ip_address` (Optional[str]): IP address for audit logging
**Returns:**
- `Dict[str, int]`: Summary statistics
- `files_found`: Number of credential files found
- `credentials_parsed`: Total credentials parsed from all files
- `credentials_imported`: Number successfully imported to database
**Example:**
```python
from api.database import SessionLocal
from api.utils.credential_scanner import scan_and_import_credentials
db = SessionLocal()
try:
results = scan_and_import_credentials(
base_path="C:/Projects/ClientA",
db=db,
client_id="client-uuid-here",
user_id="mike@example.com"
)
print(f"Files found: {results['files_found']}")
print(f"Credentials parsed: {results['credentials_parsed']}")
print(f"Credentials imported: {results['credentials_imported']}")
finally:
db.close()
```
---
## Usage Examples
### Example 1: Quick Import
```python
from api.database import SessionLocal
from api.utils.credential_scanner import scan_and_import_credentials
db = SessionLocal()
try:
results = scan_and_import_credentials(
"C:/Projects/ClientProject",
db,
client_id="your-client-uuid"
)
print(f"Imported {results['credentials_imported']} credentials")
finally:
db.close()
```
### Example 2: Preview Before Import
```python
from api.utils.credential_scanner import scan_for_credential_files, parse_credential_file
# Find files
files = scan_for_credential_files("C:/Projects/ClientProject")
print(f"Found {len(files)} files")
# Preview credentials
for file_path in files:
creds = parse_credential_file(file_path)
print(f"\n{file_path}:")
for cred in creds:
print(f" - {cred['service_name']} ({cred['credential_type']})")
```
### Example 3: Manual Import with Error Handling
```python
from api.database import SessionLocal
from api.utils.credential_scanner import (
scan_for_credential_files,
parse_credential_file,
import_credentials_to_db
)
db = SessionLocal()
try:
# Scan
files = scan_for_credential_files("C:/Projects/ClientProject")
# Parse and import each file separately
for file_path in files:
try:
creds = parse_credential_file(file_path)
count = import_credentials_to_db(db, creds, client_id="uuid-here")
print(f"✓ Imported {count} from {file_path}")
except Exception as e:
print(f"✗ Failed to import {file_path}: {e}")
continue
except Exception as e:
print(f"Error: {e}")
finally:
db.close()
```
### Example 4: Command-Line Import Tool
See `example_credential_import.py`:
```bash
# Preview without importing
python example_credential_import.py /path/to/project --preview
# Import with client association
python example_credential_import.py /path/to/project --client-id "uuid-here"
```
---
## Testing
Run the test suite:
```bash
python test_credential_scanner.py
```
**Tests included:**
1. Scan for credential files
2. Parse credential files (all formats)
3. Import credentials to database
4. Full workflow (scan + parse + import)
5. Markdown format variations
---
## Security Considerations
### Encryption
All credentials are encrypted before storage:
- **Algorithm**: AES-256-GCM (via Fernet)
- **Key management**: Stored in environment variable `ENCRYPTION_KEY`
- **Per-field encryption**: password, api_key, client_secret, token, connection_string
### Audit Trail
Every import operation creates audit log entries:
- **Action**: "create"
- **User ID**: From function parameter
- **IP address**: From function parameter
- **Timestamp**: Auto-generated
- **Details**: Service name, credential type
### Logging Safety
- Plaintext credentials are **NEVER** logged
- File paths and counts are logged
- Service names (non-sensitive) are logged
- Errors are logged without credential values
### Best Practices
1. **Delete source files** after successful import
2. **Verify imports** using the API or database queries
3. **Use client_id** to associate credentials with clients
4. **Review audit logs** regularly for compliance
5. **Rotate credentials** after initial import if they were stored in plaintext
---
## Integration with ClaudeTools
### Credential Service
The scanner uses `api/services/credential_service.py` for all database operations:
- `create_credential()` - Handles encryption and audit logging
- Automatic validation via Pydantic schemas
- Foreign key enforcement (client_id, service_id, infrastructure_id)
### Database Schema
Credentials are stored in the `credentials` table:
- `id` - UUID primary key
- `service_name` - Display name
- `credential_type` - Type (password, api_key, etc.)
- `username` - Username (optional)
- `password_encrypted` - AES-256-GCM encrypted password
- `api_key_encrypted` - Encrypted API key
- `token_encrypted` - Encrypted token
- `connection_string_encrypted` - Encrypted connection string
- Plus 20+ other fields for metadata
### Audit Logging
Audit logs stored in `credential_audit_log` table:
- `credential_id` - Reference to credential
- `action` - "create", "view", "update", "delete", "decrypt"
- `user_id` - User performing action
- `ip_address` - Source IP
- `timestamp` - When action occurred
- `details` - JSON metadata
---
## Troubleshooting
### No files found
**Problem:** `scan_for_credential_files()` returns empty list
**Solutions:**
- Verify the base path exists and is a directory
- Check file names match expected patterns (credentials.md, .env, etc.)
- Ensure files are not in excluded directories (node_modules, .git, etc.)
### Parsing errors
**Problem:** `parse_credential_file()` returns empty list
**Solutions:**
- Verify file format matches expected structure (headers, key-value pairs)
- Check for encoding issues (must be UTF-8)
- Ensure key names are recognized (see "Recognized keys" section)
### Import failures
**Problem:** `import_credentials_to_db()` fails or imports less than parsed
**Solutions:**
- Check database connection is active
- Verify `client_id` exists if provided (foreign key constraint)
- Check encryption key is configured (`ENCRYPTION_KEY` environment variable)
- Review logs for specific validation errors
### Type detection issues
**Problem:** Credentials imported with wrong type
**Solutions:**
- Manually specify `Type:` field in credential file
- Update detection patterns in `_detect_credential_type()`
- Use explicit field names (e.g., "API Key:" instead of "Key:")
---
## Extending the Scanner
### Add New File Format
```python
def _parse_custom_format(content: str) -> List[Dict]:
"""Parse credentials from custom format."""
credentials = []
# Your parsing logic here
return credentials
# Update parse_credential_file():
elif file_ext == '.custom':
credentials = _parse_custom_format(content)
```
### Add New Credential Type Pattern
```python
# Add to API_KEY_PATTERNS, SSH_KEY_PATTERN, or CONNECTION_STRING_PATTERNS
API_KEY_PATTERNS.append(r"^custom_[a-zA-Z0-9]{20,}")
# Or add detection logic to _detect_credential_type()
```
### Add Custom Field Mapping
```python
# In _parse_markdown_credentials(), add mapping:
elif key in ['custom_field', 'alt_name']:
current_cred['custom_field'] = value
```
---
## Production Deployment
### Environment Setup
```bash
# Required environment variable
export ENCRYPTION_KEY="64-character-hex-string"
# Generate new key:
python -c "from api.utils.crypto import generate_encryption_key; print(generate_encryption_key())"
```
### Import Workflow
1. **Scan** client project directories
2. **Preview** credentials before import
3. **Import** with client association
4. **Verify** import success via API
5. **Delete** source credential files
6. **Rotate** credentials if needed
7. **Document** import in client notes
### Automation Example
```python
# Automated import script for all clients
from api.database import SessionLocal
from api.models.client import Client
from api.utils.credential_scanner import scan_and_import_credentials
db = SessionLocal()
try:
clients = db.query(Client).all()
for client in clients:
project_path = f"C:/Projects/{client.name}"
if os.path.exists(project_path):
results = scan_and_import_credentials(
project_path,
db,
client_id=str(client.id)
)
print(f"{client.name}: {results['credentials_imported']} imported")
finally:
db.close()
```
---
## Related Documentation
- **API Specification**: `.claude/API_SPEC.md`
- **Credential Schema**: `.claude/SCHEMA_CREDENTIALS.md`
- **Credential Service**: `api/services/credential_service.py`
- **Encryption Utils**: `api/utils/crypto.py`
- **Database Models**: `api/models/credential.py`
---
**Last Updated:** 2026-01-16
**Version:** 1.0
**Author:** ClaudeTools Development Team

View File

@@ -0,0 +1,221 @@
# Credential Scanner Quick Reference
**Module:** `api/utils/credential_scanner`
**Purpose:** Import credentials from files to database with auto-encryption
---
## Quick Start
```python
from api.database import SessionLocal
from api.utils.credential_scanner import scan_and_import_credentials
db = SessionLocal()
try:
results = scan_and_import_credentials(
base_path="C:/Projects/MyClient",
db=db,
client_id="uuid-here" # Optional
)
print(f"Imported: {results['credentials_imported']}")
finally:
db.close()
```
---
## Functions
### 1. `scan_for_credential_files(base_path)`
Find all credential files in directory tree.
**Returns:** `List[str]` - File paths
**Finds:**
- credentials.md, credentials.txt
- passwords.md, passwords.txt
- .env, .env.local, .env.production
- secrets.md, auth.md
---
### 2. `parse_credential_file(file_path)`
Parse credentials from a file.
**Returns:** `List[Dict]` - Credential dictionaries
**Example output:**
```python
[
{
"service_name": "Gitea Admin",
"credential_type": "password",
"username": "admin",
"password": "SecurePass123!"
},
...
]
```
---
### 3. `import_credentials_to_db(db, credentials, client_id=None, user_id="system_import")`
Import credentials with auto-encryption.
**Returns:** `int` - Count of imported credentials
**Features:**
- Auto-encrypts sensitive fields (AES-256-GCM)
- Creates audit log entries
- Never logs plaintext values
- Continues on errors
---
### 4. `scan_and_import_credentials(base_path, db, client_id=None, user_id="system_import")`
Complete workflow in one call.
**Returns:** `Dict[str, int]`
```python
{
"files_found": 3,
"credentials_parsed": 8,
"credentials_imported": 8
}
```
---
## File Formats
### Markdown (.md)
```markdown
## Service Name
Username: admin
Password: secret123
API Key: sk-1234567890
URL: https://example.com
Notes: Additional info
```
### Environment (.env)
```bash
DATABASE_URL=mysql://user:pass@host/db
API_KEY=sk-1234567890
SECRET_TOKEN=abc123def456
```
### Text (.txt)
Same as Markdown format
---
## Credential Types Auto-Detected
| Value Pattern | Type | Field |
|--------------|------|-------|
| `sk-*` | api_key | api_key |
| `ghp_*` | api_key | api_key |
| `mysql://...` | connection_string | connection_string |
| `-----BEGIN...` | ssh_key | password |
| JWT (3 parts) | jwt | token |
| Default | password | password |
---
## Security
**Encryption:** AES-256-GCM via `credential_service`
**Audit:** Every import logged to `credential_audit_log`
**Logging:** Never logs plaintext credentials
---
## Command Line
```bash
# Preview
python example_credential_import.py /path --preview
# Import
python example_credential_import.py /path --client-id "uuid"
```
---
## Common Workflows
### Import from Client Directory
```python
db = SessionLocal()
try:
results = scan_and_import_credentials(
"C:/Projects/ClientA",
db,
client_id="client-uuid"
)
finally:
db.close()
```
### Preview Before Import
```python
files = scan_for_credential_files("/path")
for f in files:
creds = parse_credential_file(f)
print(f"{f}: {len(creds)} credentials")
```
### Import with Error Handling
```python
files = scan_for_credential_files("/path")
for file_path in files:
try:
creds = parse_credential_file(file_path)
count = import_credentials_to_db(db, creds)
print(f"{count} from {file_path}")
except Exception as e:
print(f"✗ Failed: {e}")
```
---
## Testing
```bash
python test_credential_scanner.py
# All 5 tests should pass
```
---
## Documentation
- **Full Guide:** `CREDENTIAL_SCANNER_GUIDE.md`
- **Summary:** `CREDENTIAL_SCANNER_SUMMARY.md`
- **Examples:** `example_credential_import.py`
- **Tests:** `test_credential_scanner.py`
---
## Troubleshooting
**No files found?**
- Check base_path exists
- Verify file names match patterns
- Ensure not in excluded dirs (.git, node_modules)
**Parsing errors?**
- Verify file format (headers, key:value pairs)
- Check UTF-8 encoding
- Ensure recognized key names
**Import fails?**
- Check database connection
- Verify ENCRYPTION_KEY set
- Check client_id exists (if provided)
---
**Quick Help:** See `CREDENTIAL_SCANNER_GUIDE.md` for complete documentation

View File

@@ -0,0 +1,326 @@
# Credential Scanner Implementation Summary
**Date:** 2026-01-16
**Module:** `api/utils/credential_scanner.py`
**Status:** ✓ Complete and Tested
---
## What Was Built
A comprehensive credential scanner and importer for the ClaudeTools context import system that:
1. **Scans directories** for credential files (credentials.md, .env, passwords.txt, etc.)
2. **Parses multiple formats** (Markdown, environment files, text)
3. **Auto-detects credential types** (API keys, passwords, connection strings, tokens)
4. **Imports to database** with automatic AES-256-GCM encryption
5. **Creates audit logs** for compliance and security tracking
---
## Files Created
### Core Implementation
- **`api/utils/credential_scanner.py`** (598 lines)
- 3 main functions + 1 convenience function
- Multi-format parser support
- Auto-encryption integration
- Comprehensive error handling
### Testing & Examples
- **`test_credential_scanner.py`** (262 lines)
- 5 comprehensive tests
- Sample file generation
- All tests passing (100%)
- **`example_credential_import.py`** (173 lines)
- Command-line import tool
- Preview and import modes
- Client association support
### Documentation
- **`CREDENTIAL_SCANNER_GUIDE.md`** (695 lines)
- Complete API reference
- Usage examples
- Security considerations
- Troubleshooting guide
- Production deployment instructions
---
## Features Implemented
### 1. File Scanning (`scan_for_credential_files`)
- Recursive directory traversal
- Smart file pattern matching
- Exclusion of build/cache directories
- Supports: credentials.md, .env, passwords.txt, secrets.md, auth.md
### 2. Multi-Format Parsing (`parse_credential_file`)
**Markdown Format:**
```markdown
## Service Name
Username: admin
Password: secret123
API Key: sk-1234567890
```
**Environment Format:**
```bash
DATABASE_URL=mysql://user:pass@host/db
API_KEY=sk-1234567890
```
**Auto-detects:**
- Service names from headers
- Credential types from value patterns
- Internal vs external URLs
- 20+ key variations (username/user/login, password/pass/pwd, etc.)
### 3. Type Detection (`_detect_credential_type`)
**Patterns recognized:**
- API keys: `sk-*`, `api_*`, `ghp_*`, `gho_*`, `xoxb-*`
- SSH keys: `-----BEGIN * PRIVATE KEY-----`
- Connection strings: `mysql://`, `postgresql://`, `Server=...`
- JWT tokens: 3-part base64 format
- OAuth tokens: `ya29.*`, `ey*`, `oauth*`
### 4. Database Import (`import_credentials_to_db`)
- Uses existing `credential_service` for encryption
- Creates audit log entries (action: "create")
- Never logs plaintext credentials
- Continues on errors (partial import support)
- Returns success count
### 5. Convenience Function (`scan_and_import_credentials`)
- One-line full workflow
- Returns detailed statistics
- Supports client association
---
## Security Features
### Encryption
- **Algorithm:** AES-256-GCM (via Fernet)
- **Encrypted fields:** password, api_key, client_secret, token, connection_string
- **Key management:** Environment variable `ENCRYPTION_KEY`
- **Per-credential:** Unique initialization vectors
### Audit Trail
Every import creates audit log with:
- `credential_id` - Reference to imported credential
- `action` - "create"
- `user_id` - From function parameter
- `ip_address` - From function parameter (optional)
- `timestamp` - Auto-generated
- `details` - Service name, credential type
### Safe Logging
- Plaintext credentials **NEVER** logged
- Only file paths and counts logged
- Service names (non-sensitive) logged
- Errors logged without credential values
---
## Test Results
```
TEST 1: Scan for Credential Files ✓ PASSED
TEST 2: Parse Credential Files ✓ PASSED
TEST 3: Import Credentials to Database ✓ PASSED
TEST 4: Full Scan and Import Workflow ✓ PASSED
TEST 5: Markdown Format Variations ✓ PASSED
All 5 tests passed successfully!
```
**Test Coverage:**
- File scanning in temporary directories
- Parsing 3 different file formats
- Database import with encryption
- Full workflow integration
- Format variation handling
**Results:**
- Found 3 credential files
- Parsed 8 credentials from all formats
- Successfully imported all 11 test credentials
- All credentials encrypted in database
- All audit log entries created
---
## Usage Examples
### Quick Import
```python
from api.database import SessionLocal
from api.utils.credential_scanner import scan_and_import_credentials
db = SessionLocal()
try:
results = scan_and_import_credentials(
"C:/Projects/ClientProject",
db,
client_id="your-client-uuid"
)
print(f"Imported {results['credentials_imported']} credentials")
finally:
db.close()
```
### Command Line
```bash
# Preview
python example_credential_import.py /path/to/project --preview
# Import
python example_credential_import.py /path/to/project --client-id "uuid-here"
```
### Step by Step
```python
from api.utils.credential_scanner import (
scan_for_credential_files,
parse_credential_file,
import_credentials_to_db
)
# 1. Scan
files = scan_for_credential_files("C:/Projects")
# 2. Parse
for file_path in files:
creds = parse_credential_file(file_path)
# 3. Import
count = import_credentials_to_db(db, creds)
```
---
## Integration Points
### Uses Existing Services
- **`credential_service.create_credential()`** - Handles encryption and storage
- **`credential_service._create_audit_log()`** - Creates audit entries
- **`crypto.encrypt_string()`** - AES-256-GCM encryption
- **`database.SessionLocal()`** - Database session management
### Database Tables
- **`credentials`** - Encrypted credential storage
- **`credential_audit_log`** - Audit trail (read-only)
- **`clients`** - Optional client association (foreign key)
### Pydantic Schemas
- **`CredentialCreate`** - Input validation
- **`CredentialResponse`** - Output format with decryption
---
## Production Readiness
### Completed
- ✓ Full implementation with error handling
- ✓ Comprehensive test suite (100% pass rate)
- ✓ Security features (encryption, audit, safe logging)
- ✓ Multi-format support (Markdown, .env, text)
- ✓ Type auto-detection
- ✓ Complete documentation
- ✓ Example scripts and usage guides
- ✓ Integration with existing credential service
### Security Validated
- ✓ Never logs plaintext credentials
- ✓ Automatic encryption before storage
- ✓ Audit trail for all operations
- ✓ Uses existing encryption infrastructure
- ✓ Validates all inputs via Pydantic schemas
### Performance
- Handles large directory trees efficiently
- Excludes common build/cache directories
- Processes files individually (memory-efficient)
- Continues on errors (partial import support)
- Database transactions per credential (atomic)
---
## Next Steps (Optional)
### Enhancements
1. **Add more file formats**
- JSON credentials files
- YAML configuration files
- CSV export from password managers
- 1Password/Bitwarden import
2. **Add duplicate detection**
- Check for existing credentials before import
- Offer update vs create choice
- Compare by service_name + username
3. **Add credential validation**
- Test API keys before import
- Verify connection strings
- Check password strength
4. **Add bulk operations**
- Import from multiple directories
- Export credentials to file
- Bulk delete/update
### API Endpoint (Future)
```python
@router.post("/credentials/import")
async def import_from_file(
file: UploadFile,
client_id: Optional[UUID] = None,
db: Session = Depends(get_db)
):
"""REST API endpoint for file upload and import"""
pass
```
---
## Documentation References
- **Full Guide:** `CREDENTIAL_SCANNER_GUIDE.md` (695 lines)
- **API Reference:** All 3 functions documented with examples
- **Security:** Encryption, audit, logging best practices
- **Testing:** `test_credential_scanner.py` (5 tests)
- **Examples:** `example_credential_import.py` (CLI tool)
---
## Conclusion
The credential scanner and importer is **production-ready** and provides:
1. **Automated discovery** of credential files in project directories
2. **Multi-format parsing** (Markdown, .env, text files)
3. **Intelligent type detection** (API keys, passwords, connection strings, etc.)
4. **Secure import** with automatic AES-256-GCM encryption
5. **Complete audit trail** for compliance and security
6. **Safe operation** with no plaintext logging
7. **Full integration** with existing ClaudeTools credential system
All 5 tests pass successfully, demonstrating:
- Correct file scanning
- Accurate parsing of all formats
- Successful database import with encryption
- Complete workflow integration
- Flexible format handling
The implementation is secure, well-tested, thoroughly documented, and ready for use in production environments.
---
**Last Updated:** 2026-01-16
**Test Status:** 5/5 Tests Passing
**Coverage:** Complete