From d6207a49ef95aa2c8ca95033a384d39498ca528a Mon Sep 17 00:00:00 2001
From: amit177 <8685831+amit177@users.noreply.github.com>
Date: Sat, 2 Sep 2023 14:57:53 +0000
Subject: [PATCH 1/7] Change form post path

---
 index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index e62956f..be9b18e 100644
--- a/index.php
+++ b/index.php
@@ -182,7 +182,7 @@ $templateData['csrfToken'] = $_SESSION[LookingGlass::SESSION_CSRF] = bin2hex(ran
             <div class="card shadow-lg">
                 <div class="card-body p-3">
                     <h1 class="fs-4 card-title mb-4">Looking Glass</h1>
-                    <form method="POST" action="/" autocomplete="off">
+                    <form method="POST" autocomplete="off">
                         <input type="hidden" name="csrfToken" value="<?php echo $templateData['csrfToken'] ?>">
 
                         <div class="row">
@@ -286,7 +286,7 @@ $templateData['csrfToken'] = $_SESSION[LookingGlass::SESSION_CSRF] = bin2hex(ran
 
         outputCard.style.display = 'inherit'
 
-        fetch('/backend.php')
+        fetch('backend.php')
             .then(async (response) => {
                 // response.body is a ReadableStream
                 const reader = response.body.getReader()

From 5850803887df377c7dc12048da55b39d27131bcb Mon Sep 17 00:00:00 2001
From: amit177 <8685831+amit177@users.noreply.github.com>
Date: Sat, 2 Sep 2023 14:58:09 +0000
Subject: [PATCH 2/7] Refresh the page instead of redirecting

---
 bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.php b/bootstrap.php
index fb0ce09..92a2191 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -31,7 +31,7 @@ function exitErrorMessage(string $message): void
 
 function exitNormal(): void
 {
-    header('Location: /');
+    header("Refresh: 0");
     exit;
 }
 

From 81f1bb7a20f92a5eeeb200440efc9272e929bae5 Mon Sep 17 00:00:00 2001
From: Karson Nichols <38633639+nicholsk18@users.noreply.github.com>
Date: Wed, 1 Nov 2023 11:00:16 -0500
Subject: [PATCH 3/7] added a way to add custom header and footer (#1)

* added a way to add custom header and footer

* rework to be backwords compatible for people who dont update their config file

* isset to make sure no warnings are shown
---
 config.dist.php |  5 +++++
 index.php       | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/config.dist.php b/config.dist.php
index 0215e72..fe18c9f 100644
--- a/config.dist.php
+++ b/config.dist.php
@@ -29,6 +29,11 @@ const LG_CUSTOM_HTML = __DIR__.'/custom.html.php';
 // Define a file here which will be loaded on top of the index file, this can be used to do some post logic;
 const LG_CUSTOM_PHP = __DIR__.'/custom.post.php';
 
+// Define a file here which will be used to display the custom header. Will be at the top of file;
+const LG_CUSTOM_HEADER_PHP = __DIR__.'/custom.header.php';
+// Define a file here which will be used to display the custom footer. Will be at the bottom of file;
+const LG_CUSTOM_FOOTER_PHP = __DIR__.'/custom.footer.php';
+
 // Define the location of this network, usually a city and a country;
 const LG_LOCATION = 'Amsterdam, Netherlands';
 // Define a query location for the link to openstreetmap (eg: Amsterdam, Netherlands will be https://www.openstreetmap.org/search?query=Amsterdam, Netherlands)
diff --git a/index.php b/index.php
index be9b18e..8fd0ade 100644
--- a/index.php
+++ b/index.php
@@ -75,6 +75,18 @@ if (LG_BLOCK_CUSTOM) {
     ob_start();
     include LG_CUSTOM_HTML;
     $templateData['custom_html'] = ob_get_clean();
+
+    if (defined('LG_CUSTOM_HEADER_PHP')) {
+        ob_start();
+        include LG_CUSTOM_HEADER_PHP;
+        $templateData['custom_header'] = ob_get_clean();
+    }
+
+    if (defined('LG_CUSTOM_FOOTER_PHP')) {
+        ob_start();
+        include LG_CUSTOM_FOOTER_PHP;
+        $templateData['custom_footer'] = ob_get_clean();
+    }
 }
 
 if (LG_CHECK_LATENCY && filter_var(LookingGlass::detectIpAddress(), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
@@ -97,6 +109,8 @@ $templateData['csrfToken'] = $_SESSION[LookingGlass::SESSION_CSRF] = bin2hex(ran
 </head>
 <body>
 
+<?php echo isset($templateData['custom_header']) ? $templateData['custom_header'] : '' ?>
+
 <div class="col-lg-6 mx-auto p-3 py-md-5">
 
     <header class="d-flex align-items-center pb-3 mb-5 border-bottom">
@@ -274,6 +288,8 @@ $templateData['csrfToken'] = $_SESSION[LookingGlass::SESSION_CSRF] = bin2hex(ran
     </footer>
 </div>
 
+<?php echo isset($templateData['custom_footer']) ? $templateData['custom_footer'] : '' ?>
+
 <?php if ($templateData['session_call_backend']): ?>
 <script type="text/javascript">
     (function () {

From c286c56d87b40e9d422fb15a41c7d9481f0f2f92 Mon Sep 17 00:00:00 2001
From: dqos <8611981+dqos@users.noreply.github.com>
Date: Wed, 1 Nov 2023 18:56:56 +0100
Subject: [PATCH 4/7] Remove CHANGELOG due to much work

---
 CHANGELOG.md | 58 ----------------------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index d91c0dc..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-## 1.2.0 - 2023-06-26
-### Fixed
-- PR https://github.com/hybula/lookingglass/pull/21 thanks to @JKJameson.
-- Issue #20 thanks to @amirgilan for reporting.
-
-### Added
-- Latency feature (by default disabled).
-
-## 1.1.3 - 2023-03-01
-### Fixed
-- Issue #12 with https://github.com/hybula/lookingglass/pull/14 thanks to @MarcHagen.
-- Issue #13 with https://github.com/hybula/lookingglass/pull/15 thanks to @MarcHagen.
-
-## 1.1.2 - 2023-01-05
-### Fixed
-- Added contact in config.php for Docker thanks to @deliciousbob.
-
-## 1.1.1 - 2022-12-27
-### Fixed
-- Fix IPv6 issues thanks to @kimma.
-
-## 1.1.0 - 2022-11-23
-### Fixed
-- Changelog date format adjusted to ISO 8601.
-- Improvements on MTR live output thanks to @MarcHagen.
-- Minor improvements in backend thanks to @MarcHagen.
-- Improved Docker support thanks to @MarcHagen.
-- Updated README.md about POSIX installation.
-- Updated Bootstrap to version 5.2.3
-
-### Added
-- A way to add custom <head> content, in the future this will replace the custom CSS feature.
-- Upgrade tips to README.md.
-
-## [1.0.1] - 2022-04-19
-### Fixed
-- Ping6/Traceroute6/MTR6 validation when using hostnames (PR #2).
-
-## [1.0.0] - 2022-04-14
-### Fixed
-- Undefined warning when refreshing a page after execution.
-- Traceroute error when there is no PID found.
-
-### Added
-- Added Docker support.
-- This CHANGELOG.md to track changes.
-
-## [0.1.0] - 2022-01-17
-### Changed
-- First release.

From 540bef3e12da2e6a9adbdb1fefa7036cb2346ffc Mon Sep 17 00:00:00 2001
From: dqos <8611981+dqos@users.noreply.github.com>
Date: Wed, 1 Nov 2023 18:57:19 +0100
Subject: [PATCH 5/7] Fix latency feature thanks to Marc

---
 LookingGlass.php | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/LookingGlass.php b/LookingGlass.php
index cf32239..252630f 100644
--- a/LookingGlass.php
+++ b/LookingGlass.php
@@ -428,7 +428,13 @@ class LookingGlass
      */
     private static function getLatencyFromSs(string $ip): array
     {
-        $lines = shell_exec('/usr/sbin/ss -Hti state established');
+        $ssPath = exec('which ss 2>/dev/null');
+        if (empty($ssPath)) {
+            // RHEL based systems
+            $ssPath = '/usr/sbin/ss';
+        }
+        $lines = shell_exec("$ssPath -Hnti state established");
+
         $ss = [];
         $i = 0;
         $j = 0;
@@ -445,26 +451,22 @@ class LookingGlass
         $output = [];
         foreach ($ss as $socket) {
             $socket = preg_replace('!\s+!', ' ', $socket);
-            $explodedsocket = explode(' ', $socket);
-            preg_match('/\d+\.\d+\.\d+\.\d+/', $explodedsocket[2], $temp);
-            if (!isset($temp[0])) {
+            preg_match('/^\d+\s+\d+\s+(?:\[::ffff:)?(?<localIp>[a-f0-9.:]+)]?:(?<localPort>\d+)\s+(?:\[::ffff:)?(?<remoteIp>[a-f0-9.:]+)]?:(?<remotePort>\d+)/', $line, $matches);
+            if ($matches['remoteIp'] !== $ip) {
                 continue;
             }
-            $sock['local'] = $temp[0];
-            preg_match('/\d+\.\d+\.\d+\.\d+/', $explodedsocket[3], $temp);
-            $sock['remote'] = $temp[0];
+            $sock['local'] = $matches['localIp'];
+            $sock['remote'] = $matches['remoteIp'];
             preg_match('/segs_out:(\d+)/', $socket, $temp);
             $sock['segs_out'] = $temp[1];
             preg_match('/segs_in:(\d+)/', $socket, $temp);
             $sock['segs_in'] = $temp[1];
-            preg_match_all('/rtt:(\d+\.\d+)\/(\d+\.\d+)/', $socket, $temp);
-            $sock['latency'] = $temp[1][0];
-            $sock['jitter'] = $temp[2][0];
-            preg_match_all('/retrans:\d+\/(\d+)/', $socket, $temp);
-            $sock['retransmissions'] = (isset($temp[1][0]) ? $temp[1][0] : 0);
-            if ($sock['remote'] == $ip) {
-                $output[] = $sock;
-            }
+            preg_match('/rtt:(\d+\.\d+)\/(\d+\.\d+)/', $socket, $temp);
+            $sock['latency'] = $temp[1];
+            $sock['jitter'] = $temp[2];
+            preg_match('/retrans:\d+\/(\d+)/', $socket, $temp);
+            $sock['retransmissions'] = ($temp[1] ?? 0);
+            $output[] = $sock;
         }
         return $output;
     }

From 9346288160cc171230e5a95875087703bf5fb9c3 Mon Sep 17 00:00:00 2001
From: dqos <8611981+dqos@users.noreply.github.com>
Date: Wed, 1 Nov 2023 19:14:38 +0100
Subject: [PATCH 6/7] Fix latency feature

---
 LookingGlass.php | 28 ++++++++++++++++------------
 README.md        |  1 +
 index.php        |  4 ++--
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/LookingGlass.php b/LookingGlass.php
index 252630f..a8911df 100644
--- a/LookingGlass.php
+++ b/LookingGlass.php
@@ -430,11 +430,10 @@ class LookingGlass
     {
         $ssPath = exec('which ss 2>/dev/null');
         if (empty($ssPath)) {
-            // RHEL based systems
+            // RHEL based systems;
             $ssPath = '/usr/sbin/ss';
         }
         $lines = shell_exec("$ssPath -Hnti state established");
-
         $ss = [];
         $i = 0;
         $j = 0;
@@ -451,22 +450,27 @@ class LookingGlass
         $output = [];
         foreach ($ss as $socket) {
             $socket = preg_replace('!\s+!', ' ', $socket);
-            preg_match('/^\d+\s+\d+\s+(?:\[::ffff:)?(?<localIp>[a-f0-9.:]+)]?:(?<localPort>\d+)\s+(?:\[::ffff:)?(?<remoteIp>[a-f0-9.:]+)]?:(?<remotePort>\d+)/', $line, $matches);
-            if ($matches['remoteIp'] !== $ip) {
+            $explodedsocket = explode(' ', $socket);
+            preg_match('/\d+\.\d+\.\d+\.\d+|\[[:a-fA-F0-9]+\]/', $explodedsocket[2], $temp);
+            if (!isset($temp[0])) {
                 continue;
             }
-            $sock['local'] = $matches['localIp'];
-            $sock['remote'] = $matches['remoteIp'];
+            $sock['local'] = $temp[0];
+            preg_match('/\d+\.\d+\.\d+\.\d+|\[[:a-fA-F0-9]+\]/', $explodedsocket[3], $temp);
+            if (preg_match('/^\[(.*)\]$/', $temp[0], $matches)) { $temp[0] = $matches[1]; }
+            $sock['remote'] = $temp[0];
             preg_match('/segs_out:(\d+)/', $socket, $temp);
             $sock['segs_out'] = $temp[1];
             preg_match('/segs_in:(\d+)/', $socket, $temp);
             $sock['segs_in'] = $temp[1];
-            preg_match('/rtt:(\d+\.\d+)\/(\d+\.\d+)/', $socket, $temp);
-            $sock['latency'] = $temp[1];
-            $sock['jitter'] = $temp[2];
-            preg_match('/retrans:\d+\/(\d+)/', $socket, $temp);
-            $sock['retransmissions'] = ($temp[1] ?? 0);
-            $output[] = $sock;
+            preg_match_all('/rtt:(\d+\.\d+)\/(\d+\.\d+)/', $socket, $temp);
+            $sock['latency'] = $temp[1][0];
+            $sock['jitter'] = $temp[2][0];
+            preg_match_all('/retrans:\d+\/(\d+)/', $socket, $temp);
+            $sock['retransmissions'] = (isset($temp[1][0]) ? $temp[1][0] : 0);
+            if ($sock['remote'] == $ip) {
+                $output[] = $sock;
+            }
         }
         return $output;
     }
diff --git a/README.md b/README.md
index fb97d75..41c3d21 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ made user-friendly for everyone to use. It allows you to execute network related
 - Supports ping/ping6, traceroute/traceroute6 and mtr/mtr6.
 - Easy to customize and to configure.
 - DNS checking to prevent unnecessary executions.
+- Latency feature from visitor to LG.
 
 ### Requirements
 - Any Linux distribution, this has been tested on RHEL 8 + 9.
diff --git a/index.php b/index.php
index 8fd0ade..398050a 100644
--- a/index.php
+++ b/index.php
@@ -89,7 +89,7 @@ if (LG_BLOCK_CUSTOM) {
     }
 }
 
-if (LG_CHECK_LATENCY && filter_var(LookingGlass::detectIpAddress(), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+if (LG_CHECK_LATENCY) {
     $templateData['latency'] = LookingGlass::getLatency();
 }
 
@@ -181,7 +181,7 @@ $templateData['csrfToken'] = $_SESSION[LookingGlass::SESSION_CSRF] = bin2hex(ran
                             <label class="mb-2 text-muted">Your IP</label>
                             <div class="input-group">
                                 <input type="text" class="form-control" value="<?php echo $templateData['user_ip'] ?>" onfocus="this.select()" readonly="">
-                                <?php if (LG_CHECK_LATENCY && filter_var(LookingGlass::detectIpAddress(), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)): ?><label class="input-group-text" title="Latency between this looking glass and your connection." style="cursor: help;"><small><?php echo $templateData['latency'] ?> MS</small></label><?php endif ?>
+                                <?php if (LG_CHECK_LATENCY): ?><label class="input-group-text" title="Latency between this looking glass and your connection." style="cursor: help;"><small><?php echo $templateData['latency'] ?> MS</small></label><?php endif ?>
                             </div>
                         </div>
                     </div>

From b9f8cc2c90fa6b65a8c6f020a72abab77b3aab9d Mon Sep 17 00:00:00 2001
From: dqos <8611981+dqos@users.noreply.github.com>
Date: Wed, 1 Nov 2023 19:15:44 +0100
Subject: [PATCH 7/7] Fix latency feature

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 398050a..3cec0f3 100644
--- a/index.php
+++ b/index.php
@@ -111,7 +111,7 @@ $templateData['csrfToken'] = $_SESSION[LookingGlass::SESSION_CSRF] = bin2hex(ran
 
 <?php echo isset($templateData['custom_header']) ? $templateData['custom_header'] : '' ?>
 
-<div class="col-lg-6 mx-auto p-3 py-md-5">
+<div class="col-lg-8 mx-auto p-3 py-md-5">
 
     <header class="d-flex align-items-center pb-3 mb-5 border-bottom">
             <div class="col-8">