diff --git a/app.py b/app.py index 98caffb..70397d1 100644 --- a/app.py +++ b/app.py @@ -66,6 +66,7 @@ class Device(db.Model): last_log = db.Column(db.Text) current_version = db.Column(db.String(50)) current_firmware = db.Column(db.String(50)) + upgrade_firmware = db.Column(db.String(50)) use_ssl = db.Column(db.Boolean, default=False) # Czy używać SSL? ssl_insecure = db.Column(db.Boolean, default=False) # Jeśli True – nie weryfikować certyfikatu SSL user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False) @@ -167,6 +168,8 @@ def check_device_update(device): update_available = False current_version = None current_firmware = None + upgrade_firmware = None # Nowa zmienna + try: app.logger.debug(f"Connecting to device {device.ip}:{device.port} using SSL: {device.use_ssl}, ssl_verify: {not device.ssl_insecure}") api = librouteros.connect( @@ -200,10 +203,15 @@ def check_device_update(device): app.logger.debug(f"Routerboard response: {board_resp}") if board_resp: board_info = board_resp[0] - # Próba odczytania firmware z kilku możliwych kluczy - firmware = board_info.get('firmware', board_info.get('firmware-version', board_info.get('upgrade-firmware', 'N/A'))) - current_firmware = firmware - log_entries.append(f"Firmware: {firmware}") + # Pobieramy oddzielnie obie wersje: + current_fw = board_info.get('firmware', + board_info.get('firmware-version', + board_info.get('current-firmware', 'N/A'))) + upgrade_fw = board_info.get('upgrade-firmware', 'N/A') + current_firmware = current_fw + upgrade_firmware = upgrade_fw + log_entries.append(f"Firmware: {current_fw}") + log_entries.append(f"Upgrade Firmware: {upgrade_fw}") # Sprawdzenie dostępnych aktualizacji log_entries.append("Checking for updates...") @@ -229,10 +237,12 @@ def check_device_update(device): update_available = True else: log_entries.append("No updates available.") - return "\n".join(log_entries), update_available, current_version, current_firmware + # Zwracamy 5-elementową krotkę + return "\n".join(log_entries), update_available, current_version, current_firmware, upgrade_firmware except Exception as e: app.logger.error(f"Error connecting to device {device.ip}: {e}", exc_info=True) - return f"Error: {str(e)}", False, None, None + return f"Error: {str(e)}", False, None, None, None + def get_email_template(subject, message): return f""" @@ -299,19 +309,17 @@ def check_all_devices(): with app.app_context(): devices = Device.query.all() for device in devices: - result, update_available, current_version, current_firmware = check_device_update(device) + result, update_available, current_version, current_firmware, upgrade_firmware = check_device_update(device) device.last_log = result device.last_check = datetime.utcnow() device.update_required = update_available device.current_version = current_version device.current_firmware = current_firmware + device.upgrade_firmware = upgrade_firmware db.session.commit() log_entry = Log(message=result, device_id=device.id, user_id=device.user_id) - #log_message = f"Urządzenie {device.name or device.ip} - {result}" - #log_entry = Log(message=log_message, device_id=device.id, user_id=device.user_id) db.session.add(log_entry) db.session.commit() - # Powiadomienia, jeśli dostępna aktualizacja if update_available: user = device.owner message = f"Urządzenie {device.name or device.ip} ma dostępną aktualizację." @@ -747,12 +755,13 @@ def force_check(device_id): if device.user_id != current_user.id: flash("Brak dostępu.") return redirect(url_for('devices')) - result, update_available, current_version, current_firmware = check_device_update(device) + result, update_available, current_version, current_firmware, upgrade_firmware = check_device_update(device) device.last_log = result device.last_check = datetime.utcnow() device.update_required = update_available device.current_version = current_version device.current_firmware = current_firmware + device.upgrade_firmware = upgrade_firmware db.session.commit() flash("Sprawdzenie urządzenia zakończone.") return redirect(url_for('devices')) @@ -907,14 +916,14 @@ def update_selected_devices(): for device_id in selected_ids: device = Device.query.get(device_id) if device and device.user_id == current_user.id: - result, update_available, current_version, current_firmware = check_device_update(device) + result, update_available, current_version, current_firmware, upgrade_firmware = check_device_update(device) device.last_log = result device.last_check = datetime.utcnow() device.update_required = update_available device.current_version = current_version device.current_firmware = current_firmware + device.upgrade_firmware = upgrade_firmware db.session.commit() - # Dodaj log dla aktualizacji log_entry = Log(message=result, device_id=device.id, user_id=device.user_id) db.session.add(log_entry) db.session.commit() @@ -958,6 +967,28 @@ def force_fetch_changelogs(): flash("Changelog został całkowicie odświeżony.", "success") return redirect(url_for('routeros_changelog')) +@app.route('/device//restart', methods=['POST']) +@login_required +def restart_device(device_id): + device = Device.query.get_or_404(device_id) + if device.user_id != current_user.id: + flash("Brak dostępu.") + return redirect(url_for('devices')) + try: + api = librouteros.connect( + host=device.ip, + username=device.device_username, + password=device.device_password, + port=device.port, + timeout=15 + ) + # Wysyłamy komendę reboot + list(api('/system/reboot')) + flash("Komenda reboot została wysłana.") + except Exception as e: + flash(f"Błąd podczas wysyłania komendy reboot: {e}") + return ('', 204) # Zwracamy odpowiedź bez treści dla żądania AJAX + # Zamknięcie harmonogramu przy zatrzymaniu aplikacji atexit.register(lambda: scheduler.shutdown()) diff --git a/templates/base.html b/templates/base.html index 052eb3d..1d7385b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,22 +7,21 @@ - {% block extra_head %}{% endblock %} @@ -232,32 +251,18 @@ - - {% block extra_scripts %}{% endblock %} diff --git a/templates/device_detail.html b/templates/device_detail.html index f9a84af..5599fd3 100644 --- a/templates/device_detail.html +++ b/templates/device_detail.html @@ -19,6 +19,35 @@ overflow-y: auto; white-space: pre-wrap; } + /* Stylizacja overlay dla system update */ + #system-update-overlay { + display: none; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: rgba(0,0,0,0.7); + z-index: 1000; + color: white; + text-align: center; + padding-top: 200px; + } + #system-update-overlay h3 { + margin-bottom: 20px; + } + #system-update-overlay .progress-container { + width: 50%; + margin: 20px auto; + background: #444; + border-radius: 5px; + } + #system-update-overlay .progress-bar { + width: 0%; + height: 30px; + background: #4caf50; + border-radius: 5px; + } {% endblock %} {% block content %} @@ -48,7 +77,8 @@

