Skip to content

Commit be7272e

Browse files
authored
Merge pull request #785 from six2dez/dev
Dev
2 parents edce836 + 174d475 commit be7272e

File tree

6 files changed

+141
-135
lines changed

6 files changed

+141
-135
lines changed

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</h1>
88

99
<p align="center">
10-
<a href="https://github.com/six2dez/reconftw/releases/tag/v2.7">
11-
<img src="https://img.shields.io/badge/release-v2.7-green">
10+
<a href="https://github.com/six2dez/reconftw/releases/tag/v2.7.1">
11+
<img src="https://img.shields.io/badge/release-v2.7.1-green">
1212
</a>
1313
</a>
1414
<a href="https://opensource.org/licenses/MIT">
@@ -173,7 +173,6 @@ export PATH=$GOPATH/bin:$GOROOT/bin:$HOME/.local/bin:$PATH
173173
AMASS_CONFIG=~/.config/amass/config.ini
174174
GITHUB_TOKENS=${tools}/.github_tokens
175175
GITLAB_TOKENS=${tools}/.gitlab_tokens
176-
SUBGPT_COOKIE=${tools}/subgpt_cookies.json
177176
#CUSTOM_CONFIG=custom_config_path.txt # In case you use a custom config file, uncomment this line and set your files path
178177

179178
# APIs/TOKENS - Uncomment the lines you want removing the '#' at the beginning of the line
@@ -212,7 +211,6 @@ SUBBRUTE=true # DNS bruteforcing
212211
SUBSCRAPING=true # Subdomains extraction from web crawling
213212
SUBPERMUTE=true # DNS permutations
214213
SUBREGEXPERMUTE=true # Permutations by regex analysis
215-
SUBGPT=true # Permutations by BingGPT prediction
216214
PERMUTATIONS_OPTION=gotator # The alternative is "ripgen" (faster, not deeper)
217215
GOTATOR_FLAGS=" -depth 1 -numbers 3 -mindup -adv -md" # Flags for gotator
218216
SUBTAKEOVER=false # Check subdomain takeovers, false by default cuz nuclei already check this

Terraform/files/reconftw.cfg

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ fuzzing_remote_list="https://raw.githubusercontent.com/six2dez/OneListForAll/mai
1515
proxy_url="http://127.0.0.1:8080/" # Proxy url
1616
install_golang=true # Set it to false if you already have Golang configured and ready
1717
upgrade_tools=true
18+
upgrade_before_running=false # Upgrade tools before running
1819
#dir_output=/custom/output/path
1920

2021
# Golang Vars (Comment or change on your own)
@@ -27,7 +28,6 @@ export PATH=$GOPATH/bin:$GOROOT/bin:$HOME/.local/bin:$PATH
2728
AMASS_CONFIG=~/.config/amass/config.ini
2829
GITHUB_TOKENS=${tools}/.github_tokens
2930
GITLAB_TOKENS=${tools}/.gitlab_tokens
30-
SUBGPT_COOKIE=${tools}/subgpt_cookies.json
3131
#CUSTOM_CONFIG=custom_config_path.txt # In case you use a custom config file, uncomment this line and set your files path
3232

3333
# APIs/TOKENS - Uncomment the lines you want removing the '#' at the beginning of the line
@@ -52,6 +52,7 @@ EMAILS=true # Fetch emails from differents sites
5252
DOMAIN_INFO=true # whois info
5353
REVERSE_WHOIS=true # amass intel reverse whois info, takes some time
5454
IP_INFO=true # Reverse IP search, geolocation and whois
55+
POSTMAN_LEAKS=true # Check for postman leaks
5556
METAFINDER_LIMIT=20 # Max 250
5657

