Skip to content

Commit

Permalink
fix: fix ci errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@hugo-syn
hugo-syn committed Apr 19, 2024
1 parent 1a16d14 commit 1532f5f
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 19 deletions.
11 changes: 6 additions & 5 deletions cmd/cariddi/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ along with this program. If not, see http://www.gnu.org/licenses/.
package main

import (
"fmt"
"os"

fileUtils "github.com/edoardottt/cariddi/internal/file"
Expand Down Expand Up @@ -178,7 +179,7 @@ func main() {
// If needed print secrets.
if !flags.JSON && !flags.Plain && len(finalSecret) != 0 {
for _, elem := range finalSecret {
output.EncapsulateCustomGreen(elem.Secret.Name, elem.Match+" in "+elem.URL)
output.EncapsulateCustomGreen(elem.Secret.Name, fmt.Sprintf("%s in %s", elem.Match, elem.URL))
}
}

Expand All @@ -194,29 +195,29 @@ func main() {
}
}

output.EncapsulateCustomGreen(finalString, " in "+elem.URL)
output.EncapsulateCustomGreen(finalString, fmt.Sprintf(" in %s", elem.URL))
}
}
}

// If needed print extensions.
if !flags.JSON && !flags.Plain && len(finalExtensions) != 0 {
for _, elem := range finalExtensions {
output.EncapsulateCustomGreen(elem.Filetype.Extension, elem.URL+" matched!")
output.EncapsulateCustomGreen(elem.Filetype.Extension, fmt.Sprintf("%s matched!", elem.URL))
}
}

// If needed print errors.
if !flags.JSON && !flags.Plain && len(finalErrors) != 0 {
for _, elem := range finalErrors {
output.EncapsulateCustomGreen(elem.Error.ErrorName, elem.Match+" in "+elem.URL)
output.EncapsulateCustomGreen(elem.Error.ErrorName, fmt.Sprintf("%s in %s", elem.Match, elem.URL))
}
}

