Adds beginning of status code handling, better status code reporting
This commit is contained in:
parent
db57919ade
commit
7f6c4a6d77
GPG Key ID:
FC09694A000800C8
@ -84,9 +84,17 @@ class Follow
|
||||
{
|
||||
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||
$this->code = ($code) ? $code : 0;
|
||||
if ($code == 200) {
|
||||
$this->updatePath($this->step, 'code', $this->code);
|
||||
return true;
|
||||
|
||||
// handle certain codes specifically
|
||||
switch ($code)
|
||||
{
|
||||
case 200:
|
||||
$this->updatePath($this->step, 'code', $this->code);
|
||||
return true;
|
||||
case 404:
|
||||
$this->updatePath($this->step, 'code', $this->code);
|
||||
$this->setError(['type' => 'code', 'message' => 'URL returned a 404 error response.']);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@ -24,6 +24,7 @@ if (isset($_POST['url']))
|
||||
// end on an error
|
||||
if ($request->error)
|
||||
{
|
||||
$error = $request->error;
|
||||
break;
|
||||
}
|
||||
|
||||
@ -33,7 +34,7 @@ if (isset($_POST['url']))
|
||||
// update our code
|
||||
$code = ($request->code) ? $request->code : false;
|
||||
|
||||
} while ($code != 200);
|
||||
} while (substr($code, 0, 1) != 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -116,6 +116,16 @@ button[type="submit"]:hover {
|
||||
background-color: #f0eded;
|
||||
}
|
||||
|
||||
address {
|
||||
display: flex;
|
||||
align-self: stretch;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-style: normal;
|
||||
padding: 0.5rem 0;
|
||||
background: #ffdee3;
|
||||
}
|
||||
|
||||
main {
|
||||
align-items: center;
|
||||
align-self: stretch;
|
||||
@ -252,13 +262,21 @@ td {
|
||||
vertical-align: top;
|
||||
word-wrap: anywhere;
|
||||
}
|
||||
td:first-child {
|
||||
text-align: center;
|
||||
}
|
||||
td:nth-child(2) {
|
||||
line-height: 1.5rem;
|
||||
padding: 0.8rem 1rem;
|
||||
width: 100%;
|
||||
}
|
||||
td:nth-child(2) a:hover {
|
||||
text-decoration-color: transparent;
|
||||
}
|
||||
td:nth-child(4) {
|
||||
text-align: center;
|
||||
padding-right: 1.5rem;
|
||||
}
|
||||
td b {
|
||||
border: 1px solid #aaa;
|
||||
border-right-width: 2px;
|
||||
@ -271,10 +289,17 @@ td b {
|
||||
padding: 0 0.25rem;
|
||||
transition: border-color 150ms ease-in-out, color 150ms ease-in-out;
|
||||
}
|
||||
td b i {
|
||||
display: inline-block;
|
||||
transition: transform 150ms ease-in-out;
|
||||
}
|
||||
td:nth-child(2) a:hover b {
|
||||
border-color: #1a1a1a;
|
||||
color: #1a1a1a;
|
||||
}
|
||||
td:nth-child(2) a:hover b i {
|
||||
transform: rotate(45deg);
|
||||
}
|
||||
tbody tr:nth-child(odd) td {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
160
index.php
160
index.php
@ -19,126 +19,130 @@ include('inc/codes.php');
|
||||
</nav>
|
||||
</menu>
|
||||
<form method="post" action="/" type="application/x-www-form-urlencoded">
|
||||
<input type="url" value="" placeholder="URL to check..." name="url">
|
||||
<input type="url" value="<?php echo $url; ?>" placeholder="URL to check..." name="url">
|
||||
<button type="submit">Check</button>
|
||||
</form>
|
||||
</header>
|
||||
<main>
|
||||
|
||||
<?php
|
||||
// error message display
|
||||
if (isset($error))
|
||||
{
|
||||
|
||||
echo "
|
||||
<address>
|
||||
".$error['message']."
|
||||
</address>";
|
||||
}
|
||||
?>
|
||||
|
||||
<main>
|
||||
<?php
|
||||
// if we have a valid request object
|
||||
if (isset($request) && count($request->path) > 0)
|
||||
{
|
||||
$steps = count($request->path) - 1;
|
||||
$count = ($steps == 1) ? '1 redirect' : $steps.' redirects';
|
||||
$count = ($steps == 1) ? 'once' : $steps.' times';
|
||||
echo "
|
||||
<article>
|
||||
<h2>Final destination</h2>
|
||||
<p>The URL you traced had ".$count." and ended here:</p>
|
||||
<p class=\"final\">
|
||||
<a href=\"".$request->getFinalRedirect()."\" target=\"blank\">
|
||||
".$request->getFinalRedirect()."
|
||||
</a>
|
||||
</p>
|
||||
<h3>Redirect trace</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Step</th>
|
||||
<th>Request</th>
|
||||
<th colspan=\"2\">Code</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>";
|
||||
<article>
|
||||
<h2>Final destination</h2>
|
||||
<p>Your URL returned a <code><strong>".$request->code."</strong></code> status code and redirected ".$count.":</p>
|
||||
<p class=\"final\">
|
||||
<a href=\"".$request->getFinalRedirect()."\" target=\"blank\">
|
||||
".$request->getFinalRedirect()."
|
||||
</a>
|
||||
</p>
|
||||
<h3>Redirect trace</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Step</th>
|
||||
<th>Request</th>
|
||||
<th colspan=\"2\">Code</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>";
|
||||
foreach ($request->path as $step)
|
||||
{
|
||||
$item = $step['step'];
|
||||
$url = $step['url'];
|
||||
$code = $step['code'];
|
||||
$next = ($step['next']) ? '⥂⇄↩︎' : '✓';
|
||||
$next = ($step['next']) ? '↩︎' : ((isset($error)) ? 'x' : '✓');
|
||||
echo "
|
||||
<tr>
|
||||
<td>".$item."</td>
|
||||
<td>".$url." <a href=\"".$url."\" target=\"blank\"><b>↗︎</b></a></td>
|
||||
<td><code>".$code."</code></td>
|
||||
<td>".$next."</td>
|
||||
</tr>";
|
||||
<tr>
|
||||
<td>".$item."</td>
|
||||
<td>".$url." <a href=\"".$url."\" target=\"blank\"><b><i>↗︎</i></b></a></td>
|
||||
<td><code>".$code."</code></td>
|
||||
<td>".$next."</td>
|
||||
</tr>";
|
||||
}
|
||||
echo "
|
||||
</tbody>
|
||||
<caption>
|
||||
User agent: ".$request::USER_AGENT."
|
||||
</caption>
|
||||
</table>
|
||||
</article>";
|
||||
</tbody>
|
||||
<caption>
|
||||
User agent: ".$request::USER_AGENT."
|
||||
</caption>
|
||||
</table>
|
||||
</article>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "
|
||||
<article>
|
||||
<h2>
|
||||
Trace a URL's redirects
|
||||
</h2>
|
||||
<p>
|
||||
Enter a URL in the search box above to derive the final resolved URL after all redirects. The script runs recursive curl requests until we get a <code>200</code> status code. This is helpful to get around link tracking or original URLs that Pi-hole outright blocks (like email links).
|
||||
</p>
|
||||
<p>
|
||||
I used to use <a href=\"https://wheregoes.com\">wheregoes.com</a> which is a good, reliable service, but decided to roll my own for privacy reasons. Absolutely nothing is logged as all URL searches are via POST and that's not currently included in my nginx logs.
|
||||
</p>
|
||||
<h3>
|
||||
Technical details
|
||||
</h3>
|
||||
<p>
|
||||
User agent
|
||||
</p>
|
||||
<p>
|
||||
Other curl settings
|
||||
</p>
|
||||
</article>
|
||||
";
|
||||
<article>
|
||||
<h2>
|
||||
Trace a URL's redirects
|
||||
</h2>
|
||||
<p>
|
||||
Enter a URL in the search box above to derive the final resolved URL after all redirects. The script runs recursive curl requests until we get a <code>200</code> status code. This is helpful to get around link tracking or original URLs that Pi-hole outright blocks (like email links).
|
||||
</p>
|
||||
<p>
|
||||
I used to use <a href=\"https://wheregoes.com\">wheregoes.com</a> which is a good, reliable service, but decided to roll my own for privacy reasons. Absolutely nothing is logged as all URL searches are via POST and that's not currently included in my nginx logs.
|
||||
</p>
|
||||
<h3>
|
||||
Technical details
|
||||
</h3>
|
||||
<p>
|
||||
User agent
|
||||
</p>
|
||||
<p>
|
||||
Other curl settings
|
||||
</p>
|
||||
</article>";
|
||||
}
|
||||
?>
|
||||
<aside>
|
||||
<h3>
|
||||
HTTP response status codes
|
||||
</h3>
|
||||
<aside>
|
||||
<h3>
|
||||
HTTP response status codes
|
||||
</h3>
|
||||
<?php
|
||||
if (isset($codes) && is_array($codes) && !empty($codes))
|
||||
{
|
||||
foreach ($codes as $group)
|
||||
{
|
||||
echo "
|
||||
<details>
|
||||
<summary>
|
||||
".$group['label']." (<code>".$group['start']."</code>–<code>".$group['range']."</code>)
|
||||
</summary>
|
||||
<dl>";
|
||||
<details>
|
||||
<summary>
|
||||
".$group['label']." (<code>".$group['start']."</code>–<code>".$group['range']."</code>)
|
||||
</summary>
|
||||
<dl>";
|
||||
foreach ($group['codes'] as $code => $prop)
|
||||
{
|
||||
echo "
|
||||
<!-- ".$code." -->
|
||||
<dt>
|
||||
<label for=\"".$code."\"><code>".$code."</code> ".$prop['name']."</label>
|
||||
</dt>
|
||||
<input type=\"checkbox\" id=\"".$code."\">
|
||||
<dd>".$prop['desc']."</dd>";
|
||||
<!-- ".$code." -->
|
||||
<dt>
|
||||
<label for=\"".$code."\"><code>".$code."</code> ".$prop['name']."</label>
|
||||
</dt>
|
||||
<input type=\"checkbox\" id=\"".$code."\">
|
||||
<dd>".$prop['desc']."</dd>";
|
||||
}
|
||||
echo "
|
||||
</dl>
|
||||
</details>";
|
||||
</dl>
|
||||
</details>";
|
||||
}
|
||||
}
|
||||
?>
|
||||
<p>
|
||||
See <a href="https://httpwg.org/specs/rfc9110.html#overview.of.status.codes">RFC 9110</a> for official documentation on each status code.
|
||||
</p>
|
||||
</aside>
|
||||
</main>
|
||||
<p>
|
||||
See <a href="https://httpwg.org/specs/rfc9110.html#overview.of.status.codes">RFC 9110</a> for official documentation on each status code.
|
||||
</p>
|
||||
</aside>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue
Block a user