tina4-python 0.2.170__tar.gz → 0.2.172__tar.gz

{tina4_python-0.2.170 → tina4_python-0.2.172}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.170
+Version: 0.2.172
 Summary: Tina4Python - This is not another framework for Python
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 Requires-Python: <4.0,>=3.12

{tina4_python-0.2.170 → tina4_python-0.2.172}/pyproject.toml

@@ -1,65 +1,65 @@
-[project]
-name = "tina4-python"
-version = "0.2.170"
-description = "Tina4Python - This is not another framework for Python"
-authors = [
-    {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}
-]
-readme = "README.md"
-requires-python = ">=3.12,<4.0"
-dependencies = [
-    "jinja2>=3.1.5,<4.0.0",
-    "libsass (>=0.23.0,<0.24.0)",
-    "python-dotenv (>=1.0.1,<2.0.0)",
-    "pyjwt (>=2.10.1,<3.0.0)",
-    "cryptography (>=44.0.0,<45.0.0)",
-    "watchdog (>=6.0.0,<7.0.0)",
-    "bcrypt (>=4.2.1,<5.0.0)",
-    "litequeue (>=0.9,<0.10)",
-    "simple-websocket (>=1.1.0,<2.0.0)",
-    "asyncer>=0.0.8",
-    "hypercorn>=0.18.0",
-    "requests>=2.32.5",
-]
-
-[dependency-groups]
-dev = [
-    "flake8>=7.2.0",
-    "jurigged>=0.6.0",
-    "mkdocs>=1.6.1",
-    "mysql-connector-python>=9.3.0",
-    "psycopg2-binary>=2.9.10",
-    "pydoc-markdown>=4.8.2",
-    "pytest>=8.3.5",
-    "pytest-asyncio>=1.3.0",
-    "python-keycloak>=5.8.1",
-    "ruff>=0.11.9",
-    "safety>=3.5.0",
-]
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.hatch.build]
-include = [
-    "tina4_python/**/*"
-]
-
-[project.scripts]
-tina4 = "tina4_python.cli:main"
-
-[[tool.pydoc-markdown.loaders]]
-type = "python"
-search_path = [ "./tina4_python" ]
-
-[tool.pydoc-markdown.renderer]
-type = "mkdocs"
-site_name= "Tina4Python"
-
-[[tool.pydoc-markdown.renderer.pages]]
-title = "API Documentation"
-name = "index"
-
-contents = [ "*" ]
-
+[project]
+name = "tina4-python"
+version = "0.2.172"
+description = "Tina4Python - This is not another framework for Python"
+authors = [
+    {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}
+]
+readme = "README.md"
+requires-python = ">=3.12,<4.0"
+dependencies = [
+    "jinja2>=3.1.5,<4.0.0",
+    "libsass (>=0.23.0,<0.24.0)",
+    "python-dotenv (>=1.0.1,<2.0.0)",
+    "pyjwt (>=2.10.1,<3.0.0)",
+    "cryptography (>=44.0.0,<45.0.0)",
+    "watchdog (>=6.0.0,<7.0.0)",
+    "bcrypt (>=4.2.1,<5.0.0)",
+    "litequeue (>=0.9,<0.10)",
+    "simple-websocket (>=1.1.0,<2.0.0)",
+    "asyncer>=0.0.8",
+    "hypercorn>=0.18.0",
+    "requests>=2.32.5",
+]
+
+[dependency-groups]
+dev = [
+    "flake8>=7.2.0",
+    "jurigged>=0.6.0",
+    "mkdocs>=1.6.1",
+    "mysql-connector-python>=9.3.0",
+    "psycopg2-binary>=2.9.10",
+    "pydoc-markdown>=4.8.2",
+    "pytest>=8.3.5",
+    "pytest-asyncio>=1.3.0",
+    "python-keycloak>=5.8.1",
+    "ruff>=0.11.9",
+    "safety>=3.5.0",
+]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build]
+include = [
+    "tina4_python/**/*"
+]
+
+[project.scripts]
+tina4 = "tina4_python.cli:main"
+
+[[tool.pydoc-markdown.loaders]]
+type = "python"
+search_path = [ "./tina4_python" ]
+
+[tool.pydoc-markdown.renderer]
+type = "mkdocs"
+site_name= "Tina4Python"
+
+[[tool.pydoc-markdown.renderer.pages]]
+title = "API Documentation"
+name = "index"
+
+contents = [ "*" ]
+

{tina4_python-0.2.170 → tina4_python-0.2.172}/tina4_python/Database.py

@@ -320,6 +320,10 @@ class Database:
             total = counter.fetchone()[0]
         except Exception as e:
             Debug.error ("COUNT ERROR", count_sql, final_params, str(e))
+            try:
+                self.dba.rollback()
+            except Exception:
+                pass
             total = 0
         finally:
             counter.close()
@@ -359,6 +363,10 @@ class Database:
             return self.get_database_result(cursor, total, limit, skip, final_sql)
         except Exception as e:
             Debug.error("FETCH ERROR", final_sql, final_params, str(e))
+            try:
+                self.dba.rollback()
+            except Exception:
+                pass
             return DatabaseResult(None, [], str(e))
         finally:
             cursor.close()
@@ -433,6 +441,10 @@ class Database:
                 return DatabaseResult(None, [], None, 0, 0, 0, sql, self)
         except Exception as e:
             Debug.error("EXECUTE ERROR:", sql, str(e))
+            try:
+                self.dba.rollback()
+            except Exception:
+                pass
             # Return the error in the result
             return DatabaseResult(None, [], str(e))
         finally:
@@ -463,6 +475,10 @@ class Database:
             return DatabaseResult(None, [], None)
         except Exception as e:
             Debug.error("EXECUTE MANY ERROR:", sql, str(e))
+            try:
+                self.dba.rollback()
+            except Exception:
+                pass
             # Return the error in the result
             return DatabaseResult(None, [], str(e))
         finally:

{tina4_python-0.2.170 → tina4_python-0.2.172}/tina4_python/Router.py

@@ -202,7 +202,7 @@ class Router:
         tina4_python.tina4_current_request["headers"] = headers
 
         validated = False
-        # we can add other methods later but right now we validate posts
+        # we can add other methods later but right now we validate gets, posts and other risky methods
         if method in [Constant.TINA4_GET, Constant.TINA4_POST, Constant.TINA4_PUT, Constant.TINA4_PATCH,
                       Constant.TINA4_DELETE]:
             content_type = "text/html"
@@ -256,8 +256,8 @@ class Router:
             Debug.debug(method, "Matching route ", route['routes'], " to ", url)
             if Router.match(url, route['routes']):
 
-                if not "noauth" in route and not validated:
-                    if Router.requires_auth(route, method, validated):
+                if "noauth" not in route or "noauth" in route and not route["noauth"] and not validated:
+                    if not validated and Router.requires_auth(route, method, validated):
                         return Response.Response("Forbidden - Access denied", Constant.HTTP_FORBIDDEN,
                                                  Constant.TEXT_HTML)