@@ -20,6 +20,7 @@ import (
2020 "encoding/hex"
2121 "encoding/json"
2222 "encoding/pem"
23+ "errors"
2324 "fmt"
2425 "hash"
2526 "html"
@@ -46,7 +47,7 @@ import (
4647 "github.com/projectdiscovery/gostruct"
4748 "github.com/projectdiscovery/mapcidr"
4849 jarm "github.com/projectdiscovery/utils/crypto/jarm"
49- errors "github.com/projectdiscovery/utils/errors "
50+ "github.com/projectdiscovery/utils/errkit "
5051 maputils "github.com/projectdiscovery/utils/maps"
5152 randint "github.com/projectdiscovery/utils/rand"
5253 stringsutil "github.com/projectdiscovery/utils/strings"
6768
6869 // ErrParsingArg is error when parsing value of argument
6970 // Use With Caution: Nuclei ignores this error in extractors(ref: https://github.com/projectdiscovery/nuclei/issues/3950)
70- ErrParsingArg = errors .New ("error parsing argument value" )
71+ ErrParsingArg = errkit .New ("error parsing argument value" )
7172
7273 DefaultMaxDecompressionSize = int64 (10 * 1024 * 1024 ) // 10MB
7374 DefaultCacheSize = 6144
@@ -81,7 +82,7 @@ var functions []dslFunction
8182func AddFunction (function dslFunction ) error {
8283 for _ , f := range functions {
8384 if function .Name == f .Name {
84- return errors .New ("duplicate helper function key defined" )
85+ return errkit .New ("duplicate helper function key defined" )
8586 }
8687 }
8788 functions = append (functions , function )
@@ -147,15 +148,16 @@ func init() {
147148 true ,
148149 func (args ... interface {}) (interface {}, error ) {
149150 argCount := len (args )
150- if argCount == 0 {
151+ switch argCount {
152+ case 0 :
151153 return nil , ErrInvalidDslFunction
152- } else if argCount == 1 {
154+ case 1 :
153155 runes := []rune (toString (args [0 ]))
154156 sort .Slice (runes , func (i int , j int ) bool {
155157 return runes [i ] < runes [j ]
156158 })
157159 return string (runes ), nil
158- } else {
160+ default :
159161 tokens := make ([]string , 0 , argCount )
160162 for _ , arg := range args {
161163 tokens = append (tokens , toString (arg ))
@@ -208,9 +210,10 @@ func init() {
208210 true ,
209211 func (args ... interface {}) (interface {}, error ) {
210212 argCount := len (args )
211- if argCount == 0 {
213+ switch argCount {
214+ case 0 :
212215 return nil , ErrInvalidDslFunction
213- } else if argCount == 1 {
216+ case 1 :
214217 builder := & strings.Builder {}
215218 visited := make (map [rune ]struct {})
216219 for _ , i := range toString (args [0 ]) {
@@ -220,7 +223,7 @@ func init() {
220223 }
221224 }
222225 return builder .String (), nil
223- } else {
226+ default :
224227 result := make ([]string , 0 , argCount )
225228 visited := make (map [string ]struct {})
226229 for _ , i := range args [0 :] {
@@ -543,7 +546,7 @@ func init() {
543546 }))
544547 MustAddFunction (NewWithPositionalArgs ("mmh3" , 1 , true , func (args ... interface {}) (interface {}, error ) {
545548 hasher := murmur3 .New32WithSeed (0 )
546- hasher .Write ([]byte (fmt .Sprint (args [0 ])))
549+ hasher .Write ([]byte (fmt .Sprint (args [0 ]))) //nolint
547550 return fmt .Sprintf ("%d" , int32 (hasher .Sum32 ())), nil
548551 }))
549552 MustAddFunction (NewWithPositionalArgs ("contains" , 2 , true , func (args ... interface {}) (interface {}, error ) {
@@ -649,24 +652,25 @@ func init() {
649652 true ,
650653 func (arguments ... interface {}) (interface {}, error ) {
651654 argumentsSize := len (arguments )
652- if argumentsSize == 2 {
655+ switch argumentsSize {
656+ case 2 :
653657 input := toString (arguments [0 ])
654658 separatorOrCount := toString (arguments [1 ])
655659
656660 count , err := strconv .Atoi (separatorOrCount )
657661 if err != nil {
658- return strings .SplitN (input , separatorOrCount , - 1 ), nil
662+ return strings .Split (input , separatorOrCount ), nil
659663 }
660664 return toChunks (input , count ), nil
661- } else if argumentsSize == 3 {
665+ case 3 :
662666 input := toString (arguments [0 ])
663667 separator := toString (arguments [1 ])
664668 count , err := strconv .Atoi (toString (arguments [2 ]))
665669 if err != nil {
666670 return nil , ErrInvalidDslFunction
667671 }
668672 return strings .SplitN (input , separator , count ), nil
669- } else {
673+ default :
670674 return nil , ErrInvalidDslFunction
671675 }
672676 }))
@@ -676,25 +680,26 @@ func init() {
676680 true ,
677681 func (arguments ... interface {}) (interface {}, error ) {
678682 argumentsSize := len (arguments )
679- if argumentsSize < 2 {
683+ switch {
684+ case argumentsSize < 2 :
680685 return nil , ErrInvalidDslFunction
681- } else if argumentsSize == 2 {
686+ case argumentsSize == 2 :
682687 separator := toString (arguments [0 ])
683688 elements , ok := arguments [1 ].([]string )
684689
685690 if ! ok {
686- return nil , errors .New ("cannot cast elements into string" )
691+ return nil , errkit .New ("cannot cast elements into string" )
687692 }
688693
689694 return strings .Join (elements , separator ), nil
690- } else {
695+ default :
691696 separator := toString (arguments [0 ])
692697 elements := arguments [1 :argumentsSize ]
693698
694699 stringElements := make ([]string , 0 , argumentsSize )
695700 for _ , element := range elements {
696701 if _ , ok := element .([]string ); ok {
697- return nil , errors .New ("cannot use join on more than one slice element" )
702+ return nil , errkit .New ("cannot use join on more than one slice element" )
698703 }
699704
700705 stringElements = append (stringElements , toString (element ))
@@ -985,7 +990,7 @@ func init() {
985990
986991 firstParsed , parseErr := version .NewVersion (toString (args [0 ]))
987992 if parseErr != nil {
988- return nil , errors . NewWithErr (ErrParsingArg ). Wrap ( parseErr )
993+ return nil , errkit . Combine (ErrParsingArg , parseErr )
989994 }
990995
991996 var versionConstraints []string
@@ -1016,11 +1021,11 @@ func init() {
10161021 bLen = int (floatVal )
10171022 }
10181023 if bLen == 0 {
1019- return nil , errors .New ("invalid padding length" )
1024+ return nil , errkit .New ("invalid padding length" )
10201025 }
10211026 bByte := []byte (toString (args [1 ]))
10221027 if len (bByte ) == 0 {
1023- return nil , errors .New ("invalid padding byte" )
1028+ return nil , errkit .New ("invalid padding byte" )
10241029 }
10251030 bData := []byte (toString (args [0 ]))
10261031 dataLen := len (bData )
@@ -1030,7 +1035,7 @@ func init() {
10301035
10311036 padMode , ok := args [3 ].(string )
10321037 if ! ok || (padMode != "prefix" && padMode != "suffix" ) {
1033- return nil , errors .New ("padding mode must be 'prefix' or 'suffix'" )
1038+ return nil , errkit .New ("padding mode must be 'prefix' or 'suffix'" )
10341039 }
10351040
10361041 paddingLen := bLen - dataLen
@@ -1101,31 +1106,31 @@ func init() {
11011106 }
11021107 argStr := toString (args [0 ])
11031108 if len (argStr ) == 0 {
1104- return nil , errors .New ("empty string" )
1109+ return nil , errkit .New ("empty string" )
11051110 }
11061111 start , err := strconv .Atoi (toString (args [1 ]))
11071112 if err != nil {
1108- return nil , errors . NewWithErr (err ). Msgf ( "invalid start position" )
1113+ return nil , errkit . Wrap (err , "invalid start position" )
11091114 }
11101115 if start > len (argStr ) {
1111- return nil , errors .New ("start position bigger than slice length" )
1116+ return nil , errkit .New ("start position bigger than slice length" )
11121117 }
11131118 if len (args ) == 2 {
11141119 return argStr [start :], nil
11151120 }
11161121
11171122 end , err := strconv .Atoi (toString (args [2 ]))
11181123 if err != nil {
1119- return nil , errors .New ("invalid end position" )
1124+ return nil , errkit .New ("invalid end position" )
11201125 }
11211126 if end < 0 {
1122- return nil , errors .New ("negative end position" )
1127+ return nil , errkit .New ("negative end position" )
11231128 }
11241129 if end < start {
1125- return nil , errors .New ("end position before start" )
1130+ return nil , errkit .New ("end position before start" )
11261131 }
11271132 if end > len (argStr ) {
1128- return nil , errors .New ("end position bigger than slice length start" )
1133+ return nil , errkit .New ("end position bigger than slice length start" )
11291134 }
11301135 return argStr [start :end ], nil
11311136 }))
@@ -1448,8 +1453,8 @@ func init() {
14481453 }
14491454
14501455 var mtime int64
1451- if ! reader .Header . ModTime .IsZero () {
1452- mtime = reader .Header . ModTime .Unix ()
1456+ if ! reader .ModTime .IsZero () {
1457+ mtime = reader .ModTime .Unix ()
14531458 }
14541459 _ = reader .Close ()
14551460
0 commit comments