Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/authz/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ resources:
ssp_id: uuid # C0 on /system-security-plans/:sspId/risks, else C1
owned_by: set<string> # PrimaryOwnerUserID — matches subject.user_uuid
status: string
source_type: string # manual | evidence-auto | oscal-import | risk-promotion
source_type: string # manual | evidence-auto | oscal-import | inherited-responsibility
poam_item:
actions: [read, create, update, delete]
attributes:
Expand Down
2 changes: 2 additions & 0 deletions internal/service/migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ func MigrateUpWithConfig(db *gorm.DB, cfg *config.Config) error {
&riskrel.RiskEvidenceLink{},
&riskrel.RiskControlLink{},
&riskrel.RiskComponentLink{},
&riskrel.RiskResponsibilityLink{},
&riskrel.RiskSubjectLink{},
&riskrel.RiskOwnerAssignment{},
&riskrel.RiskThreatRef{},
Expand Down Expand Up @@ -850,6 +851,7 @@ func MigrateDown(db *gorm.DB) error {
&riskrel.RiskEvidenceLink{},
&riskrel.RiskControlLink{},
&riskrel.RiskComponentLink{},
&riskrel.RiskResponsibilityLink{},
&riskrel.RiskSubjectLink{},
&riskrel.RiskOwnerAssignment{},
&riskrel.RiskThreatRef{},
Expand Down
15 changes: 15 additions & 0 deletions internal/service/relational/risks/links.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,21 @@ func (RiskComponentLink) TableName() string {
return "risk_component_links"
}

type RiskResponsibilityLink struct {
RiskID uuid.UUID `json:"riskId" gorm:"type:uuid;primaryKey"`
// ResponsibilityUUID is the upstream ControlImplementationResponsibility uuid
// (BCH-1340) — resolved via the filter_responsibilities -> ssp_leverage_links arm in
// risk_evidence_worker.go, not a local catalog control.
ResponsibilityUUID uuid.UUID `json:"responsibilityUuid" gorm:"type:uuid;primaryKey;index"`
CreatedAt time.Time `json:"createdAt"`
CreatedByID *uuid.UUID `json:"createdById" gorm:"type:uuid;index"`
Risk *Risk `json:"-" gorm:"foreignKey:RiskID;references:ID;constraint:OnDelete:CASCADE"`
}

func (RiskResponsibilityLink) TableName() string {
return "risk_responsibility_links"
}

type RiskSubjectLink struct {
RiskID uuid.UUID `json:"riskId" gorm:"type:uuid;primaryKey"`
SubjectID uuid.UUID `json:"subjectId" gorm:"type:uuid;primaryKey;index"`
Expand Down
9 changes: 5 additions & 4 deletions internal/service/relational/risks/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,15 @@ func RiskLevelFilterValues(raw string) []string {
type RiskSourceType string

const (
RiskSourceTypeManual RiskSourceType = "manual"
RiskSourceTypeEvidenceAuto RiskSourceType = "evidence-auto"
RiskSourceTypeOscalImport RiskSourceType = "oscal-import"
RiskSourceTypeManual RiskSourceType = "manual"
RiskSourceTypeEvidenceAuto RiskSourceType = "evidence-auto"
RiskSourceTypeOscalImport RiskSourceType = "oscal-import"
RiskSourceTypeInheritedResponsibility RiskSourceType = "inherited-responsibility"
)

func (s RiskSourceType) IsValid() bool {
switch s {
case RiskSourceTypeManual, RiskSourceTypeEvidenceAuto, RiskSourceTypeOscalImport:
case RiskSourceTypeManual, RiskSourceTypeEvidenceAuto, RiskSourceTypeOscalImport, RiskSourceTypeInheritedResponsibility:
return true
default:
return false
Expand Down
Loading
Loading