github/openNDS
1
1
Fork 0
mirror of https://github.com/openNDS/openNDS.git synced 2026-05-04 03:01:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

ndsctl: json - make parsing consistent for all vars

Browse Source 
Signed-off-by: Rob White <rob@blue-wave.net>
This commit is contained in:
Rob White
2019-08-12 18:02:14 +01:00
parent 277613f1fc
commit 17de36487b
4 changed files with 128 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
forward_authentication_service/PreAuth/demo-preauth-remote-image.sh
View File

@@ -1,4 +1,7 @@
#!/bin/sh
#Copyright &copy; The Nodogsplash Contributors 2004-2019
#Copyright &copy; Blue Wave Projects and Services 2015-2019
#This software is released under the GNU GPL license.
### functions
@@ -142,12 +145,11 @@ imageurl="https://avatars0.githubusercontent.com/u/4403602"
get_image_file
footer="
<img src=\"/images/remote/$filename\" alt=\"Splash Page: For access to the Internet.\">
<hr>
<img style=\"height:60px; width:60px; float:left;\" src=\"/images/remote/$filename\" alt=\"Splash Page: For access to the Internet.\">
<copy-right>
<br><br>
Nodogsplash $version.
Copyright &copy; The Nodogsplash Contributors 2004-$year.
This software is released under the GNU GPL license.
</copy-right>
</div>
</div>
@@ -155,6 +157,18 @@ footer="
</html>
"
# Define a login form
login_form="
<form action=\"/nodogsplash_preauth/\" method=\"get\">
<input type=\"hidden\" name=\"clientip\" value=\"$clientip\">
<input type=\"hidden\" name=\"gatewayname\" value=\"$gatewayname\">
<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>
<input type=\"submit\" value=\"Continue\" >
</form><hr>
"
# Output the page common header
echo -e $header
@@ -179,26 +193,49 @@ fi
#
if [ -z $username ] || [ -z $emailaddr ]; then
echo "<big-red>Welcome!</big-red><italic-black> To access the Internet you must enter your Name and Email Address</italic-black><hr>"
echo "<form action=\"/nodogsplash_preauth/\" method=\"get\">"
echo "<input type=\"hidden\" name=\"clientip\" value=\"$clientip\">"
echo "<input type=\"hidden\" name=\"gatewayname\" value=\"$gatewayname\">"
echo "<input type=\"hidden\" name=\"redir\" value=\"$requested\">"
echo "<input type=\"text\" name=\"username\" value=\"$username\" autocomplete=\"on\" >:Name<br><br>"
echo "<input type=\"email\" name=\"emailaddr\" value=\"$emailaddr\" autocomplete=\"on\" >:Email<br><br>"
echo "<input type=\"submit\" value=\"Continue\" >"
echo "</form><hr>"
echo -e $login_form
else
# We have both fields, so get the token and in this case also the mac address
tok="$(ndsctl json $clientip | grep token | cut -c 10- | cut -c -8)"
clientmac="$(ndsctl json $clientip | grep mac | cut -c 8- | cut -c -17)"
# If we got here, we have both the username and emailaddr fields as completed on the login page on the client,
# so we will now call ndsctl to get client data we need to authenticate and add to our log.
# Variables returned from ndsctl are listed in $varlist.
# We at least need the client token to authenticate.
# In this example we will also log the client mac address.
varlist="id ip mac added active duration token state downloaded avg_down_speed uploaded avg_up_speed"
clientinfo=$(ndsctl json $clientip)
if [ -z $clientinfo ]; then
echo "<big-red>Sorry!</big-red><italic-black> The portal is busy, please try again.</italic-black><hr>"
echo -e $login_form
echo -e $footer
exit 0
else
for var in $varlist; do
eval $var=$(echo "$clientinfo" | grep $var | awk -F'"' '{print $4}')
done
fi
tok=$token
clientmac=$mac
# We now output the "Thankyou page" with a "Continue" button.
# This is the place to include information or advertising on this page,
# as this page will stay open until the client user taps or clicks "Continue"
# Output the "Thankyou page" with a continue button
# You could include information or advertising on this page
# Be aware that many devices will close the login browser as soon as
# the client taps continue, so now is the time to deliver your message.
# the client user continues, so now is the time to deliver your message.
echo "<big-red>Thankyou!</big-red>"
echo "<br><b>Welcome $username</b>"
# Add your message here:
# You could retrieve text or images from a remote server using wget or curl
# as this router has Internet access whilst the client device does not (yet).
echo "<br><italic-black> Your News or Advertising could be here, contact the owners of this Hotspot to find out how!</italic-black>"
echo "<form action=\"/nodogsplash_auth/\" method=\"get\">"
echo "<input type=\"hidden\" name=\"tok\" value=\"$tok\">"
echo "<input type=\"hidden\" name=\"redir\" value=\"$requested\"><br>"

