Update test deps

CHANGELOG.md

@@ -205,3 +205,60 @@
 * Supported by RSS Guard #3627
 * Allow Unicode for shortcuts #3548
 
+[1.14.0]
+* Update FreshRSS to 1.19.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.19.0)
+
+[1.14.1]
+* Update FreshRSS to 1.19.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.19.1)
+
+[1.14.2]
+* Update apache configs
+
+[1.14.3]
+* Update FreshRSS to 1.19.2
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.19.2)
+* Improve dropdown menus on mobile view #4141, #4128
+* Fix regression regarding keeping read state after seeing favourites / labels #4178
+* Lots of code improvements, including improved support of PHP 8.1
+
+[1.15.0]
+* Update FreshRSS to 1.20.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.20.0)
+* New Web scraping feature HTML+XPath for Web pages without any RSS/ATOM feed #4220
+* Add support for Dynamic OPML #4407
+* New search engine supporting (nested) parentheses, also with negation #4378
+* Allow many (50k+) feeds #4347 and other performance improvements
+* New option to exclude some DOM elements with a CSS Selector when retrieving an article full content #4501
+* New option to automatically mark as read gone articles #4426
+* 2 new themes and plenty of UI improvements
+* Supported by Fluent Reader Lite client on Android and iOS #4595
+* Several bug fixes
+
+[1.15.1]
+* Update FreshRSS to 1.20.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.20.1)
+* Add support for custom XPath date/time format #4703
+* Add default redirect when authenticating #4778
+* Force default user before rendering login page #4620
+
+[1.15.2]
+* Update FreshRSS to 1.20.2
+* Update Cloudron base image to 4.0.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.20.2)
+* Fix security vulnerability in ext.php #4928 reported by @c3l3si4n
+
+[1.15.3]
+* Update FreshRSS extensions repo to f66efcf5f
+
+[1.16.0]
+* Update FreshRSS to 1.21.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.21.0)
+* New XML+XPath mode for fetching XML documents when there is no RSS/ATOM feed #5076
+* Better support of feed enclosures (image / audio / video attachments) #4944
+* User-defined time-zone #4906
+* New CLI script cli/sensitive-log.sh to help e.g. Apache clear logs for sensitive information such as credentials #5001
+* Mark some themes as tentatively deprecated: BlueLagoon, Flat, Screwdriver #4807
+* Many UI improvements
+

CloudronManifest.json

@@ -3,9 +3,10 @@
   "title": "FreshRSS",
   "author": "FreshRSS Developers",
   "description": "file://DESCRIPTION.md",
-  "changelog": "file://CHANGELOG",
+  "changelog": "file://CHANGELOG.md",
   "tagline": "RSS feed reader",
-  "version": "1.13.2",
+  "version": "1.16.0",
+  "upstreamVersion": "1.21.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
@@ -27,7 +28,7 @@
     "https://screenshots.cloudron.io/org.freshrss.cloudronapp/1.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md",
-  "minBoxVersion": "5.3.0",
+  "minBoxVersion": "7.1.0",
   "forumUrl": "https://forum.cloudron.io/category/27/freshrss",
   "documentationUrl": "https://cloudron.io/documentation/apps/freshrss/"
 }

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages FreshRSS <upstream>1.18.1</upstream>.
+This app packages FreshRSS <upstream>1.19.2</upstream>.
 
 ## About
 

Dockerfile

@@ -1,15 +1,15 @@
-FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
+FROM cloudron/base:4.0.0@sha256:31b195ed0662bdb06a6e8a5ddbedb6f191ce92e8bee04c03fb02dd4e9d0286df
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.18.1
+ARG VERSION=1.21.0
 RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1
 
 RUN mv data data-orig && ln -s /app/data data
 
-# official extensions
-RUN wget https://github.com/FreshRSS/Extensions/archive/1784092164139dc6961ba5cc5b920331b586acbc.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
+# official extensions (https://github.com/FreshRSS/Extensions/commits/master)
+RUN wget https://github.com/FreshRSS/Extensions/archive/f66efcf5feb1245607c2e3ac9ef4176b5f2801b3.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
     mv /app/code/extensions /app/code/extensions-orig && \
     ln -s /app/data/extensions /app/code/extensions
 
@@ -26,15 +26,15 @@ RUN a2enmod headers expires deflate mime dir rewrite setenvif
 
 RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
 
