Merge remote-tracking branch 'upstream/master'

.github/prtester.py

@@ -5,6 +5,7 @@
 from datetime import datetime
 from typing import Iterable
 import os.path
+import urllib
 
 # This script is specifically written to be used in automation for https://github.com/RSS-Bridge/rss-bridge
 #
@@ -45,15 +46,14 @@ def testBridges(instance: Instance, bridge_cards: Iterable, with_upload: bool, w
         bridgeid = bridge_card.get('id')
         bridgeid = bridgeid.split('-')[1] # this extracts a readable bridge name from the bridge metadata
         print(f'{bridgeid}{instance_suffix}')
-        bridgestring = '/?action=display&bridge=' + bridgeid + '&format=Html'
         bridge_name = bridgeid.replace('Bridge', '')
         context_forms = bridge_card.find_all("form")
         form_number = 1
         for context_form in context_forms:
             # a bridge can have multiple contexts, named 'forms' in html
-            # this code will produce a fully working formstring that should create a working feed when called
+            # this code will produce a fully working url that should create a working feed when called
             # this will create an example feed for every single context, to test them all
-            formstring = ''
+            context_parameters = {}
             error_messages = []
             context_name = '*untitled*'
             context_name_element = context_form.find_previous_sibling('h5')
@@ -62,27 +62,27 @@ def testBridges(instance: Instance, bridge_cards: Iterable, with_upload: bool, w
             parameters = context_form.find_all("input")
             lists = context_form.find_all("select")
             # this for/if mess cycles through all available input parameters, checks if it required, then pulls
-            # the default or examplevalue and then combines it all together into the formstring
+            # the default or examplevalue and then combines it all together into the url parameters
             # if an example or default value is missing for a required attribute, it will throw an error
             # any non-required fields are not tested!!!
             for parameter in parameters:
-                if parameter.get('type') == 'hidden' and parameter.get('name') == 'context':
-                    cleanvalue = parameter.get('value').replace(" ","+")
-                    formstring = formstring + '&' + parameter.get('name') + '=' + cleanvalue
-                if parameter.get('type') == 'number' or parameter.get('type') == 'text':
+                parameter_type = parameter.get('type')
+                parameter_name = parameter.get('name')
+                if parameter_type == 'hidden':
+                    context_parameters[parameter_name] = parameter.get('value')
+                if parameter_type == 'number' or parameter_type == 'text':
                     if parameter.has_attr('required'):
                         if parameter.get('placeholder') == '':
                             if parameter.get('value') == '':
-                                name_value = parameter.get('name')
-                                error_messages.append(f'Missing example or default value for parameter "{name_value}"')
+                                error_messages.append(f'Missing example or default value for parameter "{parameter_name}"')
                             else:
-                                formstring = formstring + '&' + parameter.get('name') + '=' + parameter.get('value')
+                                context_parameters[parameter_name] = parameter.get('value')
                         else:
-                            formstring = formstring + '&' + parameter.get('name') + '=' + parameter.get('placeholder')
-                # same thing, just for checkboxes. If a checkbox is checked per default, it gets added to the formstring
-                if parameter.get('type') == 'checkbox':
+                            context_parameters[parameter_name] = parameter.get('placeholder')
+                # same thing, just for checkboxes. If a checkbox is checked per default, it gets added to the url parameters
+                if parameter_type == 'checkbox':
                     if parameter.has_attr('checked'):
-                        formstring = formstring + '&' + parameter.get('name') + '=on'
+                        context_parameters[parameter_name] = 'on'
             for listing in lists:
                 selectionvalue = ''
                 listname = listing.get('name')
@@ -102,15 +102,21 @@ def testBridges(instance: Instance, bridge_cards: Iterable, with_upload: bool, w
                         if 'selected' in selectionentry.attrs:
                             selectionvalue = selectionentry.get('value')
                             break
-                formstring = formstring + '&' + listname + '=' + selectionvalue
+                context_parameters[listname] = selectionvalue
             termpad_url = 'about:blank'
             if error_messages:
                 status = '<br>'.join(map(lambda m: f'❌ `{m}`', error_messages))
             else:
-                # if all example/default values are present, form the full request string, run the request, add a <base> tag with
+                # if all example/default values are present, form the full request url, run the request, add a <base> tag with
                 # the url of em's public instance to the response text (so that relative paths work, e.g. to the static css file) and
                 # then upload it to termpad.com, a pastebin-like-site.
-                response = requests.get(instance.url + bridgestring + formstring)
+                context_parameters.update({
+                    'action': 'display',
+                    'bridge': bridgeid,
+                    'format': 'Html',
+                })
+                request_url = f'{instance.url}/?{urllib.parse.urlencode(context_parameters)}'
+                response = requests.get(request_url)
                 page_text = response.text.replace('<head>','<head><base href="https://rss-bridge.org/bridge01/" target="_blank">')
                 page_text = page_text.encode("utf_8")
                 soup = BeautifulSoup(page_text, "html.parser")
@@ -163,8 +169,8 @@ def getFirstLine(value: str) -> str:
         for instance_arg in args.instances:
             instance_arg_parts = instance_arg.split('::')
             instance = Instance()
-            instance.name = instance_arg_parts[1] if len(instance_arg_parts) >= 2 else ''
-            instance.url = instance_arg_parts[0]
+            instance.name = instance_arg_parts[1].strip() if len(instance_arg_parts) >= 2 else ''
+            instance.url = instance_arg_parts[0].strip().rstrip("/")
             instances.append(instance)
     else:
         instance = Instance()

Dockerfile

@@ -1,13 +1,12 @@
-FROM lwthiker/curl-impersonate:0.5-ff-slim-buster AS curlimpersonate
-
 FROM debian:12-slim AS rssbridge
 
 LABEL description="RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites that don't have one."
 LABEL repository="https://github.com/RSS-Bridge/rss-bridge"
 LABEL website="https://github.com/RSS-Bridge/rss-bridge"
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && \
+RUN set -xe && \
+    apt-get update && \
     apt-get install --yes --no-install-recommends \
       ca-certificates \
       nginx \
@@ -24,18 +23,44 @@ RUN apt-get update && \
       php-xml \
       php-zip \
       # php-zlib is enabled by default with PHP 8.2 in Debian 12
+      # for downloading libcurl-impersonate
+      curl \
       && \
+    # install curl-impersonate library
+    curlimpersonate_version=0.6.0 && \
+    { \
+        { \
+            [ $(arch) = 'aarch64' ] && \
+            archive="libcurl-impersonate-v${curlimpersonate_version}.aarch64-linux-gnu.tar.gz" && \
+            sha512sum="d04b1eabe71f3af06aa1ce99b39a49c5e1d33b636acedcd9fad163bc58156af5c3eb3f75aa706f335515791f7b9c7a6c40ffdfa47430796483ecef929abd905d" \
+        ; } \
+        || { \
+            [ $(arch) = 'armv7l' ] && \
+            archive="libcurl-impersonate-v${curlimpersonate_version}.arm-linux-gnueabihf.tar.gz" && \
+            sha512sum="05906b4efa1a6ed8f3b716fd83d476b6eea6bfc68e3dbc5212d65a2962dcaa7bd1f938c9096a7535252b11d1d08fb93adccc633585ff8cb8cec5e58bfe969bc9" \
+        ; } \
+        || { \
+            [ $(arch) = 'x86_64' ] && \
+            archive="libcurl-impersonate-v${curlimpersonate_version}.x86_64-linux-gnu.tar.gz" && \
+            sha512sum="480bbe9452cd9aff2c0daaaf91f1057b3a96385f79011628a9237223757a9b0d090c59cb5982dc54ea0d07191657299ea91ca170a25ced3d7d410fcdff130ace" \
+        ; } \
+    } && \
+    curl -LO "https://github.com/lwthiker/curl-impersonate/releases/download/v${curlimpersonate_version}/${archive}" && \
+    echo "$sha512sum  $archive" | sha512sum -c - && \
+    mkdir -p /usr/local/lib/curl-impersonate && \
+    tar xaf "$archive" -C /usr/local/lib/curl-impersonate --wildcards 'libcurl-impersonate-ff.so*' && \
+    rm "$archive" && \
+    apt-get purge --assume-yes curl && \
     rm -rf /var/lib/apt/lists/*
 
+ENV LD_PRELOAD /usr/local/lib/curl-impersonate/libcurl-impersonate-ff.so
+ENV CURL_IMPERSONATE ff91esr
+
 # logs should go to stdout / stderr
 RUN ln -sfT /dev/stderr /var/log/nginx/error.log; \
 	ln -sfT /dev/stdout /var/log/nginx/access.log; \
 	chown -R --no-dereference www-data:adm /var/log/nginx/
 
-COPY --from=curlimpersonate /usr/local/lib/libcurl-impersonate-ff.so /usr/local/lib/curl-impersonate/
-ENV LD_PRELOAD /usr/local/lib/curl-impersonate/libcurl-impersonate-ff.so
-ENV CURL_IMPERSONATE ff91esr
-
 COPY ./config/nginx.conf /etc/nginx/sites-available/default
 COPY ./config/php-fpm.conf /etc/php/8.2/fpm/pool.d/rss-bridge.conf
 COPY ./config/php.ini /etc/php/8.2/fpm/conf.d/90-rss-bridge.ini

README.md

@@ -64,7 +64,7 @@ These instructions have been tested on a fresh Debian 12 VM from Digital Ocean (
 ```shell
 timedatectl set-timezone Europe/Oslo
 
-apt install git nginx php8.2-fpm php-mbstring php-simplexml php-curl
+apt install git nginx php8.2-fpm php-mbstring php-simplexml php-curl php-intl
 
 # Create a new user account
 useradd --shell /bin/bash --create-home rss-bridge
@@ -167,12 +167,10 @@ Restart fpm and nginx:
 
 ```shell
 # Lint and restart php-fpm
-php-fpm8.2 -t
-systemctl restart php8.2-fpm
+php-fpm8.2 -t && systemctl restart php8.2-fpm
 
 # Lint and restart nginx
-nginx -t
-systemctl restart nginx
+nginx -t && systemctl restart nginx
 ```
 
 ### How to install from Composer

actions/DisplayAction.php

@@ -32,7 +32,7 @@ public function execute(Request $request)
                     return new Response('', 304, ['last-modified' => $modificationTimeGMT . 'GMT']);
                 }
             }
-            return $cachedResponse;
+            return $cachedResponse->withHeader('rss-bridge', 'This is a cached response');
         }
 
         if (!$bridgeName) {
@@ -51,7 +51,6 @@ public function execute(Request $request)
             return new Response(render(__DIR__ . '/../templates/error.html.php', ['message' => 'This bridge is not whitelisted']), 400);
         }
 
-
         if (
             Configuration::getConfig('proxy', 'url')
             && Configuration::getConfig('proxy', 'by_bridge')
@@ -62,8 +61,6 @@ public function execute(Request $request)
         }
 
         $bridge = $bridgeFactory->create($bridgeClassName);
-        $formatFactory = new FormatFactory();
-        $format = $formatFactory->create($format);
 
         $response = $this->createResponse($request, $bridge, $format);
 
@@ -93,7 +90,7 @@ public function execute(Request $request)
         return $response;
     }
 
-    private function createResponse(Request $request, BridgeAbstract $bridge, FormatAbstract $format)
+    private function createResponse(Request $request, BridgeAbstract $bridge, string $format)
     {
         $items = [];
         $feed = [];
@@ -157,6 +154,9 @@ private function createResponse(Request $request, BridgeAbstract $bridge, Format
             }
         }
 
+        $formatFactory = new FormatFactory();
+        $format = $formatFactory->create($format);
+
         $format->setItems($items);
         $format->setFeed($feed);
         $now = time();