Skip to content

Commit f7a8940

Browse files
authored
Merge pull request #309 from MerginMaps/fix/qgis-plugin-security-b105
Fix plugins.qgis.org security-review findings
2 parents 2563539 + 62e15c4 commit f7a8940

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

mergin/cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,8 @@ def remove(ctx, project):
624624
if "/" in project:
625625
try:
626626
namespace, project = project.split("/")
627-
assert namespace, "No namespace given"
628-
assert project, "No project name given"
627+
assert namespace, "No namespace given" # nosec B101
628+
assert project, "No project name given" # nosec B101
629629
except (ValueError, AssertionError) as e:
630630
click.secho(f"Incorrect namespace/project format: {e}", fg="red")
631631
return

mergin/client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ class ServerType(Enum):
9292

9393

9494
def decode_token_data(token):
95-
token_prefix = "Bearer "
96-
if not token.startswith(token_prefix):
95+
bearer_prefix = "Bearer "
96+
if not token.startswith(bearer_prefix):
9797
raise TokenError(f"Token doesn't start with 'Bearer ': {token}")
9898
try:
99-
token_raw = token[len(token_prefix) :]
99+
token_raw = token[len(bearer_prefix) :]
100100
is_compressed = False
101101

102102
# compressed tokens start with dot,

mergin/client_pull.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ def pull_project_finalize(job: PullJob):
694694
job.mp.log.info("finalizing pull")
695695
try:
696696
if job.v2_pull_enabled:
697-
assert job.project_info is None
697+
assert job.project_info is None # nosec B101
698698

699699
project_info_response = job.mc.project_info_v2(job.mp.project_id(), files_at_version=job.version)
700700
job.project_info = asdict(project_info_response)

0 commit comments

Comments
 (0)