Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/d4rckh/vaf
Browse files Browse the repository at this point in the history
  • Loading branch information
@d4rckh
d4rckh committed Mar 12, 2022
2 parents 6abf4ef + c995fe2 commit 38459dd
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 63 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ vaf_dev.exe
test
src/Vaf.exe
vaf
vaf.exe
vaf.exe
example_wordlists/
13 changes: 0 additions & 13 deletions example_wordlists/short.txt
View file

This file was deleted.

9 changes: 3 additions & 6 deletions src/utils/VafLogger.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,18 @@ import strformat
import uri
import strutils

proc log*(logType: string, logMessage: string): int =
proc log*(logType: string, logMessage: string): void =
if logType == "info":
echo aquamarine & "INFO: " & resetcols & logMessage & resetcols
return 1
if logType == "result":
echo aquamarine & "RESULT: " & resetcols & logMessage & resetcols
return 1
if logType == "header":
echo bluey & "\t\t" & logMessage & resetcols & "\n"
return 1
if logType == "error":
echo orange & "ERROR: " & logMessage & resetcols & "\n"


proc printResponse*(response: VafFuzzResult): int =
proc printResponse*(response: VafFuzzResult): void =
var urlDecoded: string = ""
var urlDisplay: string = ""
var statusColor: string = khaki
Expand All @@ -30,5 +27,5 @@ proc printResponse*(response: VafFuzzResult): int =
urlDisplay = urlDisplay.replace(response.word, fmt"{resetcols}{khaki}{response.word}{resetcols}{orange}")
if "200" == statusCode or "201" == statusCode:
statusColor = lightgreen
return log("result", &"{resetcols}{statusColor}Status: {statusCode}; Length: {response.responseLength}; Time: {response.responseTime}ms\t{response.word} {orange}{urlDecoded} {urlDisplay} {resetcols}")
log("result", &"{resetcols}{statusColor}Status: {statusCode}; Length: {response.responseLength}; Time: {response.responseTime}ms\t{response.word} {orange}{urlDecoded} {urlDisplay} {resetcols}")

106 changes: 63 additions & 43 deletions src/vaf.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import utils/VafFuzzResult
import utils/VafColors
import utils/VafBanner
import utils/VafOutput
import std/streams

printBanner()

Expand Down Expand Up @@ -40,62 +41,81 @@ try:
var displayUrl: string = url.replace("[]", fmt"{resetcols}{orange}[]{resetcols}{khaki}")

if url == "" or wordlist == "":
discard log("error", "Please specify an URL to fuzz using '-u' and a wordlist using '-w'.")
log("error", "Please specify an URL to fuzz using '-u' and a wordlist using '-w'.")
quit(1)

if not os.fileExists(wordlist):
log("error", "File " & wordlist & " does not exist.")
quit(1)

if not ( "[]" in url ) and ( requestMethod == "GET" ):
discard log("error", "Please specify a fuzz area in the url, example: 'https://example.org/[]'")
if not ("[]" in url) and (requestMethod == "GET"):
log("error", "Please specify a fuzz area in the url, example: 'https://example.org/[]'")
quit(1)
if not ( ( "[]" in postData ) or ( "[]" in url ) ) and ( requestMethod == "POST" ):
discard log("error", "Please specify a fuzz area in the post data or the url, example: '{\"username\": \"[]\"}' or 'https://example.org/[]'")

if not (("[]" in postData) or ("[]" in url)) and (requestMethod == "POST"):
log("error", "Please specify a fuzz area in the post data or the url, example: '{\"username\": \"[]\"}' or 'https://example.org/[]'")
quit(1)

