proper job handling for failed and expired jobs

ag-computational-bio · May 26, 2021 · 9bcd365 · 9bcd365
1 parent e6ae450
commit 9bcd365
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/.kube/dev-deployment.yaml b/.kube/dev-deployment.yaml
@@ -54,7 +54,7 @@ spec:
             secretKeyRef:
               key: Token
               name: authhandler
-        image: harbor.computational.bio.uni-giessen.de/bakta/bakta-web-backend:0.2.9-beta.35
+        image: harbor.computational.bio.uni-giessen.de/bakta/bakta-web-backend:0.2.9-beta.36
         imagePullPolicy: Always
         name: baktabackend
         ports:

diff --git a/database/handler.go b/database/handler.go
@@ -274,12 +274,8 @@ func (handler *Handler) GetJobs(jobIDs []*api.JobAuth) ([]Job, error) {
 	var jobRequests []bson.M
 
 	for _, jobRequest := range jobIDs {
-		secretSHA := sha256.Sum256([]byte(jobRequest.Secret))
-		secretSHABase64 := base64.StdEncoding.EncodeToString(secretSHA[:])
-
 		jobRequests = append(jobRequests, bson.M{
-			"jobid":  jobRequest.JobID,
-			"secret": secretSHABase64,
+			"jobid": jobRequest.JobID,
 		})
 	}
 

diff --git a/endpoints/job.go b/endpoints/job.go
@@ -2,6 +2,8 @@ package endpoints
 
 import (
 	"context"
+	"crypto/sha256"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -111,8 +113,34 @@ func (apiHandler *BaktaJobAPI) GetJobsStatus(ctx context.Context, request *api.J
 		return nil, err
 	}
 
+	foundJob := make(map[string]*database.Job)
+
 	var jobsStatus []*api.JobStatusResponse
 	for _, job := range jobs {
+		foundJob[job.JobID] = &job
+
+	}
+
+	for _, expectedJob := range jobs {
+		job, ok := foundJob[expectedJob.JobID]
+		if !ok {
+			failedJobs = append(failedJobs, &api.FailedJob{
+				JobID:     expectedJob.JobID,
+				JobStatus: api.JobFailedStatus_NOT_FOUND,
+			})
+			continue
+		}
+		secretSHA := sha256.Sum256([]byte(job.Secret))
+		secretSHABase64 := base64.StdEncoding.EncodeToString(secretSHA[:])
+
+		if secretSHABase64 != expectedJob.Secret {
+			failedJobs = append(failedJobs, &api.FailedJob{
+				JobID:     expectedJob.JobID,
+				JobStatus: api.JobFailedStatus_UNAUTHORIZED,
+			})
+			continue
+		}
+
 		statusNumber, ok := api.JobStatusEnum_value[job.Status]
 		if !ok {
 			err = fmt.Errorf("%v not a valid status", job.Status)