From b25fe5cb2b8cdafc52c283de67d1aa95027088dc Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Tue, 28 Jan 2025 21:41:00 -0500
Subject: [PATCH 1/6] feat: migrate setup configuration to pyproject.toml and
 simplify setup.py

---
 pyproject.toml | 23 +++++++++++++++++++++++
 setup.py       | 23 ++---------------------
 2 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 pyproject.toml

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..9fb33d0
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,23 @@
+[build-system]
+requires = ["setuptools>=64.0.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "simpleguardhome"
+version = "0.1.0"
+requires-python = ">=3.7"
+dependencies = [
+    "fastapi",
+    "uvicorn",
+    "python-dotenv",
+    "httpx",
+    "pydantic",
+    "jinja2",
+]
+
+[tool.setuptools]
+package-dir = {"" = "src"}
+packages = {find = {where = ["src"]}}
+
+[tool.setuptools.package-data]
+simpleguardhome = ["templates/*", "favicon.ico"]
\ No newline at end of file
diff --git a/setup.py b/setup.py
index d0f350a..fc1f76c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,22 +1,3 @@
-from setuptools import setup, find_packages
-from pathlib import Path
+from setuptools import setup
 
-setup(
-    name="simpleguardhome",
-    version="0.1.0",
-    packages=find_packages(where="src"),
-    package_dir={"": "src"},
-    include_package_data=True,
-    package_data={
-        "simpleguardhome": ["templates/*", "favicon.ico"]
-    },
-    python_requires=">=3.7",
-    install_requires=[
-        "fastapi",
-        "uvicorn",
-        "python-dotenv",
-        "httpx",
-        "pydantic",
-        "jinja2",
-    ],
-)
\ No newline at end of file
+setup()
\ No newline at end of file

From 56e05a967d8b751ebefa47b2edb53856b637287f Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Tue, 28 Jan 2025 21:41:22 -0500
Subject: [PATCH 2/6] Potential fix for code scanning alert no. 3: DOM text
 reinterpreted as HTML

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
---
 src/simpleguardhome/templates/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/simpleguardhome/templates/index.html b/src/simpleguardhome/templates/index.html
index 87e125f..bb5e98c 100644
--- a/src/simpleguardhome/templates/index.html
+++ b/src/simpleguardhome/templates/index.html
@@ -5,10 +5,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>SimpleGuardHome</title>
     <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/dompurify/2.3.4/purify.min.js"></script>
     <script>
         async function checkDomain(event) {
             event.preventDefault();
-            const domain = document.getElementById('domain').value;
+            const domain = DOMPurify.sanitize(document.getElementById('domain').value);
             const resultDiv = document.getElementById('result');
             const unblockDiv = document.getElementById('unblock-action');
             const submitBtn = document.getElementById('submit-btn');

From c9f8ebbe7d772c7ae8cae1d6fa3418086b74af86 Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Tue, 28 Jan 2025 21:41:32 -0500
Subject: [PATCH 3/6] Potential fix for code scanning alert no. 2: DOM text
 reinterpreted as HTML

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
---
 src/simpleguardhome/templates/index.html | 28 +++++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/simpleguardhome/templates/index.html b/src/simpleguardhome/templates/index.html
index 87e125f..97c752d 100644
--- a/src/simpleguardhome/templates/index.html
+++ b/src/simpleguardhome/templates/index.html
@@ -6,6 +6,18 @@
     <title>SimpleGuardHome</title>
     <script src="https://cdn.tailwindcss.com"></script>
     <script>
+        function escapeHtml(unsafe) {
+            return unsafe.replace(/[&<"']/g, function (m) {
+                switch (m) {
+                    case '&': return '&amp;';
+                    case '<': return '&lt;';
+                    case '>': return '&gt;';
+                    case '"': return '&quot;';
+                    case "'": return '&#039;';
+                    default: return m;
+                }
+            });
+        }
         async function checkDomain(event) {
             event.preventDefault();
             const domain = document.getElementById('domain').value;
@@ -33,10 +45,10 @@
                         resultDiv.innerHTML = `
                             <div class="bg-red-100 border-l-4 border-red-500 text-red-700 p-4 mb-4">
                                 <p class="font-bold">Domain is blocked</p>
-                                <p class="text-sm"><strong>${domain}</strong> is blocked</p>
-                                <p class="text-sm">Reason: ${data.reason}</p>
-                                ${data.rules?.length ? `<p class="text-sm font-mono bg-red-50 p-2 mt-1 rounded">Rule: ${data.rules[0].text}</p>` : ''}
-                                ${data.service_name ? `<p class="text-sm mt-2">Service: ${data.service_name}</p>` : ''}
+                                <p class="text-sm"><strong>${escapeHtml(domain)}</strong> is blocked</p>
+                                <p class="text-sm">Reason: ${escapeHtml(data.reason)}</p>
+                                ${data.rules?.length ? `<p class="text-sm font-mono bg-red-50 p-2 mt-1 rounded">Rule: ${escapeHtml(data.rules[0].text)}</p>` : ''}
+                                ${data.service_name ? `<p class="text-sm mt-2">Service: ${escapeHtml(data.service_name)}</p>` : ''}
                             </div>`;
                         unblockDiv.innerHTML = `
                             <button onclick="unblockDomain('${domain}')" 
@@ -47,8 +59,8 @@
                         resultDiv.innerHTML = `
                             <div class="bg-green-100 border-l-4 border-green-500 text-green-700 p-4">
                                 <p class="font-bold">Domain is not blocked</p>
-                                <p class="text-sm"><strong>${domain}</strong> is allowed</p>
-                                <p class="text-xs mt-2">Status: ${data.reason}</p>
+                                <p class="text-sm"><strong>${escapeHtml(domain)}</strong> is allowed</p>
+                                <p class="text-xs mt-2">Status: ${escapeHtml(data.reason)}</p>
                             </div>`;
                         unblockDiv.innerHTML = '';
                     }
@@ -60,7 +72,7 @@
                     resultDiv.innerHTML = `
                         <div class="bg-${bgColor}-100 border-l-4 border-${bgColor}-500 text-${bgColor}-700 p-4">
                             <p class="font-bold">Error checking domain</p>
-                            <p class="text-sm">${errorMsg}</p>
+                            <p class="text-sm">${escapeHtml(errorMsg)}</p>
                         </div>`;
                     unblockDiv.innerHTML = '';
                 }
@@ -68,7 +80,7 @@
                 resultDiv.innerHTML = `
                     <div class="bg-red-100 border-l-4 border-red-500 text-red-700 p-4">
                         <p class="font-bold">Error checking domain</p>
-                        <p class="text-sm">${error.message}</p>
+                        <p class="text-sm">${escapeHtml(error.message)}</p>
                     </div>`;
                 unblockDiv.innerHTML = '';
             } finally {

From 57539fa56ec40a2965b95d341e0f01e3de62eeff Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Tue, 28 Jan 2025 21:45:10 -0500
Subject: [PATCH 4/6] feat(docker): update Dockerfile for improved package
 installation and add pyproject.toml

---
 Dockerfile     | 10 ++++------
 pyproject.toml | 11 ++++++++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f1419c0..a5fdff1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update && \
     python3-pip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
-    && python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel
+    && python3 -m pip install --no-cache-dir --upgrade "pip>=21.3" setuptools wheel
 
 # Add architecture-specific compiler flags if needed
 ENV ARCHFLAGS=""
@@ -24,7 +24,7 @@ RUN mkdir -p /app/src/simpleguardhome && \
     chmod -R 755 /app
 
 # Copy source code, maintaining directory structure
-COPY setup.py requirements.txt /app/
+COPY setup.py requirements.txt pyproject.toml /app/
 COPY src /app/src/
 
 # Set PYTHONPATH
@@ -37,10 +37,8 @@ RUN pip install --no-cache-dir -r requirements.txt
 RUN set -e && \
     echo "Installing package..." && \
     pip uninstall -y simpleguardhome || true && \
-    # First install dependencies only
-    pip install --no-deps -v -e . && \
-    # Then install package with dependencies
-    pip install -e . && \
+    # Install package with dependencies and PEP 517 support
+    pip install --use-pep517 -e . && \
     echo "Verifying installation..." && \
     pip show simpleguardhome && \
     # List all package files
diff --git a/pyproject.toml b/pyproject.toml
index 9fb33d0..282b1dc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,6 +5,12 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "simpleguardhome"
 version = "0.1.0"
+description = "SimpleGuardHome - A lightweight AdGuardHome UI"
+authors = [
+    {name = "SimpleGuardHome Team"}
+]
+readme = "README.md"
+license = {file = "LICENSE"}
 requires-python = ">=3.7"
 dependencies = [
     "fastapi",
@@ -20,4 +26,7 @@ package-dir = {"" = "src"}
 packages = {find = {where = ["src"]}}
 
 [tool.setuptools.package-data]
-simpleguardhome = ["templates/*", "favicon.ico"]
\ No newline at end of file
+simpleguardhome = ["templates/*", "favicon.ico"]
+
+[tool.setuptools.editable]
+mode = "compat"
\ No newline at end of file

From b1297b5ada22fbbc17660794b4cb9a94795b533f Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Tue, 28 Jan 2025 21:54:25 -0500
Subject: [PATCH 5/6] Update index.html

---
 src/simpleguardhome/templates/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/simpleguardhome/templates/index.html b/src/simpleguardhome/templates/index.html
index bb5e98c..4286fd3 100644
--- a/src/simpleguardhome/templates/index.html
+++ b/src/simpleguardhome/templates/index.html
@@ -4,8 +4,8 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>SimpleGuardHome</title>
-    <script src="https://cdn.tailwindcss.com"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/dompurify/2.3.4/purify.min.js"></script>
+    <script src="https://unpkg.com/@tailwindcss/browser@4" integrity="sha384-fsXZ0Oru5QjGkveFx8DdmBAyKdwnJ7TnbRzDN5LROCKt8PAN8h7y7oqCwtk9cN68" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/dompurify/2.3.4/purify.min.js" integrity="sha384-KGmzmwrs7oAU2sG5qfETslFsscVcCaxQrX2d7PW7I9bTrsuTD/eSMFr9jaMS9i+b" crossorigin="anonymous"></script>
     <script>
         async function checkDomain(event) {
             event.preventDefault();
@@ -163,4 +163,4 @@
         </div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>

From 0c7d5a2a9ba5d8ec031ec830f534cc3009d13721 Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Tue, 28 Jan 2025 21:58:03 -0500
Subject: [PATCH 6/6] feat(docker): update Dockerfile for editable mode
 compatibility and refine package installation

---
 Dockerfile     | 4 ++--
 pyproject.toml | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a5fdff1..37b6199 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,8 +37,8 @@ RUN pip install --no-cache-dir -r requirements.txt
 RUN set -e && \
     echo "Installing package..." && \
     pip uninstall -y simpleguardhome || true && \
-    # Install package with dependencies and PEP 517 support
-    pip install --use-pep517 -e . && \
+    # Install package in editable mode with compatibility mode enabled
+    pip install --use-pep517 -e . --config-settings editable_mode=compat && \
     echo "Verifying installation..." && \
     pip show simpleguardhome && \
     # List all package files
diff --git a/pyproject.toml b/pyproject.toml
index 282b1dc..b264e78 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,7 +26,4 @@ package-dir = {"" = "src"}
 packages = {find = {where = ["src"]}}
 
 [tool.setuptools.package-data]
-simpleguardhome = ["templates/*", "favicon.ico"]
-
-[tool.setuptools.editable]
-mode = "compat"
\ No newline at end of file
+simpleguardhome = ["templates/*", "favicon.ico"]
\ No newline at end of file