echo ""
discard log("header", fmt"Argument summary")
discard log("info", fmt"Printing on status: {khaki}{printOnStatus}")
discard log("info", fmt"Target URL: {khaki}{displayUrl}")
log("header", fmt"Argument summary")
log("info", fmt"Printing on status: {khaki}{printOnStatus}")
log("info", fmt"Target URL: {khaki}{displayUrl}")
if requestMethod == "POST":
discard log("info", fmt"Post Data: {khaki}{displayPostData}")
discard log("info", fmt"Method: {khaki}{requestMethod}")
log("info", fmt"Post Data: {khaki}{displayPostData}")
log("info", fmt"Method: {khaki}{requestMethod}")
if not ( grep == "" ):
discard log("info", fmt"Grep: {khaki}{grep}")
discard log("info", fmt"Using Wordlist: {khaki}{wordlist}")
log("info", fmt"Grep: {khaki}{grep}")
log("info", fmt"Using Wordlist: {khaki}{wordlist}")
if not ( parsedArgs.prefix == ""):
discard log("info", fmt"Using prefixes: {khaki}{parsedArgs.prefix}")
log("info", fmt"Using prefixes: {khaki}{parsedArgs.prefix}")
if not ( parsedArgs.suffix == ""):
discard log("info", fmt"Using suffixes: {khaki}{parsedArgs.suffix}")
discard log("info", fmt"Print if reflexive: {khaki}{parsedArgs.printifreflexive}")
discard log("info", fmt"Url Encode: {khaki}{parsedArgs.urlencode}")
# discard log("info", fmt"Print Url: {khaki}{parsedArgs.printurl}")
log("info", fmt"Using suffixes: {khaki}{parsedArgs.suffix}")
log("info", fmt"Print if reflexive: {khaki}{parsedArgs.printifreflexive}")
log("info", fmt"Url Encode: {khaki}{parsedArgs.urlencode}")
if not ( parsedArgs.output == ""):
discard log("info", fmt"Output file: {khaki}{parsedArgs.output}")
log("info", fmt"Output file: {khaki}{parsedArgs.output}")
echo ""
discard log("header", fmt"Results")
for keyword in lines(wordlist):
for prefix in parsedArgs.prefix.split(","):
for suffix in parsedArgs.suffix.split(","):
var word = prefix & keyword & suffix
if parsedArgs.urlencode:
word = encodeUrl(word, true)
var urlToRequest: string = url.replace("[]", word)
var resp: VafResponse = makeRequest(urlToRequest, requestMethod, postData.replace("[]", word))
var fuzzResult: VafFuzzResult = VafFuzzResult(
word: word,
statusCode: resp.statusCode,
urlencoded: parsedArgs.urlencode,
url: urlToRequest,
printUrl: parsedArgs.printurl,
responseLength: resp.responseLength,
responseTime: resp.responseTime
)
proc doLog() =
discard printResponse(fuzzResult)
if not ( parsedArgs.output == "" ):
saveTofile(fuzzResult, parsedArgs.output)
log("header", fmt"Results")

proc fuzz(word: string): void =
var urlToRequest: string = url.replace("[]", word)
var resp: VafResponse = makeRequest(urlToRequest, requestMethod, postData.replace("[]", word))
var fuzzResult: VafFuzzResult = VafFuzzResult(
word: word,
statusCode: resp.statusCode,
urlencoded: parsedArgs.urlencode,
url: urlToRequest,
printUrl: parsedArgs.printurl,
responseLength: resp.responseLength,
responseTime: resp.responseTime
)
proc doLog() =
printResponse(fuzzResult)
if not (parsedArgs.output == ""):
saveTofile(fuzzResult, parsedArgs.output)

if ((printOnStatus in resp.statusCode) or (printOnStatus == "any")) and
(((word in resp.content) or decodeUrl(word) in resp.content) or not parsedArgs.printifreflexive) and
(grep in resp.content):
doLog()

var strm = newFileStream(wordlist, fmRead)
var line = ""

let prefixes = parsedArgs.prefix.split(",")
let suffixes = parsedArgs.suffix.split(",")

if not isNil(strm):
while strm.readLine(line):
for prefix in prefixes:
for suffix in suffixes:
var word = prefix & line & suffix
if parsedArgs.urlencode:
word = encodeUrl(word, true)
fuzz(word)
strm.close()

if ((printOnStatus in resp.statusCode) or (printOnStatus == "any")) and (((word in resp.content) or decodeUrl(word) in resp.content) or not parsedArgs.printifreflexive) and (grep in resp.content):
doLog()
except ShortCircuit as e:
if e.flag == "argparse_help":
echo p.help
quit(0)
quit(0)

0 comments on commit 38459dd

Please sign in to comment.