Merge pull request #2173 from camptocamp/ghci/audit/snyk/prod-2-10

Audit Snyk check/fix prod-2-10

Author: geo-ghci-int[bot]

CONST_create_template/build

@@ -15,11 +15,16 @@ from typing import TYPE_CHECKING, Any, List, Optional
 
 import yaml
 
-CompletedProcess = subprocess.CompletedProcess[str] if TYPE_CHECKING else subprocess.CompletedProcess
+CompletedProcess = (
+    subprocess.CompletedProcess[str] if TYPE_CHECKING else subprocess.CompletedProcess
+)
 
 
 def run(
-    args: argparse.Namespace, command: List[str], exit_on_error: bool = True, **kwargs: Any
+    args: argparse.Namespace,
+    command: List[str],
+    exit_on_error: bool = True,
+    **kwargs: Any,
 ) -> Optional[CompletedProcess]:
     if args.verbose or args.dry_run:
         print(shlex.join(command))
@@ -36,15 +41,25 @@ def run(
 
 def main() -> None:
     parser = argparse.ArgumentParser(description="Build the project")
-    parser.add_argument("--verbose", action="store_true", help="Display the Docker build commands")
-    parser.add_argument("--no-cache", action="store_true", help="Disable docker cache on build")
     parser.add_argument(
-        "--dry-run", action="store_true", help="Display the docker build commands without executing them"
+        "--verbose", action="store_true", help="Display the Docker build commands"
+    )
+    parser.add_argument(
+        "--no-cache", action="store_true", help="Disable docker cache on build"
+    )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Display the docker build commands without executing them",
     )
     parser.add_argument("--service", help="Build only the specified service")
     parser.add_argument("--env", action="store_true", help="Build only the .env file")
-    parser.add_argument("--simple", action="store_true", help="Force simple application mode")
-    parser.add_argument("--not-simple", action="store_true", help="Force not simple application mode")
+    parser.add_argument(
+        "--simple", action="store_true", help="Force simple application mode"
+    )
+    parser.add_argument(
+        "--not-simple", action="store_true", help="Force not simple application mode"
+    )
     parser.add_argument("--upgrade", help="Start upgrading the project to version")
     parser.add_argument(
         "--reload",
@@ -60,9 +75,12 @@ def main() -> None:
         help="Do not pull external or base images for faster rebuild during development.",
     )
     parser.add_argument(
-        "--debug", help="Path to c2cgeoportal source folder to be able to debug the upgrade procedure"
+        "--debug",
+        help="Path to c2cgeoportal source folder to be able to debug the upgrade procedure",
+    )
+    parser.add_argument(
+        "--stack-trace", action="store_true", help="Display the stack trace on error"
     )
-    parser.add_argument("--stack-trace", action="store_true", help="Display the stack trace on error")
     parser.add_argument("env_files", nargs="*", help="The environment config")
     args = parser.parse_args()
 
@@ -124,7 +142,11 @@ def main() -> None:
             if args.not_simple:
                 simple = False
 
