Stage/vuls
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat : scan with image digest (#939)

Browse Source
This commit is contained in:
Tomoya Amachi
2020-03-03 16:51:06 +09:00
committed by GitHub
parent fe3f1b9924
commit 9aa0d87a21
8 changed files with 83 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scan/base.go
View File

@@ -417,8 +417,9 @@ func (l *base) convertToModel() models.ScanResult {
}
image := models.Image{
Name: l.ServerInfo.Image.Name,
Tag: l.ServerInfo.Image.Tag,
Name: l.ServerInfo.Image.Name,
Tag: l.ServerInfo.Image.Tag,
Digest: l.ServerInfo.Image.Digest,
}
errs, warns := []string{}, []string{}

2
scan/container.go
View File

@@ -105,7 +105,7 @@ func convertLibWithScanner(libs map[analyzer.FilePath][]godeptypes.Library) ([]m
func scanImage(c config.ServerInfo) (os *analyzer.OS, pkgs []analyzer.Package, libs map[analyzer.FilePath][]godeptypes.Library, err error) {
ctx := context.Background()
domain := c.Image.Name + ":" + c.Image.Tag
domain := c.Image.GetFullName()
util.Log.Info("Start fetch container... ", domain)
fanalCache := cache.Initialize(utils.CacheDir())

6
scan/serverapi.go
View File

@@ -497,11 +497,11 @@ func detectImageOSesOnServer(containerHost osTypeInterface) (oses []osTypeInterf
return
}
for idx, containerConf := range containerHostInfo.Images {
for idx, img := range containerHostInfo.Images {
copied := containerHostInfo
// change servername for original
copied.ServerName = fmt.Sprintf("%s:%s@%s", idx, containerConf.Tag, containerHostInfo.ServerName)
copied.Image = containerConf
copied.ServerName = fmt.Sprintf("%s@%s", idx, containerHostInfo.ServerName)
copied.Image = img
copied.Type = ""
os := detectOS(copied)
oses = append(oses, os)