Linting

selfprivacy_api/migrations/__init__.py

@@ -1,3 +1,13 @@
+"""Migrations module.
+Migrations module is introduced in v1.1.1 and provides one-shot
+migrations which cannot be performed from the NixOS configuration file changes.
+These migrations are checked and ran before every start of the API.
+
+You can disable certain migrations if needed by creating an array
+at api.skippedMigrations in userdata.json and populating it
+with IDs of the migrations to skip.
+Adding DISABLE_ALL to that array disables the migrations module entirely.
+"""
 from selfprivacy_api.utils import ReadUserData
 from selfprivacy_api.migrations.fix_nixos_config_branch import FixNixosConfigBranch
 from selfprivacy_api.migrations.create_tokens_json import CreateTokensJson
@@ -26,7 +36,7 @@ def run_migrations():
             try:
                 if migration.is_migration_needed():
                     migration.migrate()
-            except Exception as e:
+            except Exception as err:
                 print(f"Error while migrating {migration.get_migration_name()}")
-                print(e)
+                print(err)
                 print("Skipping this migration")

selfprivacy_api/migrations/create_tokens_json.py

@@ -4,7 +4,7 @@ import json
 from pathlib import Path
 
 from selfprivacy_api.migrations.migration import Migration
-from selfprivacy_api.utils import USERDATA_FILE, TOKENS_FILE, ReadUserData
+from selfprivacy_api.utils import TOKENS_FILE, ReadUserData
 
 
 class CreateTokensJson(Migration):
@@ -50,7 +50,7 @@ class CreateTokensJson(Migration):
                     }
                 ]
             }
-            with open(TOKENS_FILE, "w") as tokens:
+            with open(TOKENS_FILE, "w", encoding="utf-8") as tokens:
                 json.dump(structure, tokens, indent=4)
             print("Done")
         except Exception as e:

selfprivacy_api/migrations/fix_nixos_config_branch.py

@@ -24,10 +24,7 @@ class FixNixosConfigBranch(Migration):
                 ["git", "rev-parse", "--abbrev-ref", "HEAD"], start_new_session=True
             )
             os.chdir(current_working_directory)
-            if nixos_config_branch.decode("utf-8").strip() == "rolling-testing":
+            return nixos_config_branch.decode("utf-8").strip() == "rolling-testing"
-                return True
-            else:
-                return False
         except subprocess.CalledProcessError:
             os.chdir(current_working_directory)
             return False

selfprivacy_api/migrations/migration.py

@@ -1,16 +1,16 @@
 from abc import ABC, abstractmethod
 
-"""
-Abstract Migration class
-This class is used to define the structure of a migration
-Migration has a function is_migration_needed() that returns True or False
-Migration has a function migrate() that does the migration
-Migration has a function get_migration_name() that returns the migration name
-Migration has a function get_migration_description() that returns the migration description
-"""
-
 
 class Migration(ABC):
+    """
+    Abstract Migration class
+    This class is used to define the structure of a migration
+    Migration has a function is_migration_needed() that returns True or False
+    Migration has a function migrate() that does the migration
+    Migration has a function get_migration_name() that returns the migration name
+    Migration has a function get_migration_description() that returns the migration description
+    """
+
     @abstractmethod
     def get_migration_name(self):
         pass

selfprivacy_api/resources/api_auth/app_tokens.py

