Skip to content
This repository has been archived by the owner on Sep 30, 2021. It is now read-only.

added --psk-file option #399

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added --psk-file option #399

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2b020b
added --psk-file option
Defelo Jun 23, 2019
b67528b
Merge branch 'master' into master
Defelo Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions create_ap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ usage() {
echo " 'bridge' for bridging"
echo " 'none' for no Internet sharing (equivalent to -n)"
echo " --psk Use 64 hex digits pre-shared-key instead of passphrase"
echo " --psk-file Use wpa psk file instead of passphrase"
echo " --hidden Make the Access Point hidden (do not broadcast the SSID)"
echo " --mac-filter Enable MAC address filtering"
echo " --mac-filter-accept Location of MAC address filter list (defaults to /etc/hostapd/hostapd.accept)"
Expand Down Expand Up @@ -652,6 +653,7 @@ DAEMON_PIDFILE=
DAEMON_LOGFILE=/dev/null
NO_HAVEGED=0
USE_PSK=0
USE_PSK_FILE=0

HOSTAPD_DEBUG_ARGS=
REDIRECT_TO_LOCALHOST=0
Expand Down Expand Up @@ -1054,7 +1056,7 @@ for ((i=0; i<$#; i++)); do
fi
done

GETOPT_ARGS=$(getopt -o hc:w:g:de:nm: -l "help","hidden","hostapd-debug:","redirect-to-localhost","mac-filter","mac-filter-accept:","isolate-clients","ieee80211n","ieee80211ac","ht_capab:","vht_capab:","driver:","no-virt","fix-unmanaged","country:","freq-band:","mac:","dhcp-dns:","daemon","pidfile:","logfile:","stop:","list","list-running","list-clients:","version","psk","no-haveged","no-dns","no-dnsmasq","mkconfig:","config:" -n "$PROGNAME" -- "$@")
GETOPT_ARGS=$(getopt -o hc:w:g:de:nm: -l "help","hidden","hostapd-debug:","redirect-to-localhost","mac-filter","mac-filter-accept:","isolate-clients","ieee80211n","ieee80211ac","ht_capab:","vht_capab:","driver:","no-virt","fix-unmanaged","country:","freq-band:","mac:","dhcp-dns:","daemon","pidfile:","logfile:","stop:","list","list-running","list-clients:","version","psk","psk-file","no-haveged","no-dns","no-dnsmasq","mkconfig:","config:" -n "$PROGNAME" -- "$@")
[[ $? -ne 0 ]] && exit 1
eval set -- "$GETOPT_ARGS"

Expand Down Expand Up @@ -1211,6 +1213,10 @@ while :; do
shift
USE_PSK=1
;;
--psk-file)
shift
USE_PSK_FILE=1
;;
--no-dns)
shift
NO_DNS=1
Expand Down Expand Up @@ -1456,7 +1462,7 @@ else
break
done
while :; do
if [[ $USE_PSK -eq 0 ]]; then
if [[ $USE_PSK -eq 0 && $USE_PSK_FILE -eq 0 ]]; then
read -p "Passphrase: " -s PASSPHRASE
echo
if [[ ${#PASSPHRASE} -gt 0 && ${#PASSPHRASE} -lt 8 ]] || [[ ${#PASSPHRASE} -gt 63 ]]; then
Expand All @@ -1470,13 +1476,15 @@ else
else
break
fi
else
elif [[ $USE_PSK_FILE -eq 0 ]]; then
read -p "PSK: " PASSPHRASE
echo
if [[ ${#PASSPHRASE} -gt 0 && ${#PASSPHRASE} -ne 64 ]]; then
echo "ERROR: Invalid pre-shared-key length ${#PASSPHRASE} (expected 64)" >&2
continue
fi
else
read -p "WPA PSK file: " PASSPHRASE
fi
done
else
Expand All @@ -1485,6 +1493,10 @@ else
fi
fi

if [[ $USE_PSK_FILE -eq 1 ]]; then
PSK_FILE=$PASSPHRASE
fi

if [[ "$SHARE_METHOD" != "none" ]] && ! is_interface $INTERNET_IFACE; then
echo "ERROR: '${INTERNET_IFACE}' is not an interface" >&2
exit 1
Expand Down Expand Up @@ -1697,13 +1709,22 @@ if [[ -n "$PASSPHRASE" ]]; then
fi
cat << EOF >> $CONFDIR/hostapd.conf
wpa=${WPA_VERSION}
wpa_${WPA_KEY_TYPE}=${PASSPHRASE}
wpa_key_mgmt=WPA-PSK
wpa_pairwise=TKIP CCMP
rsn_pairwise=CCMP
EOF
fi

if [[ $USE_PSK_FILE -eq 0 ]]; then
cat << EOF >> $CONFDIR/hostapd.conf
wpa_${WPA_KEY_TYPE}=${PASSPHRASE}
EOF
else
cat << EOF >> $CONFDIR/hostapd.conf
wpa_psk_file=${PSK_FILE}
EOF
fi

if [[ "$SHARE_METHOD" == "bridge" ]]; then
echo "bridge=${BRIDGE_IFACE}" >> $CONFDIR/hostapd.conf
elif [[ $NO_DNSMASQ -eq 0 ]]; then
Expand Down