Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@hahwul
hahwul committed Apr 23, 2020
1 parent cfc119c commit e5f02ed
Showing 1 changed file with 22 additions and 20 deletions.
42 changes: 22 additions & 20 deletions pkg/scanning/scan.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import (
"time"

"github.com/briandowns/spinner"
"github.com/hahwul/dalfox/pkg/optimization"
"github.com/hahwul/dalfox/pkg/printing"
"github.com/hahwul/dalfox/pkg/verification"
)

// Scan is main scanning function
Expand Down Expand Up @@ -94,8 +96,8 @@ func Scan(target string, options_string map[string]string, options_bool map[stri
if !options_bool["only-discovery"] {
// XSS Scanning

printing.DalLog("SYSTEM", "Generate XSS payload and Optimization.. 🛠")
// Optimization..
printing.DalLog("SYSTEM", "Generate XSS payload and optimization.Optimization.. 🛠")
// optimization.Optimization..

/*
k: parama name
Expand All @@ -107,7 +109,7 @@ func Scan(target string, options_string map[string]string, options_bool map[stri

arr := getCommonPayload()
for _, avv := range arr {
tq := MakePathQuery(target, avv)
tq := optimization.MakePathQuery(target, avv)
tm := map[string]string{"param": "pleasedonthaveanamelikethis_plz_plz"}
tm["type"] = "inPATH"
tm["payload"] = ";" + avv
Expand All @@ -131,8 +133,8 @@ func Scan(target string, options_string map[string]string, options_bool map[stri
// inJS XSS
arr := getInJsPayload()
for _, avv := range arr {
if Optimization(avv, badchars) {
tq := MakeRequestQuery(target, k, avv)
if optimization.Optimization(avv, badchars) {
tq := optimization.MakeRequestQuery(target, k, avv)
tm := map[string]string{"param": k}
tm["type"] = "inJS"
tm["payload"] = avv
Expand All @@ -143,8 +145,8 @@ func Scan(target string, options_string map[string]string, options_bool map[stri
if strings.Contains(av, "inATTR") {
arr := getAttrPayload()
for _, avv := range arr {
if Optimization(avv, badchars) {
tq := MakeRequestQuery(target, k, avv)
if optimization.Optimization(avv, badchars) {
tq := optimization.MakeRequestQuery(target, k, avv)
tm := map[string]string{"param": k}
tm["type"] = "inATTR"
tm["payload"] = avv
Expand All @@ -156,9 +158,9 @@ func Scan(target string, options_string map[string]string, options_bool map[stri
if strings.Contains(av, "inHTML") {
/*
arr := GetTags()
if Optimization("<", badchars) {
if optimization.Optimization("<", badchars) {
for _, avv := range arr {
tq := MakeRequestQuery(target, k, "/"+avv+"=1")
tq := optimization.MakeRequestQuery(target, k, "/"+avv+"=1")
tm := map[string]string{"param": k}
tm["type"] = "inHTML"
tm["payload"] = avv
Expand All @@ -170,8 +172,8 @@ func Scan(target string, options_string map[string]string, options_bool map[stri

arc := getCommonPayload()
for _, avv := range arc {
if Optimization(avv, badchars) {
tq := MakeRequestQuery(target, k, avv)
if optimization.Optimization(avv, badchars) {
tq := optimization.MakeRequestQuery(target, k, avv)
tm := map[string]string{"param": k}
tm["type"] = "inHTML"
tm["payload"] = avv
Expand All @@ -187,7 +189,7 @@ func Scan(target string, options_string map[string]string, options_bool map[stri
spu, _ := url.Parse(target)
spd := spu.Query()
for spk, _ := range spd {
tq := MakeRequestQuery(target, spk, "\"'><script src="+options_string["blind"]+"></script>")
tq := optimization.MakeRequestQuery(target, spk, "\"'><script src="+options_string["blind"]+"></script>")
tm := map[string]string{"param": spk}
tm["type"] = "toBlind"
tm["payload"] = "Blind"
Expand Down Expand Up @@ -363,7 +365,7 @@ func ParameterAnalysis(target string, options_string map[string]string) map[stri
temp_q := temp_url.Query()
temp_url.RawQuery = temp_q.Encode()
*/
temp_url := MakeRequestQuery(target, k, "DalFox")
temp_url := optimization.MakeRequestQuery(target, k, "DalFox")
var code string

//temp_url.RawQuery = temp_q.Encode()
Expand Down Expand Up @@ -391,22 +393,22 @@ func ParameterAnalysis(target string, options_string map[string]string) map[stri
smap = smap + "inJS[" + strconv.Itoa(ij) + "] "
}
ia := 0
temp_url := MakeRequestQuery(target, k, "\" id=dalfox \"")
temp_url := optimization.MakeRequestQuery(target, k, "\" id=dalfox \"")
_, _, vds, _ := SendReq(temp_url, "", options_string)
if vds {
ia = ia + 1
}
temp_url = MakeRequestQuery(target, k, "' id=dalfox '")
temp_url = optimization.MakeRequestQuery(target, k, "' id=dalfox '")
_, _, vds, _ = SendReq(temp_url, "", options_string)
if vds {
ia = ia + 1
}
temp_url = MakeRequestQuery(target, k, "' class=dalfox '")
temp_url = optimization.MakeRequestQuery(target, k, "' class=dalfox '")
_, _, vds, _ = SendReq(temp_url, "", options_string)
if vds {
ia = ia + 1
}
temp_url = MakeRequestQuery(target, k, "\" class=dalfox \"")
temp_url = optimization.MakeRequestQuery(target, k, "\" class=dalfox \"")
_, _, vds, _ = SendReq(temp_url, "", options_string)
if vds {
ia = ia + 1
Expand Down Expand Up @@ -437,7 +439,7 @@ func ParameterAnalysis(target string, options_string map[string]string) map[stri
*/
go func() {
defer wg.Done()
turl := MakeRequestQuery(target, k, "dalfox"+char)
turl := optimization.MakeRequestQuery(target, k, "dalfox"+char)
_, _, _, vrs := SendReq(turl, "dalfox"+char, options_string)
_ = resp
if vrs {
Expand Down Expand Up @@ -494,8 +496,8 @@ func SendReq(url, payload string, options_string map[string]string) (string, *ht
str := string(bytes)

defer resp.Body.Close()
vds := VerifyDOM(str)
vrs := VerifyReflection(str, payload)
vds := verification.VerifyDOM(str)
vrs := verification.VerifyReflection(str, payload)
return str, resp, vds, vrs
}

Expand Down

0 comments on commit e5f02ed

Please sign in to comment.