fixy i now funkcje (przebudowa rozwiazywania nazw)
This commit is contained in:
Mateusz Gruszczyński
parent
f8a9dd451b
commit
1dc4300881
153
app.py
153
app.py
@ -56,6 +56,26 @@ class Host(db.Model):
|
||||
except Exception:
|
||||
return self.hostname
|
||||
|
||||
@property
|
||||
def resolved_daemon(self):
|
||||
if self.daemon_url:
|
||||
try:
|
||||
daemon_str = self.daemon_url.split("://")[-1]
|
||||
daemon_ip = daemon_str.split(":")[0]
|
||||
return socket.gethostbyaddr(daemon_ip)[0]
|
||||
except Exception:
|
||||
return daemon_ip
|
||||
return ""
|
||||
|
||||
@property
|
||||
def raw_ip(self):
|
||||
if self.use_daemon and self.type == 'linux' and self.daemon_url:
|
||||
daemon_str = self.daemon_url.split("://")[-1]
|
||||
daemon_ip = daemon_str.split(":")[0]
|
||||
return daemon_ip
|
||||
return self.hostname
|
||||
|
||||
|
||||
class DeployLog(db.Model):
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
timestamp = db.Column(db.DateTime, default=db.func.current_timestamp())
|
||||
@ -329,6 +349,12 @@ def cleanup_old_backups():
|
||||
db.session.delete(b)
|
||||
db.session.commit()
|
||||
|
||||
def format_host(host):
|
||||
if host.use_daemon and host.type == 'linux' and host.daemon_url:
|
||||
return f"{host.resolved_daemon} ({host.raw_ip})"
|
||||
else:
|
||||
return f"{host.resolved_hostname} ({host.raw_ip})"
|
||||
|
||||
# -------------------
|
||||
# LOGOWANIE, REJESTRACJA, ZMIANA HASŁA
|
||||
# -------------------
|
||||
@ -553,33 +579,25 @@ def edit_server(id):
|
||||
def test_server_connection(id):
|
||||
if 'user_id' not in session:
|
||||
return redirect(url_for('login'))
|
||||
|
||||
host = db.session.get(Host, id)
|
||||
if not host or host.user_id != session['user_id']:
|
||||
flash('Host not found or unauthorized', 'danger')
|
||||
return redirect(url_for('server_list'))
|
||||
|
||||
try:
|
||||
if host.use_daemon and host.type == 'linux':
|
||||
# Połączenie przez demon (self-signed certy, verify=False)
|
||||
import requests
|
||||
headers = {"Authorization": host.daemon_token}
|
||||
|
||||
# Najpierw sprawdzenie /health
|
||||
health_url = host.daemon_url.rstrip('/') + '/health'
|
||||
resp = requests.get(health_url, headers=headers, verify=False, timeout=5)
|
||||
if resp.status_code == 200:
|
||||
flash(f'Demon connection successful (health OK) for {host.hostname}', 'success')
|
||||
flash(f'Demon connection successful (health OK) for {format_host(host)}', 'success')
|
||||
else:
|
||||
raise Exception(f"Demon health check returned {resp.status_code}")
|
||||
|
||||
# Dodatkowe pobranie /system-info
|
||||
sysinfo_url = host.daemon_url.rstrip('/') + '/system-info'
|
||||
sysinfo_resp = requests.get(sysinfo_url, headers=headers, verify=False, timeout=5)
|
||||
if sysinfo_resp.status_code == 200:
|
||||
info = sysinfo_resp.json()
|
||||
# Wyświetlamy kilka przykładowych danych w flash:
|
||||
msg = (f"System-info for {host.hostname}: "
|
||||
msg = (f"System-info for {format_host(host)}: "
|
||||
f"CPU={info.get('cpu_percent')}%, "
|
||||
f"MEM={info.get('memory_percent')}%, "
|
||||
f"DISK={info.get('disk_percent')}%, "
|
||||
@ -587,16 +605,12 @@ def test_server_connection(id):
|
||||
flash(msg, 'info')
|
||||
else:
|
||||
raise Exception(f"Demon system-info returned {sysinfo_resp.status_code}")
|
||||
|
||||
else:
|
||||
# Standardowe sprawdzenie przez SSH
|
||||
ssh = open_ssh_connection(host)
|
||||
ssh.close()
|
||||
flash(f'SSH connection to {host.hostname} successful.', 'success')
|
||||
|
||||
flash(f'SSH connection to {format_host(host)} successful.', 'success')
|
||||
except Exception as e:
|
||||
flash(f'Connection failed for {host.hostname}: {str(e)}', 'danger')
|
||||
|
||||
flash(f'Connection failed for {format_host(host)}: {str(e)}', 'danger')
|
||||
return redirect(url_for('server_list'))
|
||||
|
||||
# -------------------
|
||||
@ -740,7 +754,7 @@ def delete_hosts_file(file_id):
|
||||
# -------------------
|
||||
# WDROŻENIE WYBRANEGO PLIKU HOSTS NA WYBRANE SERWERY
|
||||
# -------------------
|
||||
import socket
|
||||
|
||||
|
||||
@app.route('/deploy-hosts-file/<int:file_id>', methods=['GET', 'POST'])
|
||||
def deploy_hosts_file(file_id):
|
||||
@ -752,23 +766,23 @@ def deploy_hosts_file(file_id):
|
||||
return redirect(url_for('list_hosts_files'))
|
||||
hosts = Host.query.filter_by(user_id=session['user_id']).all()
|
||||
|
||||
# Dla hostów z demonem obliczamy IP i rozwiązaną nazwę z IP
|
||||
# Dla hostów korzystających z demona – obliczamy IP oraz rozwiązaną nazwę
|
||||
for host in hosts:
|
||||
if host.use_daemon and host.type == 'linux' and host.daemon_url:
|
||||
daemon_str = host.daemon_url.split("://")[-1]
|
||||
daemon_ip = daemon_str.split(":")[0]
|
||||
host.daemon_ip = daemon_ip
|
||||
try:
|
||||
host.resolved_daemon = socket.gethostbyaddr(daemon_ip)[0]
|
||||
resolved_daemon = socket.gethostbyaddr(daemon_ip)[0]
|
||||
except Exception:
|
||||
host.resolved_daemon = daemon_ip # jeśli nie uda się rozwiązać, pozostaw IP
|
||||
resolved_daemon = daemon_ip
|
||||
host._resolved_daemon_local = resolved_daemon
|
||||
|
||||
if request.method == 'POST':
|
||||
selected_host_ids = request.form.getlist('hosts')
|
||||
for host in hosts:
|
||||
if str(host.id) in selected_host_ids:
|
||||
try:
|
||||
# Przygotuj zawartość do wgrania
|
||||
adjusted_content = ensure_local_defaults(file.content)
|
||||
wrapped_content = wrap_content_with_comments(adjusted_content)
|
||||
|
||||
@ -780,17 +794,13 @@ def deploy_hosts_file(file_id):
|
||||
headers=headers, timeout=10, verify=False)
|
||||
if resp.status_code != 200:
|
||||
raise Exception(f"Daemon POST error: {resp.status_code} - {resp.text}")
|
||||
db.session.add(DeployLog(
|
||||
details=f'[LINUX/DAEMON] Deployed file "{file.title}" to {host.daemon_ip} - {host.resolved_daemon} for user {session["user_id"]}',
|
||||
user_id=session['user_id']
|
||||
))
|
||||
log_details = f'[LINUX/DAEMON] Updated {format_host(host)}'
|
||||
db.session.add(DeployLog(details=log_details, user_id=session['user_id']))
|
||||
elif host.type == 'mikrotik':
|
||||
wrapped_mikro = wrap_mikrotik_content(file.content)
|
||||
deploy_mikrotik(host, wrapped_mikro)
|
||||
db.session.add(DeployLog(
|
||||
details=f'[MIKROTIK] Deployed file "{file.title}" to {host.hostname} for user {session["user_id"]}',
|
||||
user_id=session['user_id']
|
||||
))
|
||||
log_details = f'[MIKROTIK] Updated {format_host(host)}'
|
||||
db.session.add(DeployLog(details=log_details, user_id=session['user_id']))
|
||||
else:
|
||||
ssh = open_ssh_connection(host)
|
||||
with tempfile.NamedTemporaryFile(mode='w', delete=False) as tmpf:
|
||||
@ -801,14 +811,12 @@ def deploy_hosts_file(file_id):
|
||||
sftp.close()
|
||||
ssh.close()
|
||||
os.remove(tmp_file_path)
|
||||
db.session.add(DeployLog(
|
||||
details=f'[LINUX] Deployed file "{file.title}" to {host.hostname} for user {session["user_id"]}',
|
||||
user_id=session['user_id']
|
||||
))
|
||||
log_details = f'[LINUX] Updated {format_host(host)}'
|
||||
db.session.add(DeployLog(details=log_details, user_id=session['user_id']))
|
||||
db.session.commit()
|
||||
flash(f'Deployed file "{file.title}" to {host.hostname}', 'success')
|
||||
flash(f'Deployed file "{file.title}" to {format_host(host)}', 'success')
|
||||
except Exception as e:
|
||||
flash(f'Error deploying file "{file.title}" to {host.hostname}: {str(e)}', 'danger')
|
||||
flash(f'Error deploying file "{file.title}" to {format_host(host)}: {str(e)}', 'danger')
|
||||
return redirect(url_for('list_hosts_files'))
|
||||
|
||||
return render_template('deploy_hosts_file.html', file=file, hosts=hosts)
|
||||
@ -835,26 +843,21 @@ def server_backup(host_id):
|
||||
raise Exception(f"Daemon GET error: {resp.status_code} - {resp.text}")
|
||||
data = resp.json()
|
||||
content = data.get("hosts", "")
|
||||
# Wyodrębnienie adresu IP z daemon_url
|
||||
daemon_str = host.daemon_url.split("://")[-1]
|
||||
daemon_ip = daemon_str.split(":")[0]
|
||||
description = f'Backup (daemon) from {host.hostname} (Daemon IP: {daemon_ip})'
|
||||
description = f'Backup from server {format_host(host)} at {datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S")}'
|
||||
elif host.type == 'mikrotik':
|
||||
ssh = open_ssh_connection(host)
|
||||
stdin, stdout, stderr = ssh.exec_command("/ip dns static export")
|
||||
content = stdout.read().decode('utf-8')
|
||||
ssh.close()
|
||||
description = f'Backup (mikrotik) from {host.hostname}'
|
||||
description = f'Backup from server {format_host(host)}'
|
||||
else:
|
||||
# Standard Linux (SSH)
|
||||
ssh = open_ssh_connection(host)
|
||||
sftp = ssh.open_sftp()
|
||||
with sftp.open('/etc/hosts', 'r') as remote_file:
|
||||
content = remote_file.read().decode('utf-8')
|
||||
sftp.close()
|
||||
ssh.close()
|
||||
description = f'Backup from {host.hostname}'
|
||||
|
||||
description = f'Backup from server {format_host(host)}'
|
||||
backup = Backup(
|
||||
user_id=session['user_id'],
|
||||
host_id=host.id,
|
||||
@ -863,9 +866,9 @@ def server_backup(host_id):
|
||||
)
|
||||
db.session.add(backup)
|
||||
db.session.commit()
|
||||
flash(f'Backup for host {host.hostname} created successfully.', 'success')
|
||||
flash(f'Backup for host {format_host(host)} created successfully.', 'success')
|
||||
except Exception as e:
|
||||
flash(f'Error creating backup for host {host.hostname}: {str(e)}', 'danger')
|
||||
flash(f'Error creating backup for host {format_host(host)}: {str(e)}', 'danger')
|
||||
return redirect(url_for('server_list'))
|
||||
|
||||
@app.route('/backups')
|
||||
@ -891,37 +894,32 @@ def restore_backup(backup_id):
|
||||
try:
|
||||
if host.type == 'mikrotik':
|
||||
ssh = open_ssh_connection(host)
|
||||
# Usuń istniejące wpisy
|
||||
ssh.exec_command("/ip dns static remove [find]")
|
||||
import time
|
||||
time.sleep(1)
|
||||
# Przygotuj jedno polecenie, które dodaje wszystkie wpisy
|
||||
commands = []
|
||||
for line in backup.content.splitlines():
|
||||
line = line.strip()
|
||||
if line.startswith("add "):
|
||||
commands.append("/ip dns static " + line)
|
||||
full_command = " ; ".join(commands)
|
||||
#print("[DEBUG] Full command sent to Mikrotik:", full_command)
|
||||
ssh.exec_command(full_command)
|
||||
ssh.close()
|
||||
flash(f'Backup restored to mikrotik host {host.hostname} successfully.', 'success')
|
||||
flash(f'Backup restored to {format_host(host)} successfully.', 'success')
|
||||
else:
|
||||
ssh = open_ssh_connection(host)
|
||||
sftp = ssh.open_sftp()
|
||||
with tempfile.NamedTemporaryFile(mode='w', delete=False) as tmpf:
|
||||
tmpf.write(backup.content)
|
||||
tmp_file_path = tmpf.name
|
||||
#print(f"[DEBUG] Tymczasowy plik: {tmp_file_path} zawiera: {backup.content}")
|
||||
sftp.put(tmp_file_path, '/etc/hosts')
|
||||
sftp.close()
|
||||
ssh.close()
|
||||
os.remove(tmp_file_path)
|
||||
flash(f'Backup restored to host {host.hostname} successfully.', 'success')
|
||||
flash(f'Backup restored to {format_host(host)} successfully.', 'success')
|
||||
except Exception as e:
|
||||
flash(f'Error restoring backup to host {host.hostname}: {str(e)}', 'danger')
|
||||
flash(f'Error restoring backup to {format_host(host)}: {str(e)}', 'danger')
|
||||
else:
|
||||
# Przywrócenie backupu jako domyślnej konfiguracji (Default Hosts)
|
||||
hostfile = HostFile.query.filter_by(user_id=session['user_id'], title="Default Hosts").first()
|
||||
if not hostfile:
|
||||
hostfile = HostFile(user_id=session['user_id'], title="Default Hosts", content=backup.content)
|
||||
@ -963,26 +961,21 @@ def backup_all():
|
||||
raise Exception(f"Daemon GET error: {resp.status_code} - {resp.text}")
|
||||
data = resp.json()
|
||||
content = data.get("hosts", "")
|
||||
# Wyodrębnienie adresu IP demona
|
||||
daemon_str = host.daemon_url.split("://")[-1]
|
||||
daemon_ip = daemon_str.split(":")[0]
|
||||
description = f'Backup (daemon) from {host.hostname} (Daemon IP: {daemon_ip})'
|
||||
description = f'Backup from server {format_host(host)}'
|
||||
elif host.type == 'mikrotik':
|
||||
ssh = open_ssh_connection(host)
|
||||
stdin, stdout, stderr = ssh.exec_command("/ip dns static export")
|
||||
content = stdout.read().decode('utf-8')
|
||||
ssh.close()
|
||||
description = f'Backup (mikrotik) from {host.hostname}'
|
||||
description = f'Backup from server {format_host(host)}'
|
||||
else:
|
||||
# Standard Linux (SSH)
|
||||
ssh = open_ssh_connection(host)
|
||||
sftp = ssh.open_sftp()
|
||||
with sftp.open('/etc/hosts', 'r') as remote_file:
|
||||
content = remote_file.read().decode('utf-8')
|
||||
sftp.close()
|
||||
ssh.close()
|
||||
description = f'Backup from {host.hostname}'
|
||||
|
||||
description = f'Backup from server {format_host(host)}'
|
||||
backup = Backup(
|
||||
user_id=user_id,
|
||||
host_id=host.id,
|
||||
@ -992,11 +985,9 @@ def backup_all():
|
||||
db.session.add(backup)
|
||||
db.session.commit()
|
||||
except Exception as e:
|
||||
flash(f'Error creating backup for host {host.hostname}: {str(e)}', 'danger')
|
||||
|
||||
flash(f'Error creating backup for {format_host(host)}: {str(e)}', 'danger')
|
||||
flash('Backup for all hosts created successfully.', 'success')
|
||||
return redirect(url_for('backups'))
|
||||
|
||||
# -------------------
|
||||
# IMPORT/EXPORT HOSTÓW
|
||||
# -------------------
|
||||
@ -1193,35 +1184,26 @@ def deploy_user(user_id):
|
||||
default_file = HostFile.query.filter_by(user_id=user_id, title="Default Hosts").first()
|
||||
if not default_file:
|
||||
return
|
||||
|
||||
# Pobieramy regex tylko raz – globalnie
|
||||
regex_lines = ""
|
||||
if user_settings and user_settings.regex_deploy_enabled:
|
||||
regex_lines = generate_regex_hosts(user_id)
|
||||
|
||||
hosts = Host.query.filter_by(user_id=user_id).all()
|
||||
for h in hosts:
|
||||
if not h.auto_deploy_enabled:
|
||||
continue
|
||||
|
||||
if h.preferred_hostfile_id:
|
||||
chosen_file = HostFile.query.filter_by(id=h.preferred_hostfile_id, user_id=user_id).first()
|
||||
if not chosen_file:
|
||||
chosen_file = default_file
|
||||
else:
|
||||
chosen_file = default_file
|
||||
|
||||
# Dołączamy regex_lines tylko, jeśli dla hosta nie wyłączono tej opcji
|
||||
final_content = ("" if h.disable_regex_deploy else regex_lines) + chosen_file.content
|
||||
|
||||
try:
|
||||
if h.type == 'mikrotik':
|
||||
wrapped_content = wrap_mikrotik_content(final_content)
|
||||
deploy_mikrotik(h, wrapped_content)
|
||||
db.session.add(DeployLog(
|
||||
details=f'[MIKROTIK] Updated {h.hostname} for user {user_id}',
|
||||
user_id=user_id
|
||||
))
|
||||
log_details = f'[MIKROTIK] Updated {format_host(h)} for user {user_id}'
|
||||
db.session.add(DeployLog(details=log_details, user_id=user_id))
|
||||
elif h.use_daemon and h.type == 'linux':
|
||||
import requests
|
||||
adjusted_content = ensure_local_defaults(final_content)
|
||||
@ -1231,13 +1213,8 @@ def deploy_user(user_id):
|
||||
resp = requests.post(url, json={"hosts": wrapped_content}, headers=headers, timeout=10, verify=False)
|
||||
if resp.status_code != 200:
|
||||
raise Exception(f"Daemon POST error: {resp.status_code} - {resp.text}")
|
||||
|
||||
daemon_str = h.daemon_url.split("://")[-1]
|
||||
daemon_ip = daemon_str.split(":")[0]
|
||||
db.session.add(DeployLog(
|
||||
details=f'[LINUX/DAEMON] Updated {h.hostname} (Daemon IP: {daemon_ip}) for user {user_id}',
|
||||
user_id=user_id
|
||||
))
|
||||
log_details = f'[LINUX/DAEMON] Updated {format_host(h)} for user {user_id}'
|
||||
db.session.add(DeployLog(details=log_details, user_id=user_id))
|
||||
else:
|
||||
ssh = open_ssh_connection(h)
|
||||
adjusted_content = ensure_local_defaults(final_content)
|
||||
@ -1250,17 +1227,11 @@ def deploy_user(user_id):
|
||||
sftp.close()
|
||||
ssh.close()
|
||||
os.remove(tmp_file_path)
|
||||
db.session.add(DeployLog(
|
||||
details=f'[LINUX] Updated {h.hostname} for user {user_id}',
|
||||
user_id=user_id
|
||||
))
|
||||
|
||||
log_details = f'[LINUX] Updated {format_host(h)} for user {user_id}'
|
||||
db.session.add(DeployLog(details=log_details, user_id=user_id))
|
||||
db.session.commit()
|
||||
except Exception as e:
|
||||
db.session.add(DeployLog(
|
||||
details=f'Failed to update {h.hostname}: {str(e)} for user {user_id}',
|
||||
user_id=user_id
|
||||
))
|
||||
db.session.add(DeployLog(details=f'Failed to update {format_host(h)}: {str(e)} for user {user_id}', user_id=user_id))
|
||||
db.session.commit()
|
||||
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
<th>Wybrany plik /etc/hosts</th>
|
||||
<th>Auto Deploy</th>
|
||||
<th>Auto Backup</th>
|
||||
<th>Wyłącz regex deploy</th> <!-- Nowa kolumna -->
|
||||
<th>Wyłącz CIDR/regex deploy</th>
|
||||
<th>Akcje</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -37,16 +37,15 @@
|
||||
{% for h in hosts %}
|
||||
<tr>
|
||||
<td>{{ h.id }}</td>
|
||||
<td data-bs-toggle="tooltip" data-bs-placement="top"
|
||||
title="{% if h.use_daemon and h.type == 'linux' and h.daemon_url %}{{ h.resolved_daemon }}{% else %}{{ h.resolved_hostname }}{% endif %}">
|
||||
<td data-bs-toggle="tooltip" data-bs-placement="top" title="{{ h.raw_ip }}">
|
||||
{% if h.use_daemon and h.type == 'linux' and h.daemon_url %}
|
||||
{% set daemon_str = h.daemon_url.split('://') | last %}
|
||||
{% set daemon_ip = daemon_str.split(':')[0] %}
|
||||
{{ daemon_ip }}
|
||||
{{ h.resolved_daemon }}
|
||||
{% else %}
|
||||
{{ h.hostname }}
|
||||
{{ h.resolved_hostname }}
|
||||
{% endif %}
|
||||
</td>
|
||||
</td>
|
||||
|
||||
|
||||
<td>
|
||||
{% if h.use_daemon and h.type == 'linux' %}
|
||||
<em>—</em>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user