Merge pull request #1103 from dennisverspuij/fix-on-in-markdown

 Fix removal of on=... attributes from html (generated from markdown)

diff --git a/.htaccess b/.htaccess
index 19dd72a805e7b3bd170c87aabb25ad4764ca179a..7ba4744b262af9c1ca97f617c4bb60d9510808e9 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -6,6 +6,10 @@ RewriteEngine On
 # Prevent accessing subdirectories not managed by SCM
 RewriteRule ^(.git|doxygen|vendor) - [F]
 
+# Forward the "Authorization" HTTP header
+RewriteCond %{HTTP:Authorization} ^(.*)
+RewriteRule .* - [e=HTTP_AUTHORIZATION:%1]
+
 # REST API
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e737d8cbbc4ef45c51a7d304c65c12c9eff5bec..3218f4d83a1dbcfe9b4885418cc001e3577fd72c 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [v0.10.0](https://github.com/shaarli/Shaarli/releases/tag/v0.10.0) - UNPUBLISHED
 
+
+## [v0.9.6](https://github.com/shaarli/Shaarli/releases/tag/v0.9.6) - 2018-03-25
+## Changed
+- htaccess: prevent accessing resources not managed by SCM
+- htaccess: always forward the 'Authorization' HTTP header
+
+
 ## [v0.9.5](https://github.com/shaarli/Shaarli/releases/tag/v0.9.5) - 2018-02-02
 ### Fixed
 - Fix a warning happening when `php-intl` is not installed on the system

diff --git a/README.md b/README.md
index 106384d8475773b1a44a8a9ac73ade8825a5e051..df9018b6b488639761254bc0cc9e484c2377b86b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ _It is designed to be personal (single-user), fast and handy._
 [![](https://img.shields.io/badge/stable-v0.8.6-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.8.6)
 [![](https://img.shields.io/travis/shaarli/Shaarli/stable.svg?label=stable)](https://travis-ci.org/shaarli/Shaarli)
 •
-[![](https://img.shields.io/badge/latest-v0.9.5-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.9.5)
+[![](https://img.shields.io/badge/latest-v0.9.6-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.9.6)
 [![](https://img.shields.io/travis/shaarli/Shaarli/latest.svg?label=latest)](https://travis-ci.org/shaarli/Shaarli)
 •
 [![](https://img.shields.io/badge/master-v0.10.x-blue.svg)](https://github.com/shaarli/Shaarli)

diff --git a/doc/md/Download-and-Installation.md b/doc/md/Download-and-Installation.md
index 0fdbd27de59ab5b184b3c9812cb1479d6ab40e76..05f0c8f2db3d5fe6bcddf32ab5d6c40c15eece6a 100644 (file)
--- a/doc/md/Download-and-Installation.md
+++ b/doc/md/Download-and-Installation.md
@@ -25,11 +25,11 @@ Using one of the following methods:
 
 In most cases, you should download the latest Shaarli release from the [releases](https://github.com/shaarli/Shaarli/releases) page. **Download our *shaarli-full* archive** to include dependencies.
 
-The current latest released version is `v0.9.3`
+The current latest released version is `v0.9.6`
 
 ```bash
-$ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.3/shaarli-v0.9.3-full.zip
-$ unzip shaarli-v0.9.3-full.zip
+$ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.6/shaarli-v0.9.6-full.zip
+$ unzip shaarli-v0.9.6-full.zip
 $ mv Shaarli /path/to/shaarli/
 ```
 

diff --git a/doc/md/Upgrade-and-migration.md b/doc/md/Upgrade-and-migration.md
index f666be751034c9b6d6e2f842c89435892b92e7dc..ac24ff34053c64e818ead7df366bb2b9968e75ac 100644 (file)
--- a/doc/md/Upgrade-and-migration.md
+++ b/doc/md/Upgrade-and-migration.md
@@ -3,7 +3,7 @@
 ### Note your current version
 
 If anything goes wrong, it's important for us to know which version you're upgrading from.
-The current version is present in the `version.php` file.
+The current version is present in the `shaarli_version.php` file.
 
 ### Backup your data
 

diff --git a/docker/alpine/Dockerfile.armhf.latest b/docker/alpine/Dockerfile.armhf.latest
index c923834abb9871ae70135af61b50cabefcf998ee..824a192633bbb7c2fb78d682644900c97805e8eb 100644 (file)
--- a/docker/alpine/Dockerfile.armhf.latest
+++ b/docker/alpine/Dockerfile.armhf.latest
@@ -37,7 +37,9 @@ RUN curl -L https://github.com/shaarli/Shaarli/archive/latest.tar.gz | tar xzf -
     && cd shaarli \
     && composer --prefer-dist --no-dev install \
     && rm -rf ~/.composer \
-    && chown -R nginx:nginx .
+    && chown -R nginx:nginx . \
+    && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
+    && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
 
 VOLUME /var/www/shaarli/data
 

diff --git a/docker/alpine/Dockerfile.armhf.master b/docker/alpine/Dockerfile.armhf.master
index 7f1bdf85a19c7e663253d2262d9615e5bc041533..6c89adc3b9f734828f9e47257d4d1cea2a36c089 100644 (file)
--- a/docker/alpine/Dockerfile.armhf.master
+++ b/docker/alpine/Dockerfile.armhf.master
@@ -37,7 +37,9 @@ RUN curl -L https://github.com/shaarli/Shaarli/archive/master.tar.gz | tar xzf -
     && cd shaarli \
     && composer --prefer-dist --no-dev install \
     && rm -rf ~/.composer \
-    && chown -R nginx:nginx .
+    && chown -R nginx:nginx . \
+    && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
+    && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
 
 VOLUME /var/www/shaarli/data
 

diff --git a/docker/alpine/Dockerfile.latest b/docker/alpine/Dockerfile.latest
index 4724b633857358faabafcc8bcc762266703ebde8..755d87517c1ec8c1ae156bccedbd30ffb6b555be 100644 (file)
--- a/docker/alpine/Dockerfile.latest
+++ b/docker/alpine/Dockerfile.latest
@@ -42,7 +42,10 @@ RUN rm -rf /etc/php7/php-fpm.d/www.conf \
 WORKDIR /var/www
 COPY --from=composer /app/shaarli shaarli
 
-RUN chown -R nginx:nginx .
+RUN chown -R nginx:nginx . \
+    && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
+    && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
+
 VOLUME /var/www/shaarli/data
 
 EXPOSE 80

diff --git a/docker/alpine/Dockerfile.master b/docker/alpine/Dockerfile.master
index 9cb4dec49565d34337051088e43e0fcffed98b3d..0472947f54d90854b9966185daaf9da7d341df73 100644 (file)
--- a/docker/alpine/Dockerfile.master
+++ b/docker/alpine/Dockerfile.master
@@ -42,7 +42,10 @@ RUN rm -rf /etc/php7/php-fpm.d/www.conf \
 WORKDIR /var/www
 COPY --from=composer /app/shaarli shaarli
 
-RUN chown -R nginx:nginx .
+RUN chown -R nginx:nginx . \
+    && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
+    && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
+
 VOLUME /var/www/shaarli/data
 
 EXPOSE 80

diff --git a/tpl/vintage/loginform.html b/tpl/vintage/loginform.html
index 2c9b710e8cc344af87f94aa6d5bce55b0ba37523..0f7d6387e8ec07e2dfc93b16afc23dfdc203c7c0 100644 (file)
--- a/tpl/vintage/loginform.html
+++ b/tpl/vintage/loginform.html
@@ -13,7 +13,7 @@
   {include="page.header"}
 
   <div id="headerform">
-    {if="!ban_canLogin($conf)"}
+    {if="!$user_can_login"}
       You have been banned from login after too many failed attempts. Try later.
     {else}
       <form method="post" name="loginform">