From 215e24ffe07223e3d6ffd3edb056103e2d258971 Mon Sep 17 00:00:00 2001
From: Dobin <dobin.rutishauser@gmail.com>
Date: Fri, 8 Mar 2024 11:09:31 +0000
Subject: [PATCH] refactor: make nicer ui, web, log

---
 app/static/styles.css              | 14 +++++++-
 app/storage.py                     |  6 ----
 app/templates/files.html           |  8 ++---
 app/templates/project.html         | 35 +++++++++++++------
 app/templates/project_add_get.html |  1 -
 app/views.py                       | 56 ++++++------------------------
 log.py                             |  5 ++-
 model/project.py                   |  1 +
 pe/derbackdoorer.py                |  4 +--
 pe/superpe.py                      |  2 --
 web.py                             |  2 ++
 11 files changed, 60 insertions(+), 74 deletions(-)

diff --git a/app/static/styles.css b/app/static/styles.css
index eb9e5fd..57afa03 100644
--- a/app/static/styles.css
+++ b/app/static/styles.css
@@ -63,4 +63,16 @@
     max-width: 40em;
     width: 40em;
     text-align: left;
-  }
\ No newline at end of file
+  }
+
+
+  .nav-item .btn {
+    margin-bottom: 5px; /* Add some space between the buttons */
+  }
+
+  .custom-line {
+    border-top: 1px solid #7e7e7e; /* Create a solid line */
+    width: 100%; /* Span the full width of the container */
+    margin: 20px 0; /* Add some vertical spacing */
+  }
+  
\ No newline at end of file
diff --git a/app/storage.py b/app/storage.py
index e631708..036dd37 100644
--- a/app/storage.py
+++ b/app/storage.py
@@ -25,18 +25,12 @@ class Storage():
         self.save_data()
 
     def get_data(self):
-        print("Read data")
         with open("app/data.pickle", "rb") as f:
             data = f.read()
             data = pickle.loads(data)
-
-        for project in data:
-            print("  {}".format(project.name))
-
         return data
 
     def save_data(self):
-        print("Save data")
         with open("app/data.pickle", "wb") as f:
             f.write(pickle.dumps(self.data))
 
diff --git a/app/templates/files.html b/app/templates/files.html
index 4acf4e1..cafc46d 100644
--- a/app/templates/files.html
+++ b/app/templates/files.html
@@ -1,12 +1,12 @@
 
 <div class="container-fluid">
   <div class="row">
-    <div class="col-md-3">
-      <ul class="nav nav-tabs flex-column" id="myTab" role="tablist">
+    <div class="col-md-2">
+      <ul class="nav nav-pills flex-column" id="myTab" role="tablist">
         {% for log_file in log_files %}
         <li class="nav-item" role="presentation">
           <button
-            class="nav-link {% if loop.last %}active{% endif %}" 
+            class="nav-link btn btn-light {% if loop.last %}active{% endif %}" 
             id="project-{{log_file['id']}}-tab" 
             data-bs-toggle="tab" 
             data-bs-target="#project-{{log_file['id']}}" 
@@ -20,7 +20,7 @@
       </ul>
     </div>
     
-    <div class="col-md-9">
+    <div class="col-md-10">
       <div class="tab-content" id="myTabContent">
         {% for log_file in log_files %}
         <div 
diff --git a/app/templates/project.html b/app/templates/project.html
index 9ec505f..c3408c1 100644
--- a/app/templates/project.html
+++ b/app/templates/project.html
@@ -7,12 +7,14 @@
     {% include 'navigation.html' %}
 
     <div class="indent">
-        <h1> Project {{project_name}} </h1>
+        <h2> {{project_name}} </h2>
         <form method="POST" enctype="multipart/form-data" action="/add_project">
+        <input type="hidden" name="project_name" value="{{project_name}}">
+
         <div class="row">
-            <div class="col-4">
-                <input type="text" name="project_name" class="hidden form-control" value="{{project_name}}"
-                placeholder="Projekt" aria-label="PROJECTNAME" aria-describedby="basic-addon1">
+            <div class="col-3">
+                <input type="text" name="comment" class="hidden form-control" value="{{project.comment}}"
+                placeholder="" aria-label="PROJECTNAME" aria-describedby="basic-addon1">
             
                 <select class="form-select" name="shellcode" aria-label="SHELLCODE">
                     {% for shellcode in shellcodes %}
