Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zerohost-dashboard",
"version": "1.2.5",
"version": "1.2.6",
"private": true,
"type": "module",
"scripts": {
Expand Down
9 changes: 8 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,14 @@
</head>
<body>

<div id="app"></div>
<div id="app">
<div class="auth-page" style="display:flex;align-items:center;justify-content:center;min-height:100vh;padding:24px;">
<div class="auth-card" style="text-align:center;padding:48px;">
<span class="spinner" style="width:32px;height:32px;border-width:3px;margin:0 auto 16px;display:block;"></span>
<p style="color:var(--text-secondary);">Loading...</p>
</div>
</div>
</div>

<script src="/js/app.js?v=6"></script>
<script src="/js/admin.js?v=6"></script>
Expand Down
34 changes: 19 additions & 15 deletions public/js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -306,29 +306,33 @@ async function handleAdminLogin(e) {
btn.innerHTML = '<span class="spinner"></span> Signing in...';

try {
const capWidget = $a('#admin-login-form cap-widget');
const capToken = capWidget?.token || '';
const data = await adminApi('/login', {
method: 'POST',
body: JSON.stringify({
email: $a('#admin-email').value,
password: $a('#admin-password').value,
capToken,
}),
});
const capWidget = $a('#admin-login-form cap-widget');
const capToken = capWidget?.token || '';
const data = await adminApi('/login', {
method: 'POST',
body: JSON.stringify({
email: $a('#admin-email').value,
password: $a('#admin-password').value,
capToken,
}),
});
adminState.token = data.token;
adminState.user = data.user;
localStorage.setItem(ADMIN_STORAGE_KEY, data.token);
history.replaceState({ adminPage: 'dashboard' }, '', '/admin/dashboard');
renderAdminLayout();
} catch (err) {
if (errorEl) {
errorEl.textContent = err.message;
errorEl.classList.add('show');
const currentErrorEl = $a('#admin-login-form .auth-error');
if (currentErrorEl) {
currentErrorEl.textContent = err.message;
currentErrorEl.classList.add('show');
}
} finally {
btn.disabled = false;
btn.innerHTML = 'Sign In';
const currentBtn = $a('#admin-login-btn');
if (currentBtn) {
currentBtn.disabled = false;
currentBtn.innerHTML = 'Sign In';
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion public/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1654,7 +1654,7 @@ async function renderDashboard() {
<div style="padding:8px 12px 0;display:flex;gap:16px;justify-content:center;flex-wrap:wrap">

</div>
<div style="padding:4px 0 8px;text-align:center;font-size:0.7rem;color:var(--text-muted);letter-spacing:0.05em">v1.2.5</div>
<div style="padding:4px 0 8px;text-align:center;font-size:0.7rem;color:var(--text-muted);letter-spacing:0.05em">v1.2.6</div>
</div>
<div class="sidebar-resizer" id="sidebar-resizer"></div>
</aside>
Expand Down
2 changes: 1 addition & 1 deletion server.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ app.use((err, req, res, next) => {
});
app.use(cookieParser(process.env.COOKIE_SECRET));

const csrfExemptPaths = ['/api/auth/login', '/api/auth/register', '/api/auth/passkey/options', '/api/auth/passkey/verify', '/api/auth/passkeys/login/begin', '/api/auth/passkeys/login/complete', '/api/auth/passkeys/register/begin', '/api/auth/passkeys/register/complete', '/api/auth/totp/verify', '/api/auth/totp/recovery'];
const csrfExemptPaths = ['/api/auth/login', '/api/auth/register', '/api/auth/passkey/options', '/api/auth/passkey/verify', '/api/auth/passkeys/login/begin', '/api/auth/passkeys/login/complete', '/api/auth/passkeys/register/begin', '/api/auth/passkeys/register/complete', '/api/auth/totp/verify', '/api/auth/totp/recovery', '/api/admin/login'];
app.use((req, res, next) => {
if (!req.path.startsWith('/api/')) return next();
if (csrfExemptPaths.includes(req.path)) return next();
Expand Down
184 changes: 0 additions & 184 deletions services/security.js
Original file line number Diff line number Diff line change
Expand Up @@ -379,12 +379,6 @@ export function isKnownBotIp(ip) {
if (!clean || !isIP(clean)) return false;
const parts = clean.split('.').map(Number);
if (parts.length !== 4) return false;
if (parts[0] === 3) return true;
if (parts[0] === 15) return true;
if (parts[0] === 23) return true;
if (parts[0] === 34) return true;
if (parts[0] === 35) return true;
if (parts[0] === 44) return true;
if (parts[0] === 45 && parts[1] === 8) return true;
if (parts[0] === 45 && parts[1] === 14) return true;
if (parts[0] === 45 && parts[1] === 15) return true;
Expand All @@ -406,184 +400,6 @@ export function isKnownBotIp(ip) {
if (parts[0] === 45 && parts[1] === 152) return true;
if (parts[0] === 45 && parts[1] === 153) return true;
if (parts[0] === 45 && parts[1] === 155) return true;
if (parts[0] === 47) return true;
if (parts[0] === 51) return true;
if (parts[0] === 54) return true;
if (parts[0] === 63 && parts[1] === 32) return true;
if (parts[0] === 63 && parts[1] === 35) return true;
if (parts[0] === 64 && parts[1] === 62) return true;
if (parts[0] === 64 && parts[1] === 90) return true;
if (parts[0] === 65) return true;
if (parts[0] === 66) return true;
if (parts[0] === 67) return true;
if (parts[0] === 68) return true;
if (parts[0] === 69) return true;
if (parts[0] === 70) return true;
if (parts[0] === 71) return true;
if (parts[0] === 72) return true;
if (parts[0] === 73) return true;
if (parts[0] === 74) return true;
if (parts[0] === 75) return true;
if (parts[0] === 76) return true;
if (parts[0] === 77) return true;
if (parts[0] === 78) return true;
if (parts[0] === 79) return true;
if (parts[0] === 80) return true;
if (parts[0] === 81) return true;
if (parts[0] === 82) return true;
if (parts[0] === 83) return true;
if (parts[0] === 84) return true;
if (parts[0] === 85) return true;
if (parts[0] === 86) return true;
if (parts[0] === 87) return true;
if (parts[0] === 88) return true;
if (parts[0] === 89) return true;
if (parts[0] === 90) return true;
if (parts[0] === 91) return true;
if (parts[0] === 92) return true;
if (parts[0] === 93) return true;
if (parts[0] === 94) return true;
if (parts[0] === 95) return true;
if (parts[0] === 96) return true;
if (parts[0] === 97) return true;
if (parts[0] === 98) return true;
if (parts[0] === 99) return true;
if (parts[0] === 100) return true;
if (parts[0] === 101) return true;
if (parts[0] === 102) return true;
if (parts[0] === 103) return true;
if (parts[0] === 104) return true;
if (parts[0] === 104 && parts[1] === 16) return true;
if (parts[0] === 104 && parts[1] === 17) return true;
if (parts[0] === 104 && parts[1] === 18) return true;
if (parts[0] === 104 && parts[1] === 19) return true;
if (parts[0] === 104 && parts[1] === 20) return true;
if (parts[0] === 104 && parts[1] === 21) return true;
if (parts[0] === 104 && parts[1] === 22) return true;
if (parts[0] === 104 && parts[1] === 23) return true;
if (parts[0] === 104 && parts[1] === 24) return true;
if (parts[0] === 104 && parts[1] === 25) return true;
if (parts[0] === 104 && parts[1] === 26) return true;
if (parts[0] === 104 && parts[1] === 27) return true;
if (parts[0] === 104 && parts[1] === 28) return true;
if (parts[0] === 105) return true;
if (parts[0] === 106) return true;
if (parts[0] === 107) return true;
if (parts[0] === 108) return true;
if (parts[0] === 109) return true;
if (parts[0] === 110) return true;
if (parts[0] === 111) return true;
if (parts[0] === 112) return true;
if (parts[0] === 113) return true;
if (parts[0] === 114) return true;
if (parts[0] === 115) return true;
if (parts[0] === 116) return true;
if (parts[0] === 117) return true;
if (parts[0] === 118) return true;
if (parts[0] === 119) return true;
if (parts[0] === 120) return true;
if (parts[0] === 121) return true;
if (parts[0] === 122) return true;
if (parts[0] === 123) return true;
if (parts[0] === 124) return true;
if (parts[0] === 125) return true;
if (parts[0] === 126) return true;
if (parts[0] === 128) return true;
if (parts[0] === 129) return true;
if (parts[0] === 130) return true;
if (parts[0] === 131) return true;
if (parts[0] === 132) return true;
if (parts[0] === 133) return true;
if (parts[0] === 134) return true;
if (parts[0] === 135) return true;
if (parts[0] === 136) return true;
if (parts[0] === 137) return true;
if (parts[0] === 138) return true;
if (parts[0] === 139) return true;
if (parts[0] === 140) return true;
if (parts[0] === 141) return true;
if (parts[0] === 142) return true;
if (parts[0] === 143) return true;
if (parts[0] === 144) return true;
if (parts[0] === 145) return true;
if (parts[0] === 146) return true;
if (parts[0] === 147) return true;
if (parts[0] === 148) return true;
if (parts[0] === 149) return true;
if (parts[0] === 150) return true;
if (parts[0] === 151) return true;
if (parts[0] === 152) return true;
if (parts[0] === 153) return true;
if (parts[0] === 154) return true;
if (parts[0] === 155) return true;
if (parts[0] === 156) return true;
if (parts[0] === 157) return true;
if (parts[0] === 158) return true;
if (parts[0] === 159) return true;
if (parts[0] === 160) return true;
if (parts[0] === 161) return true;
if (parts[0] === 162) return true;
if (parts[0] === 163) return true;
if (parts[0] === 164) return true;
if (parts[0] === 165) return true;
if (parts[0] === 166) return true;
if (parts[0] === 167) return true;
if (parts[0] === 168) return true;
if (parts[0] === 169) return true;
if (parts[0] === 170) return true;
if (parts[0] === 171) return true;
if (parts[0] === 172) return true;
if (parts[0] === 173) return true;
if (parts[0] === 174) return true;
if (parts[0] === 175) return true;
if (parts[0] === 176) return true;
if (parts[0] === 177) return true;
if (parts[0] === 178) return true;
if (parts[0] === 179) return true;
if (parts[0] === 180) return true;
if (parts[0] === 181) return true;
if (parts[0] === 182) return true;
if (parts[0] === 183) return true;
if (parts[0] === 184) return true;
if (parts[0] === 185) return true;
if (parts[0] === 186) return true;
if (parts[0] === 187) return true;
if (parts[0] === 188) return true;
if (parts[0] === 189) return true;
if (parts[0] === 190) return true;
if (parts[0] === 191) return true;
if (parts[0] === 192 && parts[1] === 0) return true;
if (parts[0] === 192 && parts[1] === 3) return true;
if (parts[0] === 193) return true;
if (parts[0] === 194) return true;
if (parts[0] === 195) return true;
if (parts[0] === 196) return true;
if (parts[0] === 197) return true;
if (parts[0] === 198) return true;
if (parts[0] === 199) return true;
if (parts[0] === 200) return true;
if (parts[0] === 201) return true;
if (parts[0] === 202) return true;
if (parts[0] === 203) return true;
if (parts[0] === 204) return true;
if (parts[0] === 205) return true;
if (parts[0] === 206) return true;
if (parts[0] === 207) return true;
if (parts[0] === 208) return true;
if (parts[0] === 209) return true;
if (parts[0] === 210) return true;
if (parts[0] === 211) return true;
if (parts[0] === 212) return true;
if (parts[0] === 213) return true;
if (parts[0] === 214) return true;
if (parts[0] === 215) return true;
if (parts[0] === 216) return true;
if (parts[0] === 217) return true;
if (parts[0] === 218) return true;
if (parts[0] === 219) return true;
if (parts[0] === 220) return true;
if (parts[0] === 221) return true;
if (parts[0] === 222) return true;
return false;
}

Expand Down
Loading