5758
# Subdomains
@@ -60,16 +61,16 @@ RUNSUBFINDER=true
6061
SUBDOMAINS_GENERAL=true # Enable or disable the whole Subdomains module
6162
SUBPASSIVE=true # Passive subdomains search
6263
SUBCRT=true # crtsh search
63-
SUBNOERROR=true # Check DNS NOERROR response and BF on them
64+
CTR_LIMIT=999999 # Limit the number of results
65+
SUBNOERROR=false # Check DNS NOERROR response and BF on them
6466
SUBANALYTICS=true # Google Analytics search
6567
SUBBRUTE=true # DNS bruteforcing
6668
SUBSCRAPING=true # Subdomains extraction from web crawling
6769
SUBPERMUTE=true # DNS permutations
6870
SUBREGEXPERMUTE=true # Permutations by regex analysis
69-
SUBGPT=true # Permutations by BingGPT prediction
7071
PERMUTATIONS_OPTION=gotator # The alternative is "ripgen" (faster, not deeper)
7172
GOTATOR_FLAGS=" -depth 1 -numbers 3 -mindup -adv -md" # Flags for gotator
72-
SUBTAKEOVER=false # Check subdomain takeovers, false by default cuz nuclei already check this
73+
SUBTAKEOVER=true # Check subdomain takeovers, false by default cuz nuclei already check this
7374
SUB_RECURSIVE_PASSIVE=false # Uses a lot of API keys queries
7475
DEEP_RECURSIVE_PASSIVE=10 # Number of top subdomains for recursion
7576
SUB_RECURSIVE_BRUTE=false # Needs big disk space and time to resolve
@@ -96,8 +97,9 @@ CDN_IP=true # Check which IPs belongs to CDN
9697
# Web analysis
9798
WAF_DETECTION=true # Detect WAFs
9899
NUCLEICHECK=true # Enable or disable nuclei
100+
NUCLEI_TEMPLATES_PATH="$HOME/nuclei-templates" # Set nuclei templates path
99101
NUCLEI_SEVERITY="info,low,medium,high,critical" # Set templates criticity
100-
NUCLEI_FLAGS=" -silent -t $HOME/nuclei-templates/ -retries 2" # Additional nuclei extra flags, don't set the severity here but the exclusions like " -etags openssh"
102+
NUCLEI_FLAGS=" -silent -t ${NUCLEI_TEMPLATES_PATH}/ -retries 2" # Additional nuclei extra flags, don't set the severity here but the exclusions like " -etags openssh"
101103
NUCLEI_FLAGS_JS=" -silent -tags exposure,token -severity info,low,medium,high,critical" # Additional nuclei extra flags for js secrets
102104
URL_CHECK=true # Enable or disable URL collection
103105
URL_CHECK_PASSIVE=true # Search for urls, passive methods from Archive, OTX, CommonCrawl, etc
@@ -110,8 +112,8 @@ CMS_SCANNER=true # CMS scanner
110112
WORDLIST=true # Wordlist generation
111113
ROBOTSWORDLIST=true # Check historic disallow entries on waybackMachine
112114
PASSWORD_DICT=true # Generate password dictionary
113-
PASSWORD_MIN_LENGTH=5 # Min password lenght
114-
PASSWORD_MAX_LENGTH=14 # Max password lenght
115+
PASSWORD_MIN_LENGTH=5 # Min password length
116+
PASSWORD_MAX_LENGTH=14 # Max password length
115117

116118
# Vulns
117119
VULNS_GENERAL=false # Enable or disable the vulnerability module (very intrusive and slow)
@@ -133,6 +135,7 @@ PROTO_POLLUTION=true # Check for prototype pollution flaws
133135
SMUGGLING=true # Check for HTTP request smuggling flaws
134136
WEBCACHE=true # Check for Web Cache issues
135137
BYPASSER4XX=true # Check for 4XX bypasses
138+
FUZZPARAMS=true # Fuzz parameters values
136139

