fix(controller): add check remote user status

Author: duanhongyi

rootfs/api/backend.py

@@ -8,6 +8,8 @@
 from api import serializers
 from api.oauth import OAuthManager
 
+User = get_user_model()
+
 
 class DryccOauthBackend(object):
 
@@ -29,7 +31,7 @@ def authenticate(self, request, username=None, password=None, **kwargs):
     def get_user(self, user_id):
         user = None
         try:
-            user = get_user_model().objects.get(pk=user_id)
+            user = User.objects.get(pk=user_id)
         except ObjectDoesNotExist:
             pass
         return user

rootfs/api/manager.py

@@ -53,7 +53,7 @@ class User(ManagerAPI):
     def get_status(self, username):
         """
         {
-            "is_active": false,
+            "is_active": False,
             "message": "The user is in arrears"
         }
         """

rootfs/api/models/__init__.py

@@ -19,13 +19,15 @@
 from django.db.models.signals import post_delete, post_save
 from django.utils.timezone import now
 from django.dispatch import receiver
+from django.contrib.auth import get_user_model
 from rest_framework.exceptions import ValidationError
 from rest_framework.authtoken.models import Token
 from requests_toolbelt import user_agent
 from scheduler.exceptions import KubeException
 from .. import __version__ as drycc_version
 from ..exceptions import DryccException, AlreadyExists, ServiceUnavailable, UnprocessableEntity  # noqa
 
+User = get_user_model()
 logger = logging.getLogger(__name__)
 session = None
 
@@ -255,7 +257,7 @@ def _hook_release_created(**kwargs):
 
 
 # automatically generate a new token on creation
-@receiver(post_save, sender=settings.AUTH_USER_MODEL)
+@receiver(post_save, sender=User)
 def create_auth_token_handle(sender, instance=None, created=False, **kwargs):
     if created:
         Token.objects.create(user=instance)

rootfs/api/models/app.py

@@ -17,6 +17,7 @@
 
 from django.conf import settings
 from django.db import models
+from django.contrib.auth import get_user_model
 from rest_framework.exceptions import ValidationError, NotFound
 
 from api.models import get_session
@@ -30,6 +31,7 @@
 from api.utils import generate_app_name, apply_tasks, unit_to_bytes, unit_to_millicpu
 from scheduler import KubeHTTPException, KubeException
 
+User = get_user_model()
 logger = logging.getLogger(__name__)
 
 
@@ -64,7 +66,7 @@ class App(UuidAuditedModel):
     Application used to service requests on behalf of end-users
     """
 
-    owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
+    owner = models.ForeignKey(User, on_delete=models.PROTECT)
     id = models.SlugField(max_length=63, unique=True, null=True,
                           validators=[validate_app_id,
                                       validate_reserved_names])

rootfs/api/models/appsettings.py

@@ -1,21 +1,23 @@
 import logging
-from django.conf import settings
 from django.db import models
 from django.db import transaction
+
 from django.contrib.postgres.fields import ArrayField
 from rest_framework.exceptions import NotFound
-
+from django.contrib.auth import get_user_model
 from api.utils import dict_diff
 from api.models import UuidAuditedModel
 from api.exceptions import DryccException, AlreadyExists, UnprocessableEntity
 
+User = get_user_model()
+
 
 class AppSettings(UuidAuditedModel):
     """
     Instance of Application settings used by scheduler
     """
 
-    owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
+    owner = models.ForeignKey(User, on_delete=models.PROTECT)
     app = models.ForeignKey('App', on_delete=models.CASCADE)
     routable = models.BooleanField(null=True)
     # the default values is None to differentiate from user sending an empty allowlist

rootfs/api/models/build.py

@@ -1,10 +1,11 @@
+import logging
 from django.conf import settings
 from django.db import models
-
+from django.contrib.auth import get_user_model
 from api.models import UuidAuditedModel
 from api.exceptions import DryccException, Conflict
 
-import logging
+User = get_user_model()
 logger = logging.getLogger(__name__)
 
 
@@ -13,7 +14,7 @@ class Build(UuidAuditedModel):
     Instance of a software build used by runtime nodes
     """
 
-    owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
+    owner = models.ForeignKey(User, on_delete=models.PROTECT)
     app = models.ForeignKey('App', on_delete=models.CASCADE)
     image = models.TextField()
     stack = models.CharField(max_length=32)

rootfs/api/models/certificate.py

@@ -1,3 +1,4 @@
+import logging
 from OpenSSL import crypto
 from pyasn1.codec.der import decoder as der_decoder
 from pyasn1.type import univ, constraint
@@ -8,17 +9,15 @@
 
 from django.shortcuts import get_object_or_404
 from django.db import models
-from django.conf import settings
 from django.core.exceptions import SuspiciousOperation
 from django.contrib.postgres.fields import ArrayField
+from django.contrib.auth import get_user_model
 from rest_framework.exceptions import ValidationError
-
 from api.models import AuditedModel, validate_label, AlreadyExists, ServiceUnavailable
 from api.models.domain import Domain
-
 from scheduler import KubeException
 
-import logging
+User = get_user_model()
 logger = logging.getLogger(__name__)
 
 
@@ -82,7 +81,7 @@ class Certificate(AuditedModel):
     """
     Public and private key pair used to secure application traffic at the router.
     """
-    owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
+    owner = models.ForeignKey(User, on_delete=models.PROTECT)
     name = models.CharField(max_length=253, unique=True, validators=[validate_label])
     # there is no upper limit on the size of an x.509 certificate
     certificate = models.TextField(validators=[validate_certificate])

rootfs/api/models/config.py

@@ -2,11 +2,12 @@
 import logging
 from django.conf import settings
 from django.db import models
+from django.contrib.auth import get_user_model
 from api.models.release import Release
 from api.models import UuidAuditedModel
 from api.exceptions import DryccException, UnprocessableEntity
 
-
+User = get_user_model()
 logger = logging.getLogger(__name__)
 
 
@@ -16,7 +17,7 @@ class Config(UuidAuditedModel):
     during runtime execution of the Application.
     """
 
-    owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
+    owner = models.ForeignKey(User, on_delete=models.PROTECT)
     app = models.ForeignKey('App', on_delete=models.CASCADE)
     values = models.JSONField(default=dict, blank=True)
     memory = models.JSONField(default=dict, blank=True)

rootfs/api/models/domain.py

@@ -1,12 +1,13 @@
 from django.db import models
-from django.conf import settings
 from django.db import transaction
-
+from django.contrib.auth import get_user_model
 from api.models import AuditedModel
 
+User = get_user_model()
+
 
 class Domain(AuditedModel):
-    owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
+    owner = models.ForeignKey(User, on_delete=models.PROTECT)
     app = models.ForeignKey('App', on_delete=models.CASCADE)
     domain = models.TextField(
         blank=False, null=False, unique=True,

rootfs/api/models/key.py

@@ -1,12 +1,12 @@
 import base64
-
-from django.conf import settings
 from django.db import models
 from rest_framework.exceptions import ValidationError
-
+from django.contrib.auth import get_user_model
 from api.models import UuidAuditedModel
 from api.utils import fingerprint
 
+User = get_user_model()
+
 
 def validate_base64(value):
     """Check that value contains only valid base64 characters."""
@@ -19,7 +19,7 @@ def validate_base64(value):
 class Key(UuidAuditedModel):
     """An SSH public key."""
 
-    owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+    owner = models.ForeignKey(User, on_delete=models.CASCADE)
     id = models.CharField(max_length=128, unique=True)
     public = models.TextField(
         unique=True, validators=[validate_base64],