- GetReflectorName()); ?> vGetVersion()); ?> - Dashboard v / Service uptime: GetServiceUptime()); ?>
- | Users / Modules | -Repeaters / Nodes (NodeCount()); ?>) | -Peers (PeerCount()); ?>) | +Repeaters / Nodes (NodeCount(); ?>) | +Peers (PeerCount(); ?>) | Modules list | Reflectors list | - your private hash in '.sanitize_output($CallingHome['HashFile']).' could not be created, please check your config file and the permissions for the defined folder. + your private hash in '.$CallingHome['HashFile'].' could not be created, please check your config file and the permissions for the defined folder. '; } } @@ -219,7 +185,7 @@ else { ?> - + diff --git a/dashboard/pgs/class.interlink.php b/dashboard/pgs/class.interlink.php old mode 100644 new mode 100755 index eb6da90..296c196 --- a/dashboard/pgs/class.interlink.php +++ b/dashboard/pgs/class.interlink.php @@ -12,52 +12,34 @@ class Interlink { $this->Modules = null; } - public function SetName($RefName) { - $RefName = trim($RefName); - // Validate reflector name format (XLX + 3 alphanumeric) - if (preg_match('/^[A-Z0-9]{3,10}$/i', $RefName)) { - $this->ReflectorName = strtoupper($RefName); - } - } - public function SetAddress($RefAdd) { - $RefAdd = trim($RefAdd); - // Validate it's a valid hostname or IP - if (filter_var($RefAdd, FILTER_VALIDATE_IP) || - filter_var($RefAdd, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) { - $this->ReflectorAddress = $RefAdd; - } - } + public function SetName($RefName) { $this->ReflectorName = trim($RefName); } + public function SetAddress($RefAdd) { $this->ReflectorAddress = trim($RefAdd); } public function GetName() { return $this->ReflectorName; } public function GetAddress() { return $this->ReflectorAddress; } public function GetModules() { return $this->Modules; } public function AddModule($Module) { - $Module = trim(strtoupper($Module)); - if (strlen($Module) != 1) return false; - if (!preg_match('/^[A-Z]$/', $Module)) return false; // Only A-Z - if (strpos($this->Modules, $Module) === false) { - $this->Modules .= $Module; - } - return true; + $Module = trim($Module); + if (strlen($Module) != 1) return false; + if (strpos($this->Modules, $Module) === false) { + $this->Modules .= $Module; + } + return true; } public function RemoveModule($Module) { - $Module = trim(strtoupper($Module)); - if (strlen($Module) != 1) return false; - if (!preg_match('/^[A-Z]$/', $Module)) return false; // Only A-Z - if (strpos($this->Modules, $Module) !== false) { - $this->Modules = str_replace($Module, '', $this->Modules); - } - return true; + $Module = trim($Module); + if (strlen($Module) != 1) return false; + if (strpos($this->Modules, $Module) !== false) { + $this->Modules = substr($this->Modules, 0, strpos($this->Modules, $Module)-1).substr($this->Modules, strpos($this->Modules, $Module)+1, strlen($this->Modules)); + } + return true; } public function HasModuleEnabled($Module) { - $Module = trim(strtoupper($Module)); - if (strlen($Module) != 1 || !preg_match('/^[A-Z]$/', $Module)) { - return false; - } - return (strpos($this->Modules, $Module) !== false); + if (strlen($Module) != 1) return false; + return (strpos($this->Modules, $Module) !== false); } } diff --git a/dashboard/pgs/class.node.php b/dashboard/pgs/class.node.php old mode 100644 new mode 100755 index 538e326..e1076a5 --- a/dashboard/pgs/class.node.php +++ b/dashboard/pgs/class.node.php @@ -14,44 +14,29 @@ class Node { public function __construct($Callsign, $IP, $LinkedModule, $Protocol, $ConnectTime, $LastHeardTime, $RandomID) { - // Validate and sanitize IP - $IP = trim($IP); - $this->IP = filter_var($IP, FILTER_VALIDATE_IP) ? $IP : '0.0.0.0'; + $this->IP = $IP; - // Validate protocol - $Protocol = trim($Protocol); - $allowed_protocols = ['DPlus', 'DExtra', 'DCS', 'DMR', 'YSF', 'DEXTRA', 'DPLUS', 'DMRMmdvm']; - $this->Protocol = in_array($Protocol, $allowed_protocols, true) ? $Protocol : 'Unknown'; - - $this->ConnectTime = ParseTime($ConnectTime); - $this->LastHeardTime = ParseTime($LastHeardTime); + $this->Protocol = $Protocol; + $this->ConnectTime = ParseTime($ConnectTime); + $this->LastHeardTime = ParseTime($LastHeardTime); + + $this->FullCallsign = trim(str_replace(" ", "-", $Callsign)); + $this->FullCallsign = str_replace(" ", "-", $this->FullCallsign); + $this->FullCallsign = str_replace(" ", "-", $this->FullCallsign); + + if (strpos($Callsign, " ") !== false) { + $this->Callsign = trim(substr($Callsign, 0, strpos($Callsign, " "))); + $this->Suffix = trim(substr($Callsign, strpos($Callsign, " "), strlen($Callsign))); + $this->Prefix = strtoupper(trim(substr($Callsign, 0, 3))); + } + else { + $this->Callsign = trim($Callsign); + $this->Suffix = ""; + $this->Prefix = ""; + } - // Sanitize callsign (remove excessive spaces, validate format) - $Callsign = trim(preg_replace('/\s+/', ' ', $Callsign)); - - $this->FullCallsign = str_replace(" ", "-", $Callsign); - - if (strpos($Callsign, " ") !== false) { - $this->Callsign = trim(substr($Callsign, 0, strpos($Callsign, " "))); - $this->Suffix = trim(substr($Callsign, strpos($Callsign, " "))); - $this->Prefix = strtoupper(trim(substr($Callsign, 0, 3))); - } - else { - $this->Callsign = trim($Callsign); - $this->Suffix = ""; - $this->Prefix = ""; - } - - // Validate callsign format (basic check) - if (!preg_match('/^[A-Z0-9]{1,10}$/i', $this->Callsign)) { - $this->Callsign = 'INVALID'; - } - - // Validate LinkedModule (single letter A-Z) - $LinkedModule = trim(strtoupper($LinkedModule)); - $this->LinkedModule = preg_match('/^[A-Z]$/', $LinkedModule) ? $LinkedModule : ''; - - $this->RandomID = $RandomID; + $this->LinkedModule = trim($LinkedModule); + $this->RandomID = $RandomID; } public function GetFullCallsign() { return $this->FullCallsign; } diff --git a/dashboard/pgs/class.parsexml.php b/dashboard/pgs/class.parsexml.php old mode 100644 new mode 100755 index 7ac7ae6..8a54b1f --- a/dashboard/pgs/class.parsexml.php +++ b/dashboard/pgs/class.parsexml.php @@ -7,31 +7,21 @@ class ParseXML { } public function GetElement($InputString, $ElementName) { - // Sanitize element name to prevent XML injection - $ElementName = preg_replace('/[^a-zA-Z0-9_\-\s]/', '', $ElementName); - - if (strpos($InputString, "<".$ElementName.">") === false) return false; - if (strpos($InputString, "") === false) return false; + if (strpos($InputString, "<".$ElementName.">") === false) return false; + if (strpos($InputString, "") === false) return false; + + $Element = substr($InputString, strpos($InputString, "<".$ElementName.">")+strlen($ElementName)+2, strpos($InputString, "")-strpos($InputString, "<".$ElementName.">")-strlen($ElementName)-2); + return $Element; - $Element = substr($InputString, strpos($InputString, "<".$ElementName.">")+strlen($ElementName)+2, strpos($InputString, "")-strpos($InputString, "<".$ElementName.">")-strlen($ElementName)-2); - - // Return raw content - sanitization happens at output time - return $Element; } public function GetAllElements($InputString, $ElementName) { - // Sanitize element name to prevent XML injection - $ElementName = preg_replace('/[^a-zA-Z0-9_\-\s]/', '', $ElementName); - - $Elements = array(); - while (strpos($InputString, $ElementName) !== false) { - $element = $this->GetElement($InputString, $ElementName); - if ($element !== false) { - $Elements[] = $element; - } - $InputString = substr($InputString, strpos($InputString, "")+strlen($ElementName)+3, strlen($InputString)); - } - return $Elements; + $Elements = array(); + while (strpos($InputString, $ElementName) !== false) { + $Elements[] = $this->GetElement($InputString, $ElementName); + $InputString = substr($InputString, strpos($InputString, "")+strlen($ElementName)+3, strlen($InputString)); + } + return $Elements; } } diff --git a/dashboard/pgs/class.peer.php b/dashboard/pgs/class.peer.php old mode 100644 new mode 100755 index eb8d9ca..ae39c1b --- a/dashboard/pgs/class.peer.php +++ b/dashboard/pgs/class.peer.php @@ -10,30 +10,13 @@ class Peer { private $LastHeardTime; public function __construct($Callsign, $IP, $LinkedModule, $Protocol, $ConnectTime, $LastHeardTime) { - - // Validate and sanitize IP - $IP = trim($IP); - $this->IP = filter_var($IP, FILTER_VALIDATE_IP) ? $IP : '0.0.0.0'; - - // Validate protocol - $Protocol = trim($Protocol); - $allowed_protocols = ['DPlus', 'DExtra', 'DCS', 'DMR', 'YSF', 'DEXTRA', 'DPLUS', 'XLX']; - $this->Protocol = in_array($Protocol, $allowed_protocols, true) ? $Protocol : 'Unknown'; - - $this->ConnectTime = ParseTime($ConnectTime); - $this->LastHeardTime = ParseTime($LastHeardTime); - - // Sanitize and validate callsign - $Callsign = trim($Callsign); - if (preg_match('/^[A-Z0-9]{3,10}$/i', $Callsign)) { - $this->Callsign = strtoupper($Callsign); - } else { - $this->Callsign = 'INVALID'; - } - - // Validate LinkedModule (single letter A-Z) - $LinkedModule = trim(strtoupper($LinkedModule)); - $this->LinkedModule = preg_match('/^[A-Z]$/', $LinkedModule) ? $LinkedModule : ''; + + $this->IP = $IP; + $this->Protocol = $Protocol; + $this->ConnectTime = ParseTime($ConnectTime); + $this->LastHeardTime = ParseTime($LastHeardTime); + $this->Callsign = trim($Callsign); + $this->LinkedModule = trim($LinkedModule); } diff --git a/dashboard/pgs/class.reflector.php b/dashboard/pgs/class.reflector.php old mode 100644 new mode 100755 index cece0c8..099599c --- a/dashboard/pgs/class.reflector.php +++ b/dashboard/pgs/class.reflector.php @@ -37,73 +37,50 @@ class xReflector { } public function LoadXML() { - if ($this->XMLFile != null) { - $handle = fopen($this->XMLFile, 'r'); - $this->XMLContent = fread($handle, filesize($this->XMLFile)); - fclose($handle); + if ($this->XMLFile != null) { + $handle = fopen($this->XMLFile, 'r'); + $this->XMLContent = fread($handle, filesize($this->XMLFile)); + fclose($handle); - # XLX alphanumeric naming... - $this->ServiceName = substr($this->XMLContent, strpos($this->XMLContent, "|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '. sanitize_output($module) .' | -'. sanitize_output(empty($PageOptions['ModuleNames'][$module]) ? '-' : $PageOptions['ModuleNames'][$module]) .' | +'. $module .' | +'. (empty($PageOptions['ModuleNames'][$module]) ? '-' : $PageOptions['ModuleNames'][$module]) .' | '. count($Reflector->GetNodesInModulesByID($module)) .' | -'. sanitize_output('REF' . $ReflectorNumber . $module . 'L') .' | -'. sanitize_output(is_numeric($ReflectorNumber) ? '*' . sprintf('%01d',$ReflectorNumber) . (($i<=4)?$module:sprintf('%02d',$i)) : '-') .' | -'. sanitize_output('XRF' . $ReflectorNumber . $module . 'L') .' | -'. sanitize_output(is_numeric($ReflectorNumber) ? 'B' . sprintf('%01d',$ReflectorNumber) . (($i<=4)?$module:sprintf('%02d',$i)) : '-') .' | -'. sanitize_output('DCS' . $ReflectorNumber . $module . 'L') .' | -'. sanitize_output(is_numeric($ReflectorNumber) ? 'D' . sprintf('%01d',$ReflectorNumber) . (($i<=4)?$module:sprintf('%02d',$i)) : '-') .' | -'. sanitize_output(4000+$i) .' | -'. sanitize_output(9+$i) .' | +'. 'REF' . $ReflectorNumber . $module . 'L' .' | +'. (is_numeric($ReflectorNumber) ? '*' . sprintf('%01d',$ReflectorNumber) . (($i<=4)?$module:sprintf('%02d',$i)) : '-') .' | +'. 'XRF' . $ReflectorNumber . $module . 'L' .' | +'. (is_numeric($ReflectorNumber) ? 'B' . sprintf('%01d',$ReflectorNumber) . (($i<=4)?$module:sprintf('%02d',$i)) : '-') .' | +'. 'DCS' . $ReflectorNumber . $module . 'L' .' | +'. (is_numeric($ReflectorNumber) ? 'D' . sprintf('%01d',$ReflectorNumber) . (($i<=4)?$module:sprintf('%02d',$i)) : '-') .' | +'. (4000+$i) .' | +'. (9+$i) .' | '.sanitize_output($Name).' | '; +'.$Name.' | '; } else { echo ' -'.sanitize_output($Name).' | '; +'.$Name.' | '; } echo ' -'.sanitize_output(date("d.m.Y H:i", $Reflector->Peers[$i]->GetLastHeardTime())).' | -'.sanitize_output(FormatSeconds(time()-$Reflector->Peers[$i]->GetConnectTime())).' s | -'.sanitize_output($Reflector->Peers[$i]->GetProtocol()).' | -'.sanitize_output($Reflector->Peers[$i]->GetLinkedModule()).' | '; +'.date("d.m.Y H:i", $Reflector->Peers[$i]->GetLastHeardTime()).' | +'.FormatSeconds(time()-$Reflector->Peers[$i]->GetConnectTime()).' s | +'.$Reflector->Peers[$i]->GetProtocol().' | +'.$Reflector->Peers[$i]->GetLinkedModule().' | '; if ($PageOptions['PeerPage']['IPModus'] != 'HideIP') { - echo ' -'; + echo ' + | '; $Bytes = explode(".", $Reflector->Peers[$i]->GetIP()); if ($Bytes !== false && count($Bytes) == 4) { switch ($PageOptions['PeerPage']['IPModus']) { - case 'ShowLast1ByteOfIP' : echo sanitize_output($PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[3]); break; - case 'ShowLast2ByteOfIP' : echo sanitize_output($PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[2].'.'.$Bytes[3]); break; - case 'ShowLast3ByteOfIP' : echo sanitize_output($PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[1].'.'.$Bytes[2].'.'.$Bytes[3]); break; - default : echo sanitize_output($Reflector->Peers[$i]->GetIP()); + case 'ShowLast1ByteOfIP' : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[3]; break; + case 'ShowLast2ByteOfIP' : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[2].'.'.$Bytes[3]; break; + case 'ShowLast3ByteOfIP' : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[1].'.'.$Bytes[2].'.'.$Bytes[3]; break; + default : echo $Reflector->Peers[$i]->GetIP(); } } echo ' | '; diff --git a/dashboard/pgs/reflectors.php b/dashboard/pgs/reflectors.php old mode 100644 new mode 100755 index 9c37a93..d79ce5a --- a/dashboard/pgs/reflectors.php +++ b/dashboard/pgs/reflectors.php @@ -30,15 +30,15 @@ $odd = ""; for ($i=0;$i|||||||||||||||||||||||||||||||||||||||||||||||||
| '.($i+1).' | '.$NAME.' | diff --git a/dashboard/pgs/repeaters.php b/dashboard/pgs/repeaters.php old mode 100644 new mode 100755 index 1af1829..bdf8d6f --- a/dashboard/pgs/repeaters.php +++ b/dashboard/pgs/repeaters.php @@ -1,14 +1,15 @@ '; @@ -86,14 +87,14 @@ if ($PageOptions['UserPage']['ShowFilter']) {@@ -160,19 +161,19 @@ for ($i=0;$i<$Reflector->NodeCount();$i++) { | ';
list ($Flag, $Name) = $Reflector->GetFlag($Reflector->Nodes[$i]->GetCallSign());
if (file_exists("./img/flags/".$Flag.".png")) {
- echo '.'.png){kind=small} '.sanitize_output($Name).'';
+ echo ' '.$Name.'';
}
echo ' |
- Nodes[$i]->GetSuffix()); - echo '" class="pl" target="_blank">'.sanitize_output($Reflector->Nodes[$i]->GetCallSign()); - if ($Reflector->Nodes[$i]->GetSuffix() != "") { echo '-'.sanitize_output($Reflector->Nodes[$i]->GetSuffix()); } + | Nodes[$i]->GetSuffix(); + echo '" class="pl" target="_blank">'.$Reflector->Nodes[$i]->GetCallSign(); + if ($Reflector->Nodes[$i]->GetSuffix() != "") { echo '-'.$Reflector->Nodes[$i]->GetSuffix(); } echo ' | '; if (($Reflector->Nodes[$i]->GetPrefix() == 'REF') || ($Reflector->Nodes[$i]->GetPrefix() == 'XRF')) { switch ($Reflector->Nodes[$i]->GetPrefix()) { - case 'REF' : echo 'REF-Link'; break; - case 'XRF' : echo 'XRF-Link'; break; + case 'REF' : echo 'REF-Link'; break; + case 'XRF' : echo 'XRF-Link'; break; } } else { @@ -186,20 +187,20 @@ for ($i=0;$i<$Reflector->NodeCount();$i++) { } } echo ' | -'.sanitize_output(date("d.m.Y H:i", $Reflector->Nodes[$i]->GetLastHeardTime())).' | -'.sanitize_output(FormatSeconds(time()-$Reflector->Nodes[$i]->GetConnectTime())).' s | -'.sanitize_output($Reflector->Nodes[$i]->GetProtocol()).' | -'.sanitize_output($Reflector->Nodes[$i]->GetLinkedModule()).' | '; +'.date("d.m.Y H:i", $Reflector->Nodes[$i]->GetLastHeardTime()).' | +'.FormatSeconds(time()-$Reflector->Nodes[$i]->GetConnectTime()).' s | +'.$Reflector->Nodes[$i]->GetProtocol().' | +'.$Reflector->Nodes[$i]->GetLinkedModule().' | '; if ($PageOptions['RepeatersPage']['IPModus'] != 'HideIP') { echo ''; $Bytes = explode(".", $Reflector->Nodes[$i]->GetIP()); if ($Bytes !== false && count($Bytes) == 4) { switch ($PageOptions['RepeatersPage']['IPModus']) { - case 'ShowLast1ByteOfIP' : echo sanitize_output($PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$Bytes[3]); break; - case 'ShowLast2ByteOfIP' : echo sanitize_output($PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$Bytes[2].'.'.$Bytes[3]); break; - case 'ShowLast3ByteOfIP' : echo sanitize_output($PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$Bytes[1].'.'.$Bytes[2].'.'.$Bytes[3]); break; - default : echo sanitize_output($Reflector->Nodes[$i]->GetIP()); + case 'ShowLast1ByteOfIP' : echo $PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$Bytes[3]; break; + case 'ShowLast2ByteOfIP' : echo $PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$Bytes[2].'.'.$Bytes[3]; break; + case 'ShowLast3ByteOfIP' : echo $PageOptions['RepeatersPage']['MasqueradeCharacter'].'.'.$Bytes[1].'.'.$Bytes[2].'.'.$Bytes[3]; break; + default : echo $Reflector->Nodes[$i]->GetIP(); } } echo ' | '; diff --git a/dashboard/pgs/traffic.php b/dashboard/pgs/traffic.php index b60eaad..46f62e2 100644 --- a/dashboard/pgs/traffic.php +++ b/dashboard/pgs/traffic.php @@ -1,26 +1,25 @@ @@ -34,11 +33,11 @@ if (!empty($_GET['iface'])) {'.sanitize_output($VNStat['Interfaces'][$i]['Name']).'';
- if ($i < count($VNStat['Interfaces'])-1) {
- echo ' '; - } - } + echo ''.$VNStat['Interfaces'][$i]['Name'].''; + if ($i < count($VNStat['Interfaces'])) { + echo ' '; + } + } ?> |
|
';
- }
- else {
- echo ($i+1);
- }
-
- echo '