Version 1.6.2

https://github.com/FreshRSS/FreshRSS/issues/2233

CHANGELOG

@@ -53,3 +53,62 @@
 [1.1.2]
 * Update FreshRSS to 1.11.2
 
+[1.2.0]
+* Use latest base image
+
+[1.3.0]
+* Update FreshRSS to 1.12.0
+* Features
+  * Ability to add labels (custom tags) to articles #928
+  * Handle article tags containing spaces, as well as comma-separated tags #2023
+  * Handle authors containing spaces, as well as comma or semi-colon separated authors #2025
+  * Searches by tag, author, etc. accept Unicode characters #2025
+  * New option to disable cache for feeds with invalid HTTP caching #2052
+* UI
+  * New theme Swage #2069
+  * Click on authors to initiate a search by author #2025
+  * Fix CSS for button alignments in older Chrome versions #2020
+* Security
+  * Improved flow for password change (avoid error 403) #2056
+  * Allow dot . in username (best to avoid, though) #2061
+* Performance
+  * Remove some counterproductive preload / prefetch rules #2040
+  * Improved fast flush (earlier transfer, fetching of resources, and rendering) #2045
+
+[1.4.0]
+* Update FreshRSS to 1.13.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/blob/1.13.0/CHANGELOG.md)
+* Improvements to the Google Reader API #2093
+* Support for Vienna RSS (client for Mac OS X) #2091
+* Ability to import XML files exported from Tiny-Tiny-RSS #2079
+* Ability to show all the feeds that have a warning #2146
+* Share with Pinboard #1972
+
+[1.5.0]
+* Fix security issue where root directory was exposed
+* Enable mod rewrite for mobile apps like FeedMe to work
+
+[1.5.1]
+* Update FreshRSS to 1.13.1
+
+[1.6.0]
+* Update FreshRSS to 1.14.0
+* Update extensions to 0812ee05c24c
+
+[1.6.1]
+* Update FreshRSS to 1.14.1
+* Fix load more articles when using ascending order #2314
+* Fix the use of arrow keyboard keys for shortcuts #2316
+* Fix control+click or middle-click for opening articles in a background tab #2310
+* Fix the naming of the option to unfold categories #2307
+* Fix shortcut problem when using unfolded articles #2328
+* Fix auto-hiding articles #2323
+* Fix scroll functions with Edge #2337
+* Fix drop-down menu warning #2353
+* Fix delay for individual mark-as-read actions #2332
+* Fix scroll functions in Edge #2337
+
+[1.6.2]
+* Update FreshRSS to 1.14.2
+* Fix minor code syntax warning in API #2362
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.1.2",
+  "version": "1.6.2",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages FreshRSS <upstream>1.11.2</upstream>.
+This app packages FreshRSS <upstream>1.14.2</upstream>.
 
 FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
 

Dockerfile

@@ -1,18 +1,14 @@
-FROM cloudron/base:0.10.0
+FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
-
-RUN apt-get update \
-    && apt-get -y install php php-curl php-gmp php-intl php-mbstring php-xml php-zip \
-       libapache2-mod-php mysql-client php-mysql
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/1.11.2.tar.gz | tar -zxvf - --strip-components=1
+RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/1.14.2.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/2d0358e75961cbfcac7c2cbe09b098905ff67803.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
+RUN wget https://github.com/FreshRSS/Extensions/archive/0812ee05c24c5610e4a9fefbef372d49dafb447f.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
 
@@ -25,18 +21,16 @@ RUN a2disconf other-vhosts-access-log
 ADD apache/freshrss.conf /etc/apache2/sites-enabled/freshrss.conf
 RUN echo "Listen 8000" > /etc/apache2/ports.conf
 
-RUN a2enmod headers expires
+RUN a2enmod headers expires deflate mime dir rewrite setenvif
 
-RUN rm -rf /var/lib/php \
+RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
-    && ln -s /run/php /var/lib/php \
-    && mkdir -p /run/php/session
 
