mirror of
https://github.com/pi-hole/pi-hole
synced 2024-12-22 23:08:07 +00:00
42424b515b
Add ftl_api_port function Signed-off-by: Christian König <ckoenig@posteo.de> Use getFTLAPIPort in pihole Signed-off-by: Christian König <ckoenig@posteo.de> Use default portfile as fallback Signed-off-by: Christian König <ckoenig@posteo.de> Fix stickler Signed-off-by: Christian König <ckoenig@posteo.de> Correct variables Signed-off-by: Christian König <ckoenig@posteo.de> Apply suggestions from code review Co-authored-by: DL6ER <DL6ER@users.noreply.github.com> Add test getFTLAPIPort returing default port Signed-off-by: Christian König <ckoenig@posteo.de> Remove unused code from test_key_val_replacement_works Signed-off-by: Christian König <ckoenig@posteo.de> Add getFTLAPIPort_custom test Signed-off-by: Christian König <ckoenig@posteo.de> Fix output format Signed-off-by: Christian König <ckoenig@posteo.de> Add debugging Signed-off-by: Christian König <ckoenig@posteo.de> Remove debugging and fix function Signed-off-by: Christian König <ckoenig@posteo.de>
63 lines
2.0 KiB
Bash
Executable File
63 lines
2.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Pi-hole: A black hole for Internet advertisements
|
|
# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
|
|
# Network-wide ad blocking via your own hardware.
|
|
#
|
|
# Script to hold utility functions for use in other scripts
|
|
#
|
|
# This file is copyright under the latest version of the EUPL.
|
|
# Please see LICENSE file for your rights under this license.
|
|
|
|
# Basic Housekeeping rules
|
|
# - Functions must be self contained
|
|
# - Functions must be added in alphabetical order
|
|
# - Functions must be documented
|
|
# - New functions must have a test added for them in test/test_any_utils.py
|
|
|
|
#######################
|
|
# Takes three arguments key, value, and file.
|
|
# Checks the target file for the existence of the key
|
|
# - If it exists, it changes the value
|
|
# - If it does not exist, it adds the value
|
|
#
|
|
# Example usage:
|
|
# addOrEditKeyValuePair "BLOCKING_ENABLED" "true" "/etc/pihole/setupVars.conf"
|
|
#######################
|
|
addOrEditKeyValPair() {
|
|
local key="${1}"
|
|
local value="${2}"
|
|
local file="${3}"
|
|
if grep -q "^${key}=" "${file}"; then
|
|
sed -i "/^${key}=/c\\${key}=${value}" "${file}"
|
|
else
|
|
echo "${key}=${value}" >> "${file}"
|
|
fi
|
|
}
|
|
|
|
#######################
|
|
# returns FTL's current telnet API port
|
|
#######################
|
|
getFTLAPIPort(){
|
|
local -r FTLCONFFILE="/etc/pihole/pihole-FTL.conf"
|
|
local -r DEFAULT_PORT_FILE="/run/pihole-FTL.port"
|
|
local -r DEFAULT_FTL_PORT=4711
|
|
local PORTFILE
|
|
local ftl_api_port
|
|
|
|
if [[ -f "$FTLCONFFILE" ]]; then
|
|
# if PORTFILE is not set in pihole-FTL.conf, use the default path
|
|
PORTFILE="$( (grep "^PORTFILE=" $FTLCONFFILE || echo "$DEFAULT_PORT_FILE") | cut -d"=" -f2-)"
|
|
fi
|
|
|
|
if [[ -s "$PORTFILE" ]]; then
|
|
# -s: FILE exists and has a size greater than zero
|
|
ftl_api_port=$(<"$PORTFILE")
|
|
# Exploit prevention: unset the variable if there is malicious content
|
|
# Verify that the value read from the file is numeric
|
|
[[ "$ftl_api_port" =~ [^[:digit:]] ]] && unset ftl_api_port
|
|
fi
|
|
|
|
# echo the port found in the portfile or default to the default port
|
|
echo "${ftl_api_port:=$DEFAULT_FTL_PORT}"
|
|
}
|