rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

File refs in one table

Browse Source 
Added a file service
Refactored evidence and vendor compliance associated services and resolvers
Created SQL migration scripts
Updated GraphQL schema accordingly and the UI components
Removed unused methods and resolvers for evidence service

Signed-off-by: Yannis Varni <yannis@edinomis.fr>
This commit is contained in:
Yannis Varni
2025-10-03 15:38:00 +02:00
committed by Sacha Al Himdani
parent 3822b1916c
commit ff7ba08fc1
35 changed files with 1586 additions and 1658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
pkg/coredata/evidence.go
View File

@@ -28,20 +28,17 @@ import (
type (
Evidence struct {
ID gid.GID `db:"id"`
MeasureID gid.GID `db:"measure_id"`
TaskID *gid.GID `db:"task_id"`
State EvidenceState `db:"state"`
ReferenceID string `db:"reference_id"`
Type EvidenceType `db:"type"`
ObjectKey string `db:"object_key"`
MimeType string `db:"mime_type"`
Size uint64 `db:"size"`
Filename string `db:"filename"`
URL string `db:"url"`
Description string `db:"description"`
CreatedAt time.Time `db:"created_at"`
UpdatedAt time.Time `db:"updated_at"`
ID gid.GID `db:"id"`
MeasureID gid.GID `db:"measure_id"`
TaskID *gid.GID `db:"task_id"`
State EvidenceState `db:"state"`
ReferenceID string `db:"reference_id"`
Type EvidenceType `db:"type"`
URL string `db:"url"`
EvidenceFileId *gid.GID `db:"evidence_file_id"`
Description string `db:"description"`
CreatedAt time.Time `db:"created_at"`
UpdatedAt time.Time `db:"updated_at"`
}
Evidences []*Evidence
@@ -69,13 +66,10 @@ INSERT INTO
measure_id,
task_id,
reference_id,
object_key,
mime_type,
size,
state,
type,
filename,
url,
evidence_file_id,
description,
created_at,
updated_at
@@ -86,13 +80,10 @@ VALUES (
@measure_id,
@task_id,
@reference_id,
@object_key,
@mime_type,
@size,
@state,
@type,
@filename,
@url,
@evidence_file_id,
@description,
@created_at,
@updated_at
@@ -105,21 +96,18 @@ WHERE evidences.state = 'REQUESTED';
`
args := pgx.StrictNamedArgs{
"tenant_id": scope.GetTenantID(),
"evidence_id": e.ID,
"measure_id": e.MeasureID,
"task_id": e.TaskID,
"reference_id": e.ReferenceID,
"object_key": e.ObjectKey,
"mime_type": e.MimeType,
"size": e.Size,
"filename": e.Filename,
"created_at": e.CreatedAt,
"updated_at": e.UpdatedAt,
"state": e.State,
"type": e.Type,
"url": e.URL,
"description": e.Description,
"tenant_id": scope.GetTenantID(),
"evidence_id": e.ID,
"measure_id": e.MeasureID,
"task_id": e.TaskID,
"reference_id": e.ReferenceID,
"evidence_file_id": e.EvidenceFileId,
"created_at": e.CreatedAt,
"updated_at": e.UpdatedAt,
"state": e.State,
"type": e.Type,
"url": e.URL,
"description": e.Description,
}
_, err := conn.Exec(ctx, q, args)
return err
@@ -138,13 +126,10 @@ INSERT INTO
measure_id,
task_id,
reference_id,
object_key,
mime_type,
size,
state,
type,
filename,
url,
evidence_file_id,
description,
created_at,
updated_at
@@ -155,13 +140,10 @@ VALUES (
@measure_id,
@task_id,
@reference_id,
@object_key,
@mime_type,
@size,
@state,
@type,
@filename,
@url,
@evidence_file_id,
@description,
@created_at,
@updated_at
@@ -169,21 +151,18 @@ VALUES (
`
args := pgx.StrictNamedArgs{
"tenant_id": scope.GetTenantID(),
"evidence_id": e.ID,
"measure_id": e.MeasureID,
"task_id": e.TaskID,
"reference_id": e.ReferenceID,
"object_key": e.ObjectKey,
"mime_type": e.MimeType,
"size": e.Size,
"filename": e.Filename,
"created_at": e.CreatedAt,
"updated_at": e.UpdatedAt,
"state": e.State,
"type": e.Type,
"url": e.URL,
"description": e.Description,
"tenant_id": scope.GetTenantID(),
"evidence_id": e.ID,
"measure_id": e.MeasureID,
"task_id": e.TaskID,
"reference_id": e.ReferenceID,
"evidence_file_id": e.EvidenceFileId,
"created_at": e.CreatedAt,
"updated_at": e.UpdatedAt,
"state": e.State,
"type": e.Type,
"url": e.URL,
"description": e.Description,
}
_, err := conn.Exec(ctx, q, args)
return err
@@ -203,11 +182,8 @@ SELECT
reference_id,
state,
type,
object_key,
mime_type,
size,
filename,
url,
evidence_file_id,
description,
created_at,
updated_at
@@ -286,11 +262,8 @@ SELECT
reference_id,
state,
type,
object_key,
mime_type,
size,
filename,
url,
evidence_file_id,
description,
created_at,
updated_at
@@ -370,11 +343,8 @@ SELECT
reference_id,
state,
type,
object_key,
mime_type,
size,
filename,
url,
evidence_file_id,
description,
created_at,
updated_at
@@ -418,10 +388,7 @@ UPDATE
SET
type = @type,
state = @state,
object_key = @object_key,
mime_type = @mime_type,
size = @size,
filename = @filename,
evidence_file_id = @evidence_file_id,
url = @url,
description = @description,
updated_at = @updated_at
@@ -433,16 +400,13 @@ WHERE
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{
"evidence_id": e.ID,
"type": e.Type,
"state": e.State,
"object_key": e.ObjectKey,
"mime_type": e.MimeType,
"size": e.Size,
"filename": e.Filename,
"url": e.URL,
"description": e.Description,
"updated_at": e.UpdatedAt,
"evidence_id": e.ID,
"type": e.Type,
"state": e.State,
"evidence_file_id": e.EvidenceFileId,
"url": e.URL,
"description": e.Description,
"updated_at": e.UpdatedAt,
}
maps.Copy(args, scope.SQLArguments())
@@ -454,13 +418,14 @@ func (e Evidence) Delete(
ctx context.Context,
conn pg.Conn,
scope Scoper,
) error {
) (*string, error) {
q := `
DELETE FROM
evidences
WHERE
%s
%s
AND id = @evidence_id
RETURNING evidence_file_id;
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -468,6 +433,23 @@ WHERE
args := pgx.StrictNamedArgs{"evidence_id": e.ID}
maps.Copy(args, scope.SQLArguments())
_, err := conn.Exec(ctx, q, args)
return err
var evidenceFileId *gid.GID
err := conn.QueryRow(ctx, q, args).Scan(&evidenceFileId)
if err != nil {
return nil, fmt.Errorf("failed to delete evidence: %w", err)
}
if evidenceFileId != nil {
var err error
var fileKey *string
file := &File{ID: *evidenceFileId}
if fileKey, err = file.HardDelete(ctx, conn, scope); err != nil {
return nil, fmt.Errorf("failed to hard delete evidence file: %w", err)
}
return fileKey, nil
}
return nil, err
}

36
pkg/coredata/file.go
View File

@@ -135,3 +135,39 @@ VALUES (
_, err := conn.Exec(ctx, q, args)
return err
}
func (f File) SoftDelete(ctx context.Context, conn pg.Conn, scope Scoper) error {
q := `
UPDATE files
SET deleted_at = NOW()
WHERE %s
AND id = @file_id
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{"file_id": f.ID}
maps.Copy(args, scope.SQLArguments())
_, err := conn.Exec(ctx, q, args)
return err
}
func (f File) HardDelete(ctx context.Context, conn pg.Conn, scope Scoper) (*string, error) {
q := `
DELETE FROM files
WHERE %s
AND id = @file_id
RETURNING file_key
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{"file_id": f.ID}
maps.Copy(args, scope.SQLArguments())
var vcrFileKey *string
err := conn.QueryRow(ctx, q, args).Scan(&vcrFileKey)
return vcrFileKey, err
}

41
pkg/coredata/migrations/20251003T132724Z.sql Normal file
View File

@@ -0,0 +1,41 @@
ALTER TABLE evidences
ADD COLUMN evidence_file_id text;
/* 10 is for FileEntityType */
WITH
evidence_files AS (
SELECT
e.id as evidence_id,
generate_gid(decode_base64_unpadded(e.tenant_id), 25) as file_id,
e.tenant_id,
'probod' as bucket_name,
e.mime_type,
e.filename,
e.object_key,
e.size,
e.created_at,
e.updated_at
FROM evidences e
),
inserted_files AS (
INSERT INTO files (id, tenant_id, bucket_name, mime_type, file_name, file_key, file_size, created_at, updated_at)
SELECT file_id, tenant_id, bucket_name, mime_type, filename, object_key::uuid, size, created_at, updated_at
FROM evidence_files
RETURNING id, tenant_id
)
SELECT ef.evidence_id, ef.file_id
INTO TEMP TABLE file_evidence_mapping
FROM evidence_files ef;
UPDATE evidences
SET evidence_file_id = fm.file_id
FROM file_evidence_mapping fm
WHERE evidences.id = fm.evidence_id;
ALTER TABLE evidences
ALTER COLUMN filename DROP NOT NULL,
ALTER COLUMN mime_type DROP NOT NULL,
ALTER COLUMN size DROP NOT NULL,
ALTER COLUMN oject_key DROP NOT NULL;

41
pkg/coredata/migrations/20251003T151644Z.sql Normal file
View File

@@ -0,0 +1,41 @@
ALTER TABLE
vendor_compliance_reports
ADD COLUMN report_file_id text
REFERENCES files(id)
ON UPDATE CASCADE
ON DELETE RESTRICT;
WITH
/* 25 is for FileEntityType */
vcr_files AS (
SELECT
vcr.id as report_id,
generate_gid(decode_base64_unpadded(vcr.tenant_id), 25) as file_id,
vcr.tenant_id,
'probod' as bucket_name,
'application/pdf' as mime_type,
vcr.report_name,
vcr.file_key,
vcr.file_size,
vcr.created_at,
vcr.updated_at
FROM vendor_compliance_reports vcr
),
inserted_files AS (
INSERT INTO files (id, tenant_id, bucket_name, mime_type, file_name, file_key, file_size, created_at, updated_at)
SELECT file_id, tenant_id, bucket_name, mime_type, report_name, file_key::uuid, file_size, created_at, updated_at
FROM vcr_files
RETURNING id, tenant_id
)
SELECT vf.report_id, vf.file_id
INTO TEMP TABLE file_vcr_mapping
FROM vcr_files vf;
UPDATE vendor_compliance_reports
SET report_file_id = fv.file_id
FROM file_vcr_mapping fv
WHERE vendor_compliance_reports.id = fv.report_id;
ALTER TABLE vendor_compliance_reports
ALTER COLUMN file_key DROP NOT NULL,
ALTER COLUMN file_size DROP NOT NULL;

7
pkg/coredata/migrations/20251006T133729Z.sql Normal file
View File

@@ -0,0 +1,7 @@
ALTER TABLE
evidences
ADD CONSTRAINT fk_evidence_file
FOREIGN KEY (evidence_file_id)
REFERENCES files(id)
ON UPDATE CASCADE
ON DELETE RESTRICT;

75
pkg/coredata/vendor_compliance_report.go
View File

@@ -28,17 +28,16 @@ import (
type (
VendorComplianceReport struct {
ID gid.GID
VendorID gid.GID
ReportDate time.Time
ValidUntil *time.Time
ReportName string
FileKey string
FileSize int64
SnapshotID *gid.GID
SourceID *gid.GID
CreatedAt time.Time
UpdatedAt time.Time
ID gid.GID
VendorID gid.GID
ReportDate time.Time
ValidUntil *time.Time
ReportName string
ReportFileId *gid.GID
SnapshotID *gid.GID
SourceID *gid.GID
CreatedAt time.Time
UpdatedAt time.Time
}
VendorComplianceReports []*VendorComplianceReport
@@ -69,8 +68,7 @@ SELECT
report_date,
valid_until,
report_name,
file_key,
file_size,
report_file_id,
snapshot_id,
source_id,
created_at,
@@ -117,8 +115,7 @@ SELECT
report_date,
valid_until,
report_name,
file_key,
file_size,
report_file_id,
snapshot_id,
source_id,
created_at,
@@ -165,8 +162,7 @@ INSERT INTO
report_date,
valid_until,
report_name,
file_key,
file_size,
report_file_id,
created_at,
updated_at
)
@@ -177,23 +173,21 @@ VALUES (
@report_date,
@valid_until,
@report_name,
@file_key,
@file_size,
@report_file_id,
@created_at,
@updated_at
)
`
args := pgx.NamedArgs{
"id": vcr.ID,
"tenant_id": scope.GetTenantID(),
"vendor_id": vcr.VendorID,
"report_date": vcr.ReportDate,
"valid_until": vcr.ValidUntil,
"report_name": vcr.ReportName,
"file_key": vcr.FileKey,
"file_size": vcr.FileSize,
"created_at": vcr.CreatedAt,
"updated_at": vcr.UpdatedAt,
"id": vcr.ID,
"tenant_id": scope.GetTenantID(),
"vendor_id": vcr.VendorID,
"report_date": vcr.ReportDate,
"valid_until": vcr.ValidUntil,
"report_name": vcr.ReportName,
"report_file_id": vcr.ReportFileId,
"created_at": vcr.CreatedAt,
"updated_at": vcr.UpdatedAt,
}
_, err := conn.Exec(ctx, q, args)
@@ -213,6 +207,7 @@ WHERE
%s
AND id = @id
AND snapshot_id IS NULL
RETURNING report_file_id
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -220,8 +215,20 @@ WHERE
args := pgx.StrictNamedArgs{"id": vcr.ID}
maps.Copy(args, scope.SQLArguments())
_, err := conn.Exec(ctx, q, args)
return err
var vcrFileId *gid.GID
err := conn.QueryRow(ctx, q, args).Scan(&vcrFileId)
if err != nil {
return fmt.Errorf("failed to delete vendor compliance report: %w", err)
}
if vcrFileId != nil {
file := &File{ID: *vcrFileId}
if err = file.SoftDelete(ctx, conn, scope); err != nil {
return fmt.Errorf("failed to soft delete vendor compliance file: %w", err)
}
}
return nil
}
func (vcrs VendorComplianceReports) InsertVendorSnapshots(
@@ -247,8 +254,7 @@ INSERT INTO vendor_compliance_reports (
report_date,
valid_until,
report_name,
file_key,
file_size,
report_file_id,
created_at,
updated_at
)
@@ -261,8 +267,7 @@ SELECT
vcr.report_date,
vcr.valid_until,
vcr.report_name,
vcr.file_key,
vcr.file_size,
vcr.report_file_id,
vcr.created_at,
vcr.updated_at
FROM vendor_compliance_reports vcr

1
pkg/filevalidation/validator.go
View File

@@ -65,6 +65,7 @@ var FileTypes = []FileType{
{MimeType: "text/plain", Extensions: []string{".txt"}, Category: CategoryText},
{MimeType: "text/x-log", Extensions: []string{".log"}, Category: CategoryText},
{MimeType: "text/uri-list", Extensions: []string{".uri"}, Category: CategoryText},
{MimeType: "text/uri-list; charset=utf-8", Extensions: []string{".uri"}, Category: CategoryText},
// Image types
{MimeType: "image/jpeg", Extensions: []string{".jpg", ".jpeg"}, Category: CategoryImage},

391
pkg/probo/evidence_service.go
View File

@@ -15,17 +15,10 @@
package probo
import (
"bytes"
"context"
"fmt"
"io"
"mime"
"net/url"
"path/filepath"
"time"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/getprobo/probo/pkg/coredata"
"github.com/getprobo/probo/pkg/filevalidation"
"github.com/getprobo/probo/pkg/gid"
@@ -40,36 +33,10 @@ type (
fileValidator *filevalidation.FileValidator
}
File struct {
Content io.Reader
Filename string
Size int64
ContentType string
}
RequestEvidenceRequest struct {
MeasureID *gid.GID
TaskID *gid.GID
Type coredata.EvidenceType
Name string
Description string
}
FulfilledEvidenceRequest struct {
EvidenceID gid.GID
File io.Reader
URL *string
Filename *string
}
UploadTaskEvidenceRequest struct {
TaskID gid.GID
File File
}
UploadMeasureEvidenceRequest struct {
MeasureID gid.GID
File File
URL *string
File FileUpload
}
)
@@ -82,256 +49,8 @@ func (s EvidenceService) Get(
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return evidence.LoadByID(ctx, conn, s.svc.scope, evidenceID)
},
)
if err != nil {
return nil, err
}
return evidence, nil
}
func (s EvidenceService) Request(
ctx context.Context,
req RequestEvidenceRequest,
) (*coredata.Evidence, error) {
evidenceID := gid.New(s.svc.scope.GetTenantID(), coredata.EvidenceEntityType)
now := time.Now()
evidence := &coredata.Evidence{
ID: evidenceID,
State: coredata.EvidenceStateRequested,
Type: req.Type,
Filename: req.Name,
Description: req.Description,
CreatedAt: now,
UpdatedAt: now,
}
err := s.svc.pg.WithTx(
ctx,
func(conn pg.Conn) error {
task := &coredata.Task{}
if req.TaskID != nil {
if err := task.LoadByID(ctx, conn, s.svc.scope, *req.TaskID); err != nil {
return fmt.Errorf("cannot load task: %w", err)
}
if task.MeasureID == nil {
return fmt.Errorf("task %q has no measure", req.TaskID)
}
evidence.TaskID = req.TaskID
evidence.MeasureID = *task.MeasureID
} else if req.MeasureID != nil {
evidence.MeasureID = *req.MeasureID
} else {
return fmt.Errorf("measure id or task id is required")
}
return evidence.Insert(ctx, conn, s.svc.scope)
},
)
if err != nil {
return nil, fmt.Errorf("cannot insert evidence: %w", err)
}
return evidence, nil
}
func (s EvidenceService) Fulfill(
ctx context.Context,
req FulfilledEvidenceRequest,
) (*coredata.Evidence, error) {
evidence := &coredata.Evidence{}
err := s.svc.pg.WithTx(
ctx,
func(conn pg.Conn) error {
if err := evidence.LoadByID(ctx, conn, s.svc.scope, req.EvidenceID); err != nil {
return fmt.Errorf("cannot load evidence: %w", err)
}
measure := &coredata.Measure{}
if err := measure.LoadByID(ctx, conn, s.svc.scope, evidence.MeasureID); err != nil {
return fmt.Errorf("cannot load measure: %w", err)
}
evidence.State = coredata.EvidenceStateFulfilled
if req.File != nil {
evidence.Type = coredata.EvidenceTypeFile
var fileSize int64
var fileContent io.ReadSeeker
if seeker, ok := req.File.(io.Seeker); ok {
size, err := seeker.Seek(0, io.SeekEnd)
if err != nil {
return fmt.Errorf("cannot determine file size: %w", err)
}
_, err = seeker.Seek(0, io.SeekStart)
if err != nil {
return fmt.Errorf("cannot reset file position: %w", err)
}
fileSize = size
fileContent = req.File.(io.ReadSeeker)
} else {
buf, err := io.ReadAll(req.File)
if err != nil {
return fmt.Errorf("cannot read file: %w", err)
}
fileSize = int64(len(buf))
fileContent = bytes.NewReader(buf)
}
contentType := "application/octet-stream"
if req.Filename != nil {
evidence.Filename = *req.Filename
if detectedType := mime.TypeByExtension(filepath.Ext(*req.Filename)); detectedType != "" {
contentType = detectedType
}
}
if err := s.fileValidator.Validate(evidence.Filename, contentType, fileSize); err != nil {
return err
}
objectKey, err := uuid.NewV7()
if err != nil {
return fmt.Errorf("cannot generate object key: %w", err)
}
_, err = s.svc.s3.PutObject(ctx, &s3.PutObjectInput{
Bucket: aws.String(s.svc.bucket),
Key: aws.String(objectKey.String()),
Body: fileContent,
ContentType: aws.String(contentType),
Metadata: map[string]string{
"type": "evidence",
"evidence-id": req.EvidenceID.String(),
"organization-id": measure.OrganizationID.String(),
},
})
if err != nil {
return fmt.Errorf("cannot upload file to S3: %w", err)
}
headOutput, err := s.svc.s3.HeadObject(ctx, &s3.HeadObjectInput{
Bucket: aws.String(s.svc.bucket),
Key: aws.String(objectKey.String()),
})
if err != nil {
return fmt.Errorf("cannot get object metadata: %w", err)
}
evidence.ObjectKey = objectKey.String()
evidence.MimeType = contentType
evidence.Size = uint64(*headOutput.ContentLength)
} else if req.URL != nil {
evidence.Type = coredata.EvidenceTypeLink
evidence.URL = *req.URL
}
evidence.UpdatedAt = time.Now()
return evidence.Update(ctx, conn, s.svc.scope)
},
)
if err != nil {
return nil, fmt.Errorf("cannot update evidence: %w", err)
}
return evidence, nil
}
func (s EvidenceService) UploadTaskEvidence(
ctx context.Context,
req UploadTaskEvidenceRequest,
) (*coredata.Evidence, error) {
now := time.Now()
evidenceID := gid.New(s.svc.scope.GetTenantID(), coredata.EvidenceEntityType)
referenceID, err := uuid.NewV4()
if err != nil {
return nil, fmt.Errorf("cannot generate reference id: %w", err)
}
evidence := &coredata.Evidence{
ID: evidenceID,
TaskID: &req.TaskID,
State: coredata.EvidenceStateFulfilled,
ReferenceID: "custom-evidence-" + referenceID.String(),
Type: coredata.EvidenceTypeFile,
Filename: req.File.Filename,
CreatedAt: now,
UpdatedAt: now,
}
if req.File.ContentType == "" {
req.File.ContentType = "application/octet-stream"
}
if err := s.fileValidator.Validate(req.File.Filename, req.File.ContentType, req.File.Size); err != nil {
return nil, err
}
var measureOrganizationID gid.GID
err = s.svc.pg.WithTx(
ctx,
func(conn pg.Conn) error {
task := &coredata.Task{}
if err := task.LoadByID(ctx, conn, s.svc.scope, req.TaskID); err != nil {
return fmt.Errorf("cannot load task %q: %w", req.TaskID, err)
}
if task.MeasureID == nil {
return fmt.Errorf("task %q has no measure", req.TaskID)
}
measure := &coredata.Measure{}
if err := measure.LoadByID(ctx, conn, s.svc.scope, *task.MeasureID); err != nil {
return fmt.Errorf("cannot load measure: %w", err)
}
measureOrganizationID = measure.OrganizationID
objectKey, err := uuid.NewV7()
if err != nil {
return fmt.Errorf("cannot generate object key: %w", err)
}
_, err = s.svc.s3.PutObject(
ctx,
&s3.PutObjectInput{
Bucket: aws.String(s.svc.bucket),
Key: aws.String(objectKey.String()),
Body: req.File.Content,
ContentType: aws.String(req.File.ContentType),
Metadata: map[string]string{
"type": "evidence",
"evidence-id": evidenceID.String(),
"organization-id": measureOrganizationID.String(),
},
},
)
if err != nil {
return fmt.Errorf("cannot upload file to S3: %w", err)
}
evidence.ObjectKey = objectKey.String()
evidence.MimeType = req.File.ContentType
evidence.Size = uint64(req.File.Size)
evidence.MeasureID = *task.MeasureID
if err := evidence.Insert(ctx, conn, s.svc.scope); err != nil {
return fmt.Errorf("cannot insert evidence: %w", err)
if err := evidence.LoadByID(ctx, conn, s.svc.scope, evidenceID); err != nil {
return fmt.Errorf("cannot load evidence %w", err)
}
return nil
@@ -339,8 +58,7 @@ func (s EvidenceService) UploadTaskEvidence(
)
if err != nil {
// TODO try do delete file from s3 if it's a file type
return nil, err
return nil, fmt.Errorf("cannot load evidence: %w", err)
}
return evidence, nil
@@ -364,53 +82,37 @@ func (s EvidenceService) UploadMeasureEvidence(
State: coredata.EvidenceStateFulfilled,
ReferenceID: "custom-evidence-" + referenceID.String(),
Type: coredata.EvidenceTypeFile,
Filename: req.File.Filename,
CreatedAt: now,
UpdatedAt: now,
}
if req.File.ContentType == "" {
req.File.ContentType = "application/octet-stream"
}
if err := s.fileValidator.Validate(req.File.Filename, req.File.ContentType, req.File.Size); err != nil {
return nil, err
}
err = s.svc.pg.WithTx(
ctx,
func(conn pg.Conn) error {
measure := &coredata.Measure{}
var file *coredata.File
var err error
file, err = s.svc.Files.UploadAndSaveFile(
ctx,
s.fileValidator,
map[string]string{
"type": "evidence",
"evidence-id": evidenceID.String(),
"organization-id": measure.OrganizationID.String(),
},
&req.File)
if err != nil {
return fmt.Errorf("cannot upload or file: %w", err)
}
evidence.EvidenceFileId = &file.ID
if err := measure.LoadByID(ctx, conn, s.svc.scope, req.MeasureID); err != nil {
return fmt.Errorf("cannot load measure %q: %w", req.MeasureID, err)
}
objectKey, err := uuid.NewV7()
if err != nil {
return fmt.Errorf("cannot generate object key: %w", err)
}
_, err = s.svc.s3.PutObject(
ctx,
&s3.PutObjectInput{
Bucket: aws.String(s.svc.bucket),
Key: aws.String(objectKey.String()),
Body: req.File.Content,
ContentType: aws.String(req.File.ContentType),
Metadata: map[string]string{
"type": "evidence",
"evidence-id": evidenceID.String(),
"organization-id": measure.OrganizationID.String(),
},
},
)
if err != nil {
return fmt.Errorf("cannot upload file to S3: %w", err)
}
evidence.ObjectKey = objectKey.String()
evidence.MimeType = req.File.ContentType
evidence.Size = uint64(req.File.Size)
evidence.MeasureID = req.MeasureID
if err := evidence.Insert(ctx, conn, s.svc.scope); err != nil {
@@ -429,43 +131,6 @@ func (s EvidenceService) UploadMeasureEvidence(
return evidence, nil
}
func (s EvidenceService) GenerateFileURL(
ctx context.Context,
evidenceID gid.GID,
expiresIn time.Duration,
) (*string, error) {
evidence, err := s.Get(ctx, evidenceID)
if err != nil {
return nil, fmt.Errorf("cannot get evidence: %w", err)
}
if evidence.Type == coredata.EvidenceTypeLink {
return nil, fmt.Errorf("cannot generate file URL for link type evidence")
}
presignClient := s3.NewPresignClient(s.svc.s3)
// Use RFC 6266/5987 encoding for filename with UTF-8 support
encodedFilename := url.QueryEscape(evidence.Filename)
contentDisposition := fmt.Sprintf("attachment; filename=\"%s\"; filename*=UTF-8''%s",
encodedFilename, encodedFilename)
presignedReq, err := presignClient.PresignGetObject(ctx, &s3.GetObjectInput{
Bucket: aws.String(s.svc.bucket),
Key: aws.String(evidence.ObjectKey),
ResponseCacheControl: aws.String("max-age=3600, public"),
ResponseContentType: aws.String(evidence.MimeType),
ResponseContentDisposition: aws.String(contentDisposition),
}, func(opts *s3.PresignOptions) {
opts.Expires = expiresIn
})
if err != nil {
return nil, fmt.Errorf("cannot presign GetObject request: %w", err)
}
return &presignedReq.URL, nil
}
func (s EvidenceService) CountForMeasureID(
ctx context.Context,
measureID gid.GID,
@@ -581,9 +246,15 @@ func (s *EvidenceService) Delete(
return s.svc.pg.WithTx(
ctx,
func(conn pg.Conn) error {
if err := evidence.Delete(ctx, conn, s.svc.scope); err != nil {
var fileKey *string
var err error
if fileKey, err = evidence.Delete(ctx, conn, s.svc.scope); err != nil {
return fmt.Errorf("cannot delete evidence: %w", err)
}
if err = s.svc.Files.DeleteFileFromS3(ctx, *fileKey); err != nil {
return err
}
return nil
},

187
pkg/probo/file_service.go Normal file
View File

@@ -0,0 +1,187 @@
// Copyright (c) 2025 Probo Inc <hello@getprobo.com>.
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
//
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
package probo
import (
"context"
"fmt"
"io"
"time"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/getprobo/probo/pkg/coredata"
"github.com/getprobo/probo/pkg/filevalidation"
"github.com/getprobo/probo/pkg/gid"
"go.gearno.de/crypto/uuid"
"go.gearno.de/kit/pg"
)
type (
FileService struct {
svc *TenantService
}
File struct {
Content io.Reader
Filename string
Size int64
ContentType string
}
FileUpload struct {
Content io.Reader
Filename string
Size int64
ContentType string
}
)
func (s FileService) Get(
ctx context.Context,
fileID gid.GID,
) (*coredata.File, error) {
file := &coredata.File{}
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
if err := file.LoadByID(ctx, conn, s.svc.scope, fileID); err != nil {
return fmt.Errorf("cannot load file %w", err)
}
return nil
},
)
if err != nil {
return nil, fmt.Errorf("cannot load file: %w", err)
}
return file, nil
}
func (s FileService) UploadAndSaveFile(
ctx context.Context,
fileValidator *filevalidation.FileValidator,
s3Metadata map[string]string,
req *FileUpload) (*coredata.File, error) {
objectKey, err := uuid.NewV7()
if err != nil {
return nil, fmt.Errorf("cannot generate object key: %w", err)
}
mimeType := req.ContentType
if mimeType == "" {
mimeType = "application/octet-stream"
}
if err := fileValidator.Validate(req.Filename, mimeType, req.Size); err != nil {
return nil, fmt.Errorf("cannot validate file: %w", err)
}
_, err = s.svc.s3.PutObject(ctx, &s3.PutObjectInput{
Bucket: &s.svc.bucket,
Key: aws.String(objectKey.String()),
Body: req.Content,
Metadata: s3Metadata,
ContentType: aws.String(mimeType),
})
if err != nil {
return nil, fmt.Errorf("cannot upload file to S3: %w", err)
}
headOutput, err := s.svc.s3.HeadObject(ctx, &s3.HeadObjectInput{
Bucket: aws.String(s.svc.bucket),
Key: aws.String(objectKey.String()),
})
if err != nil {
return nil, fmt.Errorf("cannot get object metadata: %w", err)
}
now := time.Now()
fileID := gid.New(s.svc.scope.GetTenantID(), coredata.FileEntityType)
var file *coredata.File
err = s.svc.pg.WithTx(
ctx,
func(conn pg.Conn) error {
file = &coredata.File{
ID: fileID,
BucketName: s.svc.bucket,
MimeType: mimeType,
FileName: req.Filename,
FileKey: objectKey.String(),
FileSize: *headOutput.ContentLength,
CreatedAt: now,
UpdatedAt: now,
}
if err := file.Insert(ctx, conn, s.svc.scope); err != nil {
return fmt.Errorf("cannot insert file: %w", err)
}
return nil
},
)
if err != nil {
return nil, err
}
return file, nil
}
func (s FileService) DeleteFileFromS3(ctx context.Context, fileKey string) error {
_, err := s.svc.s3.DeleteObject(ctx, &s3.DeleteObjectInput{
Bucket: aws.String(s.svc.bucket),
Key: aws.String(fileKey),
})
if err != nil {
return fmt.Errorf("failed to delete object from S3: %w", err)
}
return nil
}
func (s FileService) GenerateFileTempURL(
ctx context.Context,
fileID gid.GID,
expiresIn time.Duration,
) (string, error) {
file, err := s.Get(ctx, fileID)
if err != nil {
return "", fmt.Errorf("cannot get file: %w", err)
}
presignClient := s3.NewPresignClient(s.svc.s3)
presignedReq, err := presignClient.PresignGetObject(ctx, &s3.GetObjectInput{
Bucket: aws.String(s.svc.bucket),
Key: aws.String(file.FileKey),
ResponseCacheControl: aws.String("max-age=3600, public"),
ResponseContentType: aws.String(file.MimeType),
ResponseContentDisposition: aws.String(fmt.Sprintf("attachment; filename=\"%s\"", file.FileName)),
}, func(opts *s3.PresignOptions) {
opts.Expires = expiresIn
})
if err != nil {
return "", fmt.Errorf("cannot presign GetObject request: %w", err)
}
return presignedReq.URL, nil
}

11
pkg/probo/framework_service.go
View File

@@ -223,15 +223,20 @@ func (s FrameworkService) Export(
for _, evidence := range evidences {
if evidence.Type != coredata.EvidenceTypeFile ||
evidence.State != coredata.EvidenceStateFulfilled ||
evidence.ObjectKey == "" {
evidence.EvidenceFileId == nil {
continue
}
evidence_file := &coredata.File{}
if err := evidence_file.LoadByID(ctx, conn, s.svc.scope, *evidence.EvidenceFileId); err != nil {
return fmt.Errorf("cannot load evidence file: %w", err)
}
object, err := s.svc.s3.GetObject(
ctx,
&s3.GetObjectInput{
Bucket: aws.String(s.svc.bucket),
Key: aws.String(evidence.ObjectKey),
Key: aws.String(evidence_file.FileKey),
},
)
if err != nil {
@@ -239,7 +244,7 @@ func (s FrameworkService) Export(
}
defer object.Body.Close()
w, err := archive.Create(fmt.Sprintf("%s/%s/%s/%s", framework.Name, control.SectionTitle, measure.Name, evidence.Filename))
w, err := archive.Create(fmt.Sprintf("%s/%s/%s/%s", framework.Name, control.SectionTitle, measure.Name, evidence_file.FileName))
if err != nil {
return fmt.Errorf("cannot create evidence in archive: %w", err)
}

4
pkg/probo/service.go
View File

@@ -94,6 +94,7 @@ type (
Snapshots *SnapshotService
ContinualImprovements *ContinualImprovementService
ProcessingActivities *ProcessingActivityService
Files *FileService
}
)
@@ -175,7 +176,7 @@ func (s *Service) WithTenant(tenantID gid.TenantID) *TenantService {
}
tenantService.Controls = &ControlService{svc: tenantService}
tenantService.Risks = &RiskService{svc: tenantService}
tenantService.VendorComplianceReports = &VendorComplianceReportService{svc: tenantService}
tenantService.VendorComplianceReports = &VendorComplianceReportService{svc: tenantService, fileValidator: filevalidation.NewValidator(filevalidation.CategoryDocument)}
tenantService.VendorBusinessAssociateAgreements = &VendorBusinessAssociateAgreementService{svc: tenantService}
tenantService.VendorContacts = &VendorContactService{svc: tenantService}
tenantService.VendorDataPrivacyAgreements = &VendorDataPrivacyAgreementService{svc: tenantService}
@@ -193,6 +194,7 @@ func (s *Service) WithTenant(tenantID gid.TenantID) *TenantService {
tenantService.Snapshots = &SnapshotService{svc: tenantService}
tenantService.ContinualImprovements = &ContinualImprovementService{svc: tenantService}
tenantService.ProcessingActivities = &ProcessingActivityService{svc: tenantService}
tenantService.Files = &FileService{svc: tenantService}
return tenantService
}

131
pkg/probo/vendor_compliance_report_service.go
View File

@@ -17,28 +17,23 @@ package probo
import (
"context"
"fmt"
"io"
"mime"
"net/url"
"path/filepath"
"time"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/getprobo/probo/pkg/coredata"
"github.com/getprobo/probo/pkg/filevalidation"
"github.com/getprobo/probo/pkg/gid"
"github.com/getprobo/probo/pkg/page"
"go.gearno.de/crypto/uuid"
"go.gearno.de/kit/pg"
)
type (
VendorComplianceReportService struct {
svc *TenantService
svc *TenantService
fileValidator *filevalidation.FileValidator
}
VendorComplianceReportCreateRequest struct {
File io.Reader
File FileUpload
ReportDate time.Time
ValidUntil *time.Time
ReportName string
@@ -71,61 +66,43 @@ func (s VendorComplianceReportService) Upload(
vendorID gid.GID,
req *VendorComplianceReportCreateRequest,
) (*coredata.VendorComplianceReport, error) {
objectKey, err := uuid.NewV7()
vendor, err := s.svc.Vendors.Get(ctx, vendorID)
if err != nil {
return nil, fmt.Errorf("cannot generate object key: %w", err)
return nil, fmt.Errorf("cannot get vendor: %w", err)
}
var vendorComplianceReport *coredata.VendorComplianceReport
f, err := s.svc.Files.UploadAndSaveFile(
ctx,
s.fileValidator,
map[string]string{
"type": "vendor-compliance-report",
"vendor-id": vendorID.String(),
"organization-id": vendor.OrganizationID.String(),
},
&req.File)
err = s.svc.pg.WithTx(
if err != nil {
return nil, err
}
now := time.Now()
vendorComplianceReportID := gid.New(s.svc.scope.GetTenantID(), coredata.VendorComplianceReportEntityType)
vendorComplianceReport := &coredata.VendorComplianceReport{
ID: vendorComplianceReportID,
VendorID: vendorID,
ReportDate: req.ReportDate,
ValidUntil: req.ValidUntil,
ReportName: req.ReportName,
ReportFileId: &f.ID,
CreatedAt: now,
UpdatedAt: now,
}
err = s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
vendor := &coredata.Vendor{}
if err := vendor.LoadByID(ctx, conn, s.svc.scope, vendorID); err != nil {
return fmt.Errorf("cannot load vendor: %w", err)
}
mimeType := mime.TypeByExtension(filepath.Ext(req.ReportName))
_, err := s.svc.s3.PutObject(ctx, &s3.PutObjectInput{
Bucket: &s.svc.bucket,
Key: aws.String(objectKey.String()),
Body: req.File,
ContentType: &mimeType,
Metadata: map[string]string{
"type": "vendor-compliance-report",
"vendor-id": vendorID.String(),
"organization-id": vendor.OrganizationID.String(),
},
})
if err != nil {
return fmt.Errorf("cannot upload file to S3: %w", err)
}
headOutput, err := s.svc.s3.HeadObject(ctx, &s3.HeadObjectInput{
Bucket: aws.String(s.svc.bucket),
Key: aws.String(objectKey.String()),
})
if err != nil {
return fmt.Errorf("cannot get object metadata: %w", err)
}
now := time.Now()
vendorComplianceReportID := gid.New(s.svc.scope.GetTenantID(), coredata.VendorComplianceReportEntityType)
vendorComplianceReport = &coredata.VendorComplianceReport{
ID: vendorComplianceReportID,
VendorID: vendorID,
ReportDate: req.ReportDate,
ValidUntil: req.ValidUntil,
ReportName: req.ReportName,
FileKey: objectKey.String(),
FileSize: *headOutput.ContentLength,
CreatedAt: now,
UpdatedAt: now,
}
return vendorComplianceReport.Insert(ctx, conn, s.svc.scope)
},
)
@@ -157,38 +134,6 @@ func (s VendorComplianceReportService) Get(
return vendorComplianceReport, nil
}
func (s VendorComplianceReportService) GenerateFileURL(
ctx context.Context,
vendorComplianceReportID gid.GID,
expiresIn time.Duration,
) (string, error) {
vendorComplianceReport, err := s.Get(ctx, vendorComplianceReportID)
if err != nil {
return "", fmt.Errorf("cannot get vendor compliance report: %w", err)
}
presignClient := s3.NewPresignClient(s.svc.s3)
// Use RFC 6266/5987 encoding for filename with UTF-8 support
encodedFilename := url.QueryEscape(vendorComplianceReport.ReportName)
contentDisposition := fmt.Sprintf("attachment; filename=\"%s\"; filename*=UTF-8''%s",
encodedFilename, encodedFilename)
presignedReq, err := presignClient.PresignGetObject(ctx, &s3.GetObjectInput{
Bucket: aws.String(s.svc.bucket),
Key: aws.String(vendorComplianceReport.FileKey),
ResponseCacheControl: aws.String("max-age=3600, public"),
ResponseContentDisposition: aws.String(contentDisposition),
}, func(opts *s3.PresignOptions) {
opts.Expires = expiresIn
})
if err != nil {
return "", fmt.Errorf("cannot presign GetObject request: %w", err)
}
return presignedReq.URL, nil
}
func (s VendorComplianceReportService) Delete(
ctx context.Context,
vendorComplianceReportID gid.GID,
@@ -198,7 +143,11 @@ func (s VendorComplianceReportService) Delete(
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return vendorComplianceReport.Delete(ctx, conn, s.svc.scope)
if err := vendorComplianceReport.Delete(ctx, conn, s.svc.scope); err != nil {
return err
}
return nil
},
)

31
pkg/server/api/console/v1/schema.graphql
View File

@@ -1755,8 +1755,7 @@ type VendorComplianceReport implements Node {
reportDate: Datetime!
validUntil: Datetime
reportName: String!
fileUrl: String! @goField(forceResolver: true)
fileSize: BigInt!
file: File @goField(forceResolver: true)
createdAt: Datetime!
updatedAt: Datetime!
}
@@ -1944,12 +1943,10 @@ type Task implements Node {
type Evidence implements Node {
id: ID!
fileUrl: String @goField(forceResolver: true)
mimeType: String!
size: Int!
state: EvidenceState!
type: EvidenceType!
filename: String!
file: File @goField(forceResolver: true)
url: String
description: String!
@@ -2590,6 +2587,16 @@ type SnapshotEdge {
node: Snapshot!
}
type File {
id: ID!
mimeType: String!
fileName: String!
size: BigInt!
downloadUrl: String! @goField(forceResolver: true)
createdAt: Datetime!
updatedAt: Datetime!
}
# Root Types
type Query {
node(id: ID!): Node!
@@ -2751,12 +2758,7 @@ type Mutation {
): DeleteRiskObligationMappingPayload!
# Evidence mutations
requestEvidence(input: RequestEvidenceInput!): RequestEvidencePayload!
fulfillEvidence(input: FulfillEvidenceInput!): FulfillEvidencePayload!
deleteEvidence(input: DeleteEvidenceInput!): DeleteEvidencePayload!
uploadTaskEvidence(
input: UploadTaskEvidenceInput!
): UploadTaskEvidencePayload!
uploadMeasureEvidence(
input: UploadMeasureEvidenceInput!
): UploadMeasureEvidencePayload!
@@ -4142,19 +4144,10 @@ type CancelSignatureRequestPayload {
deletedDocumentVersionSignatureId: ID!
}
type UploadTaskEvidencePayload {
evidenceEdge: EvidenceEdge!
}
type UploadMeasureEvidencePayload {
evidenceEdge: EvidenceEdge!
}
input UploadTaskEvidenceInput {
taskId: ID!
file: Upload!
}
input UploadMeasureEvidenceInput {
measureId: ID!
file: Upload!

1325
pkg/server/api/console/v1/schema/schema.go
View File

File diff suppressed because it is too large Load Diff

6
pkg/server/api/console/v1/types/evidence.go
View File

@@ -61,8 +61,6 @@ func NewEvidenceEdge(e *coredata.Evidence, orderBy coredata.EvidenceOrderField)
}
func NewEvidence(e *coredata.Evidence) *Evidence {
var fileURL *string = nil
var urlPtr *string = nil
if e.URL != "" {
urlCopy := e.URL
@@ -73,10 +71,6 @@ func NewEvidence(e *coredata.Evidence) *Evidence {
ID: e.ID,
State: e.State,
Type: e.Type,
FileURL: fileURL,
Filename: e.Filename,
MimeType: e.MimeType,
Size: int(e.Size),
URL: urlPtr,
Description: e.Description,
CreatedAt: e.CreatedAt,

30
pkg/server/api/console/v1/types/file.go Normal file
View File

@@ -0,0 +1,30 @@
// Copyright (c) 2025 Probo Inc <hello@getprobo.com>.
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
//
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
package types
import (
"github.com/getprobo/probo/pkg/coredata"
)
func NewFile(r *coredata.File) *File {
return &File{
ID: r.ID,
MimeType: r.MimeType,
FileName: r.FileName,
Size: r.FileSize,
CreatedAt: r.CreatedAt,
UpdatedAt: r.UpdatedAt,
}
}

26
pkg/server/api/console/v1/types/types.go
View File

@@ -1034,12 +1034,10 @@ type DocumentVersionSignatureOrder struct {
type Evidence struct {
ID gid.GID `json:"id"`
FileURL *string `json:"fileUrl,omitempty"`
MimeType string `json:"mimeType"`
Size int `json:"size"`
State coredata.EvidenceState `json:"state"`
Type coredata.EvidenceType `json:"type"`
Filename string `json:"filename"`
File *File `json:"file,omitempty"`
URL *string `json:"url,omitempty"`
Description string `json:"description"`
Task *Task `json:"task,omitempty"`
@@ -1075,6 +1073,16 @@ type ExportFrameworkPayload struct {
ExportJobID gid.GID `json:"exportJobId"`
}
type File struct {
ID gid.GID `json:"id"`
MimeType string `json:"mimeType"`
FileName string `json:"fileName"`
Size int64 `json:"size"`
DownloadURL string `json:"downloadUrl"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}
type Framework struct {
ID gid.GID `json:"id"`
Name string `json:"name"`
@@ -1955,15 +1963,6 @@ type UploadMeasureEvidencePayload struct {
EvidenceEdge *EvidenceEdge `json:"evidenceEdge"`
}
type UploadTaskEvidenceInput struct {
TaskID gid.GID `json:"taskId"`
File graphql.Upload `json:"file"`
}
type UploadTaskEvidencePayload struct {
EvidenceEdge *EvidenceEdge `json:"evidenceEdge"`
}
type UploadTrustCenterNDAInput struct {
TrustCenterID gid.GID `json:"trustCenterId"`
FileName string `json:"fileName"`
@@ -2090,8 +2089,7 @@ type VendorComplianceReport struct {
ReportDate time.Time `json:"reportDate"`
ValidUntil *time.Time `json:"validUntil,omitempty"`
ReportName string `json:"reportName"`
FileURL string `json:"fileUrl"`
FileSize int64 `json:"fileSize"`
File *File `json:"file,omitempty"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}

1
pkg/server/api/console/v1/types/vendor_compliance_report.go
View File

@@ -49,7 +49,6 @@ func NewVendorComplianceReport(c *coredata.VendorComplianceReport) *VendorCompli
ReportDate: c.ReportDate,
ValidUntil: c.ValidUntil,
ReportName: c.ReportName,
FileSize: c.FileSize,
CreatedAt: c.CreatedAt,
UpdatedAt: c.UpdatedAt,
}

137
pkg/server/api/console/v1/v1_resolver.go
View File

@@ -734,21 +734,25 @@ func (r *documentVersionSignatureResolver) SignedBy(ctx context.Context, obj *ty
return types.NewPeople(people), nil
}
// FileURL is the resolver for the fileUrl field.
func (r *evidenceResolver) FileURL(ctx context.Context, obj *types.Evidence) (*string, error) {
// File is the resolver for the file field.
func (r *evidenceResolver) File(ctx context.Context, obj *types.Evidence) (*types.File, error) {
prb := r.ProboService(ctx, obj.ID.TenantID())
if obj.Type == coredata.EvidenceTypeLink {
return obj.URL, nil
}
fileURL, err := prb.Evidences.GenerateFileURL(ctx, obj.ID, 15*time.Minute)
evidence, err := prb.Evidences.Get(ctx, obj.ID)
if err != nil {
return nil, fmt.Errorf("cannot generate file URL: %w", err)
return nil, fmt.Errorf("cannot load evidence: %w", err)
}
result := *fileURL
return &result, nil
if evidence.EvidenceFileId == nil {
return nil, nil
}
file, err := prb.Files.Get(ctx, *evidence.EvidenceFileId)
if err != nil {
return nil, fmt.Errorf("cannot load evidence file: %w", err)
}
return types.NewFile(file), nil
}
// Task is the resolver for the task field.
@@ -811,6 +815,18 @@ func (r *evidenceConnectionResolver) TotalCount(ctx context.Context, obj *types.
panic(fmt.Errorf("unsupported resolver: %T", obj.Resolver))
}
// DownloadURL is the resolver for the downloadUrl field.
func (r *fileResolver) DownloadURL(ctx context.Context, obj *types.File) (string, error) {
prb := r.ProboService(ctx, obj.ID.TenantID())
downloadUrl, err := prb.Files.GenerateFileTempURL(ctx, obj.ID, 60*time.Second)
if err != nil {
return "", fmt.Errorf("cannot generate download url: %w", err)
}
return downloadUrl, nil
}
// Organization is the resolver for the organization field.
func (r *frameworkResolver) Organization(ctx context.Context, obj *types.Framework) (*types.Organization, error) {
prb := r.ProboService(ctx, obj.ID.TenantID())
@@ -2227,55 +2243,6 @@ func (r *mutationResolver) DeleteRiskObligationMapping(ctx context.Context, inpu
}, nil
}
// RequestEvidence is the resolver for the requestEvidence field.
func (r *mutationResolver) RequestEvidence(ctx context.Context, input types.RequestEvidenceInput) (*types.RequestEvidencePayload, error) {
prb := r.ProboService(ctx, input.TaskID.TenantID())
evidence, err := prb.Evidences.Request(
ctx,
probo.RequestEvidenceRequest{
TaskID: &input.TaskID,
Name: input.Name,
Type: input.Type,
Description: input.Description,
},
)
if err != nil {
panic(fmt.Errorf("cannot request evidence: %w", err))
}
return &types.RequestEvidencePayload{
EvidenceEdge: types.NewEvidenceEdge(evidence, coredata.EvidenceOrderFieldCreatedAt),
}, nil
}
// FulfillEvidence is the resolver for the fulfillEvidence field.
func (r *mutationResolver) FulfillEvidence(ctx context.Context, input types.FulfillEvidenceInput) (*types.FulfillEvidencePayload, error) {
prb := r.ProboService(ctx, input.EvidenceID.TenantID())
req := probo.FulfilledEvidenceRequest{
EvidenceID: input.EvidenceID,
}
if input.File != nil {
req.File = input.File.File
req.Filename = &input.File.Filename
}
if input.URL != nil {
req.URL = input.URL
}
evidence, err := prb.Evidences.Fulfill(ctx, req)
if err != nil {
panic(fmt.Errorf("cannot fulfill evidence: %w", err))
}
return &types.FulfillEvidencePayload{
EvidenceEdge: types.NewEvidenceEdge(evidence, coredata.EvidenceOrderFieldCreatedAt),
}, nil
}
// DeleteEvidence is the resolver for the deleteEvidence field.
func (r *mutationResolver) DeleteEvidence(ctx context.Context, input types.DeleteEvidenceInput) (*types.DeleteEvidencePayload, error) {
prb := r.ProboService(ctx, input.EvidenceID.TenantID())
@@ -2290,31 +2257,6 @@ func (r *mutationResolver) DeleteEvidence(ctx context.Context, input types.Delet
}, nil
}
// UploadTaskEvidence is the resolver for the uploadTaskEvidence field.
func (r *mutationResolver) UploadTaskEvidence(ctx context.Context, input types.UploadTaskEvidenceInput) (*types.UploadTaskEvidencePayload, error) {
prb := r.ProboService(ctx, input.TaskID.TenantID())
evidence, err := prb.Evidences.UploadTaskEvidence(
ctx,
probo.UploadTaskEvidenceRequest{
TaskID: input.TaskID,
File: probo.File{
Content: input.File.File,
Filename: input.File.Filename,
Size: input.File.Size,
ContentType: input.File.ContentType,
},
},
)
if err != nil {
panic(fmt.Errorf("cannot upload task evidence: %w", err))
}
return &types.UploadTaskEvidencePayload{
EvidenceEdge: types.NewEvidenceEdge(evidence, coredata.EvidenceOrderFieldCreatedAt),
}, nil
}
// UploadMeasureEvidence is the resolver for the uploadMeasureEvidence field.
func (r *mutationResolver) UploadMeasureEvidence(ctx context.Context, input types.UploadMeasureEvidenceInput) (*types.UploadMeasureEvidencePayload, error) {
prb := r.ProboService(ctx, input.MeasureID.TenantID())
@@ -2323,7 +2265,7 @@ func (r *mutationResolver) UploadMeasureEvidence(ctx context.Context, input type
ctx,
probo.UploadMeasureEvidenceRequest{
MeasureID: input.MeasureID,
File: probo.File{
File: probo.FileUpload{
Content: input.File.File,
Filename: input.File.Filename,
Size: input.File.Size,
@@ -2348,7 +2290,7 @@ func (r *mutationResolver) UploadVendorComplianceReport(ctx context.Context, inp
ctx,
input.VendorID,
&probo.VendorComplianceReportCreateRequest{
File: input.File.File,
File: probo.FileUpload{Filename: input.File.Filename, Size: input.File.Size, Content: input.File.File, ContentType: input.File.ContentType},
ReportDate: input.ReportDate,
ValidUntil: input.ValidUntil,
ReportName: input.ReportName,
@@ -5065,16 +5007,25 @@ func (r *vendorComplianceReportResolver) Vendor(ctx context.Context, obj *types.
return types.NewVendor(vendor), nil
}
// FileURL is the resolver for the fileUrl field.
func (r *vendorComplianceReportResolver) FileURL(ctx context.Context, obj *types.VendorComplianceReport) (string, error) {
// File is the resolver for the file field.
func (r *vendorComplianceReportResolver) File(ctx context.Context, obj *types.VendorComplianceReport) (*types.File, error) {
prb := r.ProboService(ctx, obj.ID.TenantID())
fileURL, err := prb.VendorComplianceReports.GenerateFileURL(ctx, obj.ID, 1*time.Hour)
evidence, err := prb.VendorComplianceReports.Get(ctx, obj.ID)
if err != nil {
panic(fmt.Errorf("failed to generate file URL: %w", err))
return nil, fmt.Errorf("cannot load evidence: %w", err)
}
return fileURL, nil
if evidence.ReportFileId == nil {
return nil, nil
}
file, err := prb.Files.Get(ctx, *evidence.ReportFileId)
if err != nil {
return nil, fmt.Errorf("cannot load evidence file: %w", err)
}
return types.NewFile(file), nil
}
// TotalCount is the resolver for the totalCount field.
@@ -5271,6 +5222,9 @@ func (r *Resolver) EvidenceConnection() schema.EvidenceConnectionResolver {
return &evidenceConnectionResolver{r}
}
// File returns schema.FileResolver implementation.
func (r *Resolver) File() schema.FileResolver { return &fileResolver{r} }
// Framework returns schema.FrameworkResolver implementation.
func (r *Resolver) Framework() schema.FrameworkResolver { return &frameworkResolver{r} }
@@ -5434,6 +5388,7 @@ type documentVersionResolver struct{ *Resolver }
type documentVersionSignatureResolver struct{ *Resolver }
type evidenceResolver struct{ *Resolver }
type evidenceConnectionResolver struct{ *Resolver }
type fileResolver struct{ *Resolver }
type frameworkResolver struct{ *Resolver }
type frameworkConnectionResolver struct{ *Resolver }
type measureResolver struct{ *Resolver }