-RUN crudini --set /etc/php/7.0/apache2/php.ini PHP upload_max_filesize 64M && \
+RUN crudini --set /etc/php/7.2/apache2/php.ini PHP upload_max_filesize 64M && \
-    crudini --set /etc/php/7.0/apache2/php.ini PHP post_max_size 64M && \
+    crudini --set /etc/php/7.2/apache2/php.ini PHP post_max_size 64M && \
-    crudini --set /etc/php/7.0/apache2/php.ini PHP memory_limit 64M && \
+    crudini --set /etc/php/7.2/apache2/php.ini PHP memory_limit 64M && \
-    crudini --set /etc/php/7.0/apache2/php.ini Session session.save_path /run/php/session && \
+    crudini --set /etc/php/7.2/apache2/php.ini Session session.save_path /run/php/session && \
-    crudini --set /etc/php/7.0/apache2/php.ini Session session.gc_probability 1 && \
+    crudini --set /etc/php/7.2/apache2/php.ini Session session.gc_probability 1 && \
-    crudini --set /etc/php/7.0/apache2/php.ini Session session.gc_divisor 100
+    crudini --set /etc/php/7.2/apache2/php.ini Session session.gc_divisor 100
 
 ADD start.sh /app/code/start.sh
 

POSTINSTALL.md

@@ -3,7 +3,7 @@ This application does not integrate with Cloudron authentication.
 There is a preconfigured administrator account with the following credentials:
 
 * Username: `admin`
-* Password: `password`
+* Password: `changeme`
 
 (Please change that password on first login)
 

README.md

