Skip to content

feat: resource scanning support #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

feat: resource scanning support #34

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
addb995
resource scanning
subhashish-devtron Apr 5, 2024
ed3d5c8
pubsub fix and refactor
subhashish-devtron Apr 8, 2024
3a7409d
revert local testing changes
subhashish-devtron Apr 8, 2024
7b58ef9
calling in go-routine
subhashish-devtron Apr 8, 2024
c951667
error message scan
subhashish-devtron Apr 9, 2024
5229f9b
fixing error
subhashish-devtron Apr 9, 2024
621b323
propagating error
subhashish-devtron Apr 9, 2024
615fa8d
history id in request
subhashish-devtron Apr 11, 2024
253de12
repo changes
subhashish-devtron Apr 14, 2024
20ef665
typo fix
subhashish-devtron Apr 14, 2024
45b2c97
added changes for repo
subhashish-devtron Apr 14, 2024
7e48fd4
scanning changes
subhashish-devtron Apr 15, 2024
b96fb17
moded scan_deploy_info to image scanner
subhashish-devtron Apr 15, 2024
e58fa9f
added scanning for code wip
subhashish-devtron Apr 15, 2024
c4bf4df
scanning changes working
subhashish-devtron Apr 15, 2024
63ee220
temp
subhashish-devtron Apr 15, 2024
c5c7863
temp
subhashish-devtron Apr 15, 2024
13ce9a2
Docker
subhashish-devtron Apr 15, 2024
9d3b2b8
adding error message to logs
subhashish-devtron Apr 15, 2024
2d7589a
adding error message to logs
subhashish-devtron Apr 15, 2024
20b8994
changing output file path
subhashish-devtron Apr 15, 2024
905e001
config
subhashish-devtron Apr 15, 2024
06e5aaa
handling failure case
subhashish-devtron Apr 16, 2024
2136c2e
fix
subhashish-devtron Apr 16, 2024
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
5 changes: 5 additions & 0 deletions internal/sql/repository/RegistryIndexMappingRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ type RegistryIndexMappingRepository interface {
}

func (repo *RegistryIndexMappingRepositoryImpl) GetStartingIndexForARegistryAndATool(scanToolid int, registry common.RegistryType) (*RegistryIndexMapping, error) {
if registry == "" {
return &RegistryIndexMapping{
Index: 5,
}, nil
}
var model RegistryIndexMapping
err := repo.dbConnection.Model(&model).Where("scan_tool_id = ?", scanToolid).Where("registry_type = ?", registry).Select()
if err != nil {
Expand Down
9 changes: 6 additions & 3 deletions internal/sql/repository/ScanToolExecutionHistoryMappingRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ type ScanToolExecutionHistoryMapping struct {
ExecutionFinishTime time.Time `sql:"execution_finish_time,notnull"`
State bean.ScanExecutionProcessState `sql:"state"`
TryCount int `sql:"try_count"`
ErrorMessage string `sql:"error_message"`
AuditLog
}

type ScanToolExecutionHistoryMappingRepository interface {
Save(model *ScanToolExecutionHistoryMapping) error
SaveInBatch(models []*ScanToolExecutionHistoryMapping) error
UpdateStateByToolAndExecutionHistoryId(executionHistoryId, toolId int, state bean.ScanExecutionProcessState, executionFinishTime time.Time) error
UpdateStateByToolAndExecutionHistoryId(executionHistoryId, toolId int, state bean.ScanExecutionProcessState, executionFinishTime time.Time, errorMessage string) error
MarkAllRunningStateAsFailedHavingTryCountReachedLimit(tryCount int) error
GetAllScanHistoriesByState(state bean.ScanExecutionProcessState) ([]*ScanToolExecutionHistoryMapping, error)
GetAllScanHistoriesByExecutionHistoryIdAndStates(executionHistoryId int, states []bean.ScanExecutionProcessState) ([]*ScanToolExecutionHistoryMapping, error)
Expand Down Expand Up @@ -60,9 +61,11 @@ func (repo *ScanToolExecutionHistoryMappingRepositoryImpl) SaveInBatch(models []
}

func (repo *ScanToolExecutionHistoryMappingRepositoryImpl) UpdateStateByToolAndExecutionHistoryId(executionHistoryId, toolId int,
state bean.ScanExecutionProcessState, executionFinishTime time.Time) error {
state bean.ScanExecutionProcessState, executionFinishTime time.Time, errorMessage string) error {
model := &ScanToolExecutionHistoryMapping{}
_, err := repo.dbConnection.Model(model).Set("state = ?", state).
_, err := repo.dbConnection.Model(model).
Set("state = ?", state).
Set("error_message = ?", errorMessage).
Set("execution_finish_time = ?", executionFinishTime).
Where("image_scan_execution_history_id = ?", executionHistoryId).
Where("scan_tool_id = ?", toolId).Update()
Expand Down
10 changes: 8 additions & 2 deletions pkg/security/ImageScanService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,11 @@ func (impl *ImageScanServiceImpl) ScanImage(scanEvent *common.ImageScanEvent, to
}

func (impl *ImageScanServiceImpl) getImageScanRenderDto(registryId string, image string) (*common.ImageScanRenderDto, error) {

dockerRegistry, err := impl.dockerArtifactStoreRepository.FindById(registryId)
if err != nil {
if err == pg.ErrNoRows {
dockerRegistry = &repository.DockerArtifactStore{}
} else if err != nil {
impl.logger.Errorw("error in getting docker registry by id", "err", err, "id", registryId)
return nil, err
}
Expand All @@ -144,13 +147,16 @@ func (impl *ImageScanServiceImpl) scanImageForTool(tool *repository.ScanToolMeta
toolCopy := *tool
var processedState bean.ScanExecutionProcessState
err := impl.ProcessScanForTool(toolCopy, executionHistoryDirPathCopy, executionHistoryId, userId, ctx, imageScanRenderDto)
var errorMessage string
if err != nil {
impl.logger.Errorw("error in processing scan for tool:", toolCopy.Name, "err", err)
processedState = bean.ScanExecutionProcessStateFailed
errorMessage = err.Error()
} else {
processedState = bean.ScanExecutionProcessStateCompleted
}
updateErr := impl.scanToolExecutionHistoryMappingRepository.UpdateStateByToolAndExecutionHistoryId(executionHistoryId, toolCopy.Id, processedState, time.Now())

updateErr := impl.scanToolExecutionHistoryMappingRepository.UpdateStateByToolAndExecutionHistoryId(executionHistoryId, toolCopy.Id, processedState, time.Now(), errorMessage)
if updateErr != nil {
impl.logger.Errorw("error in UpdateStateByToolAndExecutionHistoryId", "err", err)
err = updateErr
Expand Down