Fixes

Author: JelteF

pgcommitfest/commitfest/models.py

@@ -360,6 +360,7 @@ class CfbotBranch(models.Model):
     created = models.DateTimeField(auto_now_add=True)
     modified = models.DateTimeField(auto_now=True)
 
+
 class CfbotTask(models.Model):
     STATUS_CHOICES = [
         ('CREATED', 'Created'),

pgcommitfest/commitfest/templates/commitfest.html

@@ -109,7 +109,7 @@ <h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
      {%endif%}
     </a>
     {% else %}
-      ?????
+      <span class="label label-default">Not processed</span>
     {%endif%}
    </td>
    <td>{{p.author_names|default:''}}</td>

pgcommitfest/commitfest/views.py

@@ -14,6 +14,7 @@
 from email.mime.text import MIMEText
 from email.utils import formatdate, make_msgid
 import json
+import hmac
 import urllib
 
 from pgcommitfest.mailqueue.util import send_mail, send_simple_mail
@@ -209,16 +210,15 @@ def commitfest(request, cfid):
 
     # Let's not overload the poor django ORM
     curs = connection.cursor()
-    curs.execute("""
-SELECT p.id, p.name, poc.status, v.version AS targetversion, p.created, p.modified, p.lastmail, committer.username AS committer, t.topic,
+    curs.execute("""SELECT p.id, p.name, poc.status, v.version AS targetversion, p.created, p.modified, p.lastmail, committer.username AS committer, t.topic,
 (poc.status=ANY(%(openstatuses)s)) AS is_open,
 (SELECT string_agg(first_name || ' ' || last_name || ' (' || username || ')', ', ') FROM auth_user INNER JOIN commitfest_patch_authors cpa ON cpa.user_id=auth_user.id WHERE cpa.patch_id=p.id) AS author_names,
 (SELECT string_agg(first_name || ' ' || last_name || ' (' || username || ')', ', ') FROM auth_user INNER JOIN commitfest_patch_reviewers cpr ON cpr.user_id=auth_user.id WHERE cpr.patch_id=p.id) AS reviewer_names,
 (SELECT count(1) FROM commitfest_patchoncommitfest pcf WHERE pcf.patch_id=p.id) AS num_cfs,
 (
     SELECT row_to_json(t) as cfbot_results
     from (
-        SELECT 
+        SELECT
             count(*) FILTER (WHERE task.status = 'COMPLETED') as completed,
             count(*) FILTER (WHERE task.status in ('CREATED', 'SCHEDULED', 'EXECUTING')) running,
             count(*) FILTER (WHERE task.status in ('ABORTED', 'ERRORED', 'FAILED')) failed,
@@ -328,10 +328,7 @@ def patch(request, cfid, patchid):
     patch_commitfests = PatchOnCommitFest.objects.select_related('commitfest').filter(patch=patch).order_by('-commitfest__startdate')
     committers = Committer.objects.filter(active=True).order_by('user__last_name', 'user__first_name')
 
-    try:
-        cfbot_branch = patch.cfbot_branch
-    except CfbotBranch.DoesNotExist:
-        cfbot_branch = None
+    cfbot_branch = getattr(patch, 'cfbot_branch', None)
     cfbot_tasks = patch.cfbot_tasks.order_by('position') if cfbot_branch else []
 
     # XXX: this creates a session, so find a smarter way. Probably handle
@@ -820,10 +817,6 @@ def cfbot_ingest(message):
 
     cursor = connection.cursor()
 
-    # Every message should have a shared_secret, and it should match.
-    if message["shared_secret"] != settings.CFBOT_SECRET:
-        raise Exception("Invalid shared_secret from CFbot")
-
     branch_status = message["branch_status"]
     patch_id = branch_status["submission_id"]
     branch_id = branch_status["branch_id"]
@@ -859,14 +852,16 @@ def cfbot_ingest(message):
                             created = EXCLUDED.created
                         WHERE commitfest_cfbotbranch.modified < EXCLUDED.modified
                         """,
-                    (patch_id,
-                    branch_id,
-                    branch_status["branch_name"],
-                    branch_status["commit_id"],
-                    branch_status["apply_url"],
-                    branch_status["status"],
-                    branch_status["created"],
-                    branch_status["modified"]))
+                   (
+                       patch_id,
+                       branch_id,
+                       branch_status["branch_name"],
+                       branch_status["commit_id"],
+                       branch_status["apply_url"],
+                       branch_status["status"],
+                       branch_status["created"],
+                       branch_status["modified"])
+                   )
 
     # Most messages have a task_status.  It might be missing in rare cases, like
     # when cfbot decides that a whole branch has timed out.  We INSERT or
@@ -881,29 +876,33 @@ def cfbot_ingest(message):
                          SET status = EXCLUDED.status,
                              modified = EXCLUDED.modified
                        WHERE commitfest_cfbottask.modified < EXCLUDED.modified""",
-                 (task_status["task_id"],
-                  task_status["task_name"],
-                  patch_id,
-                  branch_id,
-                  task_status["position"],
-                  task_status["status"],
-                  task_status["created"],
-                  task_status["modified"]))
+                       (
+                           task_status["task_id"],
+                           task_status["task_name"],
+                           patch_id,
+                           branch_id,
+                           task_status["position"],
+                           task_status["status"],
+                           task_status["created"],
+                           task_status["modified"])
+                       )
 
     cursor.execute("DELETE FROM commitfest_cfbottask WHERE patch_id=%s AND branch_id != %s", (patch_id, branch_id))
 
+
 @csrf_exempt
 def cfbot_notify(request):
     if request.method != 'POST':
         return HttpResponseForbidden("Invalid method")
 
     j = json.loads(request.body)
-    if j['shared_secret'] != settings.CFBOT_SECRET:
+    if not hmac.compare_digest(j['shared_secret'], settings.CFBOT_SECRET):
         return HttpResponseForbidden("Invalid API key")
 
     cfbot_ingest(j)
     return HttpResponse(status=200)
 
+
 @csrf_exempt
 def thread_notify(request):
     if request.method != 'POST':