@@ -34,3 +34,18 @@ npm install
 PATH=$PATH:node_modules/.bin mocha --bail test.js
 ```
 
+## Debugging
+
+
+* Update your data/config.php with the following, to get more debugging information:
+
+```
+'environment' => 'development',
+
+```
+
+* Check your logs:
+  * Web server / PHP logs
+  * FreshRSS API log in ./data/users/_/log_api.txt
+  * FreshRSS logs in ./data/users/you/log.txt
+

apache/freshrss.conf

@@ -1,11 +1,11 @@
 <VirtualHost *:8000>
-    DocumentRoot /app/code  
+    DocumentRoot /app/code/p
     AllowEncodedSlashes On
 
     ErrorLog /dev/stderr 
     CustomLog /dev/stdout combined
 
-    <Directory /app/code/>
+    <Directory /app/code/p/>
         Options +FollowSymLinks
         AllowOverride All
         Require all granted

start.sh

@@ -2,31 +2,31 @@
 
 set -eu
 
-mkdir -p /run/php/sessions
+mkdir -p /run/php/session
 
 if ! [ -f /app/data/.installed ]; then
-  echo "Fresh installation, setting up..."
+    echo "==> Fresh installation, setting up..."
-  rsync -a /app/code/data-orig/ /app/data/
+    rsync -a /app/code/data-orig/ /app/data/
-  php cli/do-install.php \
+    php cli/do-install.php \
-    --environment production --default_user admin \
+      --environment production --default_user admin \
-    --db-type mysql --db-host "${MYSQL_HOST}" \
+      --db-type mysql --db-host "${MYSQL_HOST}" \
-    --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
+      --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
-    --db-base "${MYSQL_DATABASE}" --db-prefix "" \
+      --db-base "${MYSQL_DATABASE}" --db-prefix "" \
-    --disable_update
+      --disable_update
-  php cli/create-user.php --user admin --password password --language en
+    php cli/create-user.php --user admin --password changeme --language en
-  php cli/actualize-user.php --user admin
+    php cli/actualize-user.php --user admin
-  touch /app/data/.installed
+    touch /app/data/.installed
-  echo "Done."
+    echo "==> Done."
 fi
 
 
-echo "Symlinking log file"
+echo "==> Symlinking log file"
 rm -f /app/data/users/_/log_api.txt
 touch /tmp/log_api.txt
 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"
+echo "==> Copying packaged extensions"
 mkdir -p /app/data/extensions
 for f in $(ls /app/code/extensions-orig); do
     rm -rf "/app/data/extensions/$f"
@@ -34,19 +34,19 @@ for f in $(ls /app/code/extensions-orig); do
 done
 
 
-echo "Updating config file"
+echo "==> Updating config file"
-php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}/p" \
+php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}" \
     --db-type mysql --db-host "${MYSQL_HOST}" \
     --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
     --db-base "${MYSQL_DATABASE}" --db-prefix "" \
     --disable_update
 
 
-echo "Setting permissions"
+echo "==> Setting permissions"
 chown -R www-data.www-data /run/php /app/data /tmp/log_api.txt
 
 
-echo "Starting apache"
+echo "==> Starting apache"
 APACHE_CONFDIR="" source /etc/apache2/envvars
 rm -f "${APACHE_PID_FILE}"
 exec /usr/sbin/apache2 -DFOREGROUND

test/test.js

@@ -14,8 +14,7 @@ var by = webdriver.By,
     until = webdriver.until;
 
 var username = 'admin',
-    password = 'password';
+    password = 'changeme';
-
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
@@ -55,8 +54,26 @@ describe('Application life cycle test', function () {
         });
     }
 
-    function login(callback) {
+    function baseUrl() {
-        browser.manage().deleteAllCookies().then(function () {
+        if (app.manifest.version === '1.4.0') return `https://${app.fqdn}/p`;
+        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);
+        });
+    }
+
+    function login(password, callback) {
+        clearCache().then(function () {
             return browser.get('https://' + app.fqdn);
         }).then(function () {
             return visible(by.id('loginButton'));
@@ -94,7 +111,7 @@ describe('Application life cycle test', function () {
     function addSubscription(callback) {
         var url = "https://cloudron.io/blog/rss.xml";
 
-        browser.get(`https://${app.fqdn}/p/i/?c=subscription`).then(function () {
+        browser.get(`${baseUrl()}/i/?c=subscription`).then(function () {
             return visible(by.xpath('//input[@name="url_rss"]'));
         }).then(function () {
             return browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
@@ -107,10 +124,10 @@ describe('Application life cycle test', function () {
         });
     }
 
-    function addUser(callback) {
+    function addUser(password, callback) {
         var test_username = 'test';
 
-        browser.get(`https://${app.fqdn}/p/i/?c=user&a=manage`).then(function () {
+        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);
@@ -126,7 +143,7 @@ describe('Application life cycle test', function () {
     }
 
     function enableApi(callback) {
-        browser.get('https://' + app.fqdn + '/p/i/?c=auth').then(function () {
+        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();
@@ -136,8 +153,10 @@ describe('Application life cycle test', function () {
     }
 
     function checkApiConfiguration(callback) {
-        browser.get('https://' + app.fqdn + '/p/api/greader.php/check%2Fcompatibility').then(function () {
+        browser.get(`${baseUrl()}/api/`).then(function () {
-            return exists(by.xpath('//pre[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")]'));
         }).then(function () {
             callback();
         });
@@ -150,7 +169,7 @@ describe('Application life cycle test', function () {
     }
 
     function subscriptionExists(callback) {
-        browser.get('https://' + app.fqdn + '/p/i/?get=c_1').then(function () {
+        browser.get(`${baseUrl()}/i/?get=c_1`).then(function () {
             return visible(by.xpath('//a[text()="Cloudron.io"]'));
         }).then(function () {
             callback();
@@ -158,7 +177,7 @@ describe('Application life cycle test', function () {
     }
 
     function getStaticExtensionFile(callback) {
-        superagent.get(`https://${app.fqdn}/p/ext.php?f=xExtension-StickyFeeds/static/script.js&t=js`)
+        superagent.get(`${baseUrl()}/ext.php?f=xExtension-StickyFeeds/static/script.js&t=js`)
             .buffer(true)
             .end(function (err, res) {
                 expect(err).to.be(null);
@@ -178,9 +197,9 @@ describe('Application life cycle test', function () {
 
     it('can get app information', getAppInfo);
 
-    it('can login', login);
+    it('can login', login.bind(null, password));
     it('can subscribe', addSubscription);
-    it('can add users', addUser);
+    it('can add users', addUser.bind(null, password));
     it('can enable API', enableApi);
     it('can check configuration', checkApiConfiguration);
     it('subscription exists', subscriptionExists);
@@ -195,7 +214,7 @@ describe('Application life cycle test', function () {
         execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
-    it('can login', login);
+    it('can login', login.bind(null, password));
     it('can check configuration', checkApiConfiguration);
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);
@@ -209,7 +228,7 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     });
 
-    it('can login', login);
+    it('can login', login.bind(null, password));
     it('can check configuration', checkApiConfiguration);
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);
@@ -225,9 +244,9 @@ describe('Application life cycle test', function () {
     });
 
     it('can get app information', getAppInfo);
-    it('can login', login);
+    it('can login', login.bind(null, password));
     it('can subscribe', addSubscription);
-    it('can add users', addUser);
+    it('can add users', addUser.bind(null, password));
 
     it('can update', function () {
         execSync('cloudron install --wait --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
@@ -236,7 +255,7 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     });
 
-    it('can login', login);
+    it('can login', login.bind(null, password));
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);