diff --git a/config.yaml b/config.yaml index 48394dd..6e09f30 100644 --- a/config.yaml +++ b/config.yaml @@ -6,7 +6,7 @@ server: timezone: null # e.g., "America/New_York" or null for system default # manually set the server header, if null a random one will be used. - server_header: "Apache/2.2.22 (Ubuntu)" + server_header: null links: min_length: 5 diff --git a/src/handler.py b/src/handler.py index bbc87ea..eef528d 100644 --- a/src/handler.py +++ b/src/handler.py @@ -140,108 +140,25 @@ class Handler(BaseHTTPRequestHandler): random.seed(seed) num_pages = random.randint(*self.config.links_per_page_range) - html = f""" - - - - Krawl - - - -
-

Krawl me! 🕸

-
{Handler.counter}
+ # Build the content HTML + content = "" -
-""" - + # Add canary token if needed if Handler.counter <= 0 and self.config.canary_token_url: - html += f""" + content += f"""
{self.config.canary_token_url}
""" + # Add links if self.webpages is None: for _ in range(num_pages): address = ''.join([ random.choice(self.config.char_space) for _ in range(random.randint(*self.config.links_length_range)) ]) - html += f""" + content += f"""
{address}
@@ -249,18 +166,14 @@ class Handler(BaseHTTPRequestHandler): else: for _ in range(num_pages): address = random.choice(self.webpages) - html += f""" + content += f"""
{address}
""" - html += """ -
-
- -""" - return html + # Return the complete page using the template + return html_templates.main_page(Handler.counter, content) def do_HEAD(self): """Sends header information""" diff --git a/src/templates/html/main_page.html b/src/templates/html/main_page.html new file mode 100644 index 0000000..4be4916 --- /dev/null +++ b/src/templates/html/main_page.html @@ -0,0 +1,91 @@ + + + + + Krawl + + + +
+

Krawl me! 🕸

+
{counter}
+ +
+{content} +
+
+ + \ No newline at end of file diff --git a/src/templates/html_templates.py b/src/templates/html_templates.py index a7cefbc..50d94dc 100644 --- a/src/templates/html_templates.py +++ b/src/templates/html_templates.py @@ -60,3 +60,8 @@ def product_search() -> str: def input_form() -> str: """Generate input form page for XSS honeypot""" return load_template("input_form") + + +def main_page(counter: int, content: str) -> str: + """Generate main Krawl page with links and canary token""" + return load_template("main_page", counter=counter, content=content)