Fixup tests

CHANGELOG

@@ -168,3 +168,44 @@
 [1.10.0]
 * Add forum url and update screenshot links
 
+[1.11.0]
+* Update FreshRSS to 1.17.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.17.0)
+* New tag management page #3121
+* New page to add feeds and categories #3027
+* Add a way to disable/enable users #3056
+* Fix special characters in user queries #3037
+* Hide feed credentials when adding a new feed #3099
+* Trim whitespace for feed passwords #3158
+* Updated PHPMailer library to 6.1.6 #3024
+* Add blogger.com to the default list of forced HTTPS #3088
+
+[1.12.0]
+* Update base image to v3
+* Update PHP to 7.4
+
+[1.13.0]
+* Update FreshRSS to 1.18.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.18.0)
+* Allow parallel requests #3096 - Much faster manual feeds refresh
+* Reload full article content when an article has changed #3506
+* New share article link to clipboard #3330
+* Improved OPML import of feeds with multiple categories #3286
+* Add a content action parameter to work with CSS selector #3453
+* New cURL options per feed: proxy, cookie, user-agent #3367, #3494, #3516
+* Do not import feeds causing database errors (e.g. due to conflicting HTTP redirections) ##3347
+
+[1.13.1]
+* Fix apache config to log the client IP
+
+[1.13.2]
+* Update FreshRSS to 1.18.1
+* Support standard HTTP 410 Gone by disabling (muting) gone feeds #3561
+* Supported by Newsboat 2.24+ #3574
+* 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)
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.10.0",
+  "version": "1.14.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
@@ -14,7 +14,7 @@
     "scheduler": {
       "update_feeds": {
         "schedule": "*/1 * * * *",
-        "command": "/usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
+        "command": "echo '==> Run actualize script' && /usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
       }
     }
   },
@@ -24,7 +24,7 @@
   "icon": "logo.png",
   "tags": [ "rss", "atom", "greader", "reader", "news", "feeds", "feedly" ],
   "mediaLinks": [
-    "https://cloudron-app-screenshots.s3.amazonaws.com/org.freshrss.cloudronapp/7d731e71a6faa3791e19b7d7daf468a9486349cc/1.png"
+    "https://screenshots.cloudron.io/org.freshrss.cloudronapp/1.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md",
   "minBoxVersion": "5.3.0",

DESCRIPTION.md

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

Dockerfile

@@ -1,15 +1,15 @@
-FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
+FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.16.2
+ARG VERSION=1.19.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/de83a1096c10644098291539cabfbecd38d5a28f.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
+RUN wget https://github.com/FreshRSS/Extensions/archive/1784092164139dc6961ba5cc5b920331b586acbc.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,12 +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.3/apache2/php.ini PHP upload_max_filesize 64M && \
-    crudini --set /etc/php/7.3/apache2/php.ini PHP post_max_size 64M && \
-    crudini --set /etc/php/7.3/apache2/php.ini PHP memory_limit 64M && \
-    crudini --set /etc/php/7.3/apache2/php.ini Session session.save_path /run/php/session && \
-    crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_probability 1 && \
-    crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_divisor 100
+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 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
 
 ADD start.sh /app/code/start.sh
 

POSTINSTALL.md

@@ -1,7 +1,7 @@
 This app is pre-setup with an admin account. The initial credentials are:
   
-**Username**: admin <br/>
-**Password**: changeme <br/>
+**Username**: admin<br/>
+**Password**: changeme<br/>
 
 Please change the admin password immediately.
 

apache/freshrss.conf

@@ -1,9 +1,12 @@
+ServerName %{HTTP_HOST}
+
 <VirtualHost *:8000>
     DocumentRoot /app/code/p
     AllowEncodedSlashes On
 
-    ErrorLog /dev/stderr 
-    CustomLog /dev/stdout combined
+    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
+    CustomLog "|/bin/cat" proxy
+    ErrorLog "|/bin/cat"
 
     <Directory /app/code/p/>
         Options +FollowSymLinks

apache/mpm_prefork.conf

@@ -9,7 +9,7 @@
 	MaxSpareServers 3
 
     # Maximum number of servers at any given instant. Requests will be queued after this
-	MaxRequestWorkers	  6
+	MaxRequestWorkers	  10
 
     # Recycle process after handling these many requests. This protected against accidental memory leaks
 	MaxConnectionsPerChild   100

start.sh

@@ -18,6 +18,10 @@ if ! [ -f /app/data/.installed ]; then
     echo "==> Done."
 fi
 
+if [[ ! -f /app/data/php.ini ]]; then
+    echo -e "; Add custom PHP configuration in this file\n; Settings here are merged with the package's built-in php.ini\n\n" > /app/data/php.ini
+fi
+
 echo "==> Symlinking log file"
 rm -f /app/data/users/_/log_api.txt
 touch /tmp/log_api.txt

test/package.json

@@ -9,14 +9,13 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^84.0.0",
-    "ejs": "^3.1.3",
+    "chromedriver": "^96.0.0",
+    "ejs": "^3.1.6",
     "expect.js": "^0.3.1",
     "mkdirp": "^1.0.4",
-    "mocha": "^8.0.1",
+    "mocha": "^9.1.3",
     "rimraf": "^3.0.2",
-    "selenium-server-standalone-jar": "^3.141.59",
-    "selenium-webdriver": "^3.6.0",
-    "superagent": "^5.3.1"
+    "selenium-webdriver": "^4.1.0",
+    "superagent": "^6.1.0"
   }
 }

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,48 +14,43 @@ 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';
 
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
-
-
 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 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 exists(selector) {
         return browser.wait(until.elementLocated(selector), TEST_TIMEOUT);
     }
 
