Compare commits
9 Commits
b1c51d6cfd
...
network_to
| Author | SHA1 | Date | |
|---|---|---|---|
| 0c05cfd6c0 | |||
| 540bd1ce03 | |||
| 5e3d8ed47b | |||
| ce66dba7a6 | |||
| 2083444bc1 | |||
| 8cd1bcce64 | |||
| e5a41ec931 | |||
| a0d8a55ca8 | |||
| fc549dfea0 |
@@ -1,3 +1,43 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Network Tools V 1.1.4 - A. GIBERT - 2026/04/13
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add rx3-network.minotaur config file,
|
||||||
|
- Add missing etc/sudoers.d/rx3-network config file,
|
||||||
|
- Minor config files update,
|
||||||
|
- Last release of the 1.1.x branch.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Network Tools V 1.1.3 - A. GIBERT - 2025/09/19
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Fix uptime for gateway destinations,
|
||||||
|
- Add status filtering in the VPN Admin page.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Network Tools V 1.1.2 - A. GIBERT - 2025/09/12
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Minor fixes in config files and openvpn-status.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Network Tools V 1.1.1 - A. GIBERT - 2025/09/03
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add a new conection state for gateways device up with no gateway client connected,
|
||||||
|
- Improve openvpn stats reporting,
|
||||||
|
- Improve device up api events,
|
||||||
|
- Add network reinit() function,
|
||||||
|
- Add reinit at each supervisor end loop.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Network Tools V 1.1.0 - A. GIBERT - 2025/08/26
|
Network Tools V 1.1.0 - A. GIBERT - 2025/08/26
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -361,7 +361,7 @@ log_print()
|
|||||||
|
|
||||||
log_trace()
|
log_trace()
|
||||||
{
|
{
|
||||||
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "TRA" $*
|
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "TRA" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -374,7 +374,7 @@ log_trace()
|
|||||||
|
|
||||||
log_info()
|
log_info()
|
||||||
{
|
{
|
||||||
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "INF" $*
|
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "INF" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -387,7 +387,7 @@ log_info()
|
|||||||
|
|
||||||
log_warning()
|
log_warning()
|
||||||
{
|
{
|
||||||
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "WRN" $*
|
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "WRN" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -400,5 +400,5 @@ log_warning()
|
|||||||
|
|
||||||
log_error()
|
log_error()
|
||||||
{
|
{
|
||||||
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "ERR" $*
|
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "ERR" "$@"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -291,6 +291,14 @@ dns_init()
|
|||||||
|
|
||||||
dns_deinit()
|
dns_deinit()
|
||||||
{
|
{
|
||||||
:;
|
DNS_A_TAB=()
|
||||||
|
DNS_A_ID_LIST=""
|
||||||
|
|
||||||
|
DNS_PTR_TAB=()
|
||||||
|
DNS_PTR_ID_LIST=""
|
||||||
|
|
||||||
|
DNS_CACHE_UPDATED=0
|
||||||
|
|
||||||
|
# :;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -406,9 +406,14 @@ network_dst_tab_load()
|
|||||||
|
|
||||||
if [[ "${ndtl_status}" == "1" ]]
|
if [[ "${ndtl_status}" == "1" ]]
|
||||||
then
|
then
|
||||||
|
if [[ "${ndtl_type}" == "1" ]]
|
||||||
ndtl_start_date="$( stat -c %Z /sys/class/net/${ndtl_device})"
|
then
|
||||||
ndtl_uptime="$( echo $(( $(date +%s) - ${ndtl_start_date})) | awk '{days = int($1/86400); print days " day" (( days > 1 ) ? "s" : "") strftime(" %H:%M:%S", $1,1)}')"
|
ndtl_start_date="${ovpn_stat_connected_date}"
|
||||||
|
ndtl_uptime="$( echo $(( $(date +%s) - ${ovpn_stat_connected_time_t})) | awk '{days = int($1/86400); print days " day" (( days > 1 ) ? "s" : "") strftime(" %H:%M:%S", $1,1)}')"
|
||||||
|
else
|
||||||
|
ndtl_start_date="$( stat -c %Z /sys/class/net/${ndtl_device})"
|
||||||
|
ndtl_uptime="$( echo $(( $(date +%s) - ${ndtl_start_date})) | awk '{days = int($1/86400); print days " day" (( days > 1 ) ? "s" : "") strftime(" %H:%M:%S", $1,1)}')"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
ndtl_start_date=""
|
ndtl_start_date=""
|
||||||
ndtl_uptime=""
|
ndtl_uptime=""
|
||||||
@@ -554,12 +559,12 @@ network_dst_ip_update()
|
|||||||
|
|
||||||
if [[ "${dst_ip}" != "${dst_ip_new}" ]]
|
if [[ "${dst_ip}" != "${dst_ip_new}" ]]
|
||||||
then
|
then
|
||||||
log_info "Network" "Update ${dst_host_name}: Old: [${dst_ip}] New: [${dst_ip_new}]"
|
log_info "Network" "Update [${dst_host_name}]: Old: [${dst_ip}] New: [${dst_ip_new}]"
|
||||||
|
|
||||||
${DEBUG} /usr/local/sbin/ip_host_update "${dst_host_name/.*}" "${dst_host_name#*.}" "${dst_ip_new}" 60
|
${DEBUG} /usr/local/sbin/ip_host_update "${dst_host_name/.*}" "${dst_host_name#*.}" "${dst_ip_new}" 60
|
||||||
tab_assign NETWORK_DST_TAB "${dst_id},IP" "${dst_ip_new}"
|
tab_assign NETWORK_DST_TAB "${dst_id},IP" "${dst_ip_new}"
|
||||||
else
|
else
|
||||||
log_trace "Network" "Skiping ${dst_host_name}: IP: [${dst_ip}]"
|
log_trace "Network" "Skiping [${dst_host_name}]: IP: [${dst_ip}]"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -584,7 +589,7 @@ network_dst_name_ip_update()
|
|||||||
network_dst_tab_get "${dst_id}"
|
network_dst_tab_get "${dst_id}"
|
||||||
network_dst_ip_update "${dst_ip_new}"
|
network_dst_ip_update "${dst_ip_new}"
|
||||||
else
|
else
|
||||||
log_error "Network: dst name not found: [${dst_name}]"
|
log_error "Network" "dst name not found: [${dst_name}]"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1019,52 +1024,6 @@ network_device_deinit()
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
#--------------------------------------------------------------------------------------------------------------------------
|
|
||||||
# network_dst_init
|
|
||||||
#--------------------------------------------------------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
#network_device_name_init()
|
|
||||||
#{
|
|
||||||
# local dst_id="$1"
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# if [[ "${dst_id}" != "" ]]
|
|
||||||
# then
|
|
||||||
# network_dst_tab_get "${dst_id}"
|
|
||||||
#
|
|
||||||
# network_route_dst_init "${dst_id}"
|
|
||||||
#
|
|
||||||
# network_route_rx3_init "${dst_device}"
|
|
||||||
#
|
|
||||||
# fi
|
|
||||||
#
|
|
||||||
# network_route_rx3_init "${target_device}"
|
|
||||||
#}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#--------------------------------------------------------------------------------------------------------------------------
|
|
||||||
# network_device_name_init
|
|
||||||
#--------------------------------------------------------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
#network_device_name_init()
|
|
||||||
#{
|
|
||||||
# local target_device="$1"
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# network_dst_tab_dev_lookup ${target_device}
|
|
||||||
#
|
|
||||||
# if [[ "${dst_id}" != "" ]]
|
|
||||||
# then
|
|
||||||
# network_route_dst_init "${dst_id}"
|
|
||||||
# fi
|
|
||||||
#
|
|
||||||
# network_route_rx3_init "${target_device}"
|
|
||||||
#}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#--------------------------------------------------------------------------------------------------------------------------
|
#--------------------------------------------------------------------------------------------------------------------------
|
||||||
# network_route_init
|
# network_route_init
|
||||||
@@ -1189,29 +1148,40 @@ network_dst_address_refresh()
|
|||||||
local proxy_port=8080
|
local proxy_port=8080
|
||||||
|
|
||||||
|
|
||||||
network_dst_tab_get "${dst_id}"
|
network_dst_tab_get "${dst_id}"
|
||||||
|
|
||||||
if [[ ( "${dst_host_name}" != "" )]]
|
if [[ ( "${dst_host_name}" != "" )]]
|
||||||
then
|
then
|
||||||
if [[ ${dst_host_name} =~ ([0-9]+) ]]
|
if [[ ${dst_host_name} =~ ([0-9]+) ]]
|
||||||
then
|
then
|
||||||
proxy_host="proxy${BASH_REMATCH[1]}.${NETWORK_DST_PROXY_NAME}"
|
proxy_host="proxy${BASH_REMATCH[1]}.${NETWORK_DST_PROXY_NAME}"
|
||||||
|
|
||||||
if [[ ( "${dst_ip}" != "0.0.0.0") && ( "${dst_status}" != 1)]]
|
if [[ ( "${dst_status}" == 1) || ( ( "${dst_status}" != 1) && ( "${dst_ip}" != "0.0.0.0")) ]]
|
||||||
then
|
then
|
||||||
dst_ip_new="0.0.0.0"
|
if [[ ( ( "${dst_ip}" != "0.0.0.0") && ( "${dst_status}" != 1)) ]]
|
||||||
|
then
|
||||||
|
log_info "Network" "Reseting IP: [${dst_host_name}]: IP: [${dst_ip_new}] Status: (${dst_status})"
|
||||||
|
dst_ip_new="0.0.0.0"
|
||||||
|
else
|
||||||
|
dst_ip_new="$( nc -w "${NETWORK_NC_TIMEOUT}" "${proxy_host}" "${proxy_port}" 2>/dev/null)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if is_valid_ip "${dst_ip_new}"
|
||||||
|
then
|
||||||
|
if [[ "${dst_ip}" != "${dst_ip_new}" ]]
|
||||||
|
then
|
||||||
|
network_dst_ip_update "${dst_ip_new}"
|
||||||
|
else
|
||||||
|
log_trace "Network" "Skiping: [${dst_host_name}]: No changes..."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
log_info "Network" "Skiping: [${dst_host_name}]: Invalid IP: [${dst_ip_new}]"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
dst_ip_new="$( nc -w ${NETWORK_NC_TIMEOUT} ${proxy_host} ${proxy_port} 2>/dev/null)"
|
log_trace "Network" "Skiping: [${dst_host_name}]: Device not Up..."
|
||||||
fi
|
|
||||||
|
|
||||||
if is_valid_ip "${dst_ip_new}"
|
|
||||||
then
|
|
||||||
network_dst_ip_update "${dst_ip_new}"
|
|
||||||
else
|
|
||||||
log_info "Network" "Skiping: [${dst_host_name}]: Invalid IP: [${dst_ip_new}]"
|
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
log_info "Network" "Skiping: dst_id: [${dst_id}]: Invalid host_name: [${dst_host_name}]"
|
log_info "Network" "Skiping: dst_id: [${dst_id}]: Invalid host_name: [${dst_host_name}]"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@@ -1549,7 +1519,38 @@ network_init()
|
|||||||
|
|
||||||
network_deinit()
|
network_deinit()
|
||||||
{
|
{
|
||||||
dns_deinit
|
NETWORK_OPENVPN_STATUS=""
|
||||||
|
|
||||||
|
NETWORK_IP_ROUTE_TAB=()
|
||||||
|
NETWORK_IP_ROUTE_ID_LIST=""
|
||||||
|
NETWORK_IP_ROUTE_IP_IDX=()
|
||||||
|
|
||||||
|
NETWORK_SRC_TYPE=""
|
||||||
|
NETWORK_SRC_TAB=()
|
||||||
|
NETWORK_SRC_ID_LIST=""
|
||||||
|
NETWORK_SRC_IP_IDX=()
|
||||||
|
|
||||||
|
NETWORK_DST_TYPE=""
|
||||||
|
NETWORK_DST_TAB=()
|
||||||
|
NETWORK_DST_ID_LIST=""
|
||||||
|
NETWORK_DST_NAME_IDX=()
|
||||||
|
NETWORK_DST_DEV_IDX=()
|
||||||
|
|
||||||
|
dns_deinit
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------------------------------------------------------------
|
||||||
|
# network_reinit
|
||||||
|
#--------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
network_reinit()
|
||||||
|
{
|
||||||
|
network_deinit
|
||||||
|
network_init
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash -x
|
#!/bin/bash
|
||||||
|
|
||||||
if [[ "${VPN_BASH}" != "" ]]
|
if [[ "${VPN_BASH}" != "" ]]
|
||||||
then
|
then
|
||||||
@@ -348,6 +348,8 @@ vpn_supervisor()
|
|||||||
|
|
||||||
log_trace "VPN" "Refreshing DNS entries..."
|
log_trace "VPN" "Refreshing DNS entries..."
|
||||||
network_dst_address_refresh_all
|
network_dst_address_refresh_all
|
||||||
|
|
||||||
|
network_reinit
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ dev=$1
|
|||||||
|
|
||||||
if [[ "$1" != "" ]]
|
if [[ "$1" != "" ]]
|
||||||
then
|
then
|
||||||
cat /etc/openvpn/openvpn-status-$dev.log
|
cat /var/lib/openvpn/$dev.status
|
||||||
else
|
else
|
||||||
awk '{print FILENAME ": " $0}' /etc/openvpn/openvpn-status-*.log
|
awk '{print FILENAME ": " $0}' /var/lib/openvpn/*.status
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -125,33 +125,35 @@ Destination_Status_Board()
|
|||||||
dst_ip="-"
|
dst_ip="-"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${format}" == "html" ]]
|
if [[ ( "${status}" == "" ) || ( "${status}" == "${dst_status}") ]]
|
||||||
then
|
then
|
||||||
echo -n "<TR><TD class="header">${dst_id}</TD><TD>${dst_name}</TD><TD>${NETWORK_DST_TYPE[${dst_type}]}</TD><TD>${dst_device}</TD>"
|
if [[ "${format}" == "html" ]]
|
||||||
|
then
|
||||||
|
echo -n "<TR><TD class="header">${dst_id}</TD><TD>${dst_name}</TD><TD>${NETWORK_DST_TYPE[${dst_type}]}</TD><TD>${dst_device}</TD>"
|
||||||
|
|
||||||
case "${dst_status}"
|
case "${dst_status}"
|
||||||
in
|
in
|
||||||
"0")
|
"0")
|
||||||
echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></TD>"
|
echo -n "<TD><A HREF=\"?admin=${admin}&user=${user}&status=${dst_status}\"><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></A></TD>"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"1")
|
"1")
|
||||||
echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></TD>"
|
echo -n "<TD><A HREF=\"?admin=${admin}&user=${user}&status=${dst_status}\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></A></TD>"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"2")
|
"2")
|
||||||
echo -n "<TD><IMG SRC=\"/icons/user-unready.png\" TITLE=\"Unready\" ALT=\"Unready\"></TD>"
|
echo -n "<TD><A HREF=\"?admin=${admin}&user=${user}&status=${dst_status}\"><IMG SRC=\"/icons/user-unready.png\" TITLE=\"Unready\" ALT=\"Unready\"></A></TD>"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
echo -n "<TD><IMG SRC=\"\" TITLE=\"Unknown\" ALT=\"Unknown\"></TD>"
|
echo -n "<TD><IMG SRC=\"\" TITLE=\"Unknown\" ALT=\"Unknown\"></TD>"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
||||||
echo "<TD>${dst_ip:--}</TD><TD>${dst_host_name:--}</TD><TD>${dst_config:--}</TD><TD>${dst_table}</TD><TD>${dst_bytes_received:--}</TD><TD>${dst_bytes_sent:--}</TD><TD>${dst_uptime:--}</TD>"
|
echo "<TD>${dst_ip:--}</TD><TD>${dst_host_name:--}</TD><TD>${dst_config:--}</TD><TD>${dst_table}</TD><TD>${dst_bytes_received:--}</TD><TD>${dst_bytes_sent:--}</TD><TD>${dst_uptime:--}</TD>"
|
||||||
else
|
else
|
||||||
echo "${dst_id};${dst_name};${NETWORK_DST_TYPE[${dst_type}]};${dst_device};${dst_status};${dst_ip};${dst_host_name};${dst_config};${dst_table};${dst_bytes_received};${dst_bytes_sent};${dst_uptime}"
|
echo "${dst_id};${dst_name};${NETWORK_DST_TYPE[${dst_type}]};${dst_device};${dst_status};${dst_ip};${dst_host_name};${dst_config};${dst_table};${dst_bytes_received};${dst_bytes_sent};${dst_uptime}"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
@@ -179,13 +181,13 @@ Source_Routing_Board_Line()
|
|||||||
|
|
||||||
network_src_tab_get ${src_id}
|
network_src_tab_get ${src_id}
|
||||||
|
|
||||||
if [[ ( "${filter}" == "") || ( "${filter}" == "owner") || ( "${filter}" == "${src_owner}") ]]
|
if [[ ( "${user}" == "") || ( "${user}" == "owner") || ( "${user}" == "${src_owner}") ]]
|
||||||
then
|
then
|
||||||
if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
||||||
then
|
then
|
||||||
class="default"
|
class="default"
|
||||||
else
|
else
|
||||||
if [[ "${filter}" == "owner" ]]
|
if [[ "${user}" == "owner" ]]
|
||||||
then
|
then
|
||||||
class="skip"
|
class="skip"
|
||||||
else
|
else
|
||||||
@@ -193,10 +195,15 @@ Source_Routing_Board_Line()
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# filter == user not owner of this line
|
# user == user not owner of this line
|
||||||
|
|
||||||
class="skip"
|
class="skip"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ ( "${status}" != "") && ( "${status}" != "${src_status}") ]]
|
||||||
|
then
|
||||||
|
class="skip"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [[ "${class}" != "skip" ]]
|
if [[ "${class}" != "skip" ]]
|
||||||
@@ -212,19 +219,19 @@ Source_Routing_Board_Line()
|
|||||||
case "${src_status}"
|
case "${src_status}"
|
||||||
in
|
in
|
||||||
"0")
|
"0")
|
||||||
echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></TD>"
|
echo -n "<TD><A HREF=\"?admin=${admin}&user=${user}&status=${src_status}\"><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></A></TD>"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"1")
|
"1")
|
||||||
echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></TD>"
|
echo -n "<TD><A HREF=\"?admin=${admin}&user=${user}&status=${src_status}\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></A></TD>"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"2")
|
"2")
|
||||||
echo -n "<TD>-</TD>"
|
echo -n "<TD><A HREF=\"?admin=${admin}&user=${user}&status=${src_status}\">-</A></TD>"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
else
|
else
|
||||||
echo -n "${src_id};${NETWORK_SRC_TYPE[${src_type}]};${src_ip};${src_host_name};${src_device};${status};"
|
echo -n "${src_id};${NETWORK_SRC_TYPE[${src_type}]};${src_ip};${src_host_name};${src_device};${src_status};"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@@ -246,7 +253,7 @@ Source_Routing_Board_Line()
|
|||||||
|
|
||||||
if [[ ( ${admin} == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
if [[ ( ${admin} == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
||||||
then
|
then
|
||||||
echo -n "<A HREF=\"?cmd=route_set&admin=${admin}&filter=${filter}&ip=${src_ip}&vpn=${dst_id}\"><IMG SRC=\"/icons/user-invisible.png\" TITLE=\"Activate\" ALT=\"Activate\"></A>"
|
echo -n "<A HREF=\"?cmd=route_set&admin=${admin}&user=${user}&status=${status}&ip=${src_ip}&vpn=${dst_id}\"><IMG SRC=\"/icons/user-invisible.png\" TITLE=\"Activate\" ALT=\"Activate\"></A>"
|
||||||
else
|
else
|
||||||
echo -n " "
|
echo -n " "
|
||||||
fi
|
fi
|
||||||
@@ -274,7 +281,7 @@ Source_Routing_Board_Line()
|
|||||||
echo -n "<TD>${src_port_range}</TD><TD>-</TD><TD>-</TD>"
|
echo -n "<TD>${src_port_range}</TD><TD>-</TD><TD>-</TD>"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "<TD><A HREF=\"?admin=${admin}&filter=${src_owner}\">${src_owner}</A></TD><TD>${src_bytes_received:--}</TD><TD>${src_bytes_sent:--}</TD><TD>${src_uptime:--}</TD><TD>${src_last_seen:--}</TD></TR>"
|
echo "<TD><A HREF=\"?admin=${admin}&user=${src_owner}&status=${status}\">${src_owner}</A></TD><TD>${src_bytes_received:--}</TD><TD>${src_bytes_sent:--}</TD><TD>${src_uptime:--}</TD><TD>${src_last_seen:--}</TD></TR>"
|
||||||
else
|
else
|
||||||
echo "${src_port_range};${src_port_start};${src_port_end};${src_owner};${src_bytes_received};${src_bytes_sent};${src_uptime};${src_last_seen}"
|
echo "${src_port_range};${src_port_start};${src_port_end};${src_owner};${src_bytes_received};${src_bytes_sent};${src_uptime};${src_last_seen}"
|
||||||
fi
|
fi
|
||||||
@@ -378,13 +385,13 @@ VPN_OpenVPN_Board()
|
|||||||
|
|
||||||
if [[ "${src_type}" == 2 ]]
|
if [[ "${src_type}" == 2 ]]
|
||||||
then
|
then
|
||||||
if [[ ( "${filter}" == "") || ( "${filter}" == "owner") || ( "${filter}" == "${src_owner}") ]]
|
if [[ ( "${user}" == "") || ( "${user}" == "owner") || ( "${user}" == "${src_owner}") ]]
|
||||||
then
|
then
|
||||||
if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
||||||
then
|
then
|
||||||
class="default"
|
class="default"
|
||||||
else
|
else
|
||||||
if [[ "${filter}" == "owner" ]]
|
if [[ "${user}" == "owner" ]]
|
||||||
then
|
then
|
||||||
class="skip"
|
class="skip"
|
||||||
else
|
else
|
||||||
@@ -392,30 +399,36 @@ VPN_OpenVPN_Board()
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# filter == user not owner of this line
|
# user == user not owner of this line
|
||||||
|
|
||||||
class="skip"
|
class="skip"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ ( "${status}" != "") && ( "${status}" != "${src_status}") ]]
|
||||||
|
then
|
||||||
|
class="skip"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [[ "${class}" != "skip" ]]
|
if [[ "${class}" != "skip" ]]
|
||||||
then
|
then
|
||||||
if [[ "${format}" == "html" ]]
|
if [[ "${format}" == "html" ]]
|
||||||
then
|
then
|
||||||
echo -n " <TR class=\"${class}\"><TD class=\"header\">${idx}</TD><TD>${src_ip}</TD><TD>${src_host_name}</TD>"
|
echo -n " <TR class=\"${class}\"><TD class=\"header\">${idx}</TD><TD>${src_ip}</TD><TD>${src_host_name}</TD>"
|
||||||
echo -n "<TD><A HREF=\"?cmd=config_download&admin=${admin}&filter=${filter}&ip=${src_ip}&defroute=true&type=ext\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Default Route External Certificates\" ALT=\"Configuration External Certificates\"></A></TD>"
|
echo -n "<TD><A HREF=\"?cmd=config_download&admin=${admin}&user=${user}&status=${status}&ip=${src_ip}&defroute=true&type=ext\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Default Route External Certificates\" ALT=\"Configuration External Certificates\"></A></TD>"
|
||||||
|
|
||||||
if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
||||||
then
|
then
|
||||||
echo -n "<TD><A HREF=\"?cmd=config_download&admin=${admin}&filter=${filter}&ip=${src_ip}&defroute=true&type=inline\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Default Route Inline Certificates\" ALT=\"Configuration Inline Certificates\"></A></TD>"
|
echo -n "<TD><A HREF=\"?cmd=config_download&admin=${admin}&user=${user}&status=${status}&ip=${src_ip}&defroute=true&type=inline\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Default Route Inline Certificates\" ALT=\"Configuration Inline Certificates\"></A></TD>"
|
||||||
else
|
else
|
||||||
echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Inline Certificates\" ALT=\"Configuration Inline Certificates\"></TD>"
|
echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Inline Certificates\" ALT=\"Configuration Inline Certificates\"></TD>"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -n "<TD><A HREF=\"?cmd=config_download&admin=${admin}&filter=${filter}&ip=${src_ip}&defroute=false&type=ext\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration NoDefault Route External Certificates\" ALT=\"Configuration External Certificates\"></A></TD>"
|
echo -n "<TD><A HREF=\"?cmd=config_download&admin=${admin}&user=${user}&status=${status}&ip=${src_ip}&defroute=false&type=ext\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration NoDefault Route External Certificates\" ALT=\"Configuration External Certificates\"></A></TD>"
|
||||||
|
|
||||||
if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
||||||
then
|
then
|
||||||
echo -n "<TD><A HREF=\"?cmd=config_download&admin=${admin}&filter=${filter}&ip=${src_ip}&defroute=false&type=inline\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration NoDefault Route Inline Certificates\" ALT=\"Configuration Inline Certificates\"></A></TD>"
|
echo -n "<TD><A HREF=\"?cmd=config_download&admin=${admin}&user=${user}&status=${status}&ip=${src_ip}&defroute=false&type=inline\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration NoDefault Route Inline Certificates\" ALT=\"Configuration Inline Certificates\"></A></TD>"
|
||||||
else
|
else
|
||||||
echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Inline Certificates\" ALT=\"Configuration Inline Certificates\"></TD>"
|
echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Inline Certificates\" ALT=\"Configuration Inline Certificates\"></TD>"
|
||||||
fi
|
fi
|
||||||
@@ -425,17 +438,17 @@ VPN_OpenVPN_Board()
|
|||||||
|
|
||||||
if [[ "${format}" == "html" ]]
|
if [[ "${format}" == "html" ]]
|
||||||
then
|
then
|
||||||
echo -n "<TD><A HREF=\"?cmd=cert_download&admin=${admin}&filter=${filter}&ip=${src_ip}&type=ca\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"CA Certificate\" ALT=\"CA Certificate\"></A></TD>"
|
echo -n "<TD><A HREF=\"?cmd=cert_download&admin=${admin}&user=${user}&status=${status}&ip=${src_ip}&type=ca\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"CA Certificate\" ALT=\"CA Certificate\"></A></TD>"
|
||||||
|
|
||||||
if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
|
||||||
then
|
then
|
||||||
echo -n "<TD><A HREF=\"?cmd=cert_download&admin=${admin}&filter=${filter}&ip=${src_ip}&type=tc\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"TC Certificate\" ALT=\"TC Certificate\"></A></TD>"
|
echo -n "<TD><A HREF=\"?cmd=cert_download&admin=${admin}&user=${user}&status=${status}&ip=${src_ip}&type=tc\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"TC Certificate\" ALT=\"TC Certificate\"></A></TD>"
|
||||||
|
|
||||||
if [[ -f /etc/openvpn/tls/certs/${src_host_name}.crt ]]
|
if [[ -f /etc/openvpn/tls/certs/${src_host_name}.crt ]]
|
||||||
then
|
then
|
||||||
echo -n "<TD><A HREF=\"?cmd=cert_download&admin=${admin}&filter=${filter}&ip=${src_ip}&type=key\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Private Key\" ALT=\"Private Key\"></A></TD>"
|
echo -n "<TD><A HREF=\"?cmd=cert_download&admin=${admin}&user=${user}&status=${status}&ip=${src_ip}&type=key\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Private Key\" ALT=\"Private Key\"></A></TD>"
|
||||||
echo -n "<TD><A HREF=\"?cmd=cert_download&admin=${admin}&filter=${filter}&ip=${src_ip}&type=csr\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Certificate Signing Request\" ALT=\"Certificat Signing Request\"></A></TD>"
|
echo -n "<TD><A HREF=\"?cmd=cert_download&admin=${admin}&user=${user}&status=${status}&ip=${src_ip}&type=csr\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Certificate Signing Request\" ALT=\"Certificat Signing Request\"></A></TD>"
|
||||||
echo "<TD><A HREF=\"?cmd=cert_download&admin=${admin}&filter=${filter}&ip=${src_ip}&type=crt\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Public Certificate\" ALT=\"Public Certificate\"></A></TD></TR>"
|
echo "<TD><A HREF=\"?cmd=cert_download&admin=${admin}&user=${user}&status=${status}&ip=${src_ip}&type=crt\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Public Certificate\" ALT=\"Public Certificate\"></A></TD></TR>"
|
||||||
else
|
else
|
||||||
echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Private Key\" ALT=\"Private Key\"></TD>"
|
echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Private Key\" ALT=\"Private Key\"></TD>"
|
||||||
echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Certificat Signing Request\" ALT=\"Certificat Signing Request\"></TD>"
|
echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Certificat Signing Request\" ALT=\"Certificat Signing Request\"></TD>"
|
||||||
@@ -497,22 +510,46 @@ Main_Board_Print()
|
|||||||
admin_mode=""
|
admin_mode=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "${filter}"
|
case "${user}"
|
||||||
in
|
in
|
||||||
"owner")
|
"")
|
||||||
filter_mode="My VPN"
|
user_mode="All"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"")
|
"owner")
|
||||||
filter_mode="All VPN"
|
user_mode="My"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
filter_mode="${filter} VPN"
|
user_mode="${user}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
echo " <H1>VPN Admin Board: ${filter_mode}${admin_mode}</H1>"
|
case "${status}"
|
||||||
|
in
|
||||||
|
"")
|
||||||
|
status_mode="All"
|
||||||
|
;;
|
||||||
|
|
||||||
|
"0")
|
||||||
|
status_mode="Down"
|
||||||
|
;;
|
||||||
|
|
||||||
|
"1")
|
||||||
|
status_mode="UP"
|
||||||
|
;;
|
||||||
|
|
||||||
|
"2")
|
||||||
|
status_mode="Not Conected"
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
status_mode="Unkwown"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
echo " <H1>VPN Admin Board: ${user_mode} VPN - ${status_mode} Status${admin_mode}</H1>"
|
||||||
|
|
||||||
|
|
||||||
echo " <P>"
|
echo " <P>"
|
||||||
@@ -539,19 +576,25 @@ Main_Board_Print()
|
|||||||
then
|
then
|
||||||
if [[ "${admin}" == "true" ]]
|
if [[ "${admin}" == "true" ]]
|
||||||
then
|
then
|
||||||
echo -n "<A HREF=\"?filter=${filter}\">Non Admin Mode</A>"
|
echo -n "<A HREF=\"?user=${user}&status=${status}\">Non Admin Mode</A>"
|
||||||
else
|
else
|
||||||
echo -n "<A HREF=\"?admin=true&filter=${filter}\">Admin Mode</A>"
|
echo -n "<A HREF=\"?admin=true&user=${user}&status=${status}\">Admin Mode</A>"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -n " "
|
echo -n " "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${filter}" != "" ]]
|
if [[ "${user}" != "" ]]
|
||||||
then
|
then
|
||||||
echo -n "<A HREF=\"?admin=${admin}\">All VPN</A>"
|
echo -n "<A HREF=\"?admin=${admin}&status=${status}\">All VPN</A>"
|
||||||
|
echo -n " "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "${status}" != "" ]]
|
||||||
|
then
|
||||||
|
echo -n "<A HREF=\"?admin=${admin}&user=${user}\">All Status</A>"
|
||||||
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo " </P>"
|
echo " </P>"
|
||||||
|
|
||||||
@@ -598,7 +641,8 @@ Main_Board_Print()
|
|||||||
|
|
||||||
cmd=""
|
cmd=""
|
||||||
format=""
|
format=""
|
||||||
filter=""
|
user=""
|
||||||
|
status=""
|
||||||
ip=""
|
ip=""
|
||||||
vpn=""
|
vpn=""
|
||||||
type=""
|
type=""
|
||||||
@@ -638,6 +682,14 @@ then
|
|||||||
filter=${arg}
|
filter=${arg}
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
"user")
|
||||||
|
user=${arg}
|
||||||
|
;;
|
||||||
|
|
||||||
|
"status")
|
||||||
|
status=${arg}
|
||||||
|
;;
|
||||||
|
|
||||||
"ip")
|
"ip")
|
||||||
ip=${arg}
|
ip=${arg}
|
||||||
;;
|
;;
|
||||||
@@ -685,7 +737,7 @@ if [[ ( ${admin} == "true") && ( " ${ADMIN_USER_LIST} " != *" ${REMOTE_USER} "*)
|
|||||||
then
|
then
|
||||||
cmd_status="${cmd}: Admin NOT_AUTHORIZED"
|
cmd_status="${cmd}: Admin NOT_AUTHORIZED"
|
||||||
|
|
||||||
redirect="?filter=${filter}"
|
redirect="?user=${user}&up=${up}"
|
||||||
|
|
||||||
Header_Print
|
Header_Print
|
||||||
Footer_Print
|
Footer_Print
|
||||||
|
|||||||
Reference in New Issue
Block a user