Store filesize before encrypting the file

[jirafeau.git] / README.md

diff --git a/README.md b/README.md
index 5cc3b6c665d278e18180c5076df7ad540eb7ace8..d2ac2b5d34b964004b1a3433a7608c4d0e799b27 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,13 +1,3 @@
-# DISCLAMER
-
-This project is a fork of the [discontinued project](https://gitlab.com/mojo42/Jirafeau/) by [Jérôme Jutteau](https://gitlab.com/mojo42/Jirafeau/).
-
-If you are forking the original project, feel free to mention it in [comments](https://gitlab.com/mojo42/Jirafeau/-/issues/360). Jérôme will add it there.
-
-Other forks:
-
-- @Blackstareye [fork](https://gitlab.com/shared1270023/Jirafeau)
-

 # Jirafeau
 
 ![Made With](https://img.shields.io/badge/made_with-php-blue.svg)
 # Jirafeau
 
 ![Made With](https://img.shields.io/badge/made_with-php-blue.svg)


@@ -19,11 +9,19 @@ Jirafeau is a "one-click-filesharing": Select your file, upload, share a link. T
 
 See [jirafeau.net](https://jirafeau.net/) for a demo.
 
 
 See [jirafeau.net](https://jirafeau.net/) for a demo.
 

-![Screenshot1](http://i.imgur.com/TPjh48P.png)
+![Screenshot1](screenshots/upload1.png)
+
+## DISCLAMER
+
+This project is a fork of the [discontinued project](https://gitlab.com/mojo42/Jirafeau/) by [Jérôme Jutteau](https://gitlab.com/mojo42/).
+
+If you've also forked the original project, feel free to mention it in [comments](https://gitlab.com/mojo42/Jirafeau/-/issues/360). Jérôme will add it there.
+
+In this repository we are aiming to continue development of the original Jirafeau project. Feel free to contribute to this fork by participating in discussions and providing merge requests, so we can build the best version of Jirafeau together!

 
 ## Main features
 
 
 ## Main features
 

-- One upload → One download link and one delete link
+- One upload → one download link and one delete link

 - Send any large files (thanks to the HTML5 file API → PHP `post_max_size` limit not relevant)
 - Shows upload progress: speed, percentage and remaining upload time
 - Preview content in browser (if possible)
 - Send any large files (thanks to the HTML5 file API → PHP `post_max_size` limit not relevant)
 - Shows upload progress: speed, percentage and remaining upload time
 - Preview content in browser (if possible)


@@ -31,11 +29,11 @@ See [jirafeau.net](https://jirafeau.net/) for a demo.
 - Option to require, check or generate file download passwords
 - Set expiration time for downloads
 - Option to self-destruct after first download
 - Option to require, check or generate file download passwords
 - Set expiration time for downloads
 - Option to self-destruct after first download

-- Shortened URLs using base 64 encoding
+- Shortened URLs using Base64 encoding

 - Maximal upload size configurable
 - No database, only use basic PHP
 - Simple language support with a lot of languages
 - Maximal upload size configurable
 - No database, only use basic PHP
 - Simple language support with a lot of languages

-- File level [Deduplication](http://en.wikipedia.org/wiki/Data_deduplication) for storage optimization (does store duplicate files only once, but generate multiple links)
+- File level [deduplication](http://en.wikipedia.org/wiki/Data_deduplication) for storage optimization (does store duplicate files only once, but generate multiple links)

 - Optional data encryption
 - Small administration interface
 - CLI script to remove expired files automatically with a cronjob
 - Optional data encryption
 - Small administration interface
 - CLI script to remove expired files automatically with a cronjob


@@ -44,7 +42,7 @@ See [jirafeau.net](https://jirafeau.net/) for a demo.
 - Bash script to upload files via command line
 - Themes
 
 - Bash script to upload files via command line
 - Themes
 

-Jirafeau is a fork of the original project [Jyraphe](http://home.gna.org/jyraphe/) based on the 0.5 (stable version) with a **lot** of modifications.
+Jirafeau is a fork of the original project [Jyraphe](https://web.archive.org/web/20170506133242/home.gna.org/jyraphe) based on the 0.5 (stable version) with a **lot** of modifications.

 
 As it's original project, Jirafeau is made in the [KISS](http://en.wikipedia.org/wiki/KISS_principle) way (Keep It Simple, Stupid).
 
 
 As it's original project, Jirafeau is made in the [KISS](http://en.wikipedia.org/wiki/KISS_principle) way (Keep It Simple, Stupid).
 


@@ -52,29 +50,28 @@ Jirafeau project won't evolve to a file manager and will focus to keep a very fe
 
 ## Screenshots
 
 
 ## Screenshots
 

-- [Installation - Step 1](http://i.imgur.com/hmpT1eN.jpg)
-- [Installation - Step 2](http://i.imgur.com/2e0UGKE.jpg)
-- [Installation - Step 3](http://i.imgur.com/ofAjLXh.jpg)
-- [Installation - Step 4](http://i.imgur.com/WXqnfqJ.jpg)
-- [Upload - Step 1](http://i.imgur.com/SBmSwzJ.jpg)
-- [Upload - Step 2](http://i.imgur.com/wzPkb1Z.jpg)
-- [Upload - Progress](http://i.imgur.com/i6n95kv.jpg)
-- [Upload - Confirmation page](http://i.imgur.com/P2oS1MY.jpg)
-- [Admin Interface](http://i.imgur.com/nTdsVzn.png)
+- [Installation - Step 1](screenshots/install1.png)
+- [Installation - Step 2](screenshots/install2.png)
+- [Installation - Step 3](screenshots/install3.png)
+- [Upload - Step 1](screenshots/upload1.png)
+- [Upload - Step 2](screenshots/upload2.png)
+- [Upload - Progress](screenshots/upload_progress.png)
+- [Upload - Confirmation page](screenshots/upload_confirm.png)
+- [Admin Interface](screenshots/admin.png)

 
 ## Installation
 
 This shows how to install Jirafeau by your own, it's quite simple but you can
 
 ## Installation
 
 This shows how to install Jirafeau by your own, it's quite simple but you can

-also use a [docker image](https://hub.docker.com/r/mojo42/jirafeau/) or build
-it yourself. Check [docker folder](docker/README.md) for more informations.
+also use a [docker image](https://gitlab.com/jirafeau/Jirafeau/container_registry/) or build
+it yourself. Check [docker folder](docker/README.md) for more information.

 
 System requirements:
 
 System requirements:

-- PHP >= 5.6
+- PHP >= 7.4

 - Optional, but recommended: Git >= 2.7
 - No database required, no mail required
 
 Installation steps:
 - Optional, but recommended: Git >= 2.7
 - No database required, no mail required
 
 Installation steps:

-- Clone the [repository](https://gitlab.com/pcanterino/Jirafeau/) or download the latest [release](https://gitlab.com/pcanterino/Jirafeau/tags) from GitLab onto your webserver
+- Clone the [repository](https://gitlab.com/jirafeau/Jirafeau/) or download the latest [release](https://gitlab.com/jirafeau/Jirafeau/tags) from GitLab onto your webserver

 - Set owner & group according to your webserver
 - A) Setup with the installation wizard (web):
   - Open your browser and go to your installed location, eg. `https://example.com/jirafeau/`
 - Set owner & group according to your webserver
 - A) Setup with the installation wizard (web):
   - Open your browser and go to your installed location, eg. `https://example.com/jirafeau/`


@@ -85,27 +82,38 @@ Installation steps:
 
 💡 Hint: How to
 [install & configure Jirafeau](https://www.howtoforge.com/how-to-setup-a-file-sharing-website-with-jirafeau-on-debian-10/)
 
 💡 Hint: How to
 [install & configure Jirafeau](https://www.howtoforge.com/how-to-setup-a-file-sharing-website-with-jirafeau-on-debian-10/)

-on Debian 10 from scratch, with Nginx and PHP-FPM.
+on Debian 10 from scratch, with nginx and PHP-FPM.

 
 ### Troubleshooting
 
 If you have some troubles, consider the following cases
 
 - Check your `/lib/config.local.php` file and compare it with `/lib/config.original.php`, the configuration syntax or a parameter may have changed
 
 ### Troubleshooting
 
 If you have some troubles, consider the following cases
 
 - Check your `/lib/config.local.php` file and compare it with `/lib/config.original.php`, the configuration syntax or a parameter may have changed

-- Check owner & permissions of your files
-- set `debug` option to `true` to check any warning or error
+- Check owner and permissions of your files
+- Set `debug` option to `true` to check any warning or error

 
 ## Security
 
 `var` directory contains all files and links. It is randomly named to limit access but you may add better protection to prevent un-authorized access to it.
 You have several options:
 
 ## Security
 
 `var` directory contains all files and links. It is randomly named to limit access but you may add better protection to prevent un-authorized access to it.
 You have several options:

+

 - Configure a `.htaccess`
 - Move var folder to a place on your server which can't be directly accessed
 - Disable automatic listing on your web server config or place a index.html in var's sub-directory (this is a limited solution)
 
 - Configure a `.htaccess`
 - Move var folder to a place on your server which can't be directly accessed
 - Disable automatic listing on your web server config or place a index.html in var's sub-directory (this is a limited solution)
 

-If you are using Apache, you can add the following line to your configuration to prevent people to access to your `var` folder:
+If you are using Apache, you can add the following lines to your configuration to prevent people to access to your `var` folder:
+
+```apache
+<LocationMatch "^/var-*">
+    Require all denied
+</LocationMatch>
+```

 
 

-`RedirectMatch 301 ^/var-.* http://my.service.jirafeau`
+Or you can put a `.htaccess` file containing this into your `var` folder:
+
+```apache
+Require all denied
+```

 
 If you are using nginx, you can add the following to your $vhost.conf:
 
 
 If you are using nginx, you can add the following to your $vhost.conf:
 


@@ -137,12 +145,12 @@ In case of security troubles on the server, attacker won't be able to access fil
 By activating this feature, you have to be aware of few things:
 -  Data encryption has a cost (CPU) and it takes more time for downloads to complete once file sent.
 -  During the download, the server will decrypt on the fly (and use resource).
 By activating this feature, you have to be aware of few things:
 -  Data encryption has a cost (CPU) and it takes more time for downloads to complete once file sent.
 -  During the download, the server will decrypt on the fly (and use resource).

--  This feature needs to have the Sodium php module.
+-  This feature needs to have the [`Sodium`](https://www.php.net/manual/en/book.sodium.php) PHP module.

 -  File de-duplication will stop to work (as we can't compare two encrypted files).
 -  Be sure your server does not log client's requests.
 -  Don't forget to enable HTTPS.
 
 -  File de-duplication will stop to work (as we can't compare two encrypted files).
 -  Be sure your server does not log client's requests.
 -  Don't forget to enable HTTPS.
 

-In a next step, encryption will be made by the client (in JavaScript), see issue #10.
+In a next step, encryption will be made by the client (in JavaScript).

 
 ## License
 
 
 ## License
 


@@ -161,11 +169,11 @@ PS: If you have fixed errors or added features, then please contribute to the pr
 
 If you want to contribute to project, then take a look at the git repository:
 
 
 If you want to contribute to project, then take a look at the git repository:
 

-- https://gitlab.com/pcanterino/Jirafeau
+- https://gitlab.com/jirafeau/Jirafeau

 
 and the Contribution Guidelines
 
 
 and the Contribution Guidelines
 

-- https://gitlab.com/pcanterino/Jirafeau/blob/master/CONTRIBUTING.md
+- https://gitlab.com/jirafeau/Jirafeau/blob/master/CONTRIBUTING.md

 
 ## FAQ
 
 
 ## FAQ
 


@@ -177,7 +185,7 @@ Thanks to all contributors ! :)
 
 ### How do I upgrade my Jirafeau?
 
 
 ### How do I upgrade my Jirafeau?
 

-See change log and upgrade procedure in [CHANGELOG.md](https://gitlab.com/pcanterino/Jirafeau/blob/master/CHANGELOG.md).
+See change log and upgrade procedure in [CHANGELOG.md](https://gitlab.com/jirafeau/Jirafeau/blob/master/CHANGELOG.md).

 
 ### How can I limit upload access?
 
 
 ### How can I limit upload access?
 


@@ -185,7 +193,7 @@ There are two ways to limit upload access (but not download):
 - you can set one or more passwords in order to access the upload interface, or/and
 - you can configure a list of authorized IP ([CIDR notation](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation)) which are allowed to access to the upload page
 
 - you can set one or more passwords in order to access the upload interface, or/and
 - you can configure a list of authorized IP ([CIDR notation](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation)) which are allowed to access to the upload page
 

-Check documentation of `upload_password` and `upload_ip` parameters in [lib/config.original.php](https://gitlab.com/pcanterino/Jirafeau/blob/master/lib/config.original.php).
+Check documentation of `upload_password` and `upload_ip` parameters in [lib/config.original.php](https://gitlab.com/jirafeau/Jirafeau/blob/master/lib/config.original.php).

 
 ### How can I automatize the cleaning of old (expired) files?
 
 
 ### How can I automatize the cleaning of old (expired) files?
 


@@ -208,14 +216,14 @@ Anyway I would recommend you to use another web browser. :)
 
 You may change the default theme to any of the existing ones or a custom.
 
 
 You may change the default theme to any of the existing ones or a custom.
 

-Open your `lib/config.local.php` and change setting in the »`style`« key to the name of any folder in the `/media` directory.
+Open your `lib/config.local.php` and change setting in the `style` key to the name of any folder in the `/media` directory. If you want to change the theme for dark mode, you have to set the `dark_style` key in the config file.

 
 

-Hint: To create a custom theme just copy the »courgette« folder and name your theme »custom« (this way it will be ignored by git and not overwritten during updates). You are invited to enhance the existing themes and send pull requests however.
+Hint: To create a custom theme just copy the `courgette` folder and name your theme `custom` (this way it will be ignored by git and not overwritten during updates). If you want to create a custom theme for dark mode, you have to put it in a folder named `dark-custom`. You are invited to enhance the existing themes and send pull requests however.

 
 ### I found a bug, what should I do?
 
 
 ### I found a bug, what should I do?
 

-Feel free to open a bug in the [GitLab's issues](https://gitlab.com/pcanterino/Jirafeau/issues).
-If you can, please copy-paste informations related to bug opening provided in admin interface.
+Feel free to open a bug in the [GitLab's issues](https://gitlab.com/jirafeau/Jirafeau/issues).
+If you can, please copy-paste information related to bug opening provided in admin interface.

 Admin interface can be reached by accessing `/admin.php`.
 
 ### How to set maximum file size?
 Admin interface can be reached by accessing `/admin.php`.
 
 ### How to set maximum file size?


@@ -223,20 +231,20 @@ Admin interface can be reached by accessing `/admin.php`.
 If your browser supports the HTML5 file API, you can send files as big as you want.
 
 For browsers not supporting the HTML5 file API, the limitation comes from PHP configuration.
 If your browser supports the HTML5 file API, you can send files as big as you want.
 
 For browsers not supporting the HTML5 file API, the limitation comes from PHP configuration.

-You have to set [post_max_size](https://php.net/manual/en/ini.core.php#ini.post-max-size) and [upload_max_filesize](https://php.net/manual/en/ini.core.php#ini.upload-max-filesize) in your php configuration. Note that Nginx setups may requiere to configure `client_max_body_size`.
+You have to set [post_max_size](https://php.net/manual/en/ini.core.php#ini.post-max-size) and [upload_max_filesize](https://php.net/manual/en/ini.core.php#ini.upload-max-filesize) in your php configuration. Note that nginx setups may requiere to configure `client_max_body_size`.

 
 If you don't want to allow unlimited upload size, you can still setup a maximal file size in Jirafeau's setting (see `maximal_upload_size` in your configuration)
 
 ### How can I edit an option?
 
 
 If you don't want to allow unlimited upload size, you can still setup a maximal file size in Jirafeau's setting (see `maximal_upload_size` in your configuration)
 
 ### How can I edit an option?
 

-Documentation of all default options are located in [lib/config.original.php](https://gitlab.com/pcanterino/Jirafeau/blob/master/lib/config.original.php).
-If you want to change an option, just edit your `lib/config.local.php`.
+Documentation of all default options are located in [/lib/config.original.php](https://gitlab.com/jirafeau/Jirafeau/blob/master/lib/config.original.php).
+If you want to change an option, just edit your `/lib/config.local.php`.

 
 ### How can I change the Terms of Service?
 
 
 ### How can I change the Terms of Service?
 

-The license text on the "Terms of Service" page, which is shipped with the default installation, is based on the »[Open Source Initiative Terms of Service](https://opensource.org/ToS)«.
+The license text on the "Terms of Service" page, which is shipped with the default installation, is based on the "[Open Source Initiative Terms of Service](https://opensource.org/ToS)".

 
 

-To change this text simply copy the file [/lib/tos.original.txt](https://gitlab.com/pcanterino/Jirafeau/blob/master/lib/tos.original.txt), rename it to `/lib/tos.local.txt` and adapt it to your own needs.
+To change this text simply copy the file [/lib/tos.original.txt](https://gitlab.com/jirafeau/Jirafeau/blob/master/lib/tos.original.txt), rename it to `/lib/tos.local.txt` and adapt it to your own needs.

 
 If you update the installation, then only the `tos.original.txt` file may change eventually, not your `tos.local.txt` file.
 
 
 If you update the installation, then only the `tos.original.txt` file may change eventually, not your `tos.local.txt` file.
 


@@ -252,7 +260,7 @@ Simply go to `/script.php` with your web browser.
 
 Be sure your PHP installation is not using safe mode, it may cause timeouts.
 
 
 Be sure your PHP installation is not using safe mode, it may cause timeouts.
 

-If you're using nginx, you might need to increase `client_max_body_size` or remove the restriction altogether. In your nginx.conf:
+If you're using nginx, you might need to increase `client_max_body_size` or remove the restriction altogether. In your `nginx.conf`:

 
 ```nginx
 http {
 
 ```nginx
 http {


@@ -270,11 +278,11 @@ You may use Munin and simple scripts to collect the number of files in the Jiraf
 
 ### Why forking?
 
 
 ### Why forking?
 

-The original project seems not to be continued anymore and I prefer to add more features and increase security from a stable version.
+In this repository we are aiming to continue development of the original Jirafeau project. We plan to add more features and increase security from a stable version.

 
 ### What can we expect in the future?
 
 
 ### What can we expect in the future?
 

-Check [issues](https://gitlab.com/pcanterino/Jirafeau/issues) to check open bugs and incoming new stuff. :)
+Check [issues](https://gitlab.com/jirafeau/Jirafeau/issues) to check open bugs and incoming new stuff. :)

 
 ### What about this file deduplication thing?
 
 
 ### What about this file deduplication thing?
 


@@ -299,8 +307,10 @@ So:
 
 ### How to contact someone from Jirafeau?
 
 
 ### How to contact someone from Jirafeau?
 

-Feel free to create an [issue](https://gitlab.com/pcanterino/Jirafeau/-/issues) if you found a bug.
+Feel free to create an [issue](https://gitlab.com/jirafeau/Jirafeau/-/issues) if you found a bug.

 
 ### Can I buy you a coffee?
 
 
 ### Can I buy you a coffee?
 

-You can [drop few bucks for Jérôme Jutteau](https://www.paypal.com/paypalme/jeromejutteau) to help the [demo web site](https://jirafeau.net) to stay alive.
+You can [drop few bucks for Jérôme Jutteau](https://www.paypal.com/paypalme/jeromejutteau)
+
+Many Thanks <3