// If needed print infos.
if !flags.JSON && !flags.Plain && len(finalInfos) != 0 {
for _, elem := range finalInfos {
output.EncapsulateCustomGreen(elem.Info.Name, elem.Match+" in "+elem.URL)
output.EncapsulateCustomGreen(elem.Info.Name, fmt.Sprintf("%s in %s", elem.Match, elem.URL))
}
}
}
10 changes: 5 additions & 5 deletions pkg/crawler/colly.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ func New(scan *Scan) *Results {
// if there isn't a scheme use http.
if !urlUtils.HasProtocol(scan.Target) {
protocolTemp = "http"
targetTemp = urlUtils.GetHost(protocolTemp + "://" + scan.Target)
targetTemp = urlUtils.GetHost(fmt.Sprintf("%s://%s", protocolTemp, scan.Target))
} else {
protocolTemp = urlUtils.GetProtocol(scan.Target)
targetTemp = urlUtils.GetHost(scan.Target)
}

if scan.Intensive {
var err error
targetTemp, err = urlUtils.GetRootHost(protocolTemp + "://" + targetTemp)
targetTemp, err = urlUtils.GetRootHost(fmt.Sprintf("%s://%s", protocolTemp, targetTemp))

if err != nil {
fmt.Println(err.Error())
Expand Down Expand Up @@ -205,7 +205,7 @@ func New(scan *Scan) *Results {
})

// Start scraping on target
path, err := urlUtils.GetPath(protocolTemp + "://" + scan.Target)
path, err := urlUtils.GetPath(fmt.Sprintf("%s://%s", protocolTemp, scan.Target))
if err == nil {
var (
addPath string
Expand All @@ -217,7 +217,7 @@ func New(scan *Scan) *Results {
}

if path == "" || path == "/" {
absoluteURL = protocolTemp + "://" + scan.Target + addPath + "robots.txt"
absoluteURL = fmt.Sprintf("%s://%s%srobots.txt", protocolTemp, scan.Target, addPath)
if !ignoreBool || (ignoreBool && !IgnoreMatch(absoluteURL, &ignoreSlice)) {
err = c.Visit(absoluteURL)
if err != nil && scan.Debug && !errors.Is(err, colly.ErrAlreadyVisited) {
Expand All @@ -235,7 +235,7 @@ func New(scan *Scan) *Results {
}
}

err = c.Visit(protocolTemp + "://" + scan.Target)
err = c.Visit(fmt.Sprintf("%s://%s", protocolTemp, scan.Target))
if err != nil && scan.Debug && !errors.Is(err, colly.ErrAlreadyVisited) {
log.Println(err)
}
Expand Down
19 changes: 10 additions & 9 deletions pkg/output/output.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func TxtOutput(flags input.Input, finalResults []string, finalSecret []scanner.S
if flags.Secrets {
SecretFilename := fileUtils.CreateOutputFile(flags.TXTout, "secrets", "txt")
for _, elem := range finalSecret {
AppendOutputToTxt(elem.Secret.Name+" - "+elem.Match+" in "+elem.URL, SecretFilename)
AppendOutputToTxt(fmt.Sprintf("%s - %s in %s", elem.Secret.Name, elem.Match, elem.URL), SecretFilename)
}
}

Expand All @@ -89,7 +89,7 @@ func TxtOutput(flags input.Input, finalResults []string, finalSecret []scanner.S
}
}

AppendOutputToTxt(finalString+" in "+elem.URL, EndpointFilename)
AppendOutputToTxt(fmt.Sprintf("%s in %s", finalString, elem.URL), EndpointFilename)
}
}
}
Expand All @@ -98,23 +98,23 @@ func TxtOutput(flags input.Input, finalResults []string, finalSecret []scanner.S
if 1 <= flags.Extensions && flags.Extensions <= 7 {
ExtensionsFilename := fileUtils.CreateOutputFile(flags.TXTout, "extensions", "txt")
for _, elem := range finalExtensions {
AppendOutputToTxt(elem.Filetype.Extension+" in "+elem.URL, ExtensionsFilename)
AppendOutputToTxt(fmt.Sprintf("%s in %s", elem.Filetype.Extension, elem.URL), ExtensionsFilename)
}
}

// if errors flag enabled save also errors
if flags.Errors {
ErrorsFilename := fileUtils.CreateOutputFile(flags.TXTout, "errors", "txt")
for _, elem := range finalErrors {
AppendOutputToTxt(elem.Error.ErrorName+" - "+elem.Match+" in "+elem.URL, ErrorsFilename)
AppendOutputToTxt(fmt.Sprintf("%s - %s in %s", elem.Error.ErrorName, elem.Match, elem.URL), ErrorsFilename)
}
}

// if info flag enabled save also infos
if flags.Info {
InfosFilename := fileUtils.CreateOutputFile(flags.TXTout, "info", "txt")
for _, elem := range finalInfos {
AppendOutputToTxt(elem.Info.Name+" - "+elem.Match+" in "+elem.URL, InfosFilename)
AppendOutputToTxt(fmt.Sprintf("%s - %s in %s", elem.Info.Name, elem.Match, elem.URL), InfosFilename)
}
}
}
Expand Down Expand Up @@ -148,7 +148,7 @@ func HTMLOutput(flags input.Input, resultFilename string, finalResults []string,
HeaderHTML("Secrets found", resultFilename)

for _, elem := range finalSecret {
AppendOutputToHTML(elem.Secret.Name+" - "+elem.Match+" in "+elem.URL, "", resultFilename, false)
AppendOutputToHTML(fmt.Sprintf("%s - %s in %s", elem.Secret.Name, elem.Match, elem.URL), "", resultFilename, false)
}

FooterHTML(resultFilename)
Expand All @@ -168,7 +168,7 @@ func HTMLOutput(flags input.Input, resultFilename string, finalResults []string,
}
}

AppendOutputToHTML(finalString+" in "+elem.URL, "", resultFilename, false)
AppendOutputToHTML(fmt.Sprintf("%s in %s", finalString, elem.URL), "", resultFilename, false)
}
}

Expand All @@ -180,7 +180,7 @@ func HTMLOutput(flags input.Input, resultFilename string, finalResults []string,
HeaderHTML("Extensions found", resultFilename)

for _, elem := range finalExtensions {
AppendOutputToHTML(elem.Filetype.Extension+" in "+elem.URL, "", resultFilename, false)
AppendOutputToHTML(fmt.Sprintf("%s in %s", elem.Filetype.Extension, elem.URL), "", resultFilename, false)
}

FooterHTML(resultFilename)
Expand All @@ -191,7 +191,8 @@ func HTMLOutput(flags input.Input, resultFilename string, finalResults []string,
HeaderHTML("Errors found", resultFilename)

for _, elem := range finalErrors {
AppendOutputToHTML(elem.Error.ErrorName+" - "+elem.Match+" in "+elem.URL, "", resultFilename, false)
output := fmt.Sprintf("%s - %s in %s", elem.Error.ErrorName, elem.Match, elem.URL)
AppendOutputToHTML(output, "", resultFilename, false)
}

FooterHTML(resultFilename)
Expand Down

0 comments on commit 1532f5f

Please sign in to comment.