137140
# Extra features
138141
NOTIFICATION=false # Notification for every function
@@ -146,7 +149,7 @@ REMOVELOG=false # Delete logs after execution
146149
PROXY=false # Send to proxy the websites found
147150
SENDZIPNOTIFY=false # Send to zip the results (over notify)
148151
PRESERVE=true # set to true to avoid deleting the .called_fn files on really large scans
149-
FFUF_FLAGS=" -mc all -fc 404 -ac -sf" # Ffuf flags
152+
FFUF_FLAGS=" -mc all -fc 404 -ach -sf -of json" # Ffuf flags
150153
HTTPX_FLAGS=" -follow-redirects -random-agent -status-code -silent -title -web-server -tech-detect -location -content-length" # Httpx flags for simple web probing
151154
GOWITNESS_FLAGS=" --disable-logging --timeout 5"
152155

@@ -189,6 +192,7 @@ FFUF_MAXTIME=900 # Seconds
189192
HTTPX_TIMEOUT=10 # Seconds
190193
HTTPX_UNCOMMONPORTS_TIMEOUT=10 # Seconds
191194
PERMUTATIONS_LIMIT=21474836480 # Bytes, default is 20 GB
195+
GOWITNESS_TIMEOUT_PER_SITE=20 # Seconds
192196

193197
# lists
194198
fuzz_wordlist=${tools}/fuzz_wordlist.txt

install.sh

Lines changed: 71 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,37 @@ dir=${tools}
66
double_check=false
77

88
# ARM Detection
9-
if [[ $(uname -m) == "amd64" ]] || [[ $(uname -m) == "x86_64" ]]; then
10-
IS_ARM="False"
11-
fi
12-
if [[ $(uname -m) == "arm64" ]] || [[ $(uname -m) == "armv6l" ]]; then
13-
IS_ARM="True"
14-
if [[ $(uname -m) == "arm64" ]]; then
15-
RPI_4="False"
16-
else
17-
RPI_3="True"
18-
fi
19-
fi
9+
ARCH=$(uname -m)
10+
case $ARCH in
11+
amd64|x86_64) IS_ARM="False" ;;
12+
arm64|armv6l)
13+
IS_ARM="True"
14+
RPI_4=$([[ $ARCH == "arm64" ]] && echo "True" || echo "False")
15+
RPI_3=$([[ $ARCH == "arm64" ]] && echo "False" || echo "True")
16+
;;
17+
esac
2018

2119
#Mac Osx Detecting
22-
if [[ "$OSTYPE" == "darwin"* ]]; then
23-
IS_MAC="True"
24-
else
25-
IS_MAC="False"
26-
fi
27-
28-
# Check Bash version
29-
#(bash --version | awk 'NR==1{print $4}' | cut -d'.' -f1) 2&>/dev/null || echo "Unable to get bash version, for MacOS run 'brew install bash' and rerun installer in a new terminal" && exit 1
20+
IS_MAC=$([[ "$OSTYPE" == "darwin"* ]] && echo "True" || echo "False")
3021

3122
BASH_VERSION=$(bash --version | awk 'NR==1{print $4}' | cut -d'.' -f1)
3223
if [ "${BASH_VERSION}" -lt 4 ]; then
3324
printf "${bred} Your Bash version is lower than 4, please update${reset}\n"
34-
printf "%s Your Bash version is lower than 4, please update%s\n" "${bred}" "${reset}"
25+
printf "%s Your Bash version is lower than 4, please update%s\n" "${bred}" "${reset}" >&2
3526
if [ "True" = "$IS_MAC" ]; then
3627
printf "${yellow} For MacOS run 'brew install bash' and rerun installer in a new terminal${reset}\n\n"
3728
exit 1;
3829
fi
3930
fi
4031

