refactor web interface

2025-02-25 10:53:13 +01:00 · 2025-02-25 10:53:13 +01:00 · c6f865bbb8
commit c6f865bbb8
parent 4b5d7526ff
3 changed files with 146 additions and 107 deletions
--- a/app.py
+++ b/app.py
@ -435,45 +435,51 @@ def test_server_connection(id):
 def clear_server():
    if 'user_id' not in session:
        return redirect(url_for('login'))
-    # Pobierz listę hostów dla bieżącego użytkownika
+    hosts = Host.query.filter_by(user_id=session['user_id']).all()
+    return render_template('clear_servers.html', hosts=hosts)
+
+@app.route('/clear-single-server/<int:host_id>', methods=['POST'])
+def clear_single_server(host_id):
+    if 'user_id' not in session:
+        return redirect(url_for('login'))
+    host = db.session.get(Host, host_id)
+    if not host or host.user_id != session['user_id']:
+        flash('Host not found or unauthorized', 'danger')
+        return redirect(url_for('clear_servers'))
+    default_content = ensure_local_defaults("")
+    try:
+        if host.type == 'linux':
+            clear_linux(host, default_content)
+        elif host.type == 'mikrotik':
+            clear_mikrotik(host)
+        flash(f'Cleared host: {host.hostname}', 'success')
+    except Exception as e:
+        flash(f'Error clearing host {host.hostname}: {str(e)}', 'danger')
+    return redirect(url_for('clear_all_server'))
+
+@app.route('/clear-all-server', methods=['GET', 'POST'])
+def clear_all_server():
+    if 'user_id' not in session:
+        return redirect(url_for('login'))
    hosts = Host.query.filter_by(user_id=session['user_id']).all()
    if request.method == 'POST':
-        clear_option = request.form.get('clear_option', 'all')
        linux_clear = request.form.get('linux')
        mikrotik_clear = request.form.get('mikrotik')
        default_content = ensure_local_defaults("")
-        if clear_option == 'one':
-            host_id = request.form.get('host_id')
-            if host_id:
-                host = db.session.get(Host, int(host_id))
-                if host and host.user_id == session['user_id']:
-                    try:
-                        if host.type == 'linux' and linux_clear:
-                            clear_linux(host, default_content)
-                        elif host.type == 'mikrotik' and mikrotik_clear:
-                            clear_mikrotik(host)
-                        flash(f'Cleared host: {host.hostname}', 'success')
-                    except Exception as e:
-                        flash(f'Error clearing host {host.hostname}: {str(e)}', 'danger')
-                else:
-                    flash("Wybrany host nie został znaleziony lub nie masz do niego dostępu", "danger")
-            else:
-                flash("Nie wybrano hosta", "danger")
-        else:
-            # Opcja "all": przetwórz wszystkie hosty
-            for h in hosts:
-                try:
-                    if h.type == 'linux' and linux_clear:
-                        clear_linux(h, default_content)
-                        flash(f'Cleared Linux host: {h.hostname}', 'success')
-                    elif h.type == 'mikrotik' and mikrotik_clear:
-                        clear_mikrotik(h)
-                        flash(f'Cleared Mikrotik host: {h.hostname}', 'success')
-                except Exception as e:
-                    flash(f'Error clearing host {h.hostname}: {str(e)}', 'danger')
-        return redirect(url_for('clear_server'))
+        for h in hosts:
+            try:
+                if h.type == 'linux' and linux_clear:
+                    clear_linux(h, default_content)
+                    flash(f'Cleared Linux host: {h.hostname}', 'success')
+                elif h.type == 'mikrotik' and mikrotik_clear:
+                    clear_mikrotik(h)
+                    flash(f'Cleared Mikrotik host: {h.hostname}', 'success')
+            except Exception as e:
+                flash(f'Error clearing host {h.hostname}: {str(e)}', 'danger')
+        return redirect(url_for('clear_all_server'))
    return render_template('clear_servers.html', hosts=hosts)

+
 # -------------------
 # ZARZĄDZANIE PLIKAMI HOSTS (WIELOKROTNE PLIKI)
 # -------------------
@ -546,7 +552,8 @@ def deploy_hosts_file(file_id):
                try:
                    if host.type == 'linux':
                        ssh = open_ssh_connection(host)
-                        adjusted_content = ensure_local_defaults(hosts_content)
+                        # Używamy file.content, nie hosts_content
+                        adjusted_content = ensure_local_defaults(file.content)
                        wrapped_content = wrap_content_with_comments(adjusted_content)
                        with tempfile.NamedTemporaryFile(mode='w', delete=False) as tmpf:
                            tmpf.write(wrapped_content)