-RUN crudini --set /etc/php/7.4/apache2/php.ini PHP upload_max_filesize 64M && \
-    crudini --set /etc/php/7.4/apache2/php.ini PHP post_max_size 64M && \
-    crudini --set /etc/php/7.4/apache2/php.ini PHP memory_limit 64M && \
-    crudini --set /etc/php/7.4/apache2/php.ini Session session.save_path /run/php/session && \
-    crudini --set /etc/php/7.4/apache2/php.ini Session session.gc_probability 1 && \
-    crudini --set /etc/php/7.4/apache2/php.ini Session session.gc_divisor 100
+RUN crudini --set /etc/php/8.1/apache2/php.ini PHP upload_max_filesize 64M && \
+    crudini --set /etc/php/8.1/apache2/php.ini PHP post_max_size 64M && \
+    crudini --set /etc/php/8.1/apache2/php.ini PHP memory_limit 64M && \
+    crudini --set /etc/php/8.1/apache2/php.ini Session session.save_path /run/php/session && \
+    crudini --set /etc/php/8.1/apache2/php.ini Session session.gc_probability 1 && \
+    crudini --set /etc/php/8.1/apache2/php.ini Session session.gc_divisor 100
 
-RUN ln -s /app/data/php.ini /etc/php/7.4/apache2/conf.d/99-cloudron.ini && \
-    ln -s /app/data/php.ini /etc/php/7.4/cli/conf.d/99-cloudron.ini
+RUN ln -s /app/data/php.ini /etc/php/8.1/apache2/conf.d/99-cloudron.ini && \
+    ln -s /app/data/php.ini /etc/php/8.1/cli/conf.d/99-cloudron.ini
 
 ADD start.sh /app/code/start.sh
 

apache/freshrss.conf

@@ -12,10 +12,5 @@ ServerName %{HTTP_HOST}
         Options +FollowSymLinks
         AllowOverride All
         Require all granted
-
-        <IfModule mod_php7.c>
-            php_value memory_limit 64m
-        </IfModule>
-
     </Directory>
 </VirtualHost>

start.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-mkdir -p /run/php/session
+mkdir -p /run/php/session /app/data/extensions
 
 if ! [ -f /app/data/.installed ]; then
     echo "==> Fresh installation, setting up..."
@@ -29,7 +29,6 @@ ln -s /tmp/log_api.txt /app/data/users/_/log_api.txt
 
 # We have to copy instead of symlinking extensions (see #2)
 echo "==> Copying packaged extensions"
-mkdir -p /app/data/extensions
 for f in $(ls /app/code/extensions-orig); do
     rm -rf "/app/data/extensions/$f"
     cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"

test/package.json

@@ -9,14 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^91.0.1",
-    "ejs": "^3.1.6",
+    "chromedriver": "^110.0.0",
     "expect.js": "^0.3.1",
-    "mkdirp": "^1.0.4",
-    "mocha": "^9.0.0",
-    "rimraf": "^3.0.2",
-    "selenium-server-standalone-jar": "^3.141.59",
-    "selenium-webdriver": "^3.6.0",
-    "superagent": "^6.1.0"
+    "mocha": "^10.2.0",
+    "selenium-webdriver": "^4.8.1",
+    "superagent": "^8.0.9"
   }
 }

test/test.js

@@ -1,5 +1,11 @@
 #!/usr/bin/env node
 
+/* jshint esversion: 8 */
+/* global describe */
+/* global before */
+/* global after */
+/* global it */
+
 'use strict';
 
 require('chromedriver');
@@ -8,12 +14,8 @@ var execSync = require('child_process').execSync,
     expect = require('expect.js'),
     path = require('path'),
     superagent = require('superagent'),
-    webdriver = require('selenium-webdriver');
-
-var by = webdriver.By,
-    Keys = webdriver.Key,
-    until = webdriver.until,
-    Builder = require('selenium-webdriver').Builder;
+    { Builder, By, Key, until } = require('selenium-webdriver'),
+    { Options } = require('selenium-webdriver/chrome');
 
 var username = 'admin',
     password = 'changeme';
