squad 1.84__tar.gz → 1.86__tar.gz

{squad-1.84 → squad-1.86}/CHANGELOG.md

@@ -1,6 +1,16 @@
+# 1.86
+
+This 1.86 release adds an extension of DRF's UserRateThrottle by allowing
+throttling users registered via social accounts.
+
+# 1.85
+
+This 1.85 release changes the test jobs page to only display resubmit and cancel buttons
+when backend really supports it.
+
 # 1.84
 
-This 1.83 release has a new way to run SQUAD via docker-compose, thanks to @swvanbuuren!
+This 1.84 release has a new way to run SQUAD via docker-compose, thanks to @swvanbuuren!
 
 The release also counts with a few improvements on the REST API and CI module.
 

{squad-1.84 → squad-1.86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: squad
-Version: 1.84
+Version: 1.86
 Summary: Software Quality Dashboard
 Home-page: https://github.com/Linaro/squad
 Author: Antonio Terceiro

squad-1.86/squad/api/__init__.py

@@ -0,0 +1,40 @@
+from django.core.cache import cache
+from rest_framework.throttling import UserRateThrottle
+
+
+class SocialUserRateThrottle(UserRateThrottle):
+    """
+    Limits the rate of API calls that may be made by a given social user.
+
+    The user id will be used as a unique cache key if the user is
+    authenticated.  For anonymous requests, the IP address of the request will
+    be used.
+    """
+
+    scope = "socialuser"
+
+    def is_social_user(self, user):
+        """
+        Social account user might use multiple applications (github, gitlab, google, ...)
+        to log in. But all of the login applications would likely point to the same
+        django user, which is what we want to rate limit here.
+        """
+
+        key = f"socialuser#{user.id}"
+        from allauth.socialaccount.models import SocialAccount
+        return cache.get_or_set(key, SocialAccount.objects.filter(user_id=user.id).exists())
+
+    def get_cache_key(self, request, view):
+        if request.user and request.user.is_authenticated:
+            if not self.is_social_user(request.user):
+                # do not throttle non-social users
+                return None
+
+            ident = request.user.pk
+        else:
+            ident = self.get_ident(request)
+
+        return self.cache_format % {
+            "scope": self.scope,
+            "ident": ident
+        }

{squad-1.84 → squad-1.86}/squad/ci/backend/fake.py

@@ -60,6 +60,12 @@ class Backend(object):
     def job_url(self, test_job):
         return 'https://example.com/job/%s' % test_job.job_id
 
+    def has_resubmit(self):
+        return False
+
+    def has_cancel(self):
+        return True
+
     def cancel(self, test_job):
         return True
 

{squad-1.84 → squad-1.86}/squad/ci/backend/lava.py

@@ -106,6 +106,9 @@ class Backend(BaseBackend):
             return job_id
         return [job_id]
 
+    def has_cancel(self):
+        return True
+
     def cancel(self, test_job):
         if test_job.submitted and test_job.job_id is not None:
             return self.__cancel_job__(test_job.job_id)
@@ -329,6 +332,9 @@ class Backend(BaseBackend):
         scheme = socket_url.scheme
         return '%s://%s:%s' % (scheme, hostname, port)
 
+    def has_resubmit(self):
+        return True
+
     def resubmit(self, test_job):
         with self.handle_job_submission():
             new_job_id_list = self.__resubmit__(test_job.job_id)

{squad-1.84 → squad-1.86}/squad/ci/backend/null.py

@@ -8,7 +8,7 @@ logger = logging.getLogger('squad.ci.backend')
 description = "None"
 
 
-class Backend(object):
+class Backend:
 
     """
     This is the interface that all backends must implement. Depending on the
@@ -39,6 +39,13 @@ class Backend(object):
         """
         raise NotImplementedError
 
+    def has_resubmit(self):
+        """
+        If the backend has a resubmit method implemented, override this to
+        return True.
+        """
+        return False
+
     def resubmit(self, test_job):
         """
         Re-submits given test job to the backend service
@@ -84,6 +91,13 @@ class Backend(object):
         """
         raise NotImplementedError
 
+    def has_cancel(self):
+        """
+        If the backend has a cancel method implemented, override this to
+        return True.
+        """
+        return False
+
     def cancel(self, test_job):
         """
         Cancels the job if the backend allows it. It will not raise any

{squad-1.84 → squad-1.86}/squad/ci/backend/tuxsuite.py

@@ -32,6 +32,11 @@ requests_session = None
 
 
 class Backend(BaseBackend):
+    def has_resubmit(self):
+        return False
+
+    def has_cancel(self):
+        return True
 
     @staticmethod
     def get_session():

{squad-1.84 → squad-1.86}/squad/ci/models.py

@@ -382,7 +382,7 @@ class TestJob(models.Model):
         if self.job_status == "Canceled":
             return False
 
-        if self.job_id is not None:
+        if self.job_id is not None and self.backend.get_implementation().has_cancel():
             return self.backend.get_implementation().cancel(self)
 
         self.fetched = True

{squad-1.84 → squad-1.86}/squad/frontend/templates/squad/testjobs.jinja2

@@ -56,7 +56,7 @@
     <div class='pull-right clearfix' ng-controller='CancelController' title="{{ _('Cancel all jobs') }}">
         <a class="btn" ng-click="cancel_all({{ build.id }})" ng-class="{'btn-info': !done, 'btn-success': done, 'btn-danger': error}" ng-disabled="done" >
 	    <span ng-class="{'fa':true, 'fa-recycle':!done, 'fa-check': done && !error, 'fa-spin': loading, 'fa-close': error}" ng-disabled="done"></span>
-	    {{ _('Cancell all jobs') }}
+	    {{ _('Cancel all jobs') }}
 	</a>
     </div>
     <br />
@@ -107,7 +107,7 @@
                                 ng-class="{'fa':true, 'fa-recycle':!done, 'fa-check': done && !error, 'fa-spin': loading, 'fa-close': error}"
                                 ng-disabled="done">
                             </span>
-                            {{ _('%s - manual fetch')  % testjob.job_id }}
+                            {{ _('manual fetch') }}
                         </a>
                     </div>
                     {% endif %}
@@ -122,11 +122,12 @@
                                 ng-class="{'fa':true, 'fa-recycle':!done, 'fa-check': done && !error, 'fa-spin': loading, 'fa-close': error}"
                                 ng-disabled="done">
                             </span>
-                            {{ _('%s - cancel')  % testjob.job_id }}
+                            {{ _('cancel %s') % testjob.backend.get_implementation().has_cancel() }}
                         </a>
                     </div>
                     {% endif %}
                     <div class='pull-right' ng-controller='ResubmitController'>
+                        {% if testjob.backend.get_implementation().has_resubmit() %}
                         <a
                             class="btn"
                             ng-click="resubmit({{testjob.id}}, true)"
@@ -138,9 +139,10 @@
                                 ng-disabled="done"
                                 title="{{ _('Resubmit job no matter the status') }}">
                             </span>
-                            {{ _('%s - force resubmit') % testjob.job_id }}
+                            {{ _('force resubmit') }}
                         </a>
-                        {% if testjob.can_resubmit %}
+                        {% endif %}
+                        {% if testjob.can_resubmit and testjob.backend.get_implementation().has_resubmit() %}
                         <a
                             class="btn"
                             ng-click="resubmit({{testjob.id}}, false)"
@@ -152,7 +154,7 @@
                                 ng-disabled="done"
                                 title="{{ _('Resubmit job') }}">
                             </span>
-                            {{ _('%s - resubmit') % testjob.job_id }}
+                            {{ _('resubmit') }}
                         </a>
                         {% endif %}
                     </div>

squad-1.86/squad/version.py

@@ -0,0 +1 @@
+__version__ = '1.86'

{squad-1.84 → squad-1.86}/squad.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: squad
-Version: 1.84
+Version: 1.86
 Summary: Software Quality Dashboard
 Home-page: https://github.com/Linaro/squad
 Author: Antonio Terceiro

squad-1.84/squad/version.py

@@ -1 +0,0 @@
-__version__ = '1.84'