-            git_hash = run(args, ["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE).stdout.decode().strip()
+            git_hash = (
+                run(args, ["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE)
+                .stdout.decode()
+                .strip()
+            )
 
             dest.write(f"SIMPLE={str(simple).upper()}\n")
             dest.write(f"GIT_HASH={git_hash}\n")
@@ -143,7 +165,9 @@ def main() -> None:
         if not args.no_pull:
             # Pull all the images
             if not args.service:
-                run(args, [*docker_compose_command, "pull", "--ignore-buildable"])  # nosec
+                run(
+                    args, [*docker_compose_command, "pull", "--ignore-buildable"]
+                )  # nosec
             docker_compose_build_cmd.append("--pull")
 
         if args.service:
@@ -181,7 +205,16 @@ def main() -> None:
     if args.reload is not None:
         run(args, [*docker_compose_command, "rm", "--force", "-v", "config"])
         for service in services:
-            run(args, [*docker_compose_command, "up", "--detach", "--force-recreate", service])
+            run(
+                args,
+                [
+                    *docker_compose_command,
+                    "up",
+                    "--detach",
+                    "--force-recreate",
+                    service,
+                ],
+            )
 
 
 if __name__ == "__main__":

CONST_create_template/ci/docker-compose-check

@@ -11,11 +11,15 @@ def _main() -> None:
 
     services = [
         s.strip()
-        for s in subprocess.run(["docker", "compose", "ps"], check=True, stdout=subprocess.PIPE)
+        for s in subprocess.run(
+            ["docker", "compose", "ps"], check=True, stdout=subprocess.PIPE
+        )
         .stdout.decode("utf-8")
         .splitlines()
     ]
-    errors_statuses = [s for s in services if " Exit " in s and not s.endswith(" Exit 0")]
+    errors_statuses = [
+        s for s in services if " Exit " in s and not s.endswith(" Exit 0")
+    ]
     if errors_statuses:
         print("\n".join(errors_statuses))
         sys.exit(1)

CONST_create_template/scripts/db-backup

@@ -37,9 +37,13 @@ import sys
 def main() -> None:
     """Backup the database."""
     parser = argparse.ArgumentParser(description="Backup the database.")
-    parser.add_argument("--verbose", action="store_true", help="Print the command that is executed.")
     parser.add_argument(
-        "--dry-run", action="store_true", help="Only print the command that would be executed."
+        "--verbose", action="store_true", help="Print the command that is executed."
+    )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Only print the command that would be executed.",
     )
     parser.add_argument(
         "--env",
@@ -79,8 +83,16 @@ def main() -> None:
             command2 = ["--env=PGPASSWORD={}".format(env["PGPASSWORD"])]
             command2_annon = ["--env=PGPASSWORD=***"]
             command3 = [
-                *(["--env=PGSSLMODE={}".format(env["PGSSLMODE"])] if "PGSSLMODE" in env else []),
-                *(["--env=PGOPTIONS={}".format(env["PGOPTIONS"])] if "PGOPTIONS" in env else []),
+                *(
+                    ["--env=PGSSLMODE={}".format(env["PGSSLMODE"])]
+                    if "PGSSLMODE" in env
+                    else []
+                ),
+                *(
+                    ["--env=PGOPTIONS={}".format(env["PGOPTIONS"])]
+                    if "PGOPTIONS" in env
+                    else []
+                ),
                 "camptocamp/postgres:{}".format(env["POSTGRES_TAG"]),
                 "pg_dump",
                 "--format=c",
@@ -101,7 +113,11 @@ def main() -> None:
                 print(shlex.join([*command1, *command2_annon, *command3]))
             if args.dry_run:
                 sys.exit(0)
-            sys.exit(subprocess.run([*command1, *command2, *command3], stdout=file_out).returncode)
+            sys.exit(
+                subprocess.run(
+                    [*command1, *command2, *command3], stdout=file_out
+                ).returncode
+            )
         else:
             command = [
                 "docker",
@@ -115,7 +131,9 @@ def main() -> None:
                 *args.arg,
             ]
             if args.dry_run or args.verbose:
-                subprocess.run(["docker", "compose", "exec", "tools", "pg_dump", "--version"])
+                subprocess.run(
+                    ["docker", "compose", "exec", "tools", "pg_dump", "--version"]
+                )
                 print(shlex.join(command))
             if args.dry_run:
                 sys.exit(0)

CONST_create_template/scripts/db-restore

@@ -36,9 +36,13 @@ import sys
 def main() -> None:
     """Restore the database backup."""
     parser = argparse.ArgumentParser(description="Restore the database backup.")
-    parser.add_argument("--verbose", action="store_true", help="Print the command that is executed.")
     parser.add_argument(
-        "--dry-run", action="store_true", help="Only print the command that would be executed."
+        "--verbose", action="store_true", help="Print the command that is executed."
+    )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Only print the command that would be executed.",
     )
     parser.add_argument(
         "--env",
@@ -86,8 +90,16 @@ def main() -> None:
             ]
             command2_annon = ["--env=PGPASSWORD=***"]
             command3 = [
-                *(["--env=PGSSLMODE={}".format(env["PGSSLMODE"])] if "PGSSLMODE" in env else []),
-                *(["--env=PGOPTIONS={}".format(env["PGOPTIONS"])] if "PGOPTIONS" in env else []),
+                *(
+                    ["--env=PGSSLMODE={}".format(env["PGSSLMODE"])]
+                    if "PGSSLMODE" in env
+                    else []
+                ),
+                *(
+                    ["--env=PGOPTIONS={}".format(env["PGOPTIONS"])]
+                    if "PGOPTIONS" in env
+                    else []
+                ),
                 "camptocamp/postgres:{}".format(env["POSTGRES_TAG"]),
                 "pg_restore",
                 "--dbname={}".format(env["PGDATABASE"]),
@@ -107,7 +119,11 @@ def main() -> None:
                 print(shlex.join([*command1, *command2_annon, *command3]))
             if args.dry_run:
                 sys.exit(0)
-            sys.exit(subprocess.run([*command1, *command2, *command3], stdin=file_in).returncode)
+            sys.exit(
+                subprocess.run(
+                    [*command1, *command2, *command3], stdin=file_in
+                ).returncode
+            )
         else:
             command = [
                 "docker",
@@ -121,7 +137,9 @@ def main() -> None:
                 'pg_restore --dbname="$PGDATABASE" ' + " ".join(args.arg),
             ]
             if args.verbose or args.dry_run:
-                subprocess.run(["docker", "compose", "exec", "tools", "pg_restore", "--version"])
+                subprocess.run(
+                    ["docker", "compose", "exec", "tools", "pg_restore", "--version"]
+                )
                 print(shlex.join(command))
             if args.dry_run:
                 sys.exit(0)

CONST_create_template/scripts/qgis-project-download

@@ -24,20 +24,22 @@ Example usage:
         formatter_class=argparse.RawTextHelpFormatter,
     )
     parser.add_argument("schema", default="qgis", help="Source PostgreSQL schema name")
-    parser.add_argument("project", default="project.qgz", help="Source QGIS project name")
-    parser.add_argument("filename", default="qgisserver/project.qgz", help="Destination file name")
+    parser.add_argument(
+        "project", default="project.qgz", help="Source QGIS project name"
+    )
+    parser.add_argument(
+        "filename", default="qgisserver/project.qgz", help="Destination file name"
+    )
     args = parser.parse_args()
 
     # Connect to a DB, e.g., the test DB on your localhost, and get a cursor
     with psycopg2.connect(f"dbname={os.environ['PGDATABASE']}") as connection:
         with connection.cursor() as cursor:
-            query = sql.SQL(
-                """
+            query = sql.SQL("""
                 SELECT content
                 FROM {}.qgis_projects
                 WHERE name = %(name)s;
-            """
-            ).format(sql.Identifier(args.schema))
+            """).format(sql.Identifier(args.schema))
 
             cursor.execute(query, {"name": args.project})
             rows = cursor.fetchall()
@@ -47,7 +49,9 @@ Example usage:
             with path.open("wb") as f:
                 f.write(data)
 
-    print(f"Project {args.project} from schema {args.schema} downloaded as {args.filename}")
+    print(
+        f"Project {args.project} from schema {args.schema} downloaded as {args.filename}"
+    )
 
 
 if __name__ == "__main__":

CONST_create_template/scripts/qgis-project-upload

@@ -23,9 +23,15 @@ Example usage:
         """,
         formatter_class=argparse.RawTextHelpFormatter,
     )
-    parser.add_argument("filename", default="qgisserver/project.qgz", help="Source file name")
-    parser.add_argument("schema", default="qgis", help="Destination PostgreSQL schema name")
-    parser.add_argument("project", default="project.qgz", help="Destination QGIS project name")
+    parser.add_argument(
+        "filename", default="qgisserver/project.qgz", help="Source file name"
+    )
+    parser.add_argument(
+        "schema", default="qgis", help="Destination PostgreSQL schema name"
+    )
+    parser.add_argument(
+        "project", default="project.qgz", help="Destination QGIS project name"
+    )
     args = parser.parse_args()
 
     # Connect to a DB, e.g., the test DB on your localhost, and get a cursor
@@ -35,13 +41,11 @@ Example usage:
             with path.open("rb") as f:
                 data = f.read()
 
-            query = sql.SQL(
-                """
+            query = sql.SQL("""
                 UPDATE {}.qgis_projects
                 SET content = %(content)s
                 WHERE name = %(name)s;
-            """
-            ).format(sql.Identifier(args.schema))
+            """).format(sql.Identifier(args.schema))
 
             cursor.execute(
                 query,
@@ -51,7 +55,9 @@ Example usage:
                 },
             )
 
-    print(f"Project {args.filename} uploaded in schema {args.schema} with name {args.project}")
+    print(
+        f"Project {args.filename} uploaded in schema {args.schema} with name {args.project}"
+    )
 
 
 if __name__ == "__main__":

CONST_create_template/tests/test_app.py

@@ -11,7 +11,11 @@
         ("https://front/themes", {}, 120),
         ("https://front/static-geomapfish/0/locales/fr.json", {}, 2),
         ("https://front/dynamic.json", {"interface": "desktop"}, 10),
-        ("https://front/dynamic.json", {"interface": "desktop", "query": "", "path": "/"}, 10),
+        (
+            "https://front/dynamic.json",
+            {"interface": "desktop", "query": "", "path": "/"},
+            10,
+        ),
         ("https://front/c2c/health_check", {}, 2),
         ("https://front/c2c/health_check", {"max_level": "1"}, 2),
         ("https://front/c2c/health_check", {"checker": "check_collector"}, 2),
@@ -63,7 +67,9 @@
 def test_url(url: str, params: dict[str, str], timeout: int) -> None:
     """Tests that some URL didn't return an error."""
     for _ in range(6):
-        response = requests.get(url, params=params, verify=False, timeout=timeout)  # nosec
+        response = requests.get(
+            url, params=params, verify=False, timeout=timeout
+        )  # nosec
         if response.status_code == 503:
             time.sleep(1)
             continue

CONST_create_template/tests/test_testapp.py

@@ -12,7 +12,9 @@ def test_po(test_number: int) -> None:
     """Tests that the generated pot files are identical between the command line and the view."""
     del test_number
 
-    response = requests.get("https://front/locale.pot", verify=False, timeout=30)  # nosec
+    response = requests.get(
+        "https://front/locale.pot", verify=False, timeout=30
+    )  # nosec
     assert response.status_code == 200, response.text
     response_keys = {e.msgid for e in polib.pofile(response.text)}
 
@@ -42,7 +44,11 @@ def test_desktop_alt(url: str) -> None:
 
 def test_enum() -> None:
     """Test the enumerations view."""
-    response = requests.get("https://front/layers/test/values/type", verify=False, timeout=30)  # nosec
+    response = requests.get(
+        "https://front/layers/test/values/type", verify=False, timeout=30
+    )  # nosec
     assert response.status_code == 200, response.text
 
-    assert response.json() == {"items": [{"value": "car"}, {"value": "train"}]}, response.text
+    assert response.json() == {
+        "items": [{"value": "car"}, {"value": "train"}]
+    }, response.text