mirror of
https://git.cloudron.io/cloudron/freshrss-app
synced 2025-09-17 10:49:06 +00:00
Compare commits
2 Commits
v1.19.1
...
apiextensi
| Author | SHA1 | Date | |
|---|---|---|---|
|
03879ca8df | ||
|
|
6e8bd967e8 |
@@ -165,121 +165,5 @@
|
|||||||
* Show users last activity date #2936
|
* Show users last activity date #2936
|
||||||
* Ability to follow HTML redirections when retrieving full article content #2985
|
* Ability to follow HTML redirections when retrieving full article content #2985
|
||||||
|
|
||||||
[1.10.0]
|
[1.9.2]
|
||||||
* Add forum url and update screenshot links
|
* Make p/api/ folder writeable for extensions like TinyTinyRSS api extension
|
||||||
|
|
||||||
[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)
|
|
||||||
|
|
||||||
[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
|
|
||||||
|
|
||||||
[1.17.0]
|
|
||||||
* Update base image to 4.2.0
|
|
||||||
|
|
||||||
[1.18.0]
|
|
||||||
* Update FreshRSS to 1.22.0
|
|
||||||
* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.22.0)
|
|
||||||
* Rework trusted proxies
|
|
||||||
* Improve scaling with many feeds and long processes, reduce database locks
|
|
||||||
* Fix many bugs and regressions
|
|
||||||
* Improve themes Origine (also with automatic dark mode), Nord, etc.
|
|
||||||
* Several UI / UX improvements
|
|
||||||
* New languages Hungarian, Latvian, Persian
|
|
||||||
|
|
||||||
[1.19.0]
|
|
||||||
* Implement OIDC login
|
|
||||||
|
|
||||||
[1.19.1]
|
|
||||||
* Update FreshRSS to 1.22.1
|
|
||||||
* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.22.1)
|
|
||||||
* Fix regression in extensions translations (i18n)
|
|
||||||
* Better identification of proxied client IP
|
|
||||||
@@ -3,20 +3,18 @@
|
|||||||
"title": "FreshRSS",
|
"title": "FreshRSS",
|
||||||
"author": "FreshRSS Developers",
|
"author": "FreshRSS Developers",
|
||||||
"description": "file://DESCRIPTION.md",
|
"description": "file://DESCRIPTION.md",
|
||||||
"changelog": "file://CHANGELOG.md",
|
"changelog": "file://CHANGELOG",
|
||||||
"tagline": "RSS feed reader",
|
"tagline": "RSS feed reader",
|
||||||
"version": "1.19.1",
|
"version": "1.9.2",
|
||||||
"upstreamVersion": "1.22.1",
|
|
||||||
"healthCheckPath": "/",
|
"healthCheckPath": "/",
|
||||||
"httpPort": 8000,
|
"httpPort": 8000,
|
||||||
"addons": {
|
"addons": {
|
||||||
"localstorage": {},
|
"localstorage": {},
|
||||||
"mysql": {},
|
"mysql": {},
|
||||||
"oidc": { "loginRedirectUri": "/i/oidc/" },
|
|
||||||
"scheduler": {
|
"scheduler": {
|
||||||
"update_feeds": {
|
"update_feeds": {
|
||||||
"schedule": "*/1 * * * *",
|
"schedule": "*/1 * * * *",
|
||||||
"command": "echo '==> Run actualize script' && /usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
|
"command": "/usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -24,13 +22,18 @@
|
|||||||
"website": "http://www.freshrss.org",
|
"website": "http://www.freshrss.org",
|
||||||
"contactEmail": "support@cloudron.io",
|
"contactEmail": "support@cloudron.io",
|
||||||
"icon": "logo.png",
|
"icon": "logo.png",
|
||||||
"tags": [ "rss", "atom", "greader", "reader", "news", "feeds", "feedly" ],
|
"tags": [
|
||||||
|
"rss",
|
||||||
|
"atom",
|
||||||
|
"greader",
|
||||||
|
"reader",
|
||||||
|
"news",
|
||||||
|
"feeds"
|
||||||
|
],
|
||||||
"mediaLinks": [
|
"mediaLinks": [
|
||||||
"https://screenshots.cloudron.io/org.freshrss.cloudronapp/1.png"
|
"https://s3.amazonaws.com/cloudron-app-screenshots/org.freshrss.cloudronapp/7d731e71a6faa3791e19b7d7daf468a9486349cc/1.png"
|
||||||
],
|
],
|
||||||
"postInstallMessage": "file://POSTINSTALL.md",
|
"postInstallMessage": "file://POSTINSTALL.md",
|
||||||
"minBoxVersion": "7.5.1",
|
"minBoxVersion": "2.0.0",
|
||||||
"forumUrl": "https://forum.cloudron.io/category/27/freshrss",
|
"documentationUrl": "https://cloudron.io/documentation/apps/freshrss/"
|
||||||
"documentationUrl": "https://cloudron.io/documentation/apps/freshrss/",
|
|
||||||
"optionalSso": true
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
This app packages FreshRSS <upstream>1.16.2</upstream>.
|
||||||
|
|
||||||
## About
|
## About
|
||||||
|
|
||||||
FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
|
FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
|
||||||
@@ -7,7 +9,6 @@ It is at the same time lightweight, easy to work with, powerful and customizable
|
|||||||
It is a multi-user application with an anonymous reading mode. It supports PubSubHubbub for instant notifications from compatible Web sites. There is an API for (mobile) clients, and a Command-Line Interface. Finally, it supports extensions for further tuning.
|
It is a multi-user application with an anonymous reading mode. It supports PubSubHubbub for instant notifications from compatible Web sites. There is an API for (mobile) clients, and a Command-Line Interface. Finally, it supports extensions for further tuning.
|
||||||
|
|
||||||
## Extensions
|
## Extensions
|
||||||
|
|
||||||
FreshRSS supports further customizations by adding extensions on top of its core functionality.
|
FreshRSS supports further customizations by adding extensions on top of its core functionality.
|
||||||
See the [repository dedicated to those extensions](https://github.com/FreshRSS/Extensions).
|
See the [repository dedicated to those extensions](https://github.com/FreshRSS/Extensions).
|
||||||
|
|
||||||
|
|||||||
36
Dockerfile
36
Dockerfile
@@ -1,18 +1,17 @@
|
|||||||
FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
|
FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
|
||||||
|
|
||||||
RUN apt-get update && apt-get install --no-install-recommends -y libapache2-mod-auth-openidc && rm -rf /var/cache/apt /var/lib/apt/lists
|
|
||||||
|
|
||||||
RUN mkdir -p /app/code
|
RUN mkdir -p /app/code
|
||||||
WORKDIR /app/code
|
WORKDIR /app/code
|
||||||
|
|
||||||
ARG VERSION=1.22.1
|
ARG VERSION=1.16.2
|
||||||
RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1 && \
|
RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1
|
||||||
mv data data-orig && ln -s /app/data data
|
|
||||||
|
|
||||||
# official extensions (https://github.com/FreshRSS/Extensions/commits/master)
|
RUN mv data data-orig && ln -s /app/data data
|
||||||
RUN wget https://github.com/FreshRSS/Extensions/archive/8af0d55265ffa03de22ee62b2ae175b3cb038a3c.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
|
|
||||||
mv /app/code/extensions /app/code/extensions-orig && \
|
# official extensions
|
||||||
ln -s /app/data/extensions /app/code/extensions
|
RUN wget https://github.com/FreshRSS/Extensions/archive/de83a1096c10644098291539cabfbecd38d5a28f.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
|
||||||
|
mv /app/code/p/api /app/code/p-api-orig && ln -s /app/data/p-api /app/code/p/api && \
|
||||||
|
mv /app/code/extensions /app/code/extensions-orig && ln -s /app/data/extensions /app/code/extensions
|
||||||
|
|
||||||
# configure apache
|
# configure apache
|
||||||
RUN rm /etc/apache2/sites-enabled/*
|
RUN rm /etc/apache2/sites-enabled/*
|
||||||
@@ -23,19 +22,16 @@ RUN a2disconf other-vhosts-access-log
|
|||||||
ADD apache/freshrss.conf /etc/apache2/sites-enabled/freshrss.conf
|
ADD apache/freshrss.conf /etc/apache2/sites-enabled/freshrss.conf
|
||||||
RUN echo "Listen 8000" > /etc/apache2/ports.conf
|
RUN echo "Listen 8000" > /etc/apache2/ports.conf
|
||||||
|
|
||||||
RUN a2enmod headers expires deflate mime dir rewrite setenvif auth_openidc
|
RUN a2enmod headers expires deflate mime dir rewrite setenvif
|
||||||
|
|
||||||
RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
|
RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
|
||||||
|
|
||||||
RUN crudini --set /etc/php/8.1/apache2/php.ini PHP upload_max_filesize 64M && \
|
RUN crudini --set /etc/php/7.3/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/7.3/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/7.3/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/7.3/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/7.3/apache2/php.ini Session session.gc_probability 1 && \
|
||||||
crudini --set /etc/php/8.1/apache2/php.ini Session session.gc_divisor 100
|
crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_divisor 100
|
||||||
|
|
||||||
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
|
ADD start.sh /app/code/start.sh
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +1,10 @@
|
|||||||
<sso>
|
This application does not integrate with Cloudron authentication.
|
||||||
On first visit, sign in using the built-in Cloudron authentication and then make the user administrator
|
|
||||||
by running:
|
|
||||||
```
|
|
||||||
php cli/reconfigure.php --default_user YOUR_USERNAME
|
|
||||||
```
|
|
||||||
</sso>
|
|
||||||
|
|
||||||
<nosso>
|
There is a preconfigured administrator account with the following credentials:
|
||||||
This app is pre-setup with an admin account. The initial credentials are:
|
|
||||||
|
|
||||||
**Username**: admin<br/>
|
* Username: `admin`
|
||||||
**Password**: changeme<br/>
|
* Password: `changeme`
|
||||||
|
|
||||||
Please change the admin password immediately.
|
(Please change that password on first login)
|
||||||
</nosso>
|
|
||||||
|
You can create more accounts withing the app when logged in as administrator.
|
||||||
|
|||||||
@@ -1,55 +1,18 @@
|
|||||||
# https://github.com/FreshRSS/FreshRSS/blob/edge/Docker/FreshRSS.Apache.conf
|
|
||||||
|
|
||||||
ServerName %{HTTP_HOST}
|
|
||||||
|
|
||||||
<VirtualHost *:8000>
|
<VirtualHost *:8000>
|
||||||
DocumentRoot /app/code/p
|
DocumentRoot /app/code/p
|
||||||
AllowEncodedSlashes On
|
AllowEncodedSlashes On
|
||||||
|
|
||||||
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
|
ErrorLog /dev/stderr
|
||||||
CustomLog "|/bin/cat" proxy
|
CustomLog /dev/stdout combined
|
||||||
ErrorLog "|/bin/cat"
|
|
||||||
|
|
||||||
<Directory /app/code/p/>
|
<Directory /app/code/p/>
|
||||||
Options +FollowSymLinks
|
Options +FollowSymLinks
|
||||||
AllowOverride All
|
AllowOverride All
|
||||||
Require all granted
|
Require all granted
|
||||||
|
|
||||||
|
<IfModule mod_php7.c>
|
||||||
|
php_value memory_limit 64m
|
||||||
|
</IfModule>
|
||||||
|
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
<Directory /app/code/p/api>
|
|
||||||
Include /app/code/p/api/.htaccess
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
<Directory /app/code/p/i>
|
|
||||||
ExpiresActive Off
|
|
||||||
|
|
||||||
<IfDefine OIDC_ENABLED>
|
|
||||||
AuthType openid-connect
|
|
||||||
Require valid-user
|
|
||||||
</IfDefine>
|
|
||||||
IncludeOptional /app/code/p/i/.htaccess
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
<Directory /app/code/p/themes>
|
|
||||||
Include /app/code/p/themes/.htaccess
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
|
|
||||||
<IfDefine OIDC_ENABLED>
|
|
||||||
OIDCProviderMetadataURL ${CLOUDRON_OIDC_DISCOVERY_URL}
|
|
||||||
OIDCClientID ${CLOUDRON_OIDC_CLIENT_ID}
|
|
||||||
OIDCClientSecret ${CLOUDRON_OIDC_CLIENT_SECRET}
|
|
||||||
|
|
||||||
OIDCRedirectURI /i/oidc/
|
|
||||||
|
|
||||||
OIDCCryptoPassphrase ${OIDC_CRYPTO_PASSPHRASE}
|
|
||||||
|
|
||||||
OIDCRemoteUserClaim sub
|
|
||||||
|
|
||||||
OIDCScope "openid profile email"
|
|
||||||
|
|
||||||
OIDCRefreshAccessTokenBeforeExpiry 30
|
|
||||||
OIDCPassClaimsAs headers
|
|
||||||
OIDCXForwardedHeaders X-Forwarded-Proto
|
|
||||||
</IfDefine>
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
MaxSpareServers 3
|
MaxSpareServers 3
|
||||||
|
|
||||||
# Maximum number of servers at any given instant. Requests will be queued after this
|
# Maximum number of servers at any given instant. Requests will be queued after this
|
||||||
MaxRequestWorkers 10
|
MaxRequestWorkers 6
|
||||||
|
|
||||||
# Recycle process after handling these many requests. This protected against accidental memory leaks
|
# Recycle process after handling these many requests. This protected against accidental memory leaks
|
||||||
MaxConnectionsPerChild 100
|
MaxConnectionsPerChild 100
|
||||||
|
|||||||
32
start.sh
32
start.sh
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
mkdir -p /run/php/session /app/data/extensions
|
mkdir -p /run/php/session
|
||||||
|
|
||||||
if ! [ -f /app/data/.installed ]; then
|
if ! [ -f /app/data/.installed ]; then
|
||||||
echo "==> Fresh installation, setting up..."
|
echo "==> Fresh installation, setting up..."
|
||||||
@@ -13,19 +13,11 @@ if ! [ -f /app/data/.installed ]; then
|
|||||||
--db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \
|
--db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \
|
||||||
--db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \
|
--db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \
|
||||||
--disable_update
|
--disable_update
|
||||||
|
php cli/create-user.php --user admin --password changeme --language en
|
||||||
if [[ -z "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
|
|
||||||
php cli/create-user.php --user admin --password changeme --language en
|
|
||||||
fi
|
|
||||||
|
|
||||||
touch /app/data/.installed
|
touch /app/data/.installed
|
||||||
echo "==> Done."
|
echo "==> Done."
|
||||||
fi
|
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"
|
echo "==> Symlinking log file"
|
||||||
rm -f /app/data/users/_/log_api.txt
|
rm -f /app/data/users/_/log_api.txt
|
||||||
touch /tmp/log_api.txt
|
touch /tmp/log_api.txt
|
||||||
@@ -33,21 +25,21 @@ ln -s /tmp/log_api.txt /app/data/users/_/log_api.txt
|
|||||||
|
|
||||||
# We have to copy instead of symlinking extensions (see #2)
|
# 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
|
for f in $(ls /app/code/extensions-orig); do
|
||||||
rm -rf "/app/data/extensions/$f"
|
rm -rf "/app/data/extensions/$f"
|
||||||
cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"
|
cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "==> Updating config file"
|
echo "==> Copying extension p/api folder"
|
||||||
if [[ -z "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
|
mkdir -p /app/data/p-api
|
||||||
extra_args="--default_user admin"
|
for f in $(ls /app/code/p-api-orig); do
|
||||||
[[ ! -f /app/data/.oauth_crypto_passphrase ]] && openssl rand -base64 42 > /app/data/.oauth_crypto_passphrase
|
rm -rf "/app/data/p-api/$f"
|
||||||
export OIDC_CRYPTO_PASSPHRASE=$(</app/data/.oauth_crypto_passphrase) # used in apache config
|
cp -r "/app/code/p-api-orig/$f" "/app/data/p-api"
|
||||||
else
|
done
|
||||||
extra_args="--auth_type http_auth"
|
|
||||||
fi
|
|
||||||
|
|
||||||
php cli/reconfigure.php ${extra_args} --base_url "https://${CLOUDRON_APP_DOMAIN}" \
|
echo "==> Updating config file"
|
||||||
|
php cli/reconfigure.php --default_user admin --base_url "https://${CLOUDRON_APP_DOMAIN}" \
|
||||||
--db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \
|
--db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \
|
||||||
--db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \
|
--db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \
|
||||||
--db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \
|
--db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \
|
||||||
@@ -59,4 +51,4 @@ 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
|
APACHE_CONFDIR="" source /etc/apache2/envvars
|
||||||
rm -f "${APACHE_PID_FILE}"
|
rm -f "${APACHE_PID_FILE}"
|
||||||
exec /usr/sbin/apache2 -D FOREGROUND $([[ -n "$CLOUDRON_OIDC_ISSUER" ]] && echo '-D OIDC_ENABLED')
|
exec /usr/sbin/apache2 -DFOREGROUND
|
||||||
|
|||||||
2958
test/package-lock.json
generated
2958
test/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -9,10 +9,14 @@
|
|||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"chromedriver": "^118.0.1",
|
"chromedriver": "^83.0.0",
|
||||||
|
"ejs": "^3.1.3",
|
||||||
"expect.js": "^0.3.1",
|
"expect.js": "^0.3.1",
|
||||||
"mocha": "^10.2.0",
|
"mkdirp": "^1.0.4",
|
||||||
"selenium-webdriver": "^4.14.0",
|
"mocha": "^7.2.0",
|
||||||
"superagent": "^8.1.2"
|
"rimraf": "^3.0.2",
|
||||||
|
"selenium-server-standalone-jar": "^3.141.59",
|
||||||
|
"selenium-webdriver": "^3.6.0",
|
||||||
|
"superagent": "^5.2.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
306
test/test.js
306
test/test.js
@@ -1,58 +1,58 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
|
|
||||||
/* jshint esversion: 8 */
|
|
||||||
/* global describe */
|
|
||||||
/* global before */
|
|
||||||
/* global after */
|
|
||||||
/* global it */
|
|
||||||
/* global xit */
|
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
require('chromedriver');
|
require('chromedriver');
|
||||||
|
|
||||||
const execSync = require('child_process').execSync,
|
var execSync = require('child_process').execSync,
|
||||||
expect = require('expect.js'),
|
expect = require('expect.js'),
|
||||||
path = require('path'),
|
path = require('path'),
|
||||||
superagent = require('superagent'),
|
superagent = require('superagent'),
|
||||||
{ Builder, By, Key, until } = require('selenium-webdriver'),
|
webdriver = require('selenium-webdriver');
|
||||||
{ Options } = require('selenium-webdriver/chrome');
|
|
||||||
|
|
||||||
const admin_username = 'admin', admin_password = 'changeme';
|
var by = webdriver.By,
|
||||||
|
Keys = webdriver.Key,
|
||||||
|
until = webdriver.until,
|
||||||
|
Builder = require('selenium-webdriver').Builder;
|
||||||
|
|
||||||
|
var username = 'admin',
|
||||||
|
password = 'changeme';
|
||||||
|
|
||||||
|
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
|
||||||
|
|
||||||
if (!process.env.USERNAME || !process.env.PASSWORD) {
|
|
||||||
console.log('USERNAME and PASSWORD env vars need to be set');
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('Application life cycle test', function () {
|
describe('Application life cycle test', function () {
|
||||||
this.timeout(0);
|
this.timeout(0);
|
||||||
|
|
||||||
const LOCATION = 'test';
|
var server, browser = new Builder().forBrowser('chrome').build();
|
||||||
const TEST_TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 10000;
|
|
||||||
const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
|
|
||||||
|
|
||||||
const USERNAME = process.env.USERNAME;
|
before(function (done) {
|
||||||
const PASSWORD = process.env.PASSWORD;
|
var seleniumJar= require('selenium-server-standalone-jar');
|
||||||
|
var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
|
||||||
|
server = new SeleniumServer(seleniumJar.path, { port: 4444 });
|
||||||
|
server.start();
|
||||||
|
|
||||||
let browser, app;
|
done();
|
||||||
let athenticated_by_oidc = false;
|
|
||||||
|
|
||||||
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 () {
|
after(function (done) {
|
||||||
browser.quit();
|
browser.quit();
|
||||||
|
server.stop();
|
||||||
|
done();
|
||||||
});
|
});
|
||||||
|
|
||||||
function getAppInfo() {
|
var LOCATION = 'test';
|
||||||
var inspect = JSON.parse(execSync('cloudron inspect'));
|
var TEST_TIMEOUT = 10000;
|
||||||
app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
|
var app;
|
||||||
expect(app).to.be.an('object');
|
|
||||||
|
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 baseUrl() {
|
function baseUrl() {
|
||||||
@@ -60,175 +60,205 @@ describe('Application life cycle test', function () {
|
|||||||
return `https://${app.fqdn}`;
|
return `https://${app.fqdn}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function waitForElement(elem) {
|
// we do this because it perm redirects to /p/ in old versions
|
||||||
await browser.wait(until.elementLocated(elem), TEST_TIMEOUT);
|
function clearCache() {
|
||||||
await browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
|
// 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 login(username, password) {
|
function login(password, callback) {
|
||||||
await browser.get('https://' + app.fqdn);
|
browser.get('https://' + app.fqdn).then(function () {
|
||||||
await waitForElement(By.id('loginButton'));
|
return visible(by.id('loginButton'));
|
||||||
await browser.findElement(By.id('username')).sendKeys(username);
|
}).then(function () {
|
||||||
await browser.findElement(By.id('passwordPlain')).sendKeys(password);
|
return browser.findElement(by.id('username')).sendKeys(username);
|
||||||
await browser.findElement(By.id('loginButton')).click();
|
}).then(function () {
|
||||||
await waitForElement(By.id('btn-subscription'));
|
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 loginOIDC(username, password) {
|
function logout(callback) {
|
||||||
browser.manage().deleteAllCookies();
|
var logout_btn = by.xpath('//ul[@class="dropdown-menu"]/li/a[@class="signout"]');
|
||||||
await browser.get(`https://${app.fqdn}/i/`);
|
|
||||||
await browser.sleep(6000);
|
|
||||||
|
|
||||||
if (!athenticated_by_oidc) {
|
browser.get('https://' + app.fqdn).then(function () {
|
||||||
await waitForElement(By.xpath('//input[@name="username"]'));
|
return visible(by.id('stream'));
|
||||||
await browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(username);
|
}).then(function () {
|
||||||
await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(password);
|
return browser.findElement(by.className('dropdown-toggle')).click();
|
||||||
await browser.sleep(2000);
|
}).then(function () {
|
||||||
await browser.findElement(By.xpath('//button[@type="submit" and contains(text(), "Sign in")]')).click();
|
return visible(logout_btn);
|
||||||
await browser.sleep(2000);
|
}).then(function () {
|
||||||
|
return browser.findElement(logout_btn).click();
|
||||||
athenticated_by_oidc = true;
|
}).then(function () {
|
||||||
}
|
return browser.wait(until.elementLocated(by.id('loginButton')), TEST_TIMEOUT);
|
||||||
|
}).then(function () {
|
||||||
await waitForElement(By.id('btn-subscription'));
|
callback();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function logout() {
|
function addSubscription(callback) {
|
||||||
var logout_btn = By.xpath('//li/a[@class="signout"]');
|
var url = "https://cloudron.io/blog/rss.xml";
|
||||||
|
|
||||||
await browser.get('https://' + app.fqdn);
|
browser.get(`${baseUrl()}/i/?c=subscription`).then(function () {
|
||||||
await waitForElement(By.id('stream'));
|
return visible(by.xpath('//input[@name="url_rss"]'));
|
||||||
await browser.findElement(By.className('dropdown-toggle')).click();
|
}).then(function () {
|
||||||
await waitForElement(logout_btn);
|
return browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
|
||||||
await browser.findElement(logout_btn).click();
|
}).then(function () {
|
||||||
await waitForElement(By.id('loginButton'));
|
return browser.findElement(by.xpath('//form[@id="add_rss"]/div/button[@type="submit"]')).click();
|
||||||
|
}).then(function () {
|
||||||
|
return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
|
||||||
|
}).then(function () {
|
||||||
|
callback();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function addSubscription() {
|
function addUser(password, callback) {
|
||||||
var url = 'https://blog.cloudron.io/rss/';
|
var test_username = 'test';
|
||||||
const addUrl = app.manifest.version === '1.10.0' ? `${baseUrl()}/i/?c=subscription` : `${baseUrl()}/i/?c=subscription&a=add`;
|
|
||||||
|
|
||||||
await browser.get(addUrl);
|
browser.get(`${baseUrl()}/i/?c=user&a=manage`).then(function () {
|
||||||
await waitForElement(By.xpath('//input[@name="url_rss"]'));
|
return visible(by.id('new_user_name'));
|
||||||
await browser.findElement(By.xpath('//input[@name="url_rss"]')).sendKeys(url);
|
}).then(function () {
|
||||||
await browser.findElement(By.xpath('//form[@id="add_rss"]//button[text()="Add"]')).click();
|
return browser.findElement(by.id('new_user_name')).sendKeys(test_username);
|
||||||
await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
|
}).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();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function addUser(username, password) {
|
function enableApi(callback) {
|
||||||
await browser.get(`${baseUrl()}/i/?c=user&a=manage`);
|
browser.get(`${baseUrl()}/i/?c=auth`).then(function () {
|
||||||
await waitForElement(By.id('new_user_name'));
|
return browser.findElement(by.id('api_enabled')).click();
|
||||||
await browser.findElement(By.id('new_user_name')).sendKeys(username);
|
}).then(function () {
|
||||||
await browser.findElement(By.id('new_user_passwordPlain')).sendKeys(password);
|
return browser.findElement(by.xpath('//button[text()="Submit"]')).submit();
|
||||||
await browser.findElement(By.xpath('//button[text()="Create"]')).click();
|
}).then(function () {
|
||||||
await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
|
callback();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function enableApi() {
|
function checkApiConfiguration(callback) {
|
||||||
await browser.get(`${baseUrl()}/i/?c=auth`);
|
browser.get(`${baseUrl()}/api/`).then(function () {
|
||||||
await waitForElement(By.id('api_enabled'));
|
return exists(by.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
|
||||||
await browser.findElement(By.id('api_enabled')).click();
|
}).then(function () {
|
||||||
await browser.findElement(By.xpath('//button[text()="Submit"]')).click();
|
return exists(by.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
|
||||||
await browser.sleep(5000);
|
}).then(function () {
|
||||||
|
callback();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function checkApiConfiguration() {
|
function getAppInfo() {
|
||||||
await browser.get(`${baseUrl()}/api/`);
|
var inspect = JSON.parse(execSync('cloudron inspect'));
|
||||||
await waitForElement(By.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
|
app = inspect.apps.filter(function (a) { return a.location === LOCATION || a.location === LOCATION + '2'; })[0];
|
||||||
await waitForElement(By.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
|
expect(app).to.be.an('object');
|
||||||
}
|
}
|
||||||
|
|
||||||
async function subscriptionExists() {
|
function subscriptionExists(callback) {
|
||||||
await browser.get(`${baseUrl()}/i/?get=c_1`);
|
browser.get(`${baseUrl()}/i/?get=c_1`).then(function () {
|
||||||
return waitForElement(By.xpath('//span[text()="Cloudron"]'));
|
return visible(by.xpath('//a[text()="Cloudron.io"]'));
|
||||||
|
}).then(function () {
|
||||||
|
callback();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getStaticExtensionFile() {
|
function getStaticExtensionFile(callback) {
|
||||||
const response = await superagent.get(`${baseUrl()}/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)
|
.buffer(true)
|
||||||
.ok(() => true);
|
.end(function (err, res) {
|
||||||
expect(response.statusCode).to.be(200);
|
expect(err).to.be(null);
|
||||||
expect(response.text).to.contain('sticky_feeds'); // relies on the buffer flag above
|
expect(res.status).to.be(200);
|
||||||
|
expect(res.text).to.contain('sticky_feeds'); // relies on the buffer flag above
|
||||||
|
callback();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
|
xit('build app', function () {
|
||||||
// No SSO
|
execSync('cloudron build', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
it('install app (no sso)', function () { execSync('cloudron install --no-sso --location ' + LOCATION, EXEC_ARGS); });
|
});
|
||||||
|
|
||||||
|
it('install app', function () {
|
||||||
|
execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
|
});
|
||||||
|
|
||||||
it('can get app information', getAppInfo);
|
it('can get app information', getAppInfo);
|
||||||
|
|
||||||
it('can login', login.bind(null, admin_username, admin_password));
|
it('can login', login.bind(null, password));
|
||||||
it('can subscribe', addSubscription);
|
it('can subscribe', addSubscription);
|
||||||
it('can add users', addUser.bind(null, 'test', admin_password));
|
it('can add users', addUser.bind(null, password));
|
||||||
it('can enable API', enableApi);
|
it('can enable API', enableApi);
|
||||||
it('can check configuration', checkApiConfiguration);
|
it('can check configuration', checkApiConfiguration);
|
||||||
it('subscription exists', subscriptionExists);
|
it('subscription exists', subscriptionExists);
|
||||||
it('can get static extension file', getStaticExtensionFile);
|
it('can get static extension file', getStaticExtensionFile);
|
||||||
it('can logout', logout);
|
it('can logout', logout);
|
||||||
it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
|
|
||||||
|
|
||||||
// SSO
|
it('backup app', function () {
|
||||||
it('install app (sso)', function () { execSync('cloudron install --location ' + LOCATION, EXEC_ARGS); });
|
execSync('cloudron backup create --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
|
|
||||||
it('can get app information', getAppInfo);
|
|
||||||
|
|
||||||
it('can login OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
|
|
||||||
it('can make user Administrator', function () { execSync(`cloudron exec --app ${app.id} -- bash -c "php cli/reconfigure.php --default_user ${USERNAME}"`); });
|
|
||||||
it('can subscribe', addSubscription);
|
|
||||||
it('can enable API', enableApi);
|
|
||||||
it('can check configuration', checkApiConfiguration);
|
|
||||||
it('subscription exists', subscriptionExists);
|
|
||||||
it('can get static extension file', getStaticExtensionFile);
|
|
||||||
|
|
||||||
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 --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}`, EXEC_ARGS);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('can login OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
|
it('restore app', function () {
|
||||||
|
execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('can login', login.bind(null, password));
|
||||||
it('can check configuration', checkApiConfiguration);
|
it('can check configuration', checkApiConfiguration);
|
||||||
it('subscription exists', subscriptionExists);
|
it('subscription exists', subscriptionExists);
|
||||||
it('can get static extension file', getStaticExtensionFile);
|
it('can get static extension file', getStaticExtensionFile);
|
||||||
|
it('can logout', logout);
|
||||||
|
|
||||||
it('move to different location', function () {
|
it('move to different location', function () {
|
||||||
browser.manage().deleteAllCookies();
|
browser.manage().deleteAllCookies();
|
||||||
execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, EXEC_ARGS);
|
execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
var inspect = JSON.parse(execSync('cloudron inspect'));
|
var inspect = JSON.parse(execSync('cloudron inspect'));
|
||||||
app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
|
app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
|
||||||
expect(app).to.be.an('object');
|
expect(app).to.be.an('object');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('can login OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
|
it('can login', login.bind(null, password));
|
||||||
it('can check configuration', checkApiConfiguration);
|
it('can check configuration', checkApiConfiguration);
|
||||||
it('subscription exists', subscriptionExists);
|
it('subscription exists', subscriptionExists);
|
||||||
it('can get static extension file', getStaticExtensionFile);
|
it('can get static extension file', getStaticExtensionFile);
|
||||||
|
it('can logout', logout);
|
||||||
|
|
||||||
it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
|
it('uninstall app', function () {
|
||||||
|
execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
|
});
|
||||||
|
|
||||||
// test update
|
// test update
|
||||||
it('can install app', function () { execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, EXEC_ARGS); });
|
it('can install app', function () {
|
||||||
|
execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
|
});
|
||||||
|
|
||||||
it('can get app information', getAppInfo);
|
it('can get app information', getAppInfo);
|
||||||
// it can be changed to loginOIDC in the nextrelease
|
it('can login', login.bind(null, password));
|
||||||
it('can login', login.bind(null, admin_username, admin_password));
|
|
||||||
it('can subscribe', addSubscription);
|
it('can subscribe', addSubscription);
|
||||||
it('can add users', addUser.bind(null, 'test', admin_password));
|
it('can add users', addUser.bind(null, password));
|
||||||
|
|
||||||
it('can update', function () {
|
it('can update', function () {
|
||||||
execSync('cloudron update --app ' + app.id, EXEC_ARGS);
|
execSync('cloudron update --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
var inspect = JSON.parse(execSync('cloudron inspect'));
|
var inspect = JSON.parse(execSync('cloudron inspect'));
|
||||||
app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
|
app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
|
||||||
expect(app).to.be.an('object');
|
expect(app).to.be.an('object');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('can login', login.bind(null, admin_username, admin_password));
|
it('can login', login.bind(null, password));
|
||||||
it('subscription exists', subscriptionExists);
|
it('subscription exists', subscriptionExists);
|
||||||
it('can get static extension file', getStaticExtensionFile);
|
it('can get static extension file', getStaticExtensionFile);
|
||||||
|
|
||||||
it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
|
it('uninstall app', function () {
|
||||||
|
execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user