mirror of
https://github.com/house-of-vanity/OutFleet.git
synced 2025-08-21 14:37:16 +00:00
Added User UI
This commit is contained in:
Ultradesu
@@ -17,12 +17,13 @@ Including another URLconf
|
||||
from django.contrib import admin
|
||||
from django.urls import path, include
|
||||
from django.views.generic import RedirectView
|
||||
from vpn.views import shadowsocks, userFrontend
|
||||
from vpn.views import shadowsocks, userFrontend, userPortal
|
||||
|
||||
urlpatterns = [
|
||||
path('admin/', admin.site.urls),
|
||||
path('ss/<path:link>', shadowsocks, name='shadowsocks'),
|
||||
path('dynamic/<path:link>', shadowsocks, name='shadowsocks'),
|
||||
path('stat/<path:user_hash>', userFrontend, name='userFrontend'),
|
||||
path('u/<path:user_hash>', userPortal, name='userPortal'),
|
||||
path('', RedirectView.as_view(url='/admin/', permanent=False)),
|
||||
]
|
||||
|
||||
31
vpn/admin.py
31
vpn/admin.py
@@ -386,10 +386,17 @@ class UserAdmin(admin.ModelAdmin):
|
||||
search_fields = ('username', 'hash')
|
||||
readonly_fields = ('hash_link',)
|
||||
|
||||
@admin.display(description='API access', ordering='hash')
|
||||
@admin.display(description='User Portal', ordering='hash')
|
||||
def hash_link(self, obj):
|
||||
url = f"{EXTERNAL_ADDRESS}/stat/{obj.hash}"
|
||||
return format_html('<a href="{}">JSON server list</a>', url, obj.hash)
|
||||
portal_url = f"{EXTERNAL_ADDRESS}/u/{obj.hash}"
|
||||
json_url = f"{EXTERNAL_ADDRESS}/stat/{obj.hash}"
|
||||
return format_html(
|
||||
'<div style="display: flex; gap: 10px; flex-wrap: wrap;">' +
|
||||
'<a href="{}" target="_blank" style="background: #4ade80; color: #000; padding: 4px 8px; border-radius: 4px; text-decoration: none; font-size: 12px; font-weight: bold;">🌐 Portal</a>' +
|
||||
'<a href="{}" target="_blank" style="background: #3b82f6; color: #fff; padding: 4px 8px; border-radius: 4px; text-decoration: none; font-size: 12px; font-weight: bold;">📄 JSON</a>' +
|
||||
'</div>',
|
||||
portal_url, json_url
|
||||
)
|
||||
|
||||
@admin.display(description='Allowed servers', ordering='server_count')
|
||||
def server_count(self, obj):
|
||||
@@ -482,11 +489,23 @@ class ACLAdmin(admin.ModelAdmin):
|
||||
logger.error(f"Failed to get user info for {user.username} on {server.name}: {e}")
|
||||
return mark_safe(f"<span style='color: red;'>Server connection error: {e}</span>")
|
||||
|
||||
@admin.display(description='Dynamic Config Links')
|
||||
@admin.display(description='User Links')
|
||||
def display_links(self, obj):
|
||||
links = obj.links.all()
|
||||
formatted_links = [f"{link.comment} - {EXTERNAL_ADDRESS}/ss/{link.link}#{link.acl.server.name}" for link in links]
|
||||
return mark_safe('<br>'.join(formatted_links))
|
||||
portal_url = f"{EXTERNAL_ADDRESS}/u/{obj.user.hash}"
|
||||
|
||||
links_html = []
|
||||
for link in links:
|
||||
link_url = f"{EXTERNAL_ADDRESS}/ss/{link.link}#{obj.server.name}"
|
||||
links_html.append(f"{link.comment} - {link_url}")
|
||||
|
||||
links_text = '<br>'.join(links_html) if links_html else 'No links'
|
||||
|
||||
return format_html(
|
||||
'<div style="margin-bottom: 10px;">{}</div>' +
|
||||
'<a href="{}" target="_blank" style="background: #4ade80; color: #000; padding: 4px 8px; border-radius: 4px; text-decoration: none; font-size: 11px; font-weight: bold;">🌐 User Portal</a>',
|
||||
links_text, portal_url
|
||||
)
|
||||
|
||||
try:
|
||||
from django_celery_results.models import GroupResult, TaskResult
|
||||
|
||||
498
vpn/templates/vpn/user_portal.html
Normal file
498
vpn/templates/vpn/user_portal.html
Normal file
@@ -0,0 +1,498 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>VPN Access Portal - {{ user.username }}</title>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.min.js"></script>
|
||||
<style>
|
||||
* {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
|
||||
background: linear-gradient(135deg, #0c0c0c 0%, #1a1a1a 100%);
|
||||
color: #e0e0e0;
|
||||
min-height: 100vh;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.container {
|
||||
max-width: 1200px;
|
||||
margin: 0 auto;
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.header {
|
||||
background: rgba(255, 255, 255, 0.05);
|
||||
backdrop-filter: blur(10px);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
border-radius: 20px;
|
||||
padding: 30px;
|
||||
margin-bottom: 30px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.header h1 {
|
||||
color: #4ade80;
|
||||
font-size: 2.5rem;
|
||||
margin-bottom: 10px;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.header .subtitle {
|
||||
color: #9ca3af;
|
||||
font-size: 1.1rem;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.stats {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
gap: 40px;
|
||||
margin-top: 20px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.stat {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.stat-number {
|
||||
display: block;
|
||||
font-size: 2rem;
|
||||
font-weight: bold;
|
||||
color: #4ade80;
|
||||
}
|
||||
|
||||
.stat-label {
|
||||
color: #9ca3af;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.servers-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(400px, 1fr));
|
||||
gap: 30px;
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
.server-card {
|
||||
background: rgba(255, 255, 255, 0.05);
|
||||
backdrop-filter: blur(10px);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
border-radius: 20px;
|
||||
padding: 30px;
|
||||
transition: all 0.3s ease;
|
||||
}
|
||||
|
||||
.server-card:hover {
|
||||
transform: translateY(-5px);
|
||||
border-color: #4ade80;
|
||||
box-shadow: 0 20px 40px rgba(74, 222, 128, 0.1);
|
||||
}
|
||||
|
||||
.server-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 20px;
|
||||
flex-wrap: wrap;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.server-name {
|
||||
font-size: 1.5rem;
|
||||
font-weight: 600;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.server-type {
|
||||
background: #4ade80;
|
||||
color: #000;
|
||||
padding: 5px 12px;
|
||||
border-radius: 20px;
|
||||
font-size: 0.8rem;
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.server-status {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.status-indicator {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 8px 16px;
|
||||
border-radius: 25px;
|
||||
font-size: 0.9rem;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.status-online {
|
||||
background: rgba(74, 222, 128, 0.2);
|
||||
color: #4ade80;
|
||||
border: 1px solid rgba(74, 222, 128, 0.3);
|
||||
}
|
||||
|
||||
.status-offline {
|
||||
background: rgba(248, 113, 113, 0.2);
|
||||
color: #f87171;
|
||||
border: 1px solid rgba(248, 113, 113, 0.3);
|
||||
}
|
||||
|
||||
.status-dot {
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
border-radius: 50%;
|
||||
background: currentColor;
|
||||
}
|
||||
|
||||
.links-container {
|
||||
display: grid;
|
||||
gap: 15px;
|
||||
}
|
||||
|
||||
.link-item {
|
||||
background: rgba(0, 0, 0, 0.3);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
border-radius: 15px;
|
||||
padding: 20px;
|
||||
transition: all 0.3s ease;
|
||||
}
|
||||
|
||||
.link-item:hover {
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
border-color: rgba(74, 222, 128, 0.5);
|
||||
}
|
||||
|
||||
.link-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 15px;
|
||||
flex-wrap: wrap;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.link-comment {
|
||||
font-weight: 600;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.qr-toggle {
|
||||
background: rgba(74, 222, 128, 0.2);
|
||||
color: #4ade80;
|
||||
border: 1px solid rgba(74, 222, 128, 0.3);
|
||||
padding: 8px 16px;
|
||||
border-radius: 8px;
|
||||
cursor: pointer;
|
||||
font-size: 0.8rem;
|
||||
transition: all 0.3s ease;
|
||||
}
|
||||
|
||||
.qr-toggle:hover {
|
||||
background: rgba(74, 222, 128, 0.3);
|
||||
}
|
||||
|
||||
.link-url {
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
padding: 12px;
|
||||
border-radius: 8px;
|
||||
font-family: 'Monaco', 'Consolas', monospace;
|
||||
font-size: 0.9rem;
|
||||
color: #4ade80;
|
||||
word-break: break-all;
|
||||
margin-bottom: 15px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.copy-btn {
|
||||
position: absolute;
|
||||
top: 8px;
|
||||
right: 8px;
|
||||
background: #4ade80;
|
||||
color: #000;
|
||||
border: none;
|
||||
padding: 4px 8px;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 0.7rem;
|
||||
font-weight: 600;
|
||||
transition: all 0.3s ease;
|
||||
}
|
||||
|
||||
.copy-btn:hover {
|
||||
background: #22c55e;
|
||||
}
|
||||
|
||||
.qr-container {
|
||||
display: none;
|
||||
justify-content: center;
|
||||
padding: 20px;
|
||||
background: rgba(255, 255, 255, 0.95);
|
||||
border-radius: 12px;
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
.qr-container.show {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.footer {
|
||||
text-align: center;
|
||||
padding: 40px 20px;
|
||||
color: #6b7280;
|
||||
border-top: 1px solid rgba(255, 255, 255, 0.1);
|
||||
margin-top: 40px;
|
||||
}
|
||||
|
||||
.footer a {
|
||||
color: #4ade80;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.footer a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.servers-grid {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.header h1 {
|
||||
font-size: 2rem;
|
||||
}
|
||||
|
||||
.stats {
|
||||
gap: 20px;
|
||||
}
|
||||
|
||||
.server-card {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.link-header {
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
}
|
||||
}
|
||||
|
||||
.no-servers {
|
||||
text-align: center;
|
||||
padding: 60px 20px;
|
||||
color: #9ca3af;
|
||||
}
|
||||
|
||||
.no-servers h3 {
|
||||
font-size: 1.5rem;
|
||||
margin-bottom: 10px;
|
||||
color: #6b7280;
|
||||
}
|
||||
|
||||
.loading {
|
||||
text-align: center;
|
||||
padding: 20px;
|
||||
color: #9ca3af;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1>🚀 VPN Access Portal</h1>
|
||||
<div class="subtitle">Welcome back, <strong>{{ user.username }}</strong></div>
|
||||
<div class="stats">
|
||||
<div class="stat">
|
||||
<span class="stat-number">{{ total_servers }}</span>
|
||||
<span class="stat-label">Available Servers</span>
|
||||
</div>
|
||||
<div class="stat">
|
||||
<span class="stat-number">{{ total_links }}</span>
|
||||
<span class="stat-label">Active Connections</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if servers_data %}
|
||||
<div class="servers-grid">
|
||||
{% for server_name, server_data in servers_data.items %}
|
||||
<div class="server-card">
|
||||
<div class="server-header">
|
||||
<div class="server-name">{{ server_name }}</div>
|
||||
<div class="server-type">{{ server_data.server_type }}</div>
|
||||
</div>
|
||||
|
||||
<div class="server-status">
|
||||
{% if server_data.accessible %}
|
||||
<div class="status-indicator status-online">
|
||||
<div class="status-dot"></div>
|
||||
Online & Ready
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="status-indicator status-offline">
|
||||
<div class="status-dot"></div>
|
||||
Connection Issues
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="links-container">
|
||||
{% for link_data in server_data.links %}
|
||||
<div class="link-item">
|
||||
<div class="link-header">
|
||||
<div class="link-comment">📱 {{ link_data.comment }}</div>
|
||||
<button class="qr-toggle" onclick="toggleQR('qr-{{ link_data.link.id }}')">Show QR Code</button>
|
||||
</div>
|
||||
|
||||
<div class="link-url">
|
||||
{{ link_data.url }}
|
||||
<button class="copy-btn" onclick="copyToClipboard('{{ link_data.url }}')">Copy</button>
|
||||
</div>
|
||||
|
||||
<div id="qr-{{ link_data.link.id }}" class="qr-container">
|
||||
<!-- QR code will be generated here -->
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="no-servers">
|
||||
<h3>No VPN Access Available</h3>
|
||||
<p>You don't have access to any VPN servers yet. Please contact your administrator.</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="footer">
|
||||
<p>Powered by <a href="https://github.com/house-of-vanity/OutFleet" target="_blank">OutFleet VPN Manager</a></p>
|
||||
<p>Keep this link secure and don't share it with others</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// QR Code generation and management
|
||||
const qrCodes = {};
|
||||
|
||||
function toggleQR(containerId) {
|
||||
const container = document.getElementById(containerId);
|
||||
const isVisible = container.classList.contains('show');
|
||||
|
||||
if (isVisible) {
|
||||
container.classList.remove('show');
|
||||
} else {
|
||||
container.classList.add('show');
|
||||
|
||||
// Generate QR code if not already generated
|
||||
if (!qrCodes[containerId]) {
|
||||
const linkElement = container.previousElementSibling;
|
||||
const linkText = linkElement.textContent.trim().replace('Copy', '').trim();
|
||||
|
||||
container.innerHTML = '<div class="loading">Generating QR Code...</div>';
|
||||
|
||||
setTimeout(() => {
|
||||
container.innerHTML = '';
|
||||
qrCodes[containerId] = new QRCode(container, {
|
||||
text: linkText,
|
||||
width: 200,
|
||||
height: 200,
|
||||
colorDark: "#000000",
|
||||
colorLight: "#ffffff",
|
||||
correctLevel: QRCode.CorrectLevel.M
|
||||
});
|
||||
}, 100);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Copy to clipboard functionality
|
||||
async function copyToClipboard(text) {
|
||||
try {
|
||||
await navigator.clipboard.writeText(text);
|
||||
|
||||
// Visual feedback
|
||||
const event = new CustomEvent('copied');
|
||||
document.dispatchEvent(event);
|
||||
|
||||
// Show temporary feedback
|
||||
showCopyFeedback();
|
||||
} catch (err) {
|
||||
// Fallback for older browsers
|
||||
const textArea = document.createElement('textarea');
|
||||
textArea.value = text;
|
||||
document.body.appendChild(textArea);
|
||||
textArea.select();
|
||||
document.execCommand('copy');
|
||||
document.body.removeChild(textArea);
|
||||
showCopyFeedback();
|
||||
}
|
||||
}
|
||||
|
||||
function showCopyFeedback() {
|
||||
// Create and show a toast notification
|
||||
const toast = document.createElement('div');
|
||||
toast.textContent = 'Link copied to clipboard! ✓';
|
||||
toast.style.cssText = `
|
||||
position: fixed;
|
||||
top: 20px;
|
||||
right: 20px;
|
||||
background: #4ade80;
|
||||
color: #000;
|
||||
padding: 12px 20px;
|
||||
border-radius: 8px;
|
||||
font-weight: 600;
|
||||
z-index: 1000;
|
||||
animation: slideIn 0.3s ease;
|
||||
`;
|
||||
|
||||
document.body.appendChild(toast);
|
||||
|
||||
setTimeout(() => {
|
||||
toast.style.animation = 'slideOut 0.3s ease';
|
||||
setTimeout(() => document.body.removeChild(toast), 300);
|
||||
}, 2000);
|
||||
}
|
||||
|
||||
// Add animation styles
|
||||
const style = document.createElement('style');
|
||||
style.textContent = `
|
||||
@keyframes slideIn {
|
||||
from { transform: translateX(100%); opacity: 0; }
|
||||
to { transform: translateX(0); opacity: 1; }
|
||||
}
|
||||
@keyframes slideOut {
|
||||
from { transform: translateX(0); opacity: 1; }
|
||||
to { transform: translateX(100%); opacity: 0; }
|
||||
}
|
||||
`;
|
||||
document.head.appendChild(style);
|
||||
|
||||
// Update page title with username
|
||||
document.title = `VPN Portal - {{ user.username }}`;
|
||||
|
||||
// Add some interactivity on load
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
// Animate cards on load
|
||||
const cards = document.querySelectorAll('.server-card');
|
||||
cards.forEach((card, index) => {
|
||||
card.style.opacity = '0';
|
||||
card.style.transform = 'translateY(20px)';
|
||||
|
||||
setTimeout(() => {
|
||||
card.style.transition = 'all 0.6s ease';
|
||||
card.style.opacity = '1';
|
||||
card.style.transform = 'translateY(0)';
|
||||
}, index * 150);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
148
vpn/templates/vpn/user_portal_error.html
Normal file
148
vpn/templates/vpn/user_portal_error.html
Normal file
@@ -0,0 +1,148 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>{{ error_title }} - VPN Portal</title>
|
||||
<style>
|
||||
* {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
|
||||
background: linear-gradient(135deg, #0c0c0c 0%, #1a1a1a 100%);
|
||||
color: #e0e0e0;
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.error-container {
|
||||
max-width: 500px;
|
||||
padding: 40px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.error-card {
|
||||
background: rgba(255, 255, 255, 0.05);
|
||||
backdrop-filter: blur(10px);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
border-radius: 20px;
|
||||
padding: 40px;
|
||||
animation: fadeInUp 0.6s ease;
|
||||
}
|
||||
|
||||
.error-icon {
|
||||
font-size: 4rem;
|
||||
margin-bottom: 20px;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.error-title {
|
||||
color: #f87171;
|
||||
font-size: 2rem;
|
||||
font-weight: 700;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.error-message {
|
||||
color: #9ca3af;
|
||||
font-size: 1.1rem;
|
||||
margin-bottom: 30px;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.back-link {
|
||||
display: inline-block;
|
||||
background: #4ade80;
|
||||
color: #000;
|
||||
padding: 12px 24px;
|
||||
border-radius: 10px;
|
||||
text-decoration: none;
|
||||
font-weight: 600;
|
||||
transition: all 0.3s ease;
|
||||
}
|
||||
|
||||
.back-link:hover {
|
||||
background: #22c55e;
|
||||
transform: translateY(-2px);
|
||||
}
|
||||
|
||||
.footer {
|
||||
margin-top: 40px;
|
||||
color: #6b7280;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.footer a {
|
||||
color: #4ade80;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.footer a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
@keyframes fadeInUp {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: translateY(30px);
|
||||
}
|
||||
to {
|
||||
opacity: 1;
|
||||
transform: translateY(0);
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.error-container {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.error-card {
|
||||
padding: 30px 20px;
|
||||
}
|
||||
|
||||
.error-title {
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
.error-message {
|
||||
font-size: 1rem;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="error-container">
|
||||
<div class="error-card">
|
||||
<div class="error-icon">🚫</div>
|
||||
<h1 class="error-title">{{ error_title }}</h1>
|
||||
<p class="error-message">{{ error_message }}</p>
|
||||
|
||||
<a href="javascript:history.back()" class="back-link">← Go Back</a>
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<p>Powered by <a href="https://github.com/house-of-vanity/OutFleet" target="_blank">OutFleet VPN Manager</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// Add some interactivity
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
// Auto-refresh every 30 seconds for server errors
|
||||
{% if 'Server Error' in error_title %}
|
||||
setTimeout(() => {
|
||||
window.location.reload();
|
||||
}, 30000);
|
||||
{% endif %}
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
82
vpn/views.py
82
vpn/views.py
@@ -1,6 +1,86 @@
|
||||
def userPortal(request, user_hash):
|
||||
"""HTML portal for user to view their VPN access links and server information"""
|
||||
from .models import User, ACLLink
|
||||
import logging
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
try:
|
||||
user = get_object_or_404(User, hash=user_hash)
|
||||
logger.info(f"User portal accessed for user {user.username}")
|
||||
except Http404:
|
||||
logger.warning(f"User portal access attempt with invalid hash: {user_hash}")
|
||||
from django.shortcuts import render
|
||||
return render(request, 'vpn/user_portal_error.html', {
|
||||
'error_title': 'Access Denied',
|
||||
'error_message': 'Invalid access link. Please contact your administrator.'
|
||||
}, status=403)
|
||||
|
||||
try:
|
||||
# Get all ACL links for the user with server information
|
||||
acl_links = ACLLink.objects.filter(acl__user=user).select_related('acl__server', 'acl')
|
||||
|
||||
# Group links by server
|
||||
servers_data = {}
|
||||
total_links = 0
|
||||
|
||||
for link in acl_links:
|
||||
server = link.acl.server
|
||||
server_name = server.name
|
||||
|
||||
if server_name not in servers_data:
|
||||
# Get server status and info
|
||||
try:
|
||||
server_status = server.get_server_status()
|
||||
server_accessible = True
|
||||
server_error = None
|
||||
except Exception as e:
|
||||
logger.warning(f"Could not get status for server {server_name}: {e}")
|
||||
server_status = {}
|
||||
server_accessible = False
|
||||
server_error = str(e)
|
||||
|
||||
servers_data[server_name] = {
|
||||
'server': server,
|
||||
'status': server_status,
|
||||
'accessible': server_accessible,
|
||||
'error': server_error,
|
||||
'links': [],
|
||||
'server_type': server.server_type,
|
||||
}
|
||||
|
||||
# Add link information
|
||||
link_url = f"{EXTERNAL_ADDRESS}/ss/{link.link}#{server_name}"
|
||||
servers_data[server_name]['links'].append({
|
||||
'link': link,
|
||||
'url': link_url,
|
||||
'qr_data': link_url, # For QR code generation
|
||||
'comment': link.comment or 'Default',
|
||||
})
|
||||
total_links += 1
|
||||
|
||||
context = {
|
||||
'user': user,
|
||||
'servers_data': servers_data,
|
||||
'total_servers': len(servers_data),
|
||||
'total_links': total_links,
|
||||
'external_address': EXTERNAL_ADDRESS,
|
||||
}
|
||||
|
||||
from django.shortcuts import render
|
||||
return render(request, 'vpn/user_portal.html', context)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error loading user portal for {user.username}: {e}")
|
||||
from django.shortcuts import render
|
||||
return render(request, 'vpn/user_portal_error.html', {
|
||||
'error_title': 'Server Error',
|
||||
'error_message': 'Unable to load your VPN information. Please try again later or contact support.'
|
||||
}, status=500)
|
||||
import yaml
|
||||
import json
|
||||
from django.shortcuts import get_object_or_404
|
||||
import logging
|
||||
from django.shortcuts import get_object_or_404, render
|
||||
from django.http import JsonResponse, HttpResponse, Http404
|
||||
from mysite.settings import EXTERNAL_ADDRESS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user