Skip to content
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

fix(installer): handle removal of deleted templates during update #5998

Merged
merged 6 commits into from
Jan 27, 2025
Merged

fix(installer): handle removal of deleted templates during update #5998

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc10b39
fix(installer): handle removal of deleted templates during update
dwisiswant0 Jan 20, 2025
89f0d68
chore(installer): no log for non-existent deleted templates err
dwisiswant0 Jan 20, 2025
8175e2a
feat(installer): purge empty dirs after removing deleted templates
dwisiswant0 Jan 20, 2025
a41174b
Revert "feat(installer): purge empty dirs after removing deleted temp…
dwisiswant0 Jan 20, 2025
4ae00c2
fix(installer): use semicolons as delimiters
dwisiswant0 Jan 21, 2025
696c909
feat(installer): add mods count in `*templateUpdateResults.String`
dwisiswant0 Jan 21, 2025
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
23 changes: 19 additions & 4 deletions pkg/installer/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,15 @@ type templateUpdateResults struct {
func (t *templateUpdateResults) String() string {
var buff bytes.Buffer
data := [][]string{
{strconv.Itoa(t.totalCount), strconv.Itoa(len(t.additions)), strconv.Itoa(len(t.deletions))},
{
strconv.Itoa(t.totalCount),
strconv.Itoa(len(t.additions)),
strconv.Itoa(len(t.modifications)),
strconv.Itoa(len(t.deletions)),
},
}
table := tablewriter.NewWriter(&buff)
table.SetHeader([]string{"Total", "Added", "Removed"})
table.SetHeader([]string{"Total", "Added", "Modified", "Removed"})
for _, v := range data {
table.Append(v)
}
Expand Down Expand Up @@ -151,6 +156,13 @@ func (t *TemplateManager) updateTemplatesAt(dir string) error {
// summarize all changes
results := t.summarizeChanges(oldchecksums, newchecksums)

// remove deleted templates
for _, deletion := range results.deletions {
if err := os.Remove(deletion); err != nil && !os.IsNotExist(err) {
gologger.Warning().Msgf("failed to remove deleted template %s: %s", deletion, err)
}
}

// print summary
if results.totalCount > 0 {
gologger.Info().Msgf("Successfully updated nuclei-templates (%v) to %s. GoodLuck!", ghrd.Latest.GetTagName(), dir)
Expand Down Expand Up @@ -343,7 +355,7 @@ func (t *TemplateManager) getChecksumFromDir(dir string) (map[string]string, err
checksums, err := os.ReadFile(checksumFilePath)
if err == nil {
allChecksums := make(map[string]string)
for _, v := range strings.Split(string(checksums), "\n") {
for _, v := range strings.Split(string(checksums), ";") {
v = strings.TrimSpace(v)
tmparr := strings.Split(v, ",")
if len(tmparr) != 2 {
Expand All @@ -366,7 +378,10 @@ func (t *TemplateManager) writeChecksumFileInDir(dir string) error {
}
var buff bytes.Buffer
for k, v := range checksumMap {
buff.WriteString(k + "," + v)
buff.WriteString(k)
buff.WriteString(",")
buff.WriteString(v)
buff.WriteString(";")
}
return os.WriteFile(config.DefaultConfig.GetChecksumFilePath(), buff.Bytes(), checkSumFilePerm)
}
Expand Down
Loading