@ -556,11 +563,17 @@ 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"]}'))
+                        db.session.add(DeployLog(
+                            details=f'[LINUX] Deployed file "{file.title}" to {host.hostname} for user {session["user_id"]}',
+                            user_id=session['user_id']
+                        ))
                    elif host.type == 'mikrotik':
                        wrapped_content = wrap_mikrotik_content(file.content)
                        deploy_mikrotik(host, wrapped_content)
-                        db.session.add(DeployLog(details=f'[MIKROTIK] Deployed file "{file.title}" to {host.hostname} for user {session["user_id"]}'))
+                        db.session.add(DeployLog(
+                            details=f'[MIKROTIK] Deployed file "{file.title}" to {host.hostname} for user {session["user_id"]}',
+                            user_id=session['user_id']
+                        ))
                    db.session.commit()
                    flash(f'Deployed file "{file.title}" to {host.hostname}', 'success')
                except Exception as e:
@ -630,11 +643,19 @@ 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 "):
-                        ssh.exec_command(line)
+                        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')
            else:
@ -643,6 +664,7 @@ def restore_backup(backup_id):
                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()
@ -659,9 +681,12 @@ def restore_backup(backup_id):
        else:
            hostfile.content = backup.content
        db.session.commit()
-        flash('Backup restored to default configuration successfully.', 'success')
+        deploy_user(session['user_id'])
+        flash('Backup restored to default configuration and deployed successfully.', 'success')
    return redirect(url_for('backups'))

+
+
@app.route('/view-backup/<int:backup_id>', methods=['GET'])
 def view_backup(backup_id):
    if 'user_id' not in session:
--- a/templates/clear_servers.html
+++ b/templates/clear_servers.html
@ -1,8 +1,11 @@
 {% extends "base.html" %}
-{% block title %}Wyczyść Server - /etc/hosts Manager{% endblock %}
+{% block title %}Czyszczenie /etc/hosts - /etc/hosts Manager{% endblock %}
 {% block extra_css %}
  {{ super() }}
  <style>
