BED-4852 properly return 404 when deleting non-existent sso_provider

SpecterOps · Oct 15, 2024 · 00ab412 · 00ab412
1 parent bc3130d
commit 00ab412
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cmd/api/src/api/v2/auth/sso.go b/cmd/api/src/api/v2/auth/sso.go
@@ -33,9 +33,9 @@ func (s ManagementResource) DeleteSSOProvider(response http.ResponseWriter, requ
 	)
 
 	// Convert the incoming string url param to an int
-	if oidcProviderID, err := strconv.Atoi(rawSSOProviderID); err != nil {
+	if ssoProviderID, err := strconv.Atoi(rawSSOProviderID); err != nil {
 		api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusBadRequest, err.Error(), request), response)
-	} else if err = s.db.DeleteSSOProvider(request.Context(), oidcProviderID); errors.Is(err, database.ErrNotFound) {
+	} else if err = s.db.DeleteSSOProvider(request.Context(), ssoProviderID); errors.Is(err, database.ErrNotFound) {
 		// Handle error if requested record could not be found
 		api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusNotFound, err.Error(), request), response)
 	} else if err != nil {

diff --git a/cmd/api/src/database/sso_providers.go b/cmd/api/src/database/sso_providers.go
@@ -66,7 +66,12 @@ func (s *BloodhoundDB) DeleteSSOProvider(ctx context.Context, id int) error {
 	)
 
 	err := s.AuditableTransaction(ctx, auditEntry, func(tx *gorm.DB) error {
-		return CheckError(tx.Table(ssoProviderTableName).Where("id = ?", id).Delete(&model.SSOProvider{}))
+		result := tx.Table(ssoProviderTableName).Where("id = ?", id).Delete(&model.SSOProvider{})
+		if result.RowsAffected == 0 {
+			return ErrNotFound
+		}
+
+		return CheckError(result)
 	})
 
 	return err