Merge pull request #1 from Solstice-Software/zpuhl/encrypted-urls

Feature: Practical URL Parameter Encryption

actions/DisplayAction.php

@@ -121,8 +121,12 @@ private function createResponse(Request $request, BridgeAbstract $bridge, string
                 $items = $feedItems;
             }
             $feed = $bridge->getFeed();
-        } catch (\Exception $e) {
-            // Probably an exception inside a bridge
+        } catch (\Throwable $e) {
+            if ($e instanceof RateLimitException) {
+                // These are internally generated by bridges
+                $this->logger->info(sprintf('RateLimitException in DisplayAction(%s): %s', $bridge->getShortName(), create_sane_exception_message($e)));
+                return new Response(render(__DIR__ . '/../templates/exception.html.php', ['e' => $e]), 429);
+            }
             if ($e instanceof HttpException) {
                 // Reproduce (and log) these responses regardless of error output and report limit
                 if ($e->getCode() === 429) {
@@ -165,7 +169,7 @@ private function createResponse(Request $request, BridgeAbstract $bridge, string
             'last-modified' => gmdate('D, d M Y H:i:s ', $now) . 'GMT',
             'content-type'  => $format->getMimeType() . '; charset=' . $format->getCharset(),
         ];
-        return new Response($format->stringify(), 200, $headers);
+        return new Response($format->stringify($request), 200, $headers);
     }
 
     private function createFeedItemFromException($e, BridgeAbstract $bridge): FeedItem
@@ -213,7 +217,7 @@ private function logBridgeError($bridgeName, $code)
         return $report['count'];
     }
 
-    private static function createGithubIssueUrl(BridgeAbstract $bridge, \Exception $e, string $message): string
+    private static function createGithubIssueUrl(BridgeAbstract $bridge, \Throwable $e, string $message): string
     {
         $maintainer = $bridge->getMaintainer();
         if (str_contains($maintainer, ',')) {

bridges/NvidiaDriverBridge.php

@@ -0,0 +1,49 @@
+<?php
+
+class NvidiaDriverBridge extends FeedExpander
+{
+    const NAME = 'NVIDIA Linux Driver Releases';
+    const URI = 'https://www.nvidia.com/Download/processFind.aspx';
+    const DESCRIPTION = 'Fetch the latest NVIDIA Linux driver updates';
+    const MAINTAINER = 'tillcash';
+    const PARAMETERS = [
+        [
+            'whql' => [
+                'name' => 'Version',
+                'type' => 'list',
+                'values' => [
+                        'All' => '',
+                        'Beta' => '0',
+                        'New Feature Branch' => '5',
+                        'Recommended/Certified' => '1',
+                ],
+            ],
+        ],
+    ];
+
+    public function collectData()
+    {
+        $whql = $this->getInput('whql');
+
+        $parameters = [
+            'lid'   => 1, // en-us
+            'psid'  => 129, // GeForce
+            'osid'  => 12, // Linux 64-bit
+            'whql'  => $whql,
+        ];
+
+        $url = 'https://www.nvidia.com/Download/processFind.aspx?' . http_build_query($parameters);
+        $dom = getSimpleHTMLDOM($url);
+
+        foreach ($dom->find('tr#driverList') as $element) {
+            $id = str_replace('img_', '', $element->find('img', 0)->id);
+
+            $this->items[] = [
+                'timestamp' => $element->find('td.gridItem', 3)->plaintext,
+                'title'     => sprintf('NVIDIA Linux Driver %s', $element->find('td.gridItem', 2)->plaintext),
+                'uri'       => 'https://www.nvidia.com/Download/driverResults.aspx/' . $id,
+                'content'   => $dom->find('tr#tr_' . $id . ' span', 0)->innertext,
+            ];
+        }
+    }
+}

bridges/RedditBridge.php

@@ -93,12 +93,12 @@ public function collectData()
     {
         $forbiddenKey = 'reddit_forbidden';
         if ($this->cache->get($forbiddenKey)) {
-            throw new HttpException('403 Forbidden', 403);
+            throw new RateLimitException();
         }
 
         $rateLimitKey = 'reddit_rate_limit';
         if ($this->cache->get($rateLimitKey)) {
-            throw new HttpException('429 Too Many Requests', 429);
+            throw new RateLimitException();
         }
 
         try {
@@ -108,8 +108,10 @@ public function collectData()
                 // 403 Forbidden
                 // This can possibly mean that reddit has permanently blocked this server's ip address
                 $this->cache->set($forbiddenKey, true, 60 * 61);
+                throw new RateLimitException();
             } elseif ($e->getCode() === 429) {
                 $this->cache->set($rateLimitKey, true, 60 * 61);
+                throw new RateLimitException();
             }
             throw $e;
         }

bridges/Vk2Bridge.php

@@ -194,7 +194,7 @@ protected function getImageURLWithLargestWidth($items)
     public function collectData()
     {
         if ($this->cache->get($this->rateLimitCacheKey)) {
-            throw new HttpException('429 Too Many Requests', 429);
+            throw new RateLimitException();
         }
 
         $u = $this->getInput('u');

bridges/VkBridge.php

@@ -519,7 +519,7 @@ private function getContents()
             $uri = urljoin(self::URI, $headers['location'][0]);
 
             if (str_contains($uri, '/429.html')) {
-                returnServerError('VK responded "Too many requests"');
+                throw new RateLimitException();
             }
 
             if (!preg_match('#^https?://vk.com/#', $uri)) {

bridges/YoutubeBridge.php

@@ -82,13 +82,14 @@ public function collectData()
     {
         $cacheKey = 'youtube_rate_limit';
         if ($this->cache->get($cacheKey)) {
-            throw new HttpException('429 Too Many Requests', 429);
+            throw new RateLimitException();
         }
         try {
             $this->collectDataInternal();
         } catch (HttpException $e) {
             if ($e->getCode() === 429) {
                 $this->cache->set($cacheKey, true, 60 * 16);
+                throw new RateLimitException();
             }
             throw $e;
         }

config.default.ini.php

@@ -27,6 +27,16 @@
 ;enabled_bridges[] = YouTubeCommunityTabBridge
 enabled_bridges[] = *
 
+; Encrypted URL key. A random string between 16 and 64 characters long which is used to generate
+;   compressed and encrypted feed URLs, to keep private information secret.
+;
+; NEVER SHARE THIS KEY.
+; A password generator should be used to create this string. Whitespace is NOT ALLOWED.
+;
+; If this value is empty (default), then encrypted URLs cannot be used.
+;   Example key (DO NOT USE THIS): "b3c7@hsLqk)P(SJvjCBDUy]GMg6RamdHxEWV8K9nA4QN.p_5"
+enc_url_key = ""
+
 ; Defines the timezone used by RSS-Bridge
 ; Find a list of supported timezones at
 ; https://www.php.net/manual/en/timezones.php

formats/AtomFormat.php

@@ -14,7 +14,7 @@ class AtomFormat extends FormatAbstract
     protected const ATOM_NS = 'http://www.w3.org/2005/Atom';
     protected const MRSS_NS = 'http://search.yahoo.com/mrss/';
 
-    public function stringify()
+    public function stringify(?Request $request)
     {
         $document = new \DomDocument('1.0', $this->getCharset());
         $document->formatOutput = true;

formats/HtmlFormat.php

@@ -4,7 +4,7 @@ class HtmlFormat extends FormatAbstract
 {
     const MIME_TYPE = 'text/html';
 
-    public function stringify()
+    public function stringify(?Request $request)
     {
         // This query string is url encoded
         $queryString = $_SERVER['QUERY_STRING'];
@@ -13,14 +13,27 @@ public function stringify()
         $formatFactory = new FormatFactory();
         $formats = [];
 
+        if (str_contains(strtolower($queryString), strtolower(UrlEncryptionService::PARAMETER_NAME . '='))) {
+            $encryptionToken = 'yes';
+        } else {
+            $encryptionToken = null;
+        }
+
         // Create all formats (except HTML)
         $formatNames = $formatFactory->getFormatNames();
         foreach ($formatNames as $formatName) {
             if ($formatName === 'Html') {
                 continue;
             }
             // The format url is relative, but should be absolute in order to help feed readers.
-            $formatUrl = '?' . str_ireplace('format=Html', 'format=' . $formatName, $queryString);
+            if (str_contains(strtolower($queryString), 'format=html')) {
+                $formatUrl = '?' . str_ireplace('format=Html', 'format=' . $formatName, $queryString);
+            } else {
+                // If we're viewing the HtmlFormat and the 'format' GET parameter isn't here, this is likely an
+                //   encrypted URL being viewed. Handle this by reconstructing the raw URL with the new format.
+                $formatUrl = '?' . http_build_query($request->toArray());
+                $formatUrl .= (strlen($formatUrl) > 1 ? '&' : '') . 'format=' . $formatName;
+            }
             $formatObject = $formatFactory->create($formatName);
             $formats[] = [
                 'url'       => $formatUrl,
@@ -48,12 +61,14 @@ public function stringify()
         }
 
         $html = render_template(__DIR__ . '/../templates/html-format.html.php', [
-            'charset'       => $this->getCharset(),
-            'title'         => $feedArray['name'],
-            'formats'       => $formats,
-            'uri'           => $feedArray['uri'],
-            'items'         => $items,
-            'donation_uri'  => $donationUri,
+            'charset'          => $this->getCharset(),
+            'title'            => $feedArray['name'],
+            'formats'          => $formats,
+            'uri'              => $feedArray['uri'],
+            'items'            => $items,
+            'donation_uri'     => $donationUri,
+            'encryption_token' => $encryptionToken,
+            'bridge_name'      => $request->get('bridge'),
         ]);
         // Remove invalid characters
         ini_set('mbstring.substitute_character', 'none');

formats/JsonFormat.php

@@ -23,7 +23,7 @@ class JsonFormat extends FormatAbstract
         'uid',
     ];
 
-    public function stringify()
+    public function stringify(?Request $request)
     {
         $feedArray = $this->getFeed();
 

formats/MrssFormat.php

@@ -32,7 +32,7 @@ class MrssFormat extends FormatAbstract
     protected const ATOM_NS = 'http://www.w3.org/2005/Atom';
     protected const MRSS_NS = 'http://search.yahoo.com/mrss/';
 
-    public function stringify()
+    public function stringify(?Request $request)
     {
         $document = new \DomDocument('1.0', $this->getCharset());
         $document->formatOutput = true;

formats/PlaintextFormat.php

@@ -4,7 +4,7 @@ class PlaintextFormat extends FormatAbstract
 {
     const MIME_TYPE = 'text/plain';
 
-    public function stringify()
+    public function stringify(?Request $request)
     {
         $feed = $this->getFeed();
         foreach ($this->getItems() as $item) {

formats/SfeedFormat.php

@@ -4,7 +4,7 @@ class SfeedFormat extends FormatAbstract
 {
     const MIME_TYPE = 'text/plain';
 
-    public function stringify()
+    public function stringify(?Request $request)
     {
         $text = '';
         foreach ($this->getItems() as $item) {

lib/BridgeAbstract.php

@@ -104,9 +104,27 @@ public function getMaintainer(): string
     /**
      * A more correct method name would have been "getContexts"
      */
-    public function getParameters(): array
+    final public function getParameters(): array
     {
-        return static::PARAMETERS;
+        $parameters = static::PARAMETERS;
+
+        if (UrlEncryptionService::enabled()) {
+            // A parameter cannot be defined which collides with the special encryption parameter.
+            $illegalToken = array_key_exists(UrlEncryptionService::PARAMETER_NAME, $parameters);
+            foreach ($parameters as $k => $v) {
+                $illegalToken |= array_key_exists(UrlEncryptionService::PARAMETER_NAME, $v);
+            }
+
+            if ($illegalToken) {
+                throw new \Exception(
+                    'The parameter name "' . UrlEncryptionService::PARAMETER_NAME
+                    . '" is reserved for encrypted URLs. Remove this from the PARAMETERS definition in bridge "'
+                    . $this->getName() . '".'
+                );
+            }
+        }
+
+        return $parameters;
     }
 
     public function getItems()

lib/FormatAbstract.php

@@ -12,7 +12,7 @@ abstract class FormatAbstract
 
     protected array $feed = [];
 
-    abstract public function stringify();
+    abstract public function stringify(?Request $request);
 
     public function setFeed(array $feed)
     {

lib/ParameterValidator.php

@@ -10,7 +10,13 @@ public function validateInput(array &$input, $contexts): array
         $errors = [];
 
         foreach ($input as $name => $value) {
+            if ($name === UrlEncryptionService::PARAMETER_NAME && UrlEncryptionService::enabled()) {
+                // Do not validate against encrypted URL tokens.
+                continue;
+            }
+
             $registered = false;
+
             foreach ($contexts as $contextName => $contextParameters) {
                 if (!array_key_exists($name, $contextParameters)) {
                     continue;

lib/RssBridge.php

@@ -18,28 +18,22 @@ public function __construct(
 
     public function main(array $argv = []): Response
     {
-        if ($argv) {
-            parse_str(implode('&', array_slice($argv, 1)), $cliArgs);
-            $request = Request::fromCli($cliArgs);
-        } else {
-            $request = Request::fromGlobals();
-        }
-
-        foreach ($request->toArray() as $key => $value) {
-            if (!is_string($value)) {
-                return new Response(render(__DIR__ . '/../templates/error.html.php', [
-                    'message' => "Query parameter \"$key\" is not a string.",
-                ]), 400);
-            }
-        }
-
+        // The check for maintenance mode should always occur first since it has no
+        //   dependencies, and nothing else needs to come before it for bootstrapping.
         if (Configuration::getConfig('system', 'enable_maintenance_mode')) {
             return new Response(render(__DIR__ . '/../templates/error.html.php', [
                 'title'     => '503 Service Unavailable',
                 'message'   => 'RSS-Bridge is down for maintenance.',
             ]), 503);
         }
 
+        if ($argv) {
+            parse_str(implode('&', array_slice($argv, 1)), $cliArgs);
+            $request = Request::fromCli($cliArgs);
+        } else {
+            $request = Request::fromGlobals();
+        }
+
         // HTTP Basic auth check
         if (Configuration::getConfig('authentication', 'enable')) {
             if (Configuration::getConfig('authentication', 'password') === '') {
@@ -65,6 +59,33 @@ public function main(array $argv = []): Response
             // At this point the username and password was correct
         }
 
+        // If the URL contains an encrypted token, then the rest of the current URL
+        //   parameters are discarded and the encrypted token is decrypted, decompressed,
+        //   and expanded into the Request object's 'get' container. The user should NEVER
+        //   be redirected to another URL that would expose what params that are in the
+        //   current page.
+        if (
+            $request->get(UrlEncryptionService::PARAMETER_NAME)
+            && UrlEncryptionService::enabled()
+        ) {
+            try {
+                $request->tryDecryptUrl();
+            } catch (\Exception $e) {
+                return new Response(
+                    render(__DIR__ . '/../templates/error.html.php', ['message' => $e->getMessage()]),
+                    401
+                );
+            }
+        }
+
+        foreach ($request->toArray() as $key => $value) {
+            if (!is_string($value)) {
+                return new Response(render(__DIR__ . '/../templates/error.html.php', [
+                    'message' => "Query parameter \"$key\" is not a string.",
+                ]), 400);
+            }
+        }
+
         // Add token as attribute to request
         $request = $request->withAttribute('token', $request->get('token'));