Merge pull request #3068 from catchpoint/disable_traceroute

claud-io · web-flow · commit 63c6e7c2246c · 2024-05-23T16:56:19.000+02:00
Disable traceroute test type by default
diff --git a/www/header.inc b/www/header.inc
@@ -104,7 +104,7 @@ if (!EMBED) {
             $showUrl = $numSteps > 1 || !$url ? $gradeRunResults->getStepResult(1)->getUrl() : $url;
             echo "<ul class=\"header_data_urltime\">";
 
-            if ($test['testinfo']['type'] === "traceroute") {
+            if (GetSetting('traceroute_enabled') && $test['testinfo']['type'] === "traceroute") {
                 $showUrl = "http://" . $showUrl;
                 echo "<li><strong>HOST/IP: </strong>";
             } else {
diff --git a/www/running.inc b/www/running.inc
@@ -53,7 +53,7 @@
                 if (GetSetting('nolinks')) {
                     echo "URL: $url<br>\n";
                 } else {
-                    if ($test['testinfo']['type'] === "traceroute") {
+                    if (GetSetting('traceroute_enabled') && $test['testinfo']['type'] === "traceroute") {
                         echo "Host/IP: <a class=\"urlLinkWrap\" rel=\"nofollow\" href=\"http://$url\" target=\"_blank\">$url</a><br>\n";
                     } else {
                         echo "URL: <a class=\"urlLinkWrap\" rel=\"nofollow\" href=\"$url\" target=\"_blank\">$url</a><br>\n";
diff --git a/www/runtest.php b/www/runtest.php
@@ -1923,6 +1923,9 @@ function ValidateParameters(&$test, $locations, &$error, $destination_url = null
                 }
 
                 if (isset($test['type']) && strlen($test['type']) && $test['type'] === 'traceroute') {
+                    if (!GetSetting('traceroute_enabled')) {
+                        $error = "traceroute test type not supported";
+                    }
                     // make sure we're just passing a host name
                     $parts = parse_url($test['url']);
                     $test['url'] = $parts['host'];
diff --git a/www/templates/account/includes/signup.php b/www/templates/account/includes/signup.php
@@ -70,6 +70,7 @@
                         </td>
                     </tr>
 
+                    <?php if (GetSetting('traceroute_enabled')): ?>
                     <tr>
                         <th scope="col">Traceroute</th>
                         <td>
@@ -81,6 +82,7 @@
                             <span class="visually-hidden">Yes</span>
                         </td>
                     </tr>
+                    <?php endif; ?>
 
                     <tr>
                         <th scope="col">Test History</th>
diff --git a/www/templates/account/plans/upgrade-plan.php b/www/templates/account/plans/upgrade-plan.php
@@ -97,7 +97,9 @@
                 <li>All Connection Speeds</li>
                 <li>Filmstrip and Video</li>
                 <li>Google Lighthouse</li>
+                <?php if (GetSetting('traceroute_enabled')): ?>
                 <li>Traceroute</li>
+                <?php endif; ?>
                 <li>13 month Test History</li>
                 <li>Priority Tests</li>
                 <li>API Access</li>
diff --git a/www/templates/account/signup/step-1.php b/www/templates/account/signup/step-1.php
@@ -128,6 +128,7 @@
                 </td>
             </tr>
 
+            <?php if (GetSetting('traceroute_enabled')): ?>
             <tr>
                 <th scope="col">Traceroute</th>
                 <td>
@@ -139,6 +140,7 @@
                     <span class="visually-hidden">Yes</span>
                 </td>
             </tr>
+            <?php endif; ?>
 
             <tr>
                 <th scope="col">Test History</th>
diff --git a/www/testTypesNav.php b/www/testTypesNav.php
@@ -19,7 +19,10 @@
 
 $testTypes['Lighthouse'] = '/lighthouse';
 $testTypes['Visual Comparison'] = '/video';
-$testTypes['Traceroute'] = '/traceroute';
+
+if (GetSetting('traceroute_enabled')) {
+    $testTypes['Traceroute'] = '/traceroute';
+}
 
 unset($testTypes[$currNav]);
 ?>
diff --git a/www/traceroute.php b/www/traceroute.php
@@ -5,6 +5,48 @@
 // found in the LICENSE.md file.
 include 'common.inc';
 
+use WebPageTest\Util;
+
+if(!GetSetting('traceroute_enabled')):
+?>
+
+<!DOCTYPE html>
+<html lang="en-us">
+
+<head>
+    <title>WebPageTest - Traceroute diagnostic</title>
+    <?php include('head.inc'); ?>
+</head>
+
+<body class="home feature-pro">
+    
+<body class="home feature-pro">
+    <?php
+    $tab = 'Traceroute';
+    include 'header.inc';
+    ?>
+
+    <?php include("home_header.php"); ?>
+
+    <div class="home_content_contain">
+        <div class="home_content">
+            <div id="test_box-container" class="home_responsive_test">
+                <h2>
+                    <span>
+                        Traceroute test type not supported
+                    </span>
+                </h2>
+            </div>
+
+            <div style="position: absolute; bottom: 0">
+                <?php include('footer.inc'); ?>
+            </div>
+        </div><!--home_content_contain-->
+    </div><!--home_content-->
+</body>
+<?php die(); endif; ?>
+
+<?php
 $current_user = $request_context->getUser();
 $is_paid = !is_null($current_user) ? $current_user->isPaid() : false;
 

Original file line number	Diff line number	Diff line change
`@@ -1923,6 +1923,9 @@ function ValidateParameters(&$test, $locations, &$error, $destination_url = null`
`1923`	`1923`	`}`
`1924`	`1924`
`1925`	`1925`	`if (isset($test['type']) && strlen($test['type']) && $test['type'] === 'traceroute') {`
	`1926`	`+ if (!GetSetting('traceroute_enabled')) {`
	`1927`	`+ $error = "traceroute test type not supported";`
	`1928`	`+ }`
`1926`	`1929`	`// make sure we're just passing a host name`
`1927`	`1930`	`$parts = parse_url($test['url']);`
`1928`	`1931`	`$test['url'] = $parts['host'];`