@@ -33,7 +35,7 @@
                     {% endfor %}
                 </select>
                 </div>
-            <div class="col-4">
+            <div class="col-3">
 
                 <select class="form-select" name="source_style" aria-label="SOURCESTYLE">
                     {% for name, value in sourcestyles %}
@@ -52,7 +54,7 @@
                 </select>
             
             </div>
-            <div class="col-4">
+            <div class="col-3">
                 <select class="form-select" name="alloc_style" aria-label="ALLOCSTYLE">
                     {% for name, value in allocstyles %}
                     <option value="{{name}}"
@@ -78,20 +80,33 @@
                 </select>
     
             </div>
-        </div>
-        </form>
+            </form>
 
-        <div class="row">
-            <div class="col-4">
+            <div class="col-3">
                 <button class="btn btn-primary" type="submit" value="save">Save</button>
 
                 <form method="POST" enctype="multipart/form-data" action="/start_project">
                     <input type="hidden" name="project_name" value="{{project_name}}">
+
+                    <div class="form-check">
+                        <input class="form-check-input" name="try_start" type="checkbox" value="checked" id="flexCheckDefault" checked>
+                        <label class="form-check-label" for="flexCheckDefault">
+                            Start Infected Exe
+                        </label>
+                    </div>
+
                     <button class="btn btn-primary" type="submit" value="start">Start</button>
                 </form>
             </div>
+
         </div>
 
+        <div class="row">
+            <div class="col">
+              <div class="custom-line"></div> <!-- Here's the horizontal line -->
+            </div>
+          </div>
+
 
     <div class="row">
         <div class="col-md-12">
diff --git a/app/templates/project_add_get.html b/app/templates/project_add_get.html
index 6f12d40..27ef977 100644
--- a/app/templates/project_add_get.html
+++ b/app/templates/project_add_get.html
@@ -68,7 +68,6 @@
       </div>
 
     <button class="btn btn-primary" type="submit" value="save">Save</button>
-    <button class="btn btn-primary" type="submit" value="Verify">Verify</button>
 
     </div>
     </form>
diff --git a/app/views.py b/app/views.py
index e692353..1fe92f4 100644
--- a/app/views.py
+++ b/app/views.py
@@ -2,15 +2,12 @@ from flask import Blueprint, current_app, flash, request, redirect, url_for, ren
 from werkzeug.utils import secure_filename
 import os
 import logging
-import io
 from typing import List, Tuple
-from datetime import date
 from pygments import highlight
 from pygments.lexers import CLexer, NasmLexer, DiffLexer, HexdumpLexer
 from pygments.formatters import HtmlFormatter
 import difflib
 from ansi2html import Ansi2HTMLConverter
-import pickle
 
 from config import config
 from model.settings import Settings
@@ -66,7 +63,7 @@ def project(name):
 
 
 @views.route("/add_project", methods=['POST', 'GET'])
-def inject():
+def add_project():
     if request.method == 'POST':
         settings = Settings()
 
@@ -135,47 +132,18 @@ def inject():
 @views.route("/start_project", methods=['POST', 'GET'])
 def start_project():
     #project_name = request.args.get('project_name')
-    project_name = request.form['project_name']
+    project_name = request.form.get('project_name')
+    try_start = request.form.get('try_start')
+    if try_start != None:
+        try_start = True
+    else:
+        try_start = False
     project = storage.get_project(project_name)
+    project.settings.try_start_final_infected_exe = try_start
     start(project.settings)
     return redirect("/project/{}".format(project_name), code=302)
 
 
-@views.route("/build")
-def build():
-    exes = []
-    for file in os.listdir("app/upload/exe"):
-        exes.append(file)
-
-    shellcodes = []
-    for file in os.listdir("app/upload/shellcode"):
-        shellcodes.append(file)
-
-    sourcestyles = [(color.name, color.value) for color in SourceStyle]
-    allocstyles = [(color.name, color.value) for color in AllocStyle]
-    decoderstyles = [(color.name, color.value) for color in DecoderStyle]
-    execstyles = [(color.name, color.value) for color in ExecStyle]
-    injectstyles = [(color.name, color.value) for color in InjectStyle]
-
-    return render_template('build.html', 
-        exes=exes,
-        shellcodes=shellcodes,
-        sourcestyles=sourcestyles,
-        allocstyles=allocstyles,
-        decoderstyles=decoderstyles,
-        execstyles=execstyles,
-        injectstyles=injectstyles,
-    )
-
-
-@views.route("/files")
-def files():
-    log_files = get_logfiles()
-    return render_template('files.html', 
-        log_files=log_files
-    )
-
-
 def get_logfiles():
     log_files = []
     id = 0