74
forward_authentication_service/PreAuth/demo-preauth.sh
View File

@@ -1,4 +1,8 @@
#!/bin/sh
#Copyright &copy; The Nodogsplash Contributors 2004-2019
#Copyright &copy; Blue Wave Projects and Services 2015-2019
#This software is released under the GNU GPL license.
# Get the urlencoded querystring
query_enc="$1"
@@ -113,12 +117,11 @@ header="
version="$(ndsctl status | grep Version)"
year="$(date | awk -F ' ' '{print $(6)}')"
footer="
<img src=\"/images/splash.jpg\" alt=\"Splash Page: For access to the Internet.\">
<hr>
<img style=\"height:60px; width:60px; float:left;\" src=\"/images/splash.jpg\" alt=\"Splash Page: For access to the Internet.\">
<copy-right>
<br><br>
Nodogsplash $version.
Copyright &copy; The Nodogsplash Contributors 2004-$year.
This software is released under the GNU GPL license.
</copy-right>
</div>
</div>
@@ -126,6 +129,18 @@ footer="
</html>
"
# Define a login form
login_form="
<form action=\"/nodogsplash_preauth/\" method=\"get\">
<input type=\"hidden\" name=\"clientip\" value=\"$clientip\">
<input type=\"hidden\" name=\"gatewayname\" value=\"$gatewayname\">
<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>
<input type=\"submit\" value=\"Continue\" >
</form><hr>
"
# Output the page common header
echo -e $header
@@ -150,26 +165,49 @@ fi
#
if [ -z $username ] || [ -z $emailaddr ]; then
echo "<big-red>Welcome!</big-red><italic-black> To access the Internet you must enter your Name and Email Address</italic-black><hr>"
echo "<form action=\"/nodogsplash_preauth/\" method=\"get\">"
echo "<input type=\"hidden\" name=\"clientip\" value=\"$clientip\">"
echo "<input type=\"hidden\" name=\"gatewayname\" value=\"$gatewayname\">"
echo "<input type=\"hidden\" name=\"redir\" value=\"$requested\">"
echo "<input type=\"text\" name=\"username\" value=\"$username\" autocomplete=\"on\" >:Name<br><br>"
echo "<input type=\"email\" name=\"emailaddr\" value=\"$emailaddr\" autocomplete=\"on\" >:Email<br><br>"
echo "<input type=\"submit\" value=\"Continue\" >"
echo "</form><hr>"
echo -e $login_form
else
# We have both fields, so get the token and in this case also the mac address
tok="$(ndsctl json $clientip | grep token | cut -c 10- | cut -c -8)"
clientmac="$(ndsctl json $clientip | grep mac | cut -c 8- | cut -c -17)"
# If we got here, we have both the username and emailaddr fields as completed on the login page on the client,
# so we will now call ndsctl to get client data we need to authenticate and add to our log.
# Variables returned from ndsctl are listed in $varlist.
# We at least need the client token to authenticate.
# In this example we will also log the client mac address.
varlist="id ip mac added active duration token state downloaded avg_down_speed uploaded avg_up_speed"
clientinfo=$(ndsctl json $clientip)
if [ -z $clientinfo ]; then
echo "<big-red>Sorry!</big-red><italic-black> The portal is busy, please try again.</italic-black><hr>"
echo -e $login_form
echo -e $footer
exit 0
else
for var in $varlist; do
eval $var=$(echo "$clientinfo" | grep $var | awk -F'"' '{print $4}')
done
fi
tok=$token
clientmac=$mac
# We now output the "Thankyou page" with a "Continue" button.
# This is the place to include information or advertising on this page,
# as this page will stay open until the client user taps or clicks "Continue"
# Output the "Thankyou page" with a continue button
# You could include information or advertising on this page
# Be aware that many devices will close the login browser as soon as
# the client taps continue, so now is the time to deliver your message.
# the client user continues, so now is the time to deliver your message.
echo "<big-red>Thankyou!</big-red>"
echo "<br><b>Welcome $username</b>"
# Add your message here:
# You could retrieve text or images from a remote server using wget or curl
# as this router has Internet access whilst the client device does not (yet).
echo "<br><italic-black> Your News or Advertising could be here, contact the owners of this Hotspot to find out how!</italic-black>"
echo "<form action=\"/nodogsplash_auth/\" method=\"get\">"
echo "<input type=\"hidden\" name=\"tok\" value=\"$tok\">"
echo "<input type=\"hidden\" name=\"redir\" value=\"$requested\"><br>"