32+
# Declaring Go tools and their installation commands
4133
declare -A gotools
4234
gotools["gf"]="go install -v github.com/tomnomnom/gf@latest"
4335
gotools["qsreplace"]="go install -v github.com/tomnomnom/qsreplace@latest"
4436
gotools["amass"]="go install -v github.com/owasp-amass/amass/v3/...@master"
4537
gotools["ffuf"]="go install -v github.com/ffuf/ffuf/v2@latest"
4638
gotools["github-subdomains"]="go install -v github.com/gwen001/github-subdomains@latest"
47-
gotools["gitlab-subdomains"]="go install github.com/gwen001/gitlab-subdomains@latest"
39+
gotools["gitlab-subdomains"]="go install -v github.com/gwen001/gitlab-subdomains@latest"
4840
gotools["nuclei"]="go install -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei@latest"
4941
gotools["anew"]="go install -v github.com/tomnomnom/anew@latest"
5042
gotools["notify"]="go install -v github.com/projectdiscovery/notify/cmd/notify@latest"
@@ -54,7 +46,7 @@ gotools["github-endpoints"]="go install -v github.com/gwen001/github-endpoints@l
5446
gotools["dnsx"]="go install -v github.com/projectdiscovery/dnsx/cmd/dnsx@latest"
5547
gotools["subjs"]="go install -v github.com/lc/subjs@latest"
5648
gotools["Gxss"]="go install -v github.com/KathanP19/Gxss@latest"
57-
gotools["katana"]="go install github.com/projectdiscovery/katana/cmd/katana@latest"
49+
gotools["katana"]="go install -v github.com/projectdiscovery/katana/cmd/katana@latest"
5850
gotools["crlfuzz"]="go install -v github.com/dwisiswant0/crlfuzz/cmd/crlfuzz@latest"
5951
gotools["dalfox"]="go install -v github.com/hahwul/dalfox/v2@latest"
6052
gotools["puredns"]="go install -v github.com/d3mondev/puredns/v2@latest"
@@ -66,21 +58,22 @@ gotools["mapcidr"]="go install -v github.com/projectdiscovery/mapcidr/cmd/mapcid
6658
gotools["cdncheck"]="go install -v github.com/projectdiscovery/cdncheck/cmd/cdncheck@latest"
6759
gotools["dnstake"]="go install -v github.com/pwnesia/dnstake/cmd/dnstake@latest"
6860
gotools["gowitness"]="go install -v github.com/sensepost/gowitness@latest"
69-
gotools["tlsx"]="go install github.com/projectdiscovery/tlsx/cmd/tlsx@latest"
61+
gotools["tlsx"]="go install -v github.com/projectdiscovery/tlsx/cmd/tlsx@latest"
7062
gotools["gitdorks_go"]="go install -v github.com/damit5/gitdorks_go@latest"
7163
gotools["smap"]="go install -v github.com/s0md3v/smap/cmd/smap@latest"
7264
gotools["dsieve"]="go install -v github.com/trickest/dsieve@master"
73-
gotools["inscope"]="go install github.com/tomnomnom/hacks/inscope@latest"
74-
gotools["enumerepo"]="go install github.com/trickest/enumerepo@latest"
65+
gotools["inscope"]="go install -v github.com/tomnomnom/hacks/inscope@latest"
66+
gotools["enumerepo"]="go install -v github.com/trickest/enumerepo@latest"
7567
gotools["Web-Cache-Vulnerability-Scanner"]="go install -v github.com/Hackmanit/Web-Cache-Vulnerability-Scanner@latest"
7668
gotools["subfinder"]="go install -v github.com/projectdiscovery/subfinder/v2/cmd/subfinder@latest"
7769
gotools["byp4xx"]="go install -v github.com/lobuhi/byp4xx@latest"
78-
gotools["hakip2host"]="go install github.com/hakluke/hakip2host@latest"
70+
gotools["hakip2host"]="go install -v github.com/hakluke/hakip2host@latest"
7971
gotools["gau"]="go install -v github.com/lc/gau/v2/cmd/gau@latest"
80-
gotools["Mantra"]="go install github.com/MrEmpy/Mantra@latest"
81-
gotools["crt"]="go install github.com/cemulus/crt@latest"
72+
gotools["Mantra"]="go install -v github.com/MrEmpy/Mantra@latest"
73+
gotools["crt"]="go install -v github.com/cemulus/crt@latest"
8274
gotools["s3scanner"]="go install -v github.com/sa7mon/s3scanner@latest"
8375

76+
# Declaring repositories and their paths
8477
declare -A repos
8578
repos["dorks_hunter"]="six2dez/dorks_hunter"
8679
repos["pwndb"]="davidtavarez/pwndb"
@@ -115,7 +108,7 @@ repos["trufflehog"]="trufflesecurity/trufflehog"
115108

116109

117110
function banner_web(){
118-
echo -en "\033c"
111+
tput clear
119112
printf "\n${bgreen}"
120113
printf " ██▀███ ▓█████ ▄████▄ ▒█████ ███▄ █ █████▒▄▄▄█████▓ █ █░\n"
121114
printf " ▓██ ▒ ██▒▓█ ▀ ▒██▀ ▀█ ▒██▒ ██▒ ██ ▀█ █ ▓██ ▒ ▓ ██▒ ▓▒▓█░ █ ░█░\n"
@@ -130,8 +123,18 @@ function banner_web(){
130123
printf " ${reconftw_version} by @six2dez\n"
131124
}
132125

126+
function install_ppfuzz() {
127+
local url=$1
128+
local tar_file=$2
129+
130+
wget -N -c "$url" $DEBUG_STD
131+
eval $SUDO tar -C /usr/local/bin/ -xzf "$tar_file" $DEBUG_STD
132+
eval $SUDO rm -rf "$tar_file" $DEBUG_STD
133+
}
134+
135+
# This function installs various tools and repositories as per the configuration.
133136
function install_tools(){
134-
#eval ln -s /usr/local/bin/pip3 /usr/local/bin/pip3 $DEBUG_STD
137+
135138
eval pip3 install -I -r requirements.txt $DEBUG_STD
136139

137140
printf "${bblue} Running: Installing Golang tools (${#gotools[@]})${reset}\n\n"
@@ -219,28 +222,18 @@ function install_tools(){
219222

220223
if [ "True" = "$IS_ARM" ]; then
221224
if [ "True" = "$RPI_3" ]; then
222-
eval wget -N -c https://github.com/dwisiswant0/ppfuzz/releases/download/v1.0.1/ppfuzz-v1.0.1-armv7-unknown-linux-gnueabihf.tar.gz $DEBUG_STD
223-
eval $SUDO tar -C /usr/local/bin/ -xzf ppfuzz-v1.0.1-armv7-unknown-linux-gnueabihf.tar.gz $DEBUG_STD
224-
eval $SUDO rm -rf ppfuzz-v1.0.1-armv7-unknown-linux-gnueabihf.tar.gz $DEBUG_STD
225+
install_ppfuzz "https://github.com/dwisiswant0/ppfuzz/releases/download/v1.0.1/ppfuzz-v1.0.1-armv7-unknown-linux-gnueabihf.tar.gz" "ppfuzz-v1.0.1-armv7-unknown-linux-gnueabihf.tar.gz"
225226
elif [ "True" = "$RPI_4" ]; then
226-
eval wget -N -c https://github.com/dwisiswant0/ppfuzz/releases/download/v1.0.1/ppfuzz-v1.0.1-aarch64-unknown-linux-gnueabihf.tar.gz $DEBUG_STD
227-
eval $SUDO tar -C /usr/local/bin/ -xzf ppfuzz-v1.0.1-aarch64-unknown-linux-gnueabihf.tar.gz $DEBUG_STD
228-
eval $SUDO rm -rf ppfuzz-v1.0.1-aarch64-unknown-linux-gnueabihf.tar.gz $DEBUG_STD
227+
install_ppfuzz "https://github.com/dwisiswant0/ppfuzz/releases/download/v1.0.1/ppfuzz-v1.0.1-aarch64-unknown-linux-gnueabihf.tar.gz" "ppfuzz-v1.0.1-aarch64-unknown-linux-gnueabihf.tar.gz"
229228
fi
230229
elif [ "True" = "$IS_MAC" ]; then
231230
if [ "True" = "$IS_ARM" ]; then
232-
eval wget -N -c https://github.com/dwisiswant0/ppfuzz/releases/download/v1.0.1/ppfuzz-v1.0.1-armv7-unknown-linux-gnueabihf.tar.gz $DEBUG_STD
233-
eval $SUDO tar -C /usr/local/bin/ -xzf ppfuzz-v1.0.1-armv7-unknown-linux-gnueabihf.tar.gz $DEBUG_STD
234-
eval $SUDO rm -rf ppfuzz-v1.0.1-armv7-unknown-linux-gnueabihf.tar.gz $DEBUG_STD
231+
install_ppfuzz "https://github.com/dwisiswant0/ppfuzz/releases/download/v1.0.1/ppfuzz-v1.0.1-armv7-unknown-linux-gnueabihf.tar.gz" "ppfuzz-v1.0.1-armv7-unknown-linux-gnueabihf.tar.gz"
235232
else
236-
eval wget -N -c https://github.com/dwisiswant0/ppfuzz/releases/download/v1.0.1/ppfuzz-v1.0.1-x86_64-apple-darwin.tar.gz $DEBUG_STD
237-
eval $SUDO tar -C /usr/local/bin/ -xzf ppfuzz-v1.0.1-x86_64-apple-darwin.tar.gz $DEBUG_STD
238-
eval $SUDO rm -rf ppfuzz-v1.0.1-x86_64-apple-darwin.tar.gz $DEBUG_STD
233+
install_ppfuzz "https://github.com/dwisiswant0/ppfuzz/releases/download/v1.0.1/ppfuzz-v1.0.1-x86_64-apple-darwin.tar.gz" "ppfuzz-v1.0.1-x86_64-apple-darwin.tar.gz"
239234
fi
240235
else
241-
eval wget -N -c https://github.com/dwisiswant0/ppfuzz/releases/download/v1.0.1/ppfuzz-v1.0.1-x86_64-unknown-linux-musl.tar.gz $DEBUG_STD
242-
eval $SUDO tar -C /usr/local/bin/ -xzf ppfuzz-v1.0.1-x86_64-unknown-linux-musl.tar.gz $DEBUG_STD
243-
eval $SUDO rm -rf ppfuzz-v1.0.1-x86_64-unknown-linux-musl.tar.gz $DEBUG_STD
236+
install_ppfuzz "https://github.com/dwisiswant0/ppfuzz/releases/download/v1.0.1/ppfuzz-v1.0.1-x86_64-unknown-linux-musl.tar.gz" "ppfuzz-v1.0.1-x86_64-unknown-linux-musl.tar.gz"
244237
fi
245238
eval $SUDO chmod 755 /usr/local/bin/ppfuzz
246239
eval $SUDO strip -s /usr/local/bin/ppfuzz $DEBUG_STD
@@ -272,7 +265,14 @@ install_webserver(){
272265
$SUDO pip3 install -r $SCRIPTPATH/web/requirements.txt &>/dev/null
273266

274267
printf "${yellow} Installing tools...${reset}\n\n"
268+
if command -v apt > /dev/null; then
275269
$SUDO apt install redis-server -y &>/dev/null
270+
elif command -v yum > /dev/null; then
271+
$SUDO yum install redis -y &>/dev/null
272+
else
273+
printf '[ERROR] Unable to find a supported package manager. Please install redis manually.\n'
274+
exit 1
275+
fi
276276

277277
printf "${yellow} Creating WEB User...${reset}\n\n"
278278
$SUDO rm $SCRIPTPATH/web/db.sqlite3 &>/dev/null
@@ -305,9 +305,15 @@ display_menu(){
305305
printf "${bblue} 3. Setup Web Interface${reset} ${yellow}(User Interaction needed!)${reset}\n\n"
306306
printf "${bblue} 4. Exit${reset}\n\n"
307307
printf "${bgreen}#######################################################################${reset}\n\n"
308-
read -p "$(echo -e ${bblue} "Insert option: "${reset})" option
308+
read -p "${bblue}Insert option: ${reset}" option
309309
printf "\n\n${bgreen}#######################################################################${reset}\n\n"
310310

311+
option=$(echo "$option" | tr -d '[:space:]')
312+
if ! [[ "$option" =~ ^[1-4]$ ]]; then
313+
printf "${bred} Invalid option. Please try again.${reset}\n\n"
314+
continue
315+
fi
316+
311317
case $option in
312318
1)
313319
web=false
@@ -354,22 +360,26 @@ display_menu(){
354360
exit 1
355361
;;
356362
*)
357-
printf "${bblue} Invalid option. Exiting...${reset}\n\n"
363+
printf "${bred} Invalid option. Please try again.${reset}\n\n"
358364
exit 1
359365
;;
360366
esac
361367
fi
362368
done
363369
}
364370

365-
if [ "$1" = '--tools' ]; then
366-
install_tools
367-
fi
368-
369-
if [ "$1" != '--auto' ]; then
370-
echo "$1"
371-
display_menu
372-
fi
371+
case "$1" in
372+
--tools)
373+
install_tools
374+
;;
375+
--auto)
376+
# possibly some other actions
377+
;;
378+
*)
379+
echo "$1"
380+
display_menu
381+
;;
382+
esac
373383

