tblyler/reg
1
0
Fork 0
mirror of https://github.com/genuinetools/reg.git synced 2024-06-28 10:24:17 -04:00
Code Issues Projects Releases Wiki Activity

dont create vulns links on static tags pages

Browse source 
Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
This commit is contained in:
Jess Frazelle 2018-07-16 06:33:48 -04:00
parent 3c014c999a
commit ec64812e73
No known key found for this signature in database
GPG key ID: 18F3685C0022BFF3
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
handlers.go
View file

@ -59,7 +59,6 @@ func (rc *registryController) repositories(staticDir string, generateTagsFiles b
result := AnalysisResult{ result := AnalysisResult{
RegistryDomain: rc.reg.Domain, RegistryDomain: rc.reg.Domain,
LastUpdated: time.Now().Local().Format(time.RFC1123), LastUpdated: time.Now().Local().Format(time.RFC1123),
HasVulns: rc.cl != nil,
} }
repoList, err := rc.reg.Catalog("") repoList, err := rc.reg.Catalog("")
@ -89,7 +88,9 @@ func (rc *registryController) repositories(staticDir string, generateTagsFiles b
logrus.Infof("generating static tags page for repo %s", repo) logrus.Infof("generating static tags page for repo %s", repo)
// Parse and execute the tags templates. // Parse and execute the tags templates.
b, err := rc.generateTagsTemplate(repo) // If we are generating the tags files, disable vulnerability links in the
// templates since they won't go anywhere without a server side component.
b, err := rc.generateTagsTemplate(repo, false)
if err != nil { if err != nil {
logrus.Warnf("generating tags template for repo %q failed: %v", repo, err) logrus.Warnf("generating tags template for repo %q failed: %v", repo, err)
} }
@ -151,7 +152,7 @@ func (rc *registryController) tagsHandler(w http.ResponseWriter, r *http.Request
} }
// Generate the tags template. // Generate the tags template.
b, err := rc.generateTagsTemplate(repo) b, err := rc.generateTagsTemplate(repo, rc.cl != nil)
if err != nil { if err != nil {
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"func": "tags", "func": "tags",
@ -168,7 +169,7 @@ func (rc *registryController) tagsHandler(w http.ResponseWriter, r *http.Request
fmt.Fprint(w, string(b)) fmt.Fprint(w, string(b))
} }
func (rc *registryController) generateTagsTemplate(repo string) ([]byte, error) { func (rc *registryController) generateTagsTemplate(repo string, hasVulns bool) ([]byte, error) {
// Get the tags from the server. // Get the tags from the server.
tags, err := rc.reg.Tags(repo) tags, err := rc.reg.Tags(repo)
if err != nil { if err != nil {
@ -185,7 +186,7 @@ func (rc *registryController) generateTagsTemplate(repo string) ([]byte, error)
RegistryDomain: rc.reg.Domain, RegistryDomain: rc.reg.Domain,
LastUpdated: time.Now().Local().Format(time.RFC1123), LastUpdated: time.Now().Local().Format(time.RFC1123),
Name: repo, Name: repo,
HasVulns: rc.cl != nil, // if we have a clair client we can return vulns HasVulns: hasVulns, // if we have a clair client we can return vulns
} }
for _, tag := range tags { for _, tag := range tags {