@@ -21,35 +23,27 @@ var username = 'admin',
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    var server, browser = new Builder().forBrowser('chrome').build();
+    const LOCATION = 'test';
+    const TEST_TIMEOUT = 10000;
+    const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
-    before(function (done) {
-        var seleniumJar= require('selenium-server-standalone-jar');
-        var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
-        server = new SeleniumServer(seleniumJar.path, { port: 4444 });
-        server.start();
+    var browser, app;
 
-        done();
+    before(function () {
+        const options = new Options().windowSize({ width: 1280, height: 1024 });
+        if (process.env.HEADLESS) options.addArguments('headless');
+
+        browser = new Builder().forBrowser('chrome').setChromeOptions(options).build();
     });
 
-    after(function (done) {
+    after(function () {
         browser.quit();
-        server.stop();
-        done();
     });
 
-    var LOCATION = 'test';
-    var TEST_TIMEOUT = 10000;
-    var app;
-
-    function exists(selector) {
-        return browser.wait(until.elementLocated(selector), TEST_TIMEOUT);
-    }
-
-    function visible(selector, callback) {
-        return exists(selector).then(function () {
-            return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
-        });
+    function getAppInfo() {
+        var inspect = JSON.parse(execSync('cloudron inspect'));
+        app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
+        expect(app).to.be.an('object');
     }
 
     function baseUrl() {
@@ -57,120 +51,69 @@ describe('Application life cycle test', function () {
         return `https://${app.fqdn}`;
     }
 
-    // we do this because it perm redirects to /p/ in old versions
-    function clearCache() {
-        // https://stackoverflow.com/questions/49614217/selenium-clear-chrome-cache
-        // defaut clearance is 1 hour of cache
-        return browser.get('chrome://settings/clearBrowserData').then(function () {
-            return visible(by.css('* /deep/ #clearBrowsingDataConfirm'));
-        }).then(function () {
-            return browser.findElement(by.css('* /deep/ #clearBrowsingDataConfirm')).click();
-        }).then(function () {
-            return browser.sleep(5000);
-        });
+    async function waitForElement(elem) {
+        await browser.wait(until.elementLocated(elem), TEST_TIMEOUT);
+        await browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
     }
 
-    function login(password, callback) {
-        browser.get('https://' + app.fqdn).then(function () {
-            return visible(by.id('loginButton'));
-        }).then(function () {
-            return browser.findElement(by.id('username')).sendKeys(username);
-        }).then(function () {
-            return browser.findElement(by.id('passwordPlain')).sendKeys(password);
-        }).then(function () {
-            return browser.findElement(by.id('loginButton')).click();
-        }).then(function () {
-            return browser.wait(until.elementLocated(by.id('dropdown-configure')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
+    async function login(password) {
+        await browser.get('https://' + app.fqdn);
+        await waitForElement(By.id('loginButton'));
+        await browser.findElement(By.id('username')).sendKeys(username);
+        await browser.findElement(By.id('passwordPlain')).sendKeys(password);
+        await browser.findElement(By.id('loginButton')).click();
+        await waitForElement(By.id('btn-subscription'));
     }
 
-    function logout(callback) {
-        var logout_btn = by.xpath('//ul[@class="dropdown-menu"]/li/a[@class="signout"]');
+    async function logout() {
+        var logout_btn = By.xpath('//li/a[@class="signout"]');
 
-        browser.get('https://' + app.fqdn).then(function () {
-            return visible(by.id('stream'));
-        }).then(function () {
-            return browser.findElement(by.className('dropdown-toggle')).click();
-        }).then(function () {
-            return visible(logout_btn);
-        }).then(function () {
-            return browser.findElement(logout_btn).click();
-        }).then(function () {
-            return browser.wait(until.elementLocated(by.id('loginButton')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
+        await browser.get('https://' + app.fqdn);
+        await waitForElement(By.id('stream'));
+        await browser.findElement(By.className('dropdown-toggle')).click();
+        await waitForElement(logout_btn);
+        await browser.findElement(logout_btn).click();
+        await waitForElement(By.id('loginButton'));
     }
 
-    function addSubscription(callback) {
+    async function addSubscription() {
         var url = 'https://blog.cloudron.io/rss/';
         const addUrl = app.manifest.version === '1.10.0' ? `${baseUrl()}/i/?c=subscription` : `${baseUrl()}/i/?c=subscription&a=add`;
 
-        browser.get(addUrl).then(function () {
-            return visible(by.xpath('//input[@name="url_rss"]'));
-        }).then(function () {
-            return browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
-        }).then(function () {
-            return browser.findElement(by.xpath('//button[@type="submit"]/ancestor::form[@id="add_rss"]')).submit();
-        }).then(function () {
-            return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
-        }).then(function () {
-            callback();
-        });
+        await browser.get(addUrl);
+        await waitForElement(By.xpath('//input[@name="url_rss"]'));
+        await browser.findElement(By.xpath('//input[@name="url_rss"]')).sendKeys(url);
+        await browser.findElement(By.xpath('//form[@id="add_rss"]//button[text()="Add"]')).click();
+        await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
     }
 
-    function addUser(password, callback) {
+    async function addUser(password) {
         var test_username = 'test';
 
-        browser.get(`${baseUrl()}/i/?c=user&a=manage`).then(function () {
-            return visible(by.id('new_user_name'));
-        }).then(function () {
-            return browser.findElement(by.id('new_user_name')).sendKeys(test_username);
-        }).then(function () {
-            return browser.findElement(by.id('new_user_passwordPlain')).sendKeys(password);
-        }).then(function () {
-            return browser.findElement(by.xpath('//button[text()="Create"]')).click();
-        }).then(function () {
-            return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
-        }).then(function () {
-            callback();
-        });
+        await browser.get(`${baseUrl()}/i/?c=user&a=manage`);
+        await waitForElement(By.id('new_user_name'));
+        await browser.findElement(By.id('new_user_name')).sendKeys(test_username);
+        await browser.findElement(By.id('new_user_passwordPlain')).sendKeys(password);
+        await browser.findElement(By.xpath('//button[text()="Create"]')).click();
+        await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
     }
 
-    function enableApi(callback) {
-        browser.get(`${baseUrl()}/i/?c=auth`).then(function () {
-            return browser.findElement(by.id('api_enabled')).click();
-        }).then(function () {
-            return browser.findElement(by.xpath('//button[text()="Submit"]')).submit();
-        }).then(function () {
-            callback();
-        });
+    async function enableApi() {
+        await browser.get(`${baseUrl()}/i/?c=auth`);
+        await waitForElement(By.id('api_enabled'));
+        await browser.findElement(By.id('api_enabled')).click();
+        await browser.findElement(By.xpath('//button[text()="Submit"]')).click();
     }
 
-    function checkApiConfiguration(callback) {
-        browser.get(`${baseUrl()}/api/`).then(function () {
-            return exists(by.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
-        }).then(function () {
-            return exists(by.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
-        }).then(function () {
-            callback();
-        });
+    async function checkApiConfiguration() {
+        await browser.get(`${baseUrl()}/api/`);
+        await waitForElement(By.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
+        await waitForElement(By.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
     }
 
-    function getAppInfo() {
-        var inspect = JSON.parse(execSync('cloudron inspect'));
-        app = inspect.apps.filter(function (a) { return a.location === LOCATION || a.location === LOCATION + '2'; })[0];
-        expect(app).to.be.an('object');
-    }
-
-    function subscriptionExists(callback) {
-        browser.get(`${baseUrl()}/i/?get=c_1`).then(function () {
-            return visible(by.xpath('//span[text()="Cloudron"]'));
-        }).then(function () {
-            callback();
-        });
+    async function subscriptionExists() {
+        await browser.get(`${baseUrl()}/i/?get=c_1`);
+        return waitForElement(By.xpath('//span[text()="Cloudron"]'));
     }
 
     function getStaticExtensionFile(callback) {
@@ -184,13 +127,8 @@ describe('Application life cycle test', function () {
         });
     }
 
-    xit('build app', function () {
-        execSync('cloudron build', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
-
-    it('install app', function () {
-        execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
+    it('install app', function () { execSync('cloudron install --location ' + LOCATION, EXEC_ARGS); });
 
     it('can get app information', getAppInfo);
 
@@ -203,16 +141,14 @@ describe('Application life cycle test', function () {
     it('can get static extension file', getStaticExtensionFile);
     it('can logout', logout);
 
-    it('backup app', function () {
-        execSync('cloudron backup create --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
 
     it('restore app', function () {
-        const backups = JSON.parse(execSync('cloudron backup list --raw'));
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-        execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        const backups = JSON.parse(execSync(`cloudron backup list --raw --app ${app.id}`));
+        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
+        execSync('cloudron install --location ' + LOCATION, EXEC_ARGS);
         getAppInfo();
-        execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, EXEC_ARGS);
     });
 
     it('can login', login.bind(null, password));
@@ -223,7 +159,7 @@ describe('Application life cycle test', function () {
 
     it('move to different location', function () {
         browser.manage().deleteAllCookies();
-        execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, EXEC_ARGS);
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
         expect(app).to.be.an('object');
@@ -235,14 +171,10 @@ describe('Application life cycle test', function () {
     it('can get static extension file', getStaticExtensionFile);
     it('can logout', logout);
 
-    it('uninstall app', function () {
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
 
     // test update
-    it('can install app', function () {
-        execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    it('can install app', function () { execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, EXEC_ARGS); });
 
     it('can get app information', getAppInfo);
     it('can login', login.bind(null, password));
@@ -250,7 +182,7 @@ describe('Application life cycle test', function () {
     it('can add users', addUser.bind(null, password));
 
     it('can update', function () {
-        execSync('cloudron update --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron update --app ' + app.id, EXEC_ARGS);
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
         expect(app).to.be.an('object');
@@ -260,7 +192,5 @@ describe('Application life cycle test', function () {
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);
 
-    it('uninstall app', function () {
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
 });