free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wifi utils static analysis

This commit is contained in:
Bob Mottram 2018-03-02 20:07:54 +00:00
parent f13c18092f
commit c44d07bd2f
2 changed files with 128 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/freedombone-app-syncthing
View File

@ -112,7 +112,6 @@ function syncthing_add_id {
syncthing_create_ids_file
data=$(mktemp 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15
dialog --backtitle $"Freedombone User Control Panel" \
--title $"Add a Syncthing device ID" \
--form $"Paste the device ID for your laptop/desktop/netbook/phone/tablet below" 9 80 2 \

259
src/freedombone-utils-wifi
View File

@ -74,10 +74,10 @@ function wifi_static_network_interface {
else
read_config_param "LOCAL_NETWORK_STATIC_IP_ADDRESS"
read_config_param "ROUTER_IP_ADDRESS"
echo 'iface default inet static' > /etc/network/interfaces.d/static
echo " address ${LOCAL_NETWORK_STATIC_IP_ADDRESS}" >> /etc/network/interfaces.d/static
echo ' netmask 255.255.255.0' >> /etc/network/interfaces.d/static
echo " gateway ${ROUTER_IP_ADDRESS}" >> /etc/network/interfaces.d/static
{ echo 'iface default inet static';
echo " address ${LOCAL_NETWORK_STATIC_IP_ADDRESS}";
echo ' netmask 255.255.255.0';
echo " gateway ${ROUTER_IP_ADDRESS}"; } > /etc/network/interfaces.d/static
fi
}
@ -98,14 +98,14 @@ function setup_wifi_atheros {
else
atheros_drivers_file=$(pwd)/$atheros_drivers_file
fi
dpkg -i $atheros_drivers_file
dpkg -i "$atheros_drivers_file"
reset_usb_devices
update_wifi_adaptors
if [ $IFACE ]; then
wpa_action ${IFACE} stop
wpa_cli -i ${IFACE} terminate
if [ "$IFACE" ]; then
wpa_action "${IFACE}" stop
wpa_cli -i "${IFACE}" terminate
#ifconfig $IFACE up
ifup $IFACE
ifup "$IFACE"
fi
}
@ -129,8 +129,8 @@ function setup_wifi {
HOTSPOT='yes'
fi
if [ -f $WIFI_NETWORKS_FILE ]; then
${PROJECT_NAME}-wifi --networks $WIFI_NETWORKS_FILE
if [ -f "$WIFI_NETWORKS_FILE" ]; then
"${PROJECT_NAME}-wifi" --networks "$WIFI_NETWORKS_FILE"
mark_complete "${FUNCNAME[0]}"
return
fi
@ -144,9 +144,9 @@ function setup_wifi {
echo $'Wifi passphrase was too short'
return
fi
${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
"${PROJECT_NAME}-wifi" -s "$WIFI_SSID" -t "$WIFI_TYPE" -p "$WIFI_PASSPHRASE" --hotspot "$HOTSPOT" --networks "$WIFI_NETWORKS_FILE"
else
${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
"${PROJECT_NAME}-wifi" -s "$WIFI_SSID" -t "$WIFI_TYPE" --hotspot "$HOTSPOT" --networks "$WIFI_NETWORKS_FILE"
fi
mark_completed "${FUNCNAME[0]}"
}
@ -156,13 +156,13 @@ function install_atheros_wifi {
if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
return
fi
if [ $INSTALLING_ON_BBB != "yes" ]; then
if [ "$INSTALLING_ON_BBB" != "yes" ]; then
return
fi
if [[ $ENABLE_BATMAN != "yes" ]]; then
return
fi
if [ -d $INSTALL_DIR/open-ath9k-htc-firmware ]; then
if [ -d "$INSTALL_DIR/open-ath9k-htc-firmware" ]; then
return
fi
# have drivers already been installed ?
@ -170,32 +170,28 @@ function install_atheros_wifi {
return
fi
apt-get -yq install build-essential cmake git m4 texinfo
if [ ! -d $INSTALL_DIR ]; then
mkdir -p $INSTALL_DIR
if [ ! -d "$INSTALL_DIR" ]; then
mkdir -p "$INSTALL_DIR"
fi
cd $INSTALL_DIR
if [ ! -d $INSTALL_DIR/open-ath9k-htc-firmware ]; then
cd "$INSTALL_DIR" || exit 24678246
if [ ! -d "$INSTALL_DIR/open-ath9k-htc-firmware" ]; then
function_check git_clone
git_clone $ATHEROS_WIFI_REPO $INSTALL_DIR/open-ath9k-htc-firmware
if [ ! "$?" = "0" ]; then
rm -rf $INSTALL_DIR/open-ath9k-htc-firmware
if ! git_clone "$ATHEROS_WIFI_REPO" "$INSTALL_DIR/open-ath9k-htc-firmware"; then
rm -rf "$INSTALL_DIR/open-ath9k-htc-firmware"
exit 74283
fi
fi
cd $INSTALL_DIR/open-ath9k-htc-firmware
cd "$INSTALL_DIR/open-ath9k-htc-firmware" || exit 24682468
git checkout 1.4.0
make toolchain
if [ ! "$?" = "0" ]; then
rm -rf $INSTALL_DIR/open-ath9k-htc-firmware
if ! make toolchain; then
rm -rf "$INSTALL_DIR/open-ath9k-htc-firmware"
exit 24820
fi
make firmware
if [ ! "$?" = "0" ]; then
rm -rf $INSTALL_DIR/open-ath9k-htc-firmware
if ! make firmware; then
rm -rf "$INSTALL_DIR/open-ath9k-htc-firmware"
exit 63412
fi
cp target_firmware/*.fw /lib/firmware/
if [ ! "$?" = "0" ]; then
if ! cp target_firmware/*.fw /lib/firmware/; then
exit 74681
fi
mark_completed "${FUNCNAME[0]}"
@ -206,7 +202,7 @@ function update_wifi_adaptors {
IFACE_SECONDARY=
for i in $(seq 10 -1 0); do
ifdown --force wlan${i} 2> /dev/null
ifdown --force "wlan${i}" 2> /dev/null
done
for i in $(seq 10 -1 0); do
@ -226,7 +222,7 @@ function wifi_get_psk {
passphrase=$2
psk=$(wpa_passphrase "$ssid" "$passphrase" | grep 'psk=' | sed -n 2p | awk -F '=' '{print $2}')
echo $psk
echo "$psk"
}
function hotspot_off {
@ -274,34 +270,34 @@ function hotspot_on {
sed -i 's|#DAEMON_CONF=.*|DAEMON_CONF="/etc/hostapd/hostapd.conf"|g' /etc/default/hostapd
echo '### Wireless network name ###' > /etc/hostapd/hostapd.conf
echo "interface=$WIFI_INTERFACE" >> /etc/hostapd/hostapd.conf
echo '' >> /etc/hostapd/hostapd.conf
echo '### Set your bridge name ###' >> /etc/hostapd/hostapd.conf
echo 'bridge=br0' >> /etc/hostapd/hostapd.conf
echo '' >> /etc/hostapd/hostapd.conf
echo 'driver=nl80211' >> /etc/hostapd/hostapd.conf
echo "country_code=UK" >> /etc/hostapd/hostapd.conf
echo "ssid=$WIFI_SSID" >> /etc/hostapd/hostapd.conf
echo 'hw_mode=g' >> /etc/hostapd/hostapd.conf
echo 'channel=6' >> /etc/hostapd/hostapd.conf
echo 'wpa=2' >> /etc/hostapd/hostapd.conf
echo "wpa_passphrase=$WIFI_PASSPHRASE" >> /etc/hostapd/hostapd.conf
echo '' >> /etc/hostapd/hostapd.conf
echo '## Key management algorithms ##' >> /etc/hostapd/hostapd.conf
echo 'wpa_key_mgmt=WPA-PSK' >> /etc/hostapd/hostapd.conf
echo '' >> /etc/hostapd/hostapd.conf
echo '## Set cipher suites (encryption algorithms) ##' >> /etc/hostapd/hostapd.conf
echo '## TKIP = Temporal Key Integrity Protocol' >> /etc/hostapd/hostapd.conf
echo '## CCMP = AES in Counter mode with CBC-MAC' >> /etc/hostapd/hostapd.conf
echo 'wpa_pairwise=TKIP' >> /etc/hostapd/hostapd.conf
echo 'rsn_pairwise=CCMP' >> /etc/hostapd/hostapd.conf
echo '' >> /etc/hostapd/hostapd.conf
echo '## Shared Key Authentication ##'
echo 'auth_algs=1' >> /etc/hostapd/hostapd.conf
echo '' >> /etc/hostapd/hostapd.conf
echo '## Accept all MAC address ###' >> /etc/hostapd/hostapd.conf
echo 'macaddr_acl=0' >> /etc/hostapd/hostapd.conf
{ echo '### Wireless network name ###';
echo "interface=$WIFI_INTERFACE";
echo '';
echo '### Set your bridge name ###';
echo 'bridge=br0';
echo '';
echo 'driver=nl80211';
echo "country_code=UK";
echo "ssid=$WIFI_SSID";
echo 'hw_mode=g';
echo 'channel=6';
echo 'wpa=2';
echo "wpa_passphrase=$WIFI_PASSPHRASE";
echo '';
echo '## Key management algorithms ##';
echo 'wpa_key_mgmt=WPA-PSK';
echo '';
echo '## Set cipher suites (encryption algorithms) ##';
echo '## TKIP = Temporal Key Integrity Protocol';
echo '## CCMP = AES in Counter mode with CBC-MAC';
echo 'wpa_pairwise=TKIP';
echo 'rsn_pairwise=CCMP';
echo '';
echo '## Shared Key Authentication ##'
echo 'auth_algs=1';
echo '';
echo '## Accept all MAC address ###';
echo 'macaddr_acl=0'; } > /etc/hostapd/hostapd.conf
if [ ! -f /etc/network/interfaces_original_static ]; then
if [ -f /etc/network/interfaces.d/static ]; then
@ -365,7 +361,7 @@ function wifi_wpa2_psk {
echo " wpa-roam $WIFI_CONFIG" >> /etc/network/interfaces.d/wifi
wifi_static_network_interface
wpa_passphrase "$ssid" "$passphrase" > $WIFI_CONFIG
wpa_passphrase "$ssid" "$passphrase" > "$WIFI_CONFIG"
systemctl restart network-manager
ifup $WIFI_INTERFACE
@ -385,24 +381,23 @@ function wifi_none {
wifi_static_network_interface
echo 'ctrl_interface=/run/wpa_supplicant' > $WIFI_CONFIG
echo 'update_config=1' >> $WIFI_CONFIG
echo 'eapol_version=1' >> $WIFI_CONFIG
echo '' >> $WIFI_CONFIG
echo 'network={' >> $WIFI_CONFIG
{ echo 'ctrl_interface=/run/wpa_supplicant';
echo 'update_config=1';
echo 'eapol_version=1';
echo '';
echo 'network={'; } > "$WIFI_CONFIG"
if [[ "${ssid}" != $'any' && "${ssid}" != $'all' && "${ssid}" != $'open' ]]; then
echo " ssid=\"${ssid}\"" >> $WIFI_CONFIG
echo " ssid=\"${ssid}\"" >> "$WIFI_CONFIG"
fi
echo ' key_mgmt=NONE' >> $WIFI_CONFIG
echo '}' >> $WIFI_CONFIG
echo ' key_mgmt=NONE' >> "$WIFI_CONFIG"
echo '}' >> "$WIFI_CONFIG"
systemctl restart network-manager
ifup $WIFI_INTERFACE
}
function networks_from_file {
if [ ! -f $WIFI_NETWORKS_FILE ]; then
if [ ! -f "$WIFI_NETWORKS_FILE" ]; then
exit 4
fi
@ -416,21 +411,21 @@ function networks_from_file {
echo 'allow-hotplug eth0' > /etc/network/interfaces.d/static
echo 'iface eth0 inet dhcp' >> /etc/network/interfaces.d/static
echo "allow-hotplug ${WIFI_INTERFACE}" >> /etc/network/interfaces.d/wifi
echo "iface ${WIFI_INTERFACE} inet manual" >> /etc/network/interfaces.d/wifi
echo " wpa-roam $WIFI_CONFIG" >> /etc/network/interfaces.d/wifi
{ echo "allow-hotplug ${WIFI_INTERFACE}";
echo "iface ${WIFI_INTERFACE} inet manual";
echo " wpa-roam $WIFI_CONFIG"; } > /etc/network/interfaces.d/wifi
wifi_static_network_interface
# remove wpa_supplicant.conf if it exists
if [ -f $WIFI_CONFIG ]; then
rm -f $WIFI_CONFIG
if [ -f "$WIFI_CONFIG" ]; then
rm -f "$WIFI_CONFIG"
fi
echo 'ctrl_interface=/run/wpa_supplicant' > $WIFI_CONFIG
echo 'update_config=1' >> $WIFI_CONFIG
echo 'eapol_version=1' >> $WIFI_CONFIG
echo '' >> $WIFI_CONFIG
{ echo 'ctrl_interface=/run/wpa_supplicant';
echo 'update_config=1';
echo 'eapol_version=1';
echo ''; } > "$WIFI_CONFIG"
ctr=0
while read -r line
@ -443,19 +438,19 @@ function networks_from_file {
if [ $ctr -eq 1 ]; then
WIFI_TYPE="$line"
if [[ $WIFI_TYPE == $'none' || $WIFI_TYPE == $'open' ]]; then
echo 'network={' >> $WIFI_CONFIG
echo 'network={' >> "$WIFI_CONFIG"
if [[ "${WIFI_SSID}" != $'any' && "${WIFI_SSID}" != $'all' && "${WIFI_SSID}" != $'open' ]]; then
echo " ssid=\"${WIFI_SSID}\"" >> $WIFI_CONFIG
echo " ssid=\"${WIFI_SSID}\"" >> "$WIFI_CONFIG"
fi
echo ' key_mgmt=NONE' >> $WIFI_CONFIG
echo '}' >> $WIFI_CONFIG
echo ' key_mgmt=NONE' >> "$WIFI_CONFIG"
echo '}' >> "$WIFI_CONFIG"
ctr=0
continue
fi
fi
if [ $ctr -eq 2 ]; then
WIFI_PASSPHRASE="$line"
wpa_passphrase "$WIFI_SSID" "$WIFI_PASSPHRASE" >> $WIFI_CONFIG
wpa_passphrase "$WIFI_SSID" "$WIFI_PASSPHRASE" >> "$WIFI_CONFIG"
ctr=0
continue
fi
@ -463,7 +458,7 @@ function networks_from_file {
ctr=$((ctr + 1))
fi
fi
done < $WIFI_NETWORKS_FILE
done < "$WIFI_NETWORKS_FILE"
systemctl restart network-manager
#ifconfig ${WIFI_INTERFACE} up
@ -471,27 +466,27 @@ function networks_from_file {
}
function wifi_networks_file_header {
echo $'# Add wifi networks as follows:' > $WIFI_NETWORKS_FILE
echo '#' >> $WIFI_NETWORKS_FILE
echo $'# MySSID' >> $WIFI_NETWORKS_FILE
echo $'# wpa2-psk' >> $WIFI_NETWORKS_FILE
echo $'# myWifiPassphrase' >> $WIFI_NETWORKS_FILE
echo '#' >> $WIFI_NETWORKS_FILE
echo $'# AnotherSSID' >> $WIFI_NETWORKS_FILE
echo $'# none' >> $WIFI_NETWORKS_FILE
echo '#' >> $WIFI_NETWORKS_FILE
{ echo $'# Add wifi networks as follows:';
echo '#';
echo $'# MySSID';
echo $'# wpa2-psk';
echo $'# myWifiPassphrase';
echo '#';
echo $'# AnotherSSID';
echo $'# none';
echo '#'; } > "$WIFI_NETWORKS_FILE"
}
function create_networks_interactive {
remove_config_param "WIFI_INTERFACE"
update_wifi_adaptors
if [ ! $IFACE ]; then
if [ ! "$IFACE" ]; then
# Don't try to configure wifi if there are no adaptors
return
fi
if [ -f $WIFI_NETWORKS_FILE ]; then
rm $WIFI_NETWORKS_FILE
if [ -f "$WIFI_NETWORKS_FILE" ]; then
rm "$WIFI_NETWORKS_FILE"
fi
# By default connect to any open wifi
@ -503,11 +498,10 @@ function create_networks_interactive {
wifi_settings_defined=
while [ ! $wifi_networks_done ]
do
data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15
wifistr=$"\nTo use this system via wifi (eg. USB dongle) enter the details below, otherwise just select Ok:"
data=$(mktemp 2>/dev/null)
wifistr=$"\\nTo use this system via wifi (eg. USB dongle) enter the details below, otherwise just select Ok:"
if [ -f /root/.wifi-only ]; then
wifistr=$"\nEnter your wifi login details below."
wifistr=$"\\nEnter your wifi login details below."
fi
dialog --backtitle $"Freedombone Configuration" \
--title $"Wifi Settings ${wifi_ctr}" \
@ -515,15 +509,18 @@ function create_networks_interactive {
$"SSID (can be 'any'):" 1 1 "$WIFI_SSID" 1 24 30 30 \
$"Type (open/wpa2-psk):" 2 1 "$WIFI_TYPE" 2 24 10 10 \
$"Passphrase:" 3 1 "$WIFI_PASSPHRASE" 3 24 50 50 \
2> $data
2> "$data"
sel=$?
case $sel in
1) return;;
255) return;;
1) rm -f "$data"
return;;
255) rm -f "$data"
return;;
esac
WIFI_SSID=$(cat $data | sed -n 1p)
WIFI_TYPE=$(cat $data | sed -n 2p)
WIFI_PASSPHRASE=$(cat $data | sed -n 3p)
WIFI_SSID=$(sed -n 1p < "$data")
WIFI_TYPE=$(sed -n 2p < "$data")
WIFI_PASSPHRASE=$(sed -n 3p < "$data")
rm -f "$data"
# If the wifi-only indicator is present then wifi details must
# be specified, otherwise they're optional
@ -539,16 +536,16 @@ function create_networks_interactive {
fi
fi
if [ ! -f $WIFI_NETWORKS_FILE ]; then
if [ ! -f "$WIFI_NETWORKS_FILE" ]; then
wifi_networks_file_header
fi
# update the wifi networks file
echo '' >> $WIFI_NETWORKS_FILE
echo "$WIFI_SSID" >> $WIFI_NETWORKS_FILE
echo "$WIFI_TYPE" >> $WIFI_NETWORKS_FILE
{ echo '';
echo "$WIFI_SSID";
echo "$WIFI_TYPE"; } >> "$WIFI_NETWORKS_FILE"
if [ ${#WIFI_PASSPHRASE} -gt 1 ]; then
echo "$WIFI_PASSPHRASE" >> $WIFI_NETWORKS_FILE
echo "$WIFI_PASSPHRASE" >> "$WIFI_NETWORKS_FILE"
fi
if [ ${#WIFI_SSID} -gt 1 ]; then
@ -626,28 +623,28 @@ function remove_wifi_startup_script {
systemctl disable wifistart
rm $systemd_file
fi
if [ -f $HOME/${PROJECT_NAME}-wifi.cfg ]; then
rm $HOME/${PROJECT_NAME}-wifi.cfg
if [ -f "$HOME/${PROJECT_NAME}-wifi.cfg" ]; then
rm "$HOME/${PROJECT_NAME}-wifi.cfg"
fi
}
function create_wifi_startup_script {
systemd_file=/etc/systemd/system/wifistart.service
echo '[Unit]' > $systemd_file
echo 'Description=WifiStartup (Start wifi networking)' >> $systemd_file
echo 'After=syslog.target' >> $systemd_file
echo 'After=network.target' >> $systemd_file
echo 'After=remote-fs.target' >> $systemd_file
echo '' >> $systemd_file
echo '[Service]' >> $systemd_file
echo 'Type=simple' >> $systemd_file
echo 'User=root' >> $systemd_file
echo 'Group=root' >> $systemd_file
echo 'WorkingDirectory=/root' >> $systemd_file
echo "ExecStart=/usr/local/bin/${PROJECT_NAME}-wifi --wait 5 2> /dev/null" >> $systemd_file
echo '' >> $systemd_file
echo '[Install]' >> $systemd_file
echo 'WantedBy=multi-user.target' >> $systemd_file
{ echo '[Unit]';
echo 'Description=WifiStartup (Start wifi networking)';
echo 'After=syslog.target';
echo 'After=network.target';
echo 'After=remote-fs.target';
echo '';
echo '[Service]';
echo 'Type=simple';
echo 'User=root';
echo 'Group=root';
echo 'WorkingDirectory=/root';
echo "ExecStart=/usr/local/bin/${PROJECT_NAME}-wifi --wait 5 2> /dev/null";
echo '';
echo '[Install]';
echo 'WantedBy=multi-user.target'; } > $systemd_file
systemctl enable wifistart
systemctl daemon-reload