-    function visible(selector, callback) {
+    function visible(selector) {
         return exists(selector).then(function () {
             return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
         });
@@ -65,9 +66,9 @@ describe('Application life cycle test', function () {
         // 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'));
+            return visible(By.css('* /deep/ #clearBrowsingDataConfirm'));
         }).then(function () {
-            return browser.findElement(by.css('* /deep/ #clearBrowsingDataConfirm')).click();
+            return browser.findElement(By.css('* /deep/ #clearBrowsingDataConfirm')).click();
         }).then(function () {
             return browser.sleep(5000);
         });
@@ -75,49 +76,50 @@ describe('Application life cycle test', function () {
 
     function login(password, callback) {
         browser.get('https://' + app.fqdn).then(function () {
-            return visible(by.id('loginButton'));
+            return visible(By.id('loginButton'));
         }).then(function () {
-            return browser.findElement(by.id('username')).sendKeys(username);
+            return browser.findElement(By.id('username')).sendKeys(username);
         }).then(function () {
-            return browser.findElement(by.id('passwordPlain')).sendKeys(password);
+            return browser.findElement(By.id('passwordPlain')).sendKeys(password);
         }).then(function () {
-            return browser.findElement(by.id('loginButton')).click();
+            return browser.findElement(By.id('loginButton')).click();
         }).then(function () {
-            return browser.wait(until.elementLocated(by.id('dropdown-configure')), TEST_TIMEOUT);
+            return browser.wait(until.elementLocated(By.id('dropdown-configure')), TEST_TIMEOUT);
         }).then(function () {
             callback();
         });
     }
 
     function logout(callback) {
-        var logout_btn = by.xpath('//ul[@class="dropdown-menu"]/li/a[@class="signout"]');
+        var logout_btn = By.xpath('//li/a[@class="signout"]');
 
         browser.get('https://' + app.fqdn).then(function () {
-            return visible(by.id('stream'));
+            return visible(By.id('stream'));
         }).then(function () {
-            return browser.findElement(by.className('dropdown-toggle')).click();
+            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);
+            return browser.wait(until.elementLocated(By.id('loginButton')), TEST_TIMEOUT);
         }).then(function () {
             callback();
         });
     }
 
     function addSubscription(callback) {
-        var url = "https://cloudron.io/blog/rss.xml";
+        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(`${baseUrl()}/i/?c=subscription`).then(function () {
-            return visible(by.xpath('//input[@name="url_rss"]'));
+        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);
+            return browser.findElement(By.xpath('//input[@name="url_rss"]')).sendKeys(url);
         }).then(function () {
-            return browser.findElement(by.xpath('//form[@id="add_rss"]/div/button[@type="submit"]')).click();
+            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"]'));
+            return visible(By.xpath('//div[@id="notification" and @class="notification good"]'));
         }).then(function () {
             callback();
         });
@@ -127,15 +129,15 @@ describe('Application life cycle test', function () {
         var test_username = 'test';
 
         browser.get(`${baseUrl()}/i/?c=user&a=manage`).then(function () {
-            return visible(by.id('new_user_name'));
+            return visible(By.id('new_user_name'));
         }).then(function () {
-            return browser.findElement(by.id('new_user_name')).sendKeys(test_username);
+            return browser.findElement(By.id('new_user_name')).sendKeys(test_username);
         }).then(function () {
-            return browser.findElement(by.id('new_user_passwordPlain')).sendKeys(password);
+            return browser.findElement(By.id('new_user_passwordPlain')).sendKeys(password);
         }).then(function () {
-            return browser.findElement(by.xpath('//button[text()="Create"]')).click();
+            return browser.findElement(By.xpath('//button[text()="Create"]')).click();
         }).then(function () {
-            return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
+            return visible(By.xpath('//div[@id="notification" and @class="notification good"]'));
         }).then(function () {
             callback();
         });
@@ -143,9 +145,9 @@ describe('Application life cycle test', function () {
 
     function enableApi(callback) {
         browser.get(`${baseUrl()}/i/?c=auth`).then(function () {
-            return browser.findElement(by.id('api_enabled')).click();
+            return browser.findElement(By.id('api_enabled')).click();
         }).then(function () {
-            return browser.findElement(by.xpath('//button[text()="Submit"]')).submit();
+            return browser.findElement(By.xpath('//button[text()="Submit"]')).click();
         }).then(function () {
             callback();
         });
@@ -153,23 +155,17 @@ describe('Application life cycle test', function () {
 
     function checkApiConfiguration(callback) {
         browser.get(`${baseUrl()}/api/`).then(function () {
-            return exists(by.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
+            return exists(By.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
         }).then(function () {
-            return exists(by.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
+            return exists(By.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
         }).then(function () {
             callback();
         });
     }
 
-    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('//a[text()="Cloudron.io"]'));
+            return visible(By.xpath('//span[text()="Cloudron"]'));
         }).then(function () {
             callback();
         });
@@ -186,13 +182,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);
 
@@ -205,16 +196,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));
@@ -225,7 +214,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');
@@ -237,14 +226,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));
@@ -252,7 +237,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');
@@ -262,7 +247,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); });
 });