arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updater: Always use bzr revno to get Ubuntu db's revision number.

Browse Source 
Fixes #7
This commit is contained in:
Quentin Machu 2015-11-16 16:57:53 -05:00
parent 3a1d0602fb
commit 2452a8fc48
1 changed files with 26 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
updater/fetchers/ubuntu.go
View File

@ -65,8 +65,6 @@ var (
"product": struct{}{}, "product": struct{}{},
} }
branchedRegexp = regexp.MustCompile(`Branched (\d+) revisions.`)
revisionRegexp = regexp.MustCompile(`Now on revision (\d+).`)
affectsCaptureRegexp = regexp.MustCompile(`(?P<release>.*)_(?P<package>.*): (?P<status>[^\s]*)( \(+(?P<note>[^()]*)\)+)?`) affectsCaptureRegexp = regexp.MustCompile(`(?P<release>.*)_(?P<package>.*): (?P<status>[^\s]*)( \(+(?P<note>[^()]*)\)+)?`)
affectsCaptureRegexpNames = affectsCaptureRegexp.SubexpNames() affectsCaptureRegexpNames = affectsCaptureRegexp.SubexpNames()
) )
@ -84,7 +82,6 @@ func (fetcher *UbuntuFetcher) FetchUpdate() (resp updater.FetcherResponse, err e
log.Info("fetching Ubuntu vulneratibilities") log.Info("fetching Ubuntu vulneratibilities")
// Check to see if the repository does not already exist. // Check to see if the repository does not already exist.
var revisionNumber int
if _, pathExists := os.Stat(repositoryLocalPath); repositoryLocalPath == "" || os.IsNotExist(pathExists) { if _, pathExists := os.Stat(repositoryLocalPath); repositoryLocalPath == "" || os.IsNotExist(pathExists) {
// Create a temporary folder and download the repository. // Create a temporary folder and download the repository.
p, err := ioutil.TempDir(os.TempDir(), "ubuntu-cve-tracker") p, err := ioutil.TempDir(os.TempDir(), "ubuntu-cve-tracker")
@ -96,18 +93,24 @@ func (fetcher *UbuntuFetcher) FetchUpdate() (resp updater.FetcherResponse, err e
repositoryLocalPath = p + "/repository" repositoryLocalPath = p + "/repository"
// Create the new repository. // Create the new repository.
revisionNumber, err = createRepository(repositoryLocalPath) err = createRepository(repositoryLocalPath)
if err != nil { if err != nil {
return resp, err return resp, err
} }
} else { } else {
// Update the repository that's already on disk. // Update the repository that's already on disk.
revisionNumber, err = updateRepository(repositoryLocalPath) err = updateRepository(repositoryLocalPath)
if err != nil { if err != nil {
return resp, err return resp, err
} }
} }
// Get revision number.
revisionNumber, err := getRevisionNumber(repositoryLocalPath)
if err != nil {
return resp, err
}
// Get the latest revision number we successfully applied in the database. // Get the latest revision number we successfully applied in the database.
dbRevisionNumber, err := database.GetFlagValue("ubuntuUpdater") dbRevisionNumber, err := database.GetFlagValue("ubuntuUpdater")
if err != nil { if err != nil {
@ -200,7 +203,7 @@ func collectModifiedVulnerabilities(revision int, dbRevision, repositoryLocalPat
// Handle a database that needs upgrading. // Handle a database that needs upgrading.
out, err := utils.Exec(repositoryLocalPath, "bzr", "log", "--verbose", "-r"+strconv.Itoa(dbRevisionInt+1)+"..", "-n0") out, err := utils.Exec(repositoryLocalPath, "bzr", "log", "--verbose", "-r"+strconv.Itoa(dbRevisionInt+1)+"..", "-n0")
if err != nil { if err != nil {
log.Errorf("could not get Ubuntu vulnerabilities repository logs: %s. output: %s", err, string(out)) log.Errorf("could not get Ubuntu vulnerabilities repository logs: %s. output: %s", err, out)
return nil, cerrors.ErrCouldNotDownload return nil, cerrors.ErrCouldNotDownload
} }
@ -218,61 +221,37 @@ func collectModifiedVulnerabilities(revision int, dbRevision, repositoryLocalPat
return modifiedCVE, nil return modifiedCVE, nil
} }
func createRepository(pathToRepo string) (int, error) { func createRepository(pathToRepo string) error {
// Branch repository // Branch repository
out, err := utils.Exec("/tmp/", "bzr", "branch", ubuntuTracker, pathToRepo) out, err := utils.Exec("/tmp/", "bzr", "branch", ubuntuTracker, pathToRepo)
if err != nil { if err != nil {
log.Errorf("could not branch Ubuntu repository: %s. output: %s", err, string(out)) log.Errorf("could not branch Ubuntu repository: %s. output: %s", err, out)
return 0, cerrors.ErrCouldNotDownload return cerrors.ErrCouldNotDownload
} }
return nil
// Get revision number
regexpMatches := branchedRegexp.FindStringSubmatch(string(out))
if len(regexpMatches) != 2 {
log.Error("could not parse bzr branch output to get the revision number")
return 0, cerrors.ErrCouldNotDownload
}
revision, err := strconv.Atoi(regexpMatches[1])
if err != nil {
log.Error("could not parse bzr branch output to get the revision number")
return 0, cerrors.ErrCouldNotDownload
}
return revision, err
} }
func updateRepository(pathToRepo string) (int, error) { func updateRepository(pathToRepo string) error {
// Pull repository // Pull repository
out, err := utils.Exec(pathToRepo, "bzr", "pull", "--overwrite") out, err := utils.Exec(pathToRepo, "bzr", "pull", "--overwrite")
if err != nil { if err != nil {
log.Errorf("could not pull Ubuntu repository: %s. output: %s", err, string(out)) log.Errorf("could not pull Ubuntu repository: %s. output: %s", err, out)
return 0, cerrors.ErrCouldNotDownload return cerrors.ErrCouldNotDownload
} }
return nil
}
// Get revision number func getRevisionNumber(pathToRepo string) (int, error) {
if strings.Contains(string(out), "No revisions or tags to pull") { out, err := utils.Exec(pathToRepo, "bzr", "revno")
out, _ = utils.Exec(pathToRepo, "bzr", "revno")
revno, err := strconv.Atoi(string(out[:len(out)-1]))
if err != nil {
log.Errorf("could not parse Ubuntu repository revision number: %s. output: %s", err, string(out))
return 0, cerrors.ErrCouldNotDownload
}
return revno, nil
}
regexpMatches := revisionRegexp.FindStringSubmatch(string(out))
if len(regexpMatches) != 2 {
log.Error("could not parse bzr pull output to get the revision number")
return 0, cerrors.ErrCouldNotDownload
}
revno, err := strconv.Atoi(regexpMatches[1])
if err != nil { if err != nil {
log.Error("could not parse bzr pull output to get the revision number") log.Errorf("could not get Ubuntu repository's revision number: %s. output: %s", err, out)
return 0, cerrors.ErrCouldNotDownload
}
revno, err := strconv.Atoi(strings.TrimSpace(string(out)))
if err != nil {
log.Errorf("could not parse Ubuntu repository's revision number: %s. output: %s", err, out)
return 0, cerrors.ErrCouldNotDownload return 0, cerrors.ErrCouldNotDownload
} }
return revno, nil return revno, nil
} }