bpmcdevitt/exploit-db-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move the ordering about (to help regex)

Browse source
This commit is contained in:
g0tmi1k 2017-06-26 17:52:14 +01:00
parent c35249ca4b
commit ed901b5499
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
searchsploit
View file

@ -1,6 +1,6 @@
#!/bin/bash
# Name: SearchSploit - Exploit-DB's CLI search tool
# Version: 3.8.1 (Release date: 2017-06-26)
# Version: 3.8.2 (Release date: 2017-06-26)
# Written by: Offensive Security, Unix-Ninja, and g0tmi1k
# Homepage: https://github.com/offensive-security/exploit-database
# Manual: https://www.exploit-db.com/searchsploit/
@ -380,7 +380,7 @@ function buildterms()
else
## If there is already a value, prepend text to get ready
if [[ "${AWK_SEARCH}" ]]; then
AWK_SEARCH="${AWK_SEARCH}/ && ${CASE_TAG_FGREP}(\$3) ~ /"
AWK_SEARCH="${AWK_SEARCH}/ && ${CASE_TAG_FGREP}(\$2) ~ /"
fi
## Escape any slashes
@ -631,10 +631,10 @@ fi
## JSON require full options
if [[ "${JSON}" -eq 1 ]]; then
## Read in id, title, path, type, date, platform separated between commas
SEARCH="awk -F '[,]' '{print \$1\",\"\$2\",\"\$3\",\"\$4\",\"\$6\",\"\$7}' \"${csvpath}\""
SEARCH="awk -F '[,]' '{print \$1\",\"\$3\",\"\$2\",\"\$4\",\"\$6\",\"\$7}' \"${csvpath}\""
else
## Read in id, title and path, separated between commas (as these are the only visible fields)
SEARCH="awk -F '[,]' '{print \$1\",\"\$2\",\"\$3}' \"${csvpath}\""
SEARCH="awk -F '[,]' '{print \$1\",\"\$3\",\"\$2}' \"${csvpath}\""
fi
## EXACT search command ("-e")?
@ -683,23 +683,23 @@ fi
## Web link format ("--www")?
if [[ "${WEBLINK}" -eq 1 ]]; then
OUTPUT="$( eval ${SEARCH} \
| awk -F ',' '{ printf "%-'${FORMAT}'s | %s\n", $3, "https://www.exploit-db.com/exploits/"$1"/"}' \
| awk -F ',' '{ printf "%-'${FORMAT}'s | %s\n", $2, "https://www.exploit-db.com/exploits/"$1"/"}' \
| sort )"
## Just the EDB-ID ("--id")?
elif [[ "${EDBID}" -eq 1 ]]; then
OUTPUT="$( eval ${SEARCH} \
| awk -F ',' '{ printf "%-'${FORMAT}'s | %s\n", $3, $1 }' \
| awk -F ',' '{ printf "%-'${FORMAT}'s | %s\n", $2, $1 }' \
| sort )"
## Print JSON format (full options) ("--json")?
elif [[ "${JSON}" -eq 1 ]]; then
OUTPUT="$( eval ${SEARCH} \
| awk -F ',' '{ printf "\r\t\t'{'\"Exploit\":\"%s\",\"Platform\":\"%s\",\"Type\":\"%s\",\"Date\":\"%s\",\"Path\":\"'${gitpath}/'%s\",\"EDB-ID\":%s},\n", $3, $5, $6, $4, $2, $1 }' \
| awk -F ',' '{ printf "\r\t\t'{'\"Exploit\":\"%s\",\"Platform\":\"%s\",\"Type\":\"%s\",\"Date\":\"%s\",\"Path\":\"'${gitpath}/'%s\",\"EDB-ID\":%s},\n", $2, $5, $6, $4, $3, $1 }' \
| sed '$ s/,$//g' \
| sort )"
## Default view
else
OUTPUT="$( eval ${SEARCH} \
| awk -F ',' '{ printf "%-'${FORMAT}'s | %s\n", $3, $2 }' \
| awk -F ',' '{ printf "%-'${FORMAT}'s | %s\n", $2, $3 }' \
| sed 's_| platforms/_| _' \
| sort )"
fi