@@ -184,13 +152,11 @@ def get_logfiles():
     for file in os.listdir(f"{logs_dir}/"):
         if file.startswith("."):
             continue
-        print("Handle: ", file)
 
         with open(os.path.join(f"{logs_dir}/", file), "r") as f:
             if file.endswith(".bin"):
                 continue
             data = f.read()
-            print("FILE: {}".format(file))
             if 'main_c' in file:
                 data = highlight(data, CLexer(), HtmlFormatter(full=False))
             elif '_asm_' in file:
@@ -203,11 +169,9 @@ def get_logfiles():
             elif '.ascii' in file:
                 data = conv.convert(data, full=False)
             elif '.txt' in file:
-                    # skip it
-                    continue
+                continue # skip it 
             elif '.hex' in file:
-                print("-> hex")
-                continue
+                continue # skip it 
                 #data = escape(data)
                 #data = highlight(data, HexdumpLexer(), HtmlFormatter(full=False))
             elif '.log' in file:
diff --git a/log.py b/log.py
index 3953923..8154515 100644
--- a/log.py
+++ b/log.py
@@ -65,4 +65,7 @@ def setup_logging():
     list_handler.setFormatter(CustomFormatter())
 
     root_logger.addHandler(ch)
-    root_logger.addHandler(list_handler)
\ No newline at end of file
+    root_logger.addHandler(list_handler)
+
+def clear_log():
+    log_messages.clear()
diff --git a/model/project.py b/model/project.py
index dd480b6..7e39676 100644
--- a/model/project.py
+++ b/model/project.py
@@ -12,6 +12,7 @@ logger = logging.getLogger("Project")
 class Project():
     def __init__(self, settings: Settings):
         self.name: str = ""
+        self.comment: str = ""
         self.settings: Settings = settings
         self.payload: Payload = Payload(self.settings.payload_path)
         self.exe_host: ExeHost = ExeHost(self.settings.inject_exe_in)
diff --git a/pe/derbackdoorer.py b/pe/derbackdoorer.py
index 1cd2177..6732083 100644
--- a/pe/derbackdoorer.py
+++ b/pe/derbackdoorer.py
@@ -216,8 +216,6 @@ Trailing {sect_name} bytes:
         for ins in trampoline.split(';'):
             logger.info(f'\t{ins.strip()}')
 
-        logger.info('')
-
         return (trampoline, addrOffset)
     
 
@@ -245,7 +243,7 @@ Trailing {sect_name} bytes:
             self.compiledTrampoline = encoding
             self.compiledTrampolineCount = count
 
-            logger.info('Successfully backdoored entry point with jump/call to shellcode')
+            logger.debug('Successfully backdoored entry point with jump/call to shellcode')
             return instr.address
 
         return 0
diff --git a/pe/superpe.py b/pe/superpe.py
index 905e7a4..c1ac007 100644
--- a/pe/superpe.py
+++ b/pe/superpe.py
@@ -178,8 +178,6 @@ class SuperPe():
         if self.arch == 'x64':
             imageBaseRelocType = SuperPe.IMAGE_REL_BASED_DIR64
 
-        logger.info('Adding new relocations to backdoored PE file...')
-
         relocsSize = self.pe.OPTIONAL_HEADER.DATA_DIRECTORY[SuperPe.IMAGE_DIRECTORY_ENTRY_BASERELOC].Size
         relocsIndex = self.getSectionIndexByDataDir(SuperPe.IMAGE_DIRECTORY_ENTRY_BASERELOC)
         addr = self.pe.OPTIONAL_HEADER.DATA_DIRECTORY[SuperPe.IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress
diff --git a/web.py b/web.py
index b72163b..441abc1 100644
--- a/web.py
+++ b/web.py
@@ -3,11 +3,13 @@
 import os
 import argparse
 from flask import Flask
+import logging
 
 from app.views import views
 from log import setup_logging, writelog
 
 if __name__ == "__main__":
+	logging.getLogger('werkzeug').setLevel(logging.ERROR)
 	setup_logging()
 	parser = argparse.ArgumentParser()
 	parser.add_argument('--listenip', type=str, help='IP to listen on', default="0.0.0.0")