@@ -7,7 +7,6 @@ from selfprivacy_api.resources.api_auth import api
 from selfprivacy_api.utils.auth import (
     delete_token,
     get_tokens_info,
-    delete_token,
     is_token_name_exists,
     is_token_name_pair_valid,
     refresh_token,

selfprivacy_api/resources/api_auth/new_device.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 """New device auth module"""
-from flask import request
 from flask_restful import Resource, reqparse
 
 from selfprivacy_api.resources.api_auth import api

selfprivacy_api/resources/api_auth/recovery_token.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 """Recovery token module"""
 from datetime import datetime
-from flask import request
 from flask_restful import Resource, reqparse
 
 from selfprivacy_api.resources.api_auth import api

selfprivacy_api/resources/services/ssh.py

@@ -212,17 +212,16 @@ class SSHKeys(Resource):
                 if "sshKeys" not in data:
                     data["sshKeys"] = []
                 return data["sshKeys"]
-            else:
+            if "users" not in data:
-                if "users" not in data:
+                data["users"] = []
-                    data["users"] = []
+            for user in data["users"]:
-                for user in data["users"]:
+                if user["username"] == username:
-                    if user["username"] == username:
+                    if "sshKeys" not in user:
-                        if "sshKeys" not in user:
+                        user["sshKeys"] = []
-                            user["sshKeys"] = []
+                    return user["sshKeys"]
-                        return user["sshKeys"]
+            return {
-                return {
+                "error": "User not found",
-                    "error": "User not found",
+            }, 404
-                }, 404
 
     def post(self, username):
         """

selfprivacy_api/resources/system.py

@@ -283,6 +283,8 @@ class PythonVersion(Resource):
 
 
 class PullRepositoryChanges(Resource):
+    """Pull NixOS config repository changes"""
+
     def get(self):
         """
         Pull Repository Changes
@@ -324,12 +326,11 @@ class PullRepositoryChanges(Resource):
                 "message": "Update completed successfully",
                 "data": data,
             }
-        elif git_pull_process_descriptor.returncode > 0:
+        return {
-            return {
+            "status": git_pull_process_descriptor.returncode,
-                "status": git_pull_process_descriptor.returncode,
+            "message": "Something went wrong",
-                "message": "Something went wrong",
+            "data": data,
-                "data": data,
+        }, 500
-            }, 500
 
 
 api.add_resource(Timezone, "/configuration/timezone")

selfprivacy_api/restic_controller/__init__.py

@@ -105,10 +105,7 @@ class ResticController:
             "--json",
         ]
 
-        if (
+        if self.state in (ResticStates.BACKING_UP, ResticStates.RESTORING):
-            self.state == ResticStates.BACKING_UP
-            or self.state == ResticStates.RESTORING
-        ):
             return
         with subprocess.Popen(
             backup_listing_command,
@@ -129,10 +126,9 @@ class ResticController:
             if "Is there a repository at the following location?" in snapshots_list:
                 self.state = ResticStates.NOT_INITIALIZED
                 return
-            else:
+            self.state = ResticStates.ERROR
-                self.state = ResticStates.ERROR
+            self.error_message = snapshots_list
-                self.error_message = snapshots_list
+            return
-                return
 
     def initialize_repository(self):
         """
@@ -195,10 +191,7 @@ class ResticController:
         """
         backup_status_check_command = ["tail", "-1", "/var/backup.log"]
 
-        if (
+        if self.state in (ResticStates.NO_KEY, ResticStates.NOT_INITIALIZED):
-            self.state == ResticStates.NO_KEY
-            or self.state == ResticStates.NOT_INITIALIZED
-        ):
             return
 
         # If the log file does not exists

selfprivacy_api/utils/auth.py

@@ -222,7 +222,8 @@ def generate_recovery_token(expiration=None, uses_left=None):
 def use_mnemonic_recoverery_token(mnemonic_phrase, name):
     """Use the recovery token by converting the mnemonic word list to a byte array.
     If the recovery token if invalid itself, return None
-    If the binary representation of phrase not matches the byte array of the recovery token, return None.
+    If the binary representation of phrase not matches
+    the byte array of the recovery token, return None.
     If the mnemonic phrase is valid then generate a device token and return it.
     Substract 1 from uses_left if it exists.
     mnemonic_phrase is a string representation of the mnemonic word list.
@@ -258,7 +259,8 @@ def use_mnemonic_recoverery_token(mnemonic_phrase, name):
 
 
 def get_new_device_auth_token():
-    """Generate a new device auth token which is valid for 10 minutes and return a mnemonic phrase representation
+    """Generate a new device auth token which is valid for 10 minutes
+    and return a mnemonic phrase representation
     Write token to the new_device of the tokens.json file.
     """
     token = secrets.token_bytes(16)