7
openwrt/nodogsplash/files/etc/config/nodogsplash
View File

@@ -182,12 +182,19 @@ config nodogsplash
# It must also obtain the client token using ndsctl (or the original query string if fas_secure_enabled=0)
# for NDS authentication when calling /nodogsplash_auth/
#
################################################################################
# Enable username/emailaddress login.
################################################################################
# Note: fasport must be set to the same value as gatewayport (default = 2050)
# Enable by uncommenting the following three lines
#option fasport '2050'
#option faspath '/nodogsplash_preauth/'
#option preauth '/usr/lib/nodogsplash/login.sh'
################################################################################
#
################################################################################
# Your router may have several interfaces, and you
# probably want to keep them private from the gatewayinterface.

20
src/util.c
View File

@@ -628,15 +628,15 @@ ndsctl_json_client(FILE *fp, const t_client *client, time_t now)
unsigned long int durationsecs;
unsigned long long int download_bytes, upload_bytes;
fprintf(fp, "\"id\":%d,\n", client->id);
fprintf(fp, "\"id\":\"%d\",\n", client->id);
fprintf(fp, "\"ip\":\"%s\",\n", client->ip);
fprintf(fp, "\"mac\":\"%s\",\n", client->mac);
fprintf(fp, "\"added\":%lld,\n", (long long) client->session_start);
fprintf(fp, "\"active\":%lld,\n", (long long) client->counters.last_updated);
fprintf(fp, "\"added\":\"%lld\",\n", (long long) client->session_start);
fprintf(fp, "\"active\":\"%lld\",\n", (long long) client->counters.last_updated);
if (client->session_start) {
fprintf(fp, "\"duration\":%lu,\n", now - client->session_start);
fprintf(fp, "\"duration\":\"%lu\",\n", now - client->session_start);
} else {
fprintf(fp, "\"duration\":%lu,\n", 0ul);
fprintf(fp, "\"duration\":\"%lu\",\n", 0ul);
}
fprintf(fp, "\"token\":\"%s\",\n", client->token ? client->token : "none");
fprintf(fp, "\"state\":\"%s\",\n", fw_connection_state_as_string(client->fw_connection_state));
@@ -645,10 +645,10 @@ ndsctl_json_client(FILE *fp, const t_client *client, time_t now)
download_bytes = client->counters.incoming;
upload_bytes = client->counters.outgoing;
fprintf(fp, "\"downloaded\":%llu,\n", download_bytes / 1000);
fprintf(fp, "\"avg_down_speed\":%.2f,\n", ((double)download_bytes) / 125 / durationsecs);
fprintf(fp, "\"uploaded\":%llu,\n", upload_bytes / 1000);
fprintf(fp, "\"avg_up_speed\":%.2f\n", ((double)upload_bytes)/ 125 / durationsecs);
fprintf(fp, "\"downloaded\":\"%llu\",\n", download_bytes / 1000);
fprintf(fp, "\"avg_down_speed\":\"%.2f\",\n", ((double)download_bytes) / 125 / durationsecs);
fprintf(fp, "\"uploaded\":\"%llu\",\n", upload_bytes / 1000);
fprintf(fp, "\"avg_up_speed\":\"%.2f\"\n", ((double)upload_bytes)/ 125 / durationsecs);
}
static void
@@ -690,7 +690,7 @@ ndsctl_json_all(FILE *fp)
LOCK_CLIENT_LIST();
fprintf(fp, "{\n\"client_length\": %d,\n", get_client_list_length());
fprintf(fp, "{\n\"client_list_length\": \"%d\",\n", get_client_list_length());
client = client_get_first_client();