Return 404 if keyId not found.

tidepool-org · Sep 1, 2023 · 652c248 · 652c248
1 parent 5bb9820
commit 652c248
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/appvalidate/repository.go b/appvalidate/repository.go
@@ -8,6 +8,7 @@ import (
 
 var (
 	ErrDuplicateKeyId = errors.New("duplicate key id")
+	ErrKeyIdNotFound  = errors.New("key id not found")
 )
 
 type Filter struct {

diff --git a/auth/service/api/v1/appvalidate.go b/auth/service/api/v1/appvalidate.go
@@ -95,6 +95,10 @@ func (r *Router) VerifyAttestation(res rest.ResponseWriter, req *rest.Request) {
 			"keyId":  attestVerify.KeyID,
 		}
 		log.LoggerFromContext(ctx).WithFields(fields).WithError(err).Error("unable to verify attestation")
+		if errors.Is(err, appvalidate.ErrKeyIdNotFound) {
+			responder.Error(http.StatusNotFound, err)
+			return
+		}
 		if errors.Is(err, appvalidate.ErrAttestationVerificationFailed) {
 			responder.Error(http.StatusBadRequest, err)
 			return

diff --git a/auth/store/mongo/app_validate_repository.go b/auth/store/mongo/app_validate_repository.go
@@ -67,6 +67,9 @@ func (r *AppValidateRepository) GetAttestationChallenge(ctx context.Context, f a
 		WithError(err).
 		Debug("GetAttestationChallenge")
 	if err != nil {
+		if err == mongo.ErrNoDocuments {
+			return "", appvalidate.ErrKeyIdNotFound
+		}
 		return "", err
 	}
 	return av.AttestationChallenge, nil
@@ -124,7 +127,7 @@ func (r *AppValidateRepository) UpdateAttestation(ctx context.Context, f appvali
 		return err
 	}
 	if res.ModifiedCount == 0 {
-		return errors.New("unable to find app validation object")
+		return appvalidate.ErrKeyIdNotFound
 	}
 	return nil
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ import ( @@
     var (
     	ErrDuplicateKeyId = errors.New("duplicate key id")
+    	ErrKeyIdNotFound  = errors.New("key id not found")
     )
     type Filter struct {
@@ Expand Down @@