System: {{ device.current_version or 'Brak' }}
- Firmware: {{ device.current_firmware or 'N/A' }} + Firmware: {{ device.current_firmware or 'N/A' }}
+ Upgrade Firmware: {{ device.upgrade_firmware or 'N/A' }}

Branch aktualizacji: {{ device.branch|capitalize }} @@ -115,10 +145,10 @@

-
+
-
+
Wymuś sprawdzenie @@ -127,5 +157,74 @@ Powrót do listy urządzeń
+ + +
+

Aktualizacja systemu rozpoczęta...

+
+
+
+

300 sekund

+
+ + + + + + {% endblock %} diff --git a/templates/devices.html b/templates/devices.html index 0bdb8ab..8e6c893 100644 --- a/templates/devices.html +++ b/templates/devices.html @@ -38,16 +38,23 @@ {{ device.last_check.strftime('%Y-%m-%d %H:%M:%S') if device.last_check else 'Brak' }} - {% if device.update_required %} - Wymaga aktualizacji + {% if device.update_required or (device.current_firmware and device.upgrade_firmware and device.current_firmware != device.upgrade_firmware) %} + {% if device.update_required and (device.current_firmware and device.upgrade_firmware and device.current_firmware != device.upgrade_firmware) %} + Wymaga aktualizacji (system i firmware) + {% elif device.update_required %} + Wymaga aktualizacji (system) {% else %} - Aktualny + Wymaga aktualizacji (firmware) {% endif %} + {% else %} + Aktualny + {% endif %} System: {{ device.current_version or 'Brak' }}
- Firmware: {{ device.current_firmware or 'Brak' }} + Firmware: {{ device.current_firmware or 'Brak' }}
+ Upgrade Firmware: {{ device.upgrade_firmware or 'N/A' }} diff --git a/templates/index.html b/templates/index.html index cce80d3..e1d616d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -3,7 +3,11 @@ {% block content %}
+ {% if session.get('dark_mode', True) %} + Mikrotik Logo + {% else %} Mikrotik Logo + {% endif %}

Witamy w RouterOS Update

Zarządzaj aktualizacjami swoich urządzeń RouterOS w prosty sposób.

diff --git a/templates/routeros_changelog.html b/templates/routeros_changelog.html new file mode 100644 index 0000000..855ee41 --- /dev/null +++ b/templates/routeros_changelog.html @@ -0,0 +1,69 @@ +{% extends "base.html" %} +{% block title %}Changelog RouterOS – Kanały publikacji{% endblock %} +{% block content %} +
+

Changelog RouterOS według kanałów publikacji

+
+ +
+

Stable

+ {% for entry in entries_stable %} +
+
+
+ {{ entry.version }} + ({{ entry.timestamp.strftime('%Y-%b-%d') }}) +
+
+
+ 
{{ entry.details }}
+
+
+ {% else %} +

Brak wpisów.

+ {% endfor %} +
+ +
+

RC

+ {% for entry in entries_rc %} +
+
+
+ {{ entry.version }} + ({{ entry.timestamp.strftime('%Y-%b-%d') }}) +
+
+
+ 
{{ entry.details }}
+
+
+ {% else %} +

Brak wpisów.

+ {% endfor %} +
+ +
+

Beta

+ {% for entry in entries_beta %} +
+
+
+ {{ entry.version }} + ({{ entry.timestamp.strftime('%Y-%b-%d') }}) +
+
+
+ 
{{ entry.details }}
+
+
+ {% else %} +

Brak wpisów.

+ {% endfor %} +
+
+
+ Powrót do dashboardu +
+
+{% endblock %}