Add web-based Uptime Kuma login with TOTP support
All checks were successful
Build and Push Container / build (push) Successful in 34s
All checks were successful
Build and Push Container / build (push) Successful in 34s
- Add login modal for username/password/TOTP authentication - Persist token to file for session persistence - Make UPTIME_KUMA_API_KEY optional (can login via web UI) - Add /api/kuma/auth, /api/kuma/login, /api/kuma/logout endpoints - Show login prompt when not authenticated 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -406,6 +406,52 @@ def create_suggested_monitors():
|
|||||||
return jsonify({"created": created})
|
return jsonify({"created": created})
|
||||||
|
|
||||||
|
|
||||||
|
# Uptime Kuma authentication endpoints
|
||||||
|
@app.route("/api/kuma/auth", methods=["GET"])
|
||||||
|
def kuma_auth_status():
|
||||||
|
"""Check if authenticated to Uptime Kuma."""
|
||||||
|
try:
|
||||||
|
kuma = get_kuma_client()
|
||||||
|
authenticated = kuma.is_authenticated()
|
||||||
|
config = get_config()
|
||||||
|
return jsonify({
|
||||||
|
"authenticated": authenticated,
|
||||||
|
"url": config.uptime_kuma_url,
|
||||||
|
})
|
||||||
|
except Exception as e:
|
||||||
|
return jsonify({"authenticated": False, "error": str(e)})
|
||||||
|
|
||||||
|
|
||||||
|
@app.route("/api/kuma/login", methods=["POST"])
|
||||||
|
def kuma_login():
|
||||||
|
"""Login to Uptime Kuma with username/password/TOTP."""
|
||||||
|
data = request.json
|
||||||
|
username = data.get("username")
|
||||||
|
password = data.get("password")
|
||||||
|
totp = data.get("totp") # Optional
|
||||||
|
|
||||||
|
if not username or not password:
|
||||||
|
return jsonify({"error": "username and password are required"}), 400
|
||||||
|
|
||||||
|
try:
|
||||||
|
kuma = get_kuma_client()
|
||||||
|
result = kuma.login(username, password, totp)
|
||||||
|
return jsonify(result)
|
||||||
|
except Exception as e:
|
||||||
|
return jsonify({"error": str(e)}), 401
|
||||||
|
|
||||||
|
|
||||||
|
@app.route("/api/kuma/logout", methods=["POST"])
|
||||||
|
def kuma_logout():
|
||||||
|
"""Logout from Uptime Kuma."""
|
||||||
|
try:
|
||||||
|
kuma = get_kuma_client()
|
||||||
|
kuma.logout()
|
||||||
|
return jsonify({"status": "ok"})
|
||||||
|
except Exception as e:
|
||||||
|
return jsonify({"error": str(e)}), 500
|
||||||
|
|
||||||
|
|
||||||
# Test Uptime Kuma connection
|
# Test Uptime Kuma connection
|
||||||
@app.route("/api/kuma/test", methods=["GET"])
|
@app.route("/api/kuma/test", methods=["GET"])
|
||||||
def test_kuma_connection():
|
def test_kuma_connection():
|
||||||
|
|||||||
@@ -100,8 +100,7 @@ class Config:
|
|||||||
errors.append("SSH_PRIVATE_KEY is required")
|
errors.append("SSH_PRIVATE_KEY is required")
|
||||||
if not self.uptime_kuma_url:
|
if not self.uptime_kuma_url:
|
||||||
errors.append("UPTIME_KUMA_URL is required")
|
errors.append("UPTIME_KUMA_URL is required")
|
||||||
if not self.uptime_kuma_api_key:
|
# UPTIME_KUMA_API_KEY is optional - can login via web UI
|
||||||
errors.append("UPTIME_KUMA_API_KEY is required")
|
|
||||||
if not self.claude_api_key:
|
if not self.claude_api_key:
|
||||||
errors.append("CLAUDE_API_KEY is required")
|
errors.append("CLAUDE_API_KEY is required")
|
||||||
return errors
|
return errors
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import os
|
||||||
|
import json
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from uptime_kuma_api import UptimeKumaApi, MonitorType
|
from uptime_kuma_api import UptimeKumaApi, MonitorType
|
||||||
@@ -15,6 +17,9 @@ TYPE_MAP = {
|
|||||||
"push": MonitorType.PUSH,
|
"push": MonitorType.PUSH,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Token storage path
|
||||||
|
TOKEN_FILE = os.environ.get("KUMA_TOKEN_FILE", "/tmp/kuma_token.json")
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class Monitor:
|
class Monitor:
|
||||||
@@ -40,21 +45,68 @@ class Monitor:
|
|||||||
self.accepted_statuscodes = ["200-299"]
|
self.accepted_statuscodes = ["200-299"]
|
||||||
|
|
||||||
|
|
||||||
|
def load_saved_token() -> Optional[str]:
|
||||||
|
"""Load saved token from file."""
|
||||||
|
try:
|
||||||
|
if os.path.exists(TOKEN_FILE):
|
||||||
|
with open(TOKEN_FILE, "r") as f:
|
||||||
|
data = json.load(f)
|
||||||
|
return data.get("token")
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def save_token(token: str) -> None:
|
||||||
|
"""Save token to file."""
|
||||||
|
try:
|
||||||
|
with open(TOKEN_FILE, "w") as f:
|
||||||
|
json.dump({"token": token}, f)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Warning: Could not save token: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
def clear_saved_token() -> None:
|
||||||
|
"""Clear saved token."""
|
||||||
|
try:
|
||||||
|
if os.path.exists(TOKEN_FILE):
|
||||||
|
os.remove(TOKEN_FILE)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class UptimeKumaClient:
|
class UptimeKumaClient:
|
||||||
"""Client for Uptime Kuma using Socket.io API."""
|
"""Client for Uptime Kuma using Socket.io API."""
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
config = get_config()
|
config = get_config()
|
||||||
self.base_url = config.uptime_kuma_url.rstrip("/")
|
self.base_url = config.uptime_kuma_url.rstrip("/")
|
||||||
self.api_key = config.uptime_kuma_api_key
|
self.api_key = config.uptime_kuma_api_key # Can be empty if using saved token
|
||||||
self._api = None
|
self._api = None
|
||||||
|
self._token = None
|
||||||
|
|
||||||
|
def _get_token(self) -> Optional[str]:
|
||||||
|
"""Get token from config or saved file."""
|
||||||
|
if self._token:
|
||||||
|
return self._token
|
||||||
|
if self.api_key:
|
||||||
|
return self.api_key
|
||||||
|
return load_saved_token()
|
||||||
|
|
||||||
def _get_api(self) -> UptimeKumaApi:
|
def _get_api(self) -> UptimeKumaApi:
|
||||||
"""Get connected API instance."""
|
"""Get connected API instance."""
|
||||||
if self._api is None:
|
if self._api is None:
|
||||||
|
token = self._get_token()
|
||||||
|
if not token:
|
||||||
|
raise Exception("Not authenticated. Please login to Uptime Kuma first.")
|
||||||
|
|
||||||
self._api = UptimeKumaApi(self.base_url)
|
self._api = UptimeKumaApi(self.base_url)
|
||||||
# Login with API key as token
|
try:
|
||||||
self._api.login_by_token(self.api_key)
|
self._api.login_by_token(token)
|
||||||
|
except Exception as e:
|
||||||
|
self._api = None
|
||||||
|
clear_saved_token()
|
||||||
|
raise Exception(f"Authentication failed. Please login again: {e}")
|
||||||
return self._api
|
return self._api
|
||||||
|
|
||||||
def _disconnect(self):
|
def _disconnect(self):
|
||||||
@@ -66,6 +118,46 @@ class UptimeKumaClient:
|
|||||||
pass
|
pass
|
||||||
self._api = None
|
self._api = None
|
||||||
|
|
||||||
|
def login(self, username: str, password: str, totp: Optional[str] = None) -> dict:
|
||||||
|
"""Login with username/password and optional TOTP."""
|
||||||
|
self._disconnect()
|
||||||
|
try:
|
||||||
|
api = UptimeKumaApi(self.base_url)
|
||||||
|
if totp:
|
||||||
|
result = api.login(username, password, totp)
|
||||||
|
else:
|
||||||
|
result = api.login(username, password)
|
||||||
|
|
||||||
|
token = result.get("token")
|
||||||
|
if token:
|
||||||
|
save_token(token)
|
||||||
|
self._token = token
|
||||||
|
|
||||||
|
api.disconnect()
|
||||||
|
return {"success": True, "message": "Login successful"}
|
||||||
|
except Exception as e:
|
||||||
|
raise Exception(f"Login failed: {str(e)}")
|
||||||
|
|
||||||
|
def is_authenticated(self) -> bool:
|
||||||
|
"""Check if we have valid authentication."""
|
||||||
|
token = self._get_token()
|
||||||
|
if not token:
|
||||||
|
return False
|
||||||
|
try:
|
||||||
|
api = UptimeKumaApi(self.base_url)
|
||||||
|
api.login_by_token(token)
|
||||||
|
api.disconnect()
|
||||||
|
return True
|
||||||
|
except Exception:
|
||||||
|
clear_saved_token()
|
||||||
|
return False
|
||||||
|
|
||||||
|
def logout(self) -> None:
|
||||||
|
"""Clear saved authentication."""
|
||||||
|
self._disconnect()
|
||||||
|
self._token = None
|
||||||
|
clear_saved_token()
|
||||||
|
|
||||||
def get_monitors(self) -> list[dict]:
|
def get_monitors(self) -> list[dict]:
|
||||||
"""Get all monitors."""
|
"""Get all monitors."""
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { io } from 'socket.io-client';
|
|||||||
import Dashboard from './components/Dashboard';
|
import Dashboard from './components/Dashboard';
|
||||||
import DevModeToggle from './components/DevModeToggle';
|
import DevModeToggle from './components/DevModeToggle';
|
||||||
import ApprovalModal from './components/ApprovalModal';
|
import ApprovalModal from './components/ApprovalModal';
|
||||||
|
import KumaLoginModal from './components/KumaLoginModal';
|
||||||
import { api } from './api/client';
|
import { api } from './api/client';
|
||||||
|
|
||||||
const socket = io(window.location.origin, {
|
const socket = io(window.location.origin, {
|
||||||
@@ -16,12 +17,24 @@ export default function App() {
|
|||||||
const [scanProgress, setScanProgress] = useState({});
|
const [scanProgress, setScanProgress] = useState({});
|
||||||
const [scanResults, setScanResults] = useState({});
|
const [scanResults, setScanResults] = useState({});
|
||||||
const [analysisResults, setAnalysisResults] = useState({});
|
const [analysisResults, setAnalysisResults] = useState({});
|
||||||
|
const [kumaAuth, setKumaAuth] = useState({ authenticated: false, url: '' });
|
||||||
|
const [showKumaLogin, setShowKumaLogin] = useState(false);
|
||||||
|
|
||||||
|
// Load initial settings and check Kuma auth
|
||||||
|
const checkKumaAuth = useCallback(async () => {
|
||||||
|
try {
|
||||||
|
const auth = await api.getKumaAuthStatus();
|
||||||
|
setKumaAuth(auth);
|
||||||
|
} catch (e) {
|
||||||
|
setKumaAuth({ authenticated: false, url: '' });
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
// Load initial settings
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
api.getSettings().then(setSettings).catch(console.error);
|
api.getSettings().then(setSettings).catch(console.error);
|
||||||
api.getPendingApprovals().then(data => setPendingApprovals(data.approvals)).catch(console.error);
|
api.getPendingApprovals().then(data => setPendingApprovals(data.approvals)).catch(console.error);
|
||||||
}, []);
|
checkKumaAuth();
|
||||||
|
}, [checkKumaAuth]);
|
||||||
|
|
||||||
// Socket connection
|
// Socket connection
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -138,17 +151,34 @@ export default function App() {
|
|||||||
{/* Main Content */}
|
{/* Main Content */}
|
||||||
<main className="max-w-7xl mx-auto px-4 py-8">
|
<main className="max-w-7xl mx-auto px-4 py-8">
|
||||||
{/* Config Status */}
|
{/* Config Status */}
|
||||||
{(!settings.has_ssh_key || !settings.has_claude_key || !settings.has_kuma_key) && (
|
{(!settings.has_ssh_key || !settings.has_claude_key) && (
|
||||||
<div className="mb-6 p-4 bg-yellow-900/30 border border-yellow-600 rounded-lg">
|
<div className="mb-6 p-4 bg-yellow-900/30 border border-yellow-600 rounded-lg">
|
||||||
<h3 className="font-semibold text-yellow-400 mb-2">Configuration Required</h3>
|
<h3 className="font-semibold text-yellow-400 mb-2">Configuration Required</h3>
|
||||||
<ul className="text-sm text-yellow-200 space-y-1">
|
<ul className="text-sm text-yellow-200 space-y-1">
|
||||||
{!settings.has_ssh_key && <li>• SSH_PRIVATE_KEY environment variable is not set</li>}
|
{!settings.has_ssh_key && <li>• SSH_PRIVATE_KEY environment variable is not set</li>}
|
||||||
{!settings.has_claude_key && <li>• CLAUDE_API_KEY environment variable is not set</li>}
|
{!settings.has_claude_key && <li>• CLAUDE_API_KEY environment variable is not set</li>}
|
||||||
{!settings.has_kuma_key && <li>• UPTIME_KUMA_API_KEY environment variable is not set</li>}
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Uptime Kuma Auth Status */}
|
||||||
|
{!kumaAuth.authenticated && (
|
||||||
|
<div className="mb-6 p-4 bg-blue-900/30 border border-blue-600 rounded-lg flex items-center justify-between">
|
||||||
|
<div>
|
||||||
|
<h3 className="font-semibold text-blue-400 mb-1">Uptime Kuma Login Required</h3>
|
||||||
|
<p className="text-sm text-blue-200">
|
||||||
|
Connect to Uptime Kuma to create monitors
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={() => setShowKumaLogin(true)}
|
||||||
|
className="px-4 py-2 bg-blue-600 hover:bg-blue-500 text-white rounded transition-colors"
|
||||||
|
>
|
||||||
|
Login to Uptime Kuma
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<Dashboard
|
<Dashboard
|
||||||
scanProgress={scanProgress}
|
scanProgress={scanProgress}
|
||||||
scanResults={scanResults}
|
scanResults={scanResults}
|
||||||
@@ -165,6 +195,14 @@ export default function App() {
|
|||||||
onReject={handleReject}
|
onReject={handleReject}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Kuma Login Modal */}
|
||||||
|
<KumaLoginModal
|
||||||
|
isOpen={showKumaLogin}
|
||||||
|
onClose={() => setShowKumaLogin(false)}
|
||||||
|
onSuccess={checkKumaAuth}
|
||||||
|
kumaUrl={kumaAuth.url || settings?.uptime_kuma_url}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,4 +61,10 @@ export const api = {
|
|||||||
|
|
||||||
// Uptime Kuma
|
// Uptime Kuma
|
||||||
testKumaConnection: () => fetchApi('/kuma/test'),
|
testKumaConnection: () => fetchApi('/kuma/test'),
|
||||||
|
getKumaAuthStatus: () => fetchApi('/kuma/auth'),
|
||||||
|
kumaLogin: (username, password, totp) => fetchApi('/kuma/login', {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify({ username, password, totp }),
|
||||||
|
}),
|
||||||
|
kumaLogout: () => fetchApi('/kuma/logout', { method: 'POST' }),
|
||||||
};
|
};
|
||||||
|
|||||||
126
frontend/src/components/KumaLoginModal.jsx
Normal file
126
frontend/src/components/KumaLoginModal.jsx
Normal file
@@ -0,0 +1,126 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { api } from '../api/client';
|
||||||
|
|
||||||
|
export default function KumaLoginModal({ isOpen, onClose, onSuccess, kumaUrl }) {
|
||||||
|
const [username, setUsername] = useState('');
|
||||||
|
const [password, setPassword] = useState('');
|
||||||
|
const [totp, setTotp] = useState('');
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
|
const [error, setError] = useState(null);
|
||||||
|
const [needsTotp, setNeedsTotp] = useState(false);
|
||||||
|
|
||||||
|
const handleSubmit = async (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await api.kumaLogin(username, password, totp || undefined);
|
||||||
|
onSuccess?.();
|
||||||
|
onClose();
|
||||||
|
} catch (err) {
|
||||||
|
const errorMsg = err.message || 'Login failed';
|
||||||
|
if (errorMsg.includes('2FA') || errorMsg.includes('token') || errorMsg.includes('TOTP')) {
|
||||||
|
setNeedsTotp(true);
|
||||||
|
setError('Please enter your 2FA code');
|
||||||
|
} else {
|
||||||
|
setError(errorMsg);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!isOpen) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
|
||||||
|
<div className="bg-slate-800 rounded-lg p-6 w-full max-w-md mx-4">
|
||||||
|
<div className="flex items-center justify-between mb-4">
|
||||||
|
<h2 className="text-xl font-semibold">Login to Uptime Kuma</h2>
|
||||||
|
<button
|
||||||
|
onClick={onClose}
|
||||||
|
className="text-slate-400 hover:text-white"
|
||||||
|
>
|
||||||
|
<svg className="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p className="text-sm text-slate-400 mb-4">
|
||||||
|
Connect to <span className="text-slate-200">{kumaUrl}</span>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<form onSubmit={handleSubmit} className="space-y-4">
|
||||||
|
<div>
|
||||||
|
<label className="block text-sm font-medium text-slate-300 mb-1">
|
||||||
|
Username
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={username}
|
||||||
|
onChange={(e) => setUsername(e.target.value)}
|
||||||
|
className="w-full px-4 py-2 bg-slate-700 border border-slate-600 rounded focus:ring-2 focus:ring-kuma-green focus:border-transparent outline-none"
|
||||||
|
required
|
||||||
|
autoFocus
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label className="block text-sm font-medium text-slate-300 mb-1">
|
||||||
|
Password
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
value={password}
|
||||||
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
|
className="w-full px-4 py-2 bg-slate-700 border border-slate-600 rounded focus:ring-2 focus:ring-kuma-green focus:border-transparent outline-none"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{needsTotp && (
|
||||||
|
<div>
|
||||||
|
<label className="block text-sm font-medium text-slate-300 mb-1">
|
||||||
|
2FA Code
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={totp}
|
||||||
|
onChange={(e) => setTotp(e.target.value)}
|
||||||
|
placeholder="6-digit code"
|
||||||
|
className="w-full px-4 py-2 bg-slate-700 border border-slate-600 rounded focus:ring-2 focus:ring-kuma-green focus:border-transparent outline-none"
|
||||||
|
maxLength={6}
|
||||||
|
autoFocus
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{error && (
|
||||||
|
<div className="p-3 bg-red-900/30 border border-red-600 rounded text-red-300 text-sm">
|
||||||
|
{error}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="flex gap-3">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={onClose}
|
||||||
|
className="flex-1 px-4 py-2 bg-slate-700 hover:bg-slate-600 text-white rounded transition-colors"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
disabled={loading}
|
||||||
|
className="flex-1 px-4 py-2 bg-kuma-green hover:bg-green-400 disabled:bg-slate-600 text-slate-900 font-semibold rounded transition-colors"
|
||||||
|
>
|
||||||
|
{loading ? 'Logging in...' : 'Login'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user