Merge pull request #54 from 0xBallpoint/upgrade-http-framework

Upgrade HTTP framework

Author: hilarex

requirements.txt

@@ -8,4 +8,4 @@ scapy>=2.5.0
 jinja2>=3.1.4
 PyYAML>=6.0.2
 fastapi>=0.115.9
-uvicorn>=0.34.0
+hypercorn>=0.17.0

trapster/data/http/default_apache/config.yaml

@@ -2,6 +2,7 @@ name: default_apache
 description: Default Apache server
 headers:
   Server: Apache/2.4.41 (Ubuntu)
+  Content-Type: text/html; charset=utf-8
 
 endpoints:
   - "/":

trapster/data/http/default_iis/config.yaml

@@ -2,6 +2,7 @@ name: default_iis
 description: Default IIS server
 headers:
   Server: Microsoft-IIS/10.0
+  Content-Type: text/html; charset=utf-8
 
 endpoints:
   - "/":

trapster/data/http/demo_ai/config.yaml

@@ -1,6 +1,7 @@
 name: demo_ai
 description: Learn how to use AI to create honeypot web servers
 headers:
+  Content-Type: text/html; charset=utf-8
   X-Frame-Options: SAMEORIGIN
   Content-Security-Policy: frame-ancestors 'self'
   X-Xss-Protection: 1; mode=block

trapster/data/http/demo_api/config.yaml

@@ -7,6 +7,7 @@ description: Learn how to create your own config file for the HTTP server
 
 # headers here are optional, and will be added to all responses
 headers:
+  Content-Type: text/html; charset=utf-8
   Server: nginx
   X-Powered-By: PHP/7.4.3
 

trapster/data/http/fortigate/config.yaml

@@ -1,6 +1,7 @@
 name: fortigate
 description: Fortigate honeypot
 headers:
+  Content-Type: text/html; charset=utf-8
   X-Frame-Options: SAMEORIGIN
   Content-Security-Policy: frame-ancestors 'self'
   X-Xss-Protection: 1; mode=block

trapster/logger/formatters.py

@@ -190,6 +190,7 @@ def format(self, event):
 
         if protocol in {"http", "https"}:
             ecs_event["http"] = {
+                "version": extra.get("version"),
                 "request": {
                     "method": extra.get("method"),
                     "headers": extra.get("headers"),