+    .section {
+      margin-bottom: 2rem;
+    }
    .tooltip-inner {
      max-width: 300px;
      text-align: left;
@ -10,69 +13,65 @@
  </style>
 {% endblock %}
 {% block content %}
-<div class="card mb-4">
-  <div class="card-header">
-    <h2>Wyczyść /etc/hosts</h2>
-  </div>
-  <div class="card-body">
-    <form method="POST" action="{{ url_for('clear_server') }}">
-      <div class="mb-3">
-        <label class="form-label">Opcja czyszczenia:</label>
-        <div class="form-check">
-          <input class="form-check-input" type="radio" name="clear_option" id="clear_all" value="all" checked>
-          <label class="form-check-label" for="clear_all">Wyczyść dla wszystkich hostów</label>
+<div class="section">
+  <div class="card">
+    <div class="card-header">
+      <h2>Grupowe czyszczenie /etc/hosts</h2>
+    </div>
+    <div class="card-body">
+      <form method="POST" action="{{ url_for('clear_all_server') }}">
+        <div class="mb-3">
+          <label class="form-label">Wybierz typy hostów do czyszczenia:</label>
+          <div class="form-check">
+            <input class="form-check-input" type="checkbox" name="linux" id="linux_group">
+            <label class="form-check-label" for="linux_group">Wyczyść Linux</label>
+          </div>
+          <div class="form-check">
+            <input class="form-check-input" type="checkbox" name="mikrotik" id="mikrotik_group">
+            <label class="form-check-label" for="mikrotik_group">Wyczyść Mikrotik</label>
+          </div>
        </div>
-        <div class="form-check">
-          <input class="form-check-input" type="radio" name="clear_option" id="clear_one" value="one">
-          <label class="form-check-label" for="clear_one">Wybierz serwer</label>
-        </div>
-      </div>
-      <div class="mb-3" id="host_select_div" style="display: none;">
-        <label for="host_id" class="form-label">Wybierz serwer:</label>
-        <select class="form-select" id="host_id" name="host_id">
-          {% for host in hosts %}
-            <option value="{{ host.id }}">{{ host.hostname }}</option>
-          {% endfor %}
-        </select>
-      </div>
-      <div class="mb-3">
-        <div class="form-check">
-          <input class="form-check-input" type="checkbox" name="linux" id="linux">
-          <label class="form-check-label" for="linux">Wyczyść Linux</label>
-        </div>
-        <div class="form-check">
-          <input class="form-check-input" type="checkbox" name="mikrotik" id="mikrotik">
-          <label class="form-check-label" for="mikrotik">Wyczyść Mikrotik</label>
-        </div>
-      </div>
-      <button type="submit" class="btn btn-danger">Wyczyść</button>
-    </form>
+        <button type="submit" class="btn btn-danger">Wyczyść dla wszystkich hostów</button>
+      </form>
+    </div>
  </div>
 </div>
-<div class="mt-3 text-center">
-  <a href="{{ url_for('dashboard') }}" class="btn btn-secondary">Przejdź do pulpitu</a>
+
+<div class="section">
+  <div class="card">
+    <div class="card-header">
+      <h2>Czyszczenie pojedynczego serwera</h2>
+    </div>
+    <div class="card-body">
+      <form id="clear-single-form" method="POST">
+        <div class="mb-3">
+          <label for="host_id" class="form-label">Wybierz serwer:</label>
+          <select class="form-select" id="host_id" name="host_id">
+            {% for host in hosts %}
+              <option value="{{ host.id }}">{{ host.hostname }}</option>
+            {% endfor %}
+          </select>
+        </div>
+        <button type="submit" class="btn btn-warning">Czyszczenie pojedynczego serwera</button>
+      </form>
+    </div>
+  </div>
 </div>
 {% endblock %}
 {% block extra_js %}
  {{ super() }}
  <script>
-    // Pokazuj lub ukrywaj rozwijaną listę w zależności od wybranej opcji
-    const clearAllRadio = document.getElementById('clear_all');
-    const clearOneRadio = document.getElementById('clear_one');
-    const hostSelectDiv = document.getElementById('host_select_div');
-    
-    function toggleHostSelect() {
-      if (clearOneRadio.checked) {
-        hostSelectDiv.style.display = 'block';
-      } else {
-        hostSelectDiv.style.display = 'none';
+    // Ustaw dynamicznie action formularza dla czyszczenia pojedynczego serwera
+    document.getElementById('clear-single-form').addEventListener('submit', function(e) {
+      e.preventDefault();
+      var hostId = document.getElementById('host_id').value;
+      if(!hostId) {
+        alert("Proszę wybrać serwer!");
+        return;
      }
-    }
-    
-    clearAllRadio.addEventListener('change', toggleHostSelect);
-    clearOneRadio.addEventListener('change', toggleHostSelect);
-    
-    // Inicjalnie ustaw stan przy załadowaniu strony
-    toggleHostSelect();
+      // Skonstruuj URL bez użycia url_for
+      this.action = "/clear-single-server/" + hostId;
+      this.submit();
+    });
  </script>
 {% endblock %}
--- a/templates/deploy_hosts_file.html
+++ b/templates/deploy_hosts_file.html
@ -1,17 +1,32 @@
 {% extends "base.html" %}
 {% block title %}Deploy Hosts File - /etc/hosts Manager{% endblock %}
-{% block content %}
-<h2>Deploy Hosts File: "{{ file.title }}"</h2>
-<form method="post">
-  <div class="form-group">
-    <label>Wybierz hosty do deploy:</label>
-    {% for host in hosts %}
-    <div class="form-check">
-      <input class="form-check-input" type="checkbox" name="hosts" value="{{ host.id }}" id="host{{ host.id }}">
-      <label class="form-check-label" for="host{{ host.id }}">{{ host.hostname }} ({{ host.type }})</label>
-    </div>
-    {% endfor %}
-  </div>
-  <button type="submit" class="btn btn-success">Deploy Hosts File</button>
-</form>
+{% block extra_css %}
+  {{ super() }}
+  <style>
+    .tooltip-inner {
+      max-width: 300px;
+      text-align: left;
+    }
+  </style>
+{% endblock %}
+{% block content %}
+<div class="card mb-4">
+  <div class="card-header">
+    <h2>Wgraj plik hosts: "{{ file.title }}"</h2>
+  </div>
+  <div class="card-body">
+    <form method="post">
+      <div class="mb-3">
+        <label class="form-label">Wybierz serwery do wgrania:</label>
+        {% for host in hosts %}
+        <div class="form-check">
+          <input class="form-check-input" type="checkbox" name="hosts" value="{{ host.id }}" id="host{{ host.id }}">
+          <label class="form-check-label" for="host{{ host.id }}">{{ host.hostname }} ({{ host.type }})</label>
+        </div>
+        {% endfor %}
+      </div>
+      <button type="submit" class="btn btn-success">Wgraj plik hosts do serwera</button>
+    </form>
+  </div>
+</div>
 {% endblock %}