Skip to content

Commit

Permalink
Merge pull request #517 from nodogsplash/4.4.1beta
Browse files Browse the repository at this point in the history 
4.4.1beta Enhancements and bug fixes
  • Loading branch information
@bluewavenet
bluewavenet committed Feb 7, 2020
2 parents a14c69b + df705bb commit 5ec9e8b
Show file tree
Hide file tree
Showing 17 changed files with 368 additions and 70 deletions.
76 changes: 62 additions & 14 deletions forward_authentication_service/PreAuth/demo-preauth-remote-image.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
#!/bin/sh
#Copyright (C) The Nodogsplash Contributors 2004-2020
#Copyright (C) Blue Wave Projects and Services 2015-2020
#Copyright (C) BlueWave Projects and Services 2015-2020
#This software is released under the GNU GPL license.
#
# Warning - shebang sh is for compatibliity with busybox ash (eg on OpenWrt)
# This is changed to bash automatically by Makefile for Debian
#

#############################################################################################
#
Expand All @@ -21,6 +25,38 @@
#
#############################################################################################



# Customise the Logfile location:
#
# mountpoint is the mount point for the storage the log is to be kept on
#
# /tmp on OpenWrt is tmpfs (ram disk) and does not survive a reboot.
#
# /run on Raspbian is also tmpfs and also does not survive a reboot.
#
# These choices for OpenWrt and Raspbian are a good default for testing purposes
# as long term use on internal flash could cause memory wear
# In a production system, use the mount point of a usb drive for example
#
#
# logdir is the directory path for the log file
#
#
# logname is the name of the log file
#

#For Openwrt:
mountpoint="/tmp"
logdir="/tmp/ndslog/"
logname="ndslog.log"

#For Raspbian:
#mountpoint="/run"
#logdir="/run/ndslog/"
#logname="ndslog.log"


# functions:

get_image_file() {
Expand Down Expand Up @@ -78,7 +114,13 @@ get_client_zone () {
}

write_log () {
logfile="/tmp/ndslog.log"

if [ ! -d "$logdir" ]; then
mkdir -p "$logdir"
fi

logfile="$logdir""$logname"
awkcmd="awk ""'\$6==""\"$mountpoint\"""{print \$4}'"
min_freespace_to_log_ratio=10
datetime=$(date)

Expand All @@ -88,7 +130,7 @@ write_log () {

ndspid=$(ps | grep nodogsplash | awk -F ' ' 'NR==2 {print $1}')
filesize=$(ls -s -1 $logfile | awk -F' ' '{print $1}')
available=$(df |grep /tmp | awk -F ' ' '$6=="/tmp"{print $4}')
available=$(df | grep "$mountpoint" | eval "$awkcmd")
sizeratio=$(($available/$filesize))

if [ $sizeratio -ge $min_freespace_to_log_ratio ]; then
Expand Down Expand Up @@ -163,21 +205,27 @@ user_agent=$(printf "${user_agent_enc//%/\\x}")

# Parse for the variables returned by NDS:
hid_present=$(echo "$query_enc" | grep "hid")

if [ -z "$hid_present" ]; then
queryvarlist="clientip gatewayname redir status username emailaddr"
status_present=$(echo "$query_enc" | grep "status")

if [ ! -z "$status_present" ]; then
queryvarlist="clientip gatewayname gatewayaddress status"
elif [ -z "$hid_present" ]; then
hid="0"
gatewayaddress="0"
queryvarlist="clientip gatewayname redir username emailaddr"
else
queryvarlist="clientip gatewayname hid redir status username emailaddr"
queryvarlist="clientip gatewayname hid gatewayaddress redir username emailaddr"
fi

for var in $queryvarlist; do
nextvar=$(echo "$queryvarlist" | awk '{for(i=1;i<=NF;i++) if ($i=="'$var'") printf $(i+1)}')
eval $var=$(echo "$query_enc" | awk -F "$var%3d" '{print $2}' | awk -F "%2c%20$nextvar%3d" '{print $1}')
done

# URL decode vars that need it:

# URL decode and htmlentity encode vars that need it:
gatewayname=$(printf "${gatewayname//%/\\x}")
htmlentityencode "$gatewayname"
gatewaynamehtml=$entityencoded
username=$(printf "${username//%/\\x}")
htmlentityencode "$username"
username=$entityencoded
Expand Down Expand Up @@ -208,8 +256,7 @@ get_client_zone



header="
<!DOCTYPE html>
header="<!DOCTYPE html>
<html>
<head>
<meta http-equiv=\"Cache-Control\" content=\"no-cache, no-store, must-revalidate\">
Expand All @@ -219,11 +266,11 @@ header="
<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">
<link rel=\"shortcut icon\" href=\"/images/splash.jpg\" type=\"image/x-icon\">
<link rel=\"stylesheet\" type=\"text/css\" href=\"/splash.css\">
<title>$gatewayname.</title>
<title>$gatewaynamehtml.</title>
</head>
<body>
<div class=\"offset\">
<med-blue>$gatewayname.</med-blue>
<med-blue>$gatewaynamehtml.</med-blue>
<div class=\"insert\" style=\"max-width:100%;\">
<hr>
"
Expand Down Expand Up @@ -261,6 +308,7 @@ login_form="
<input type=\"hidden\" name=\"clientip\" value=\"$clientip\">
<input type=\"hidden\" name=\"gatewayname\" value=\"$gatewayname\">
<input type=\"hidden\" name=\"hid\" value=\"$hid\">
<input type=\"hidden\" name=\"gatewayaddress\" value=\"$gatewayaddress\">
<input type=\"hidden\" name=\"redir\" value=\"$requested\">
<input type=\"text\" name=\"username\" value=\"$username\" autocomplete=\"on\" ><br>Name<br><br>
<input type=\"email\" name=\"emailaddr\" value=\"$emailaddr\" autocomplete=\"on\" ><br>Email<br><br>
Expand All @@ -273,7 +321,7 @@ echo -e "$header"

# Check if the client is already logged in and has tapped "back" on their browser
# Make this a friendly message explaining they are good to go
if [ "$status" == "authenticated" ]; then
if [ "$status" = "authenticated" ]; then
echo "<p><big-red>You are already logged in and have access to the Internet.</big-red></p>"
echo "<hr>"
echo "<p><italic-black>You can use your Browser, Email and other network Apps as you normally would.</italic-black></p>"
Expand Down
74 changes: 60 additions & 14 deletions forward_authentication_service/PreAuth/demo-preauth.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,41 @@
#Copyright (C) The Nodogsplash Contributors 2004-2020
#Copyright (C) BlueWave Projects and Services 2015-2020
#This software is released under the GNU GPL license.
#
# Warning - shebang sh is for compatibliity with busybox ash (eg on OpenWrt)
# This is changed to bash automatically by Makefile for Debian
#


# Customise the Logfile location:
#
# mountpoint is the mount point for the storage the log is to be kept on
#
# /tmp on OpenWrt is tmpfs (ram disk) and does not survive a reboot.
#
# /run on Raspbian is also tmpfs and also does not survive a reboot.
#
# These choices for OpenWrt and Raspbian are a good default for testing purposes
# as long term use on internal flash could cause memory wear
# In a production system, use the mount point of a usb drive for example
#
#
# logdir is the directory path for the log file
#
#
# logname is the name of the log file
#

#For Openwrt:
mountpoint="/tmp"
logdir="/tmp/ndslog/"
logname="ndslog.log"

#For Raspbian:
#mountpoint="/run"
#logdir="/run/ndslog/"
#logname="ndslog.log"


# functions:

Expand Down Expand Up @@ -43,7 +78,13 @@ get_client_zone () {
}

write_log () {
logfile="/tmp/ndslog.log"

if [ ! -d "$logdir" ]; then
mkdir -p "$logdir"
fi

logfile="$logdir""$logname"
awkcmd="awk ""'\$6==""\"$mountpoint\"""{print \$4}'"
min_freespace_to_log_ratio=10
datetime=$(date)

Expand All @@ -53,7 +94,7 @@ write_log () {

ndspid=$(ps | grep nodogsplash | awk -F ' ' 'NR==2 {print $1}')
filesize=$(ls -s -1 $logfile | awk -F' ' '{print $1}')
available=$(df |grep /tmp | awk -F ' ' '$6=="/tmp"{print $4}')
available=$(df | grep "$mountpoint" | eval "$awkcmd")
sizeratio=$(($available/$filesize))

if [ $sizeratio -ge $min_freespace_to_log_ratio ]; then
Expand Down Expand Up @@ -128,21 +169,27 @@ user_agent=$(printf "${user_agent_enc//%/\\x}")

# Parse for the variables returned by NDS:
hid_present=$(echo "$query_enc" | grep "hid")

if [ -z "$hid_present" ]; then
queryvarlist="clientip gatewayname redir status username emailaddr"
status_present=$(echo "$query_enc" | grep "status")

if [ ! -z "$status_present" ]; then
queryvarlist="clientip gatewayname gatewayaddress status"
elif [ -z "$hid_present" ]; then
hid="0"
gatewayaddress="0"
queryvarlist="clientip gatewayname redir username emailaddr"
else
queryvarlist="clientip gatewayname hid redir status username emailaddr"
queryvarlist="clientip gatewayname hid gatewayaddress redir username emailaddr"
fi

for var in $queryvarlist; do
nextvar=$(echo "$queryvarlist" | awk '{for(i=1;i<=NF;i++) if ($i=="'$var'") printf $(i+1)}')
eval $var=$(echo "$query_enc" | awk -F "$var%3d" '{print $2}' | awk -F "%2c%20$nextvar%3d" '{print $1}')
done

# URL decode vars that need it:

# URL decode and htmlentity encode vars that need it:
gatewayname=$(printf "${gatewayname//%/\\x}")
htmlentityencode "$gatewayname"
gatewaynamehtml=$entityencoded
username=$(printf "${username//%/\\x}")
htmlentityencode "$username"
username=$entityencoded
Expand Down Expand Up @@ -173,8 +220,7 @@ get_client_zone



header="
<!DOCTYPE html>
header="<!DOCTYPE html>
<html>
<head>
<meta http-equiv=\"Cache-Control\" content=\"no-cache, no-store, must-revalidate\">
Expand All @@ -184,11 +230,11 @@ header="
<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">
<link rel=\"shortcut icon\" href=\"/images/splash.jpg\" type=\"image/x-icon\">
<link rel=\"stylesheet\" type=\"text/css\" href=\"/splash.css\">
<title>$gatewayname.</title>
<title>$gatewaynamehtml.</title>
</head>
<body>
<div class=\"offset\">
<med-blue>$gatewayname.</med-blue>
<med-blue>$gatewaynamehtml.</med-blue>
<div class=\"insert\" style=\"max-width:100%;\">
<hr>
"
Expand All @@ -215,6 +261,7 @@ login_form="
<input type=\"hidden\" name=\"clientip\" value=\"$clientip\">
<input type=\"hidden\" name=\"gatewayname\" value=\"$gatewayname\">
<input type=\"hidden\" name=\"hid\" value=\"$hid\">
<input type=\"hidden\" name=\"gatewayaddress\" value=\"$gatewayaddress\">
<input type=\"hidden\" name=\"redir\" value=\"$requested\">
<input type=\"text\" name=\"username\" value=\"$username\" autocomplete=\"on\" ><br>Name<br><br>
<input type=\"email\" name=\"emailaddr\" value=\"$emailaddr\" autocomplete=\"on\" ><br>Email<br><br>
Expand All @@ -227,7 +274,7 @@ echo -e "$header"

# Check if the client is already logged in and has tapped "back" on their browser
# Make this a friendly message explaining they are good to go
if [ "$status" == "authenticated" ]; then
if [ "$status" = "authenticated" ]; then
echo "<p><big-red>You are already logged in and have access to the Internet.</big-red></p>"
echo "<hr>"
echo "<p><italic-black>You can use your Browser, Email and other network Apps as you normally would.</italic-black></p>"
Expand Down Expand Up @@ -303,7 +350,6 @@ fi

# Output the page footer
echo -e "$footer"

# The output of this script could of course be much more complex and
# could easily be used to conduct a dialogue with the client user.
#
Expand Down
45 changes: 41 additions & 4 deletions forward_authentication_service/binauth/binauth_log.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,57 @@
# 3. FAS
#



# Customise the Logfile location:
#
# mountpoint is the mount point for the storage the log is to be kept on
#
# /tmp on OpenWrt is tmpfs (ram disk) and does not survive a reboot.
#
# /run on Raspbian is also tmpfs and also does not survive a reboot.
#
# These choices for OpenWrt and Raspbian are a good default for testing purposes
# as long term use on internal flash could cause memory wear
# In a production system, use the mount point of a usb drive for example
#
#
# logdir is the directory path for the log file
#
#
# logname is the name of the log file
#

#For Openwrt:
mountpoint="/tmp"
logdir="/tmp/ndslog/"
logname="binauthlog.log"

#For Raspbian:
#mountpoint="/run"
#logdir="/run/ndslog/"
#logname="binauthlog.log"

# functions:

write_log () {
logfile="/tmp/binauth.log"

if [ ! -d "$logdir" ]; then
mkdir -p "$logdir"
fi

logfile="$logdir""$logname"
awkcmd="awk ""'\$6==""\"$mountpoint\"""{print \$4}'"
min_freespace_to_log_ratio=10
datetime=$(date)

if [ ! -f $logfile ]; then
if [ ! -f "$logfile" ]; then
echo "$datetime, New log file created" > $logfile
fi

ndspid=$(ps | grep nodogsplash | awk -F ' ' 'NR==2 {print $1}')
filesize=$(ls -s -1 $logfile | awk -F' ' '{print $1}')
available=$(df |grep /tmp | awk -F ' ' '{print $4}')
available=$(df | grep "$mountpoint" | eval "$awkcmd")
sizeratio=$(($available/$filesize))

if [ $sizeratio -ge $min_freespace_to_log_ratio ]; then
Expand All @@ -57,7 +94,7 @@ write_log () {
#
action=$1

if [ $action == "auth_client" ]; then
if [ $action = "auth_client" ]; then
#
# The redir parameter is sent to this script as the fifth command line argument in url-encoded form.
#
Expand Down
9 changes: 7 additions & 2 deletions forward_authentication_service/libs/get_client_interface.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#!/bin/sh
#Copyright (C) The Nodogsplash Contributors 2004-2020
#Copyright (C) Blue Wave Projects and Services 2015-2019
#Copyright (C) BlueWave Projects and Services 2015-2020
#This software is released under the GNU GPL license.
#
# Warning - shebang sh is for compatibliity with busybox ash (eg on OpenWrt)
# This is changed to bash automatically by Makefile for Debian
#


pid=$(ps | grep get_client_interface | awk -F ' ' 'NR==2 {print $1}')

Expand All @@ -22,7 +27,7 @@ mac=$1

# exit if mac not passed

if [ $(echo "$mac" | awk -F ':' '{print NF}') != 6 ]; then
if [ $(echo "$mac" | awk -F ':' '{print NF}') -ne 6 ]; then
echo "
Usage: get_client_interface.sh [clientmac]
Expand Down

0 comments on commit 5ec9e8b

Please sign in to comment.