tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upload to tricorder functions

This commit is contained in:
Jacob Salmela 2017-05-24 21:11:15 -05:00
parent 1102fdc44b
commit cc946ce068
No known key found for this signature in database
GPG Key ID: 1962FF1A5046135E
1 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
advanced/Scripts/piholeDebug.sh
View File

@ -542,46 +542,63 @@ analyze_gravity_list() {
echo -e " ${CROSS} ${GRAVITYFILE} not found!" 2>&1 | tee -a "${DEBUG_LOG}" echo -e " ${CROSS} ${GRAVITYFILE} not found!" 2>&1 | tee -a "${DEBUG_LOG}"
} }
upload_to_tricorder() { tricorder_nc_or_ssl() {
local tricorder if command -v openssl &> /dev/null; then
echo -e "${TICK} Finshed debugging!" 2>&1 | tee -a "${DEBUG_LOG}" echo -e " ${INFO} Using openssl for transmission." 2>&1 | tee -a "${DEBUG_LOG}"
tricorder=$(cat /var/log/pihole_debug.log | openssl s_client -quiet -connect tricorder.pi-hole.net:9998 2> /dev/null)
else
echo -e " ${INFO} Using netcat for transmission." 2>&1 | tee -a "${DEBUG_LOG}"
tricorder=$(cat /var/log/pihole_debug.log | nc tricorder.pi-hole.net 9999)
fi
}
# Ensure the file exists, create if not, clear if exists.
truncate --size=0 "${DEBUG_LOG}" upload_to_tricorder() {
# Set the permissions and owner # Set the permissions and owner
chmod 644 ${DEBUG_LOG} chmod 644 ${DEBUG_LOG}
chown "$USER":pihole ${DEBUG_LOG} chown "$USER":pihole ${DEBUG_LOG}
# Copy working temp file to final log location
cat /proc/$$/fd/3 >> "${DEBUG_LOG}"
# Straight dump of tailing the logs, can sanitize later if needed.
cat /proc/$$/fd/4 >> "${DEBUG_LOG}"
echo "::: The debug log can be uploaded to tricorder.pi-hole.net for sharing with developers only." echo ""
echo -e "${TICK} Finshed debugging!" 2>&1 | tee -a "${DEBUG_LOG}"
echo -e " ${INFO} The debug log can be uploaded to tricorder.pi-hole.net for sharing with developers only."
echo -e " For more information, see: https://pi-hole.net/2016/11/07/crack-our-medical-tricorder-win-a-raspberry-pi-3/"
if [[ "${AUTOMATED}" ]]; then if [[ "${AUTOMATED}" ]]; then
echo "${INFO} Debug script running in automated mode; uploading log to tricorder..." echo -e " ${INFO} Debug script running in automated mode" 2>&1 | tee -a "${DEBUG_LOG}"
tricorder=$(cat /var/log/pihole_debug.log | nc tricorder.pi-hole.net 9999) if command -v openssl &> /dev/null; then
echo -e " ${INFO} Using openssl for transmission." 2>&1 | tee -a "${DEBUG_LOG}"
openssl s_client -quiet -connect tricorder.pi-hole.net:9998 2> /dev/null < /dev/stdin
else else
read -r -p "\n\n[?] Would you like to upload the log? [y/N] " response echo -e " ${INFO} Using netcat for transmission." 2>&1 | tee -a "${DEBUG_LOG}"
nc tricorder.pi-hole.net 9999 < /dev/stdin
fi
else
echo ""
read -r -p "[?] Would you like to upload the log? [y/N] " response
case ${response} in case ${response} in
[yY][eE][sS]|[yY]) tricorder=$(cat /var/log/pihole_debug.log | nc tricorder.pi-hole.net 9999);; [yY][eE][sS]|[yY]) tricorder_nc_or_ssl;;
*) echo "${INFO} Log will NOT be uploaded to tricorder.";; *) echo -e " ${INFO} Log will NOT be uploaded to tricorder.";exit;
esac esac
fi fi
# Check if tricorder.pi-hole.net is reachable and provide token. # Check if tricorder.pi-hole.net is reachable and provide token.
if [[ -n "${tricorder}" ]]; then if [[ -n "${tricorder}" ]]; then
echo "::: ---=== Your debug token is : ${tricorder} Please make a note of it. ===---" echo ""
echo "::: Contact the Pi-hole team with your token for assistance." echo -e "${COL_LIGHT_PURPLE}***********************************${COL_NC}"
echo "::: Thank you." echo -e "${TICK} Your debug token is: ${COL_LIGHT_GREEN}${tricorder}${COL_NC}"
echo -e "${COL_LIGHT_PURPLE}***********************************${COL_NC}"
echo -e ""
echo -e " Provide this token to the Pi-hole team for assistance:"
echo ""
echo -e " https://discourse.pi-hole.net"
else else
echo "::: There was an error uploading your debug log." echo -e " ${CROSS} There was an error uploading your debug log."
echo "::: Please try again or contact the Pi-hole team for assistance." echo -e " Please try again or contact the Pi-hole team for assistance."
fi fi
echo "::: A local copy of the Debug log can be found at : /var/log/pihole_debug.log" echo ""
echo -e " A local copy of the debug log can be found at : /var/log/pihole_debug.log"
echo ""
} }
initiate_debug initiate_debug
check_core_version check_core_version
check_web_version check_web_version
@ -598,4 +615,4 @@ check_dnsmasq_d
check_lighttpd_d check_lighttpd_d
check_http_directory check_http_directory
check_cron_d check_cron_d
#upload_to_tricorder upload_to_tricorder