374384
printf "${yellow} This may take time. So, go grab a coffee! ${reset}\n\n"
375385

@@ -432,7 +442,11 @@ eval git config --global --unset https.proxy $DEBUG_STD
432442

433443
printf "${bblue} Running: Looking for new reconFTW version${reset}\n\n"
434444

435-
eval git fetch $DEBUG_STD
445+
if ! eval git fetch $DEBUG_STD; then
446+
echo "Failed to fetch updates."
447+
exit 1
448+
fi
449+
436450
BRANCH=$(git rev-parse --abbrev-ref HEAD)
437451
HEADHASH=$(git rev-parse HEAD)
438452
UPSTREAMHASH=$(git rev-parse "${BRANCH}@{upstream}")
@@ -608,6 +622,6 @@ if [ "$web" = true ]; then
608622
printf "\n${bgreen} Web server is installed, to set it up run ./install.sh and select option 3 ${reset}\n\n"
609623
fi
610624

611-
printf "${yellow} Remember set your api keys:\n - amass (~/.config/amass/config.ini)\n - subfinder (~/.config/subfinder/provider-config.yaml)\n - GitLab (~/Tools/.gitlab_tokens)\n - SSRF Server (COLLAB_SERVER in reconftw.cfg or env var) \n - Blind XSS Server (XSS_SERVER in reconftw.cfg or env var) \n - notify (~/.config/notify/provider-config.yaml) \n - WHOISXML API (WHOISXML_API in reconftw.cfg or env var)\n - subgpt_cookies.json (subgpt_cookies.json file, follow instructions at https://github.com/s0md3v/SubGPT#getting-bing-cookie)\n\n\n${reset}"
625+
printf "${yellow} Remember set your api keys:\n - amass (~/.config/amass/config.ini)\n - subfinder (~/.config/subfinder/provider-config.yaml)\n - GitLab (~/Tools/.gitlab_tokens)\n - SSRF Server (COLLAB_SERVER in reconftw.cfg or env var) \n - Blind XSS Server (XSS_SERVER in reconftw.cfg or env var) \n - notify (~/.config/notify/provider-config.yaml) \n - WHOISXML API (WHOISXML_API in reconftw.cfg or env var)\n\n${reset}"
612626
printf "${bgreen} Finished!${reset}\n\n"
613627
printf "\n\n${bgreen}#######################################################################${reset}\n"

0 commit comments

Comments
 (0)