From 40af9e6304993fa60e00ab243f9fbca38170e1da Mon Sep 17 00:00:00 2001 From: Pierre-Alain Bandinelli Date: Sat, 14 May 2016 07:56:52 +0200 Subject: [PATCH 01/12] Adding gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..355c251 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +includes/config.php From 2f98035ac108db6733365c5f54236e0cb55ac69e Mon Sep 17 00:00:00 2001 From: Pierre-Alain Bandinelli Date: Sat, 14 May 2016 10:55:50 +0200 Subject: [PATCH 02/12] Multiple changes everywhere --- .gitignore | 3 ++ LICENSE | 1 + api.php | 9 +++-- error.php | 3 +- includes/config.template.php | 6 ++++ includes/core.php | 55 ++++++++++++++++-------------- index.php | 6 +++- rain/template/footer.html | 11 ++---- rain/template/footer.template.html | 20 +++++++++++ rain/template/header.html | 8 ++--- rain/template/info.html | 8 ++--- rain/template/upload-done.html | 4 +-- upload-done.php | 8 ++--- 13 files changed, 86 insertions(+), 56 deletions(-) create mode 100644 includes/config.template.php create mode 100644 rain/template/footer.template.html diff --git a/.gitignore b/.gitignore index 355c251..9ecb1db 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ includes/config.php +rain/cache/*.php +rain/template/footer.html +public/files diff --git a/LICENSE b/LICENSE index e11fb0b..849e3e0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,6 @@ The MIT License (MIT) Copyright (c) 2015 nokonoko +Copyright (c) 2016 PA BANDINELLI, HéliApps SAS Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to diff --git a/api.php b/api.php index eddad7d..a58709e 100644 --- a/api.php +++ b/api.php @@ -1,14 +1,17 @@ assign("title", $title); $tpl->draw("header"); $tpl->draw("error"); - $tpl->draw("footer"); -?> \ No newline at end of file +?> diff --git a/includes/config.template.php b/includes/config.template.php new file mode 100644 index 0000000..5d47d2e --- /dev/null +++ b/includes/config.template.php @@ -0,0 +1,6 @@ +assign("title", $title); $tpl->draw("header"); if(isset($_GET['info'])) { + $tpl->assign("url_filename", CONFIG_ROOT_URL); $tpl->draw("info"); } else { $tpl->draw("upload"); } $tpl->draw("footer"); -?> \ No newline at end of file +?> diff --git a/rain/template/footer.html b/rain/template/footer.html index d0244a7..99d4003 100644 --- a/rain/template/footer.html +++ b/rain/template/footer.html @@ -2,19 +2,14 @@
-
Pomf
-

If you need to store files for a longer time, please use Pomf.se or wait until Uguu offers longer time.

+
Limitations
+

If you need to store files for a longer time, you can deploy your own version of Uguu, the sources are available on Github.

-
Contact
-
- \ No newline at end of file + diff --git a/rain/template/footer.template.html b/rain/template/footer.template.html new file mode 100644 index 0000000..04bafdb --- /dev/null +++ b/rain/template/footer.template.html @@ -0,0 +1,20 @@ +
+
+
+
+
Pomf
+

If you need to store files for a longer time, please use Pomf.se or wait until Uguu offers longer time.

+
+
+
Contact
+ +
+
+
+
+ + + diff --git a/rain/template/header.html b/rain/template/header.html index 3661aa6..520790d 100644 --- a/rain/template/header.html +++ b/rain/template/header.html @@ -4,8 +4,8 @@ - - Uguu.se · {$title} + + Uguu · {$title} @@ -25,15 +25,13 @@
- +
diff --git a/rain/template/info.html b/rain/template/info.html index ef95683..6f1666e 100644 --- a/rain/template/info.html +++ b/rain/template/info.html @@ -3,16 +3,14 @@
- Info + Info

Store any filetype with a size up to 150MB for up to 1 hour. Uguu cares about your privacy and stores NO logs.

-

- If you would like to upload using ShareX read this.
To upload using curl or make a tool you can post using:
- curl -i -F name=test.jpg -F file=@localfile.jpg http://uguu.se/api.php?d=upload (HTML Response)
- curl -i -F name=test.jpg -F file=@localfile.jpg http://uguu.se/api.php?d=upload-tool (Plain text Response)

+ curl -i -F name=test.jpg -F file=@localfile.jpg {$url_filename}/api.php?d=upload (HTML Response)
+ curl -i -F name=test.jpg -F file=@localfile.jpg {$url_filename}/api.php?d=upload-tool (Plain text Response)

diff --git a/rain/template/upload-done.html b/rain/template/upload-done.html index c64aa35..ff4a8cd 100644 --- a/rain/template/upload-done.html +++ b/rain/template/upload-done.html @@ -3,8 +3,8 @@
-

File uploaded!

 -

http://a.uguu.se/{$filename}

+

File uploaded!

 +

{$url_filename}

Your file will be available for download during 24 hours.

diff --git a/upload-done.php b/upload-done.php index f48802e..3447c62 100644 --- a/upload-done.php +++ b/upload-done.php @@ -1,13 +1,13 @@ assign("title", $title); $tpl->draw("header"); -$tpl->assign("filename", $n); +$tpl->assign("url_filename", CONFIG_ROOT_URL.'/files/'.$n); $tpl->draw("upload-done"); $tpl->draw("footer"); ?> From 2239bd05ddcd865137d90a37f60066dfd296d110 Mon Sep 17 00:00:00 2001 From: Pierre-Alain Bandinelli Date: Sat, 14 May 2016 11:30:07 +0200 Subject: [PATCH 03/12] Updating script and README --- README.md | 36 +++++++++++------------------------- includes/check.sh | 2 +- includes/config.template.php | 12 +++++++----- 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 4cf8a3d..6a36173 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,34 @@ # About -[Uguu.se](http://uguu.se) source code, stores files and deletes after X amount of time. +Temp file sharing application source code, stores files and deletes after X amount of time. Forked from Uguu.se available [here](https://github.com/nokonoko/uguu). # Install Tested with: -* Nginx+PHP5-FPM (PHP 5.4) on Debian 7 Wheezy +* Nginx+PHP5-FPM (PHP 5.4) on Debian 7 Wheezy * Apache (PHP 5.4) on Ubuntu 14.04 LTS +* Apache (PHP 5.6) on Debian 8 Jessie * Nginx+PHP5-FPM (PHP 5.6) on Debian 8 Jessie -Modify -* Modify includes/core.php where to save files and other paths. -* Set correct paths in several other files. (Will add fix for this via config file instead). -* Change uguu.se to your own name in several files. -* Cron with check.sh: `crontab -e` -* After running `crontab -e`, add `0,15,30,45 * * * * bash /path/to/check.sh`, or read up on how cron works. -* Some extensions are blocked by default, this can be changed via includes/core.php's $block array. -* Everything else to your likings. - -Change php.ini and nginx.conf settings to allow bigger uploads. - -Make the uguu/ directory modifiable to the nginx user: -`setfacl -m u:www-data:rwx /path/to/uguu/directory/` - -# Todo - -* Restructure files. -* Make global config file. -* Probably a lot of things but I'm a lazy fuck, come with suggestions. +Modify +* Modify includes/config.php (copy config.template.php as a starting point) to determine the path and URL to the app, the default retention time and other config points +* Execute check.sh with cron to delete old files: `crontab -e` and add `0,15,30,45 * * * * bash /path/to/check.sh` (or adapt if you know how cron works). +* Some extensions are blocked by default, this can be changed via includes/config.php's CONFIG_BLOCKED_EXTENSIONS value. +Make the uguu/public/files and uguu/rain/cache directory modifiable to the web server user: +`chown -R www-data:www-data /path/to/uguu/public/files` and `chown -R www-data:www-data /path/to/uguu/rain/cache` # Using the API * Leaving POST value 'name' empty will cause it to save using the original filename. * Leaving POST value 'randomname' empty will cause it to use original filename or custom name if 'name' is set to file.ext. - + * Putting anything into POST value 'randomname' will cause it to return a random filename + ext (xxxxxx.ext). * Putting a custom name into POST value 'name' will cause it to return a custom filename (yourpick.ext). - + E.g: * curl -i -F name=test.jpg -F file=@localfile.jpg http://uguu.se/api.php?d=upload (HTML Response) * curl -i -F name=test.jpg -F file=@localfile.jpg http://uguu.se/api.php?d=upload-tool (Plain text Response) - This will probably get changed later since it's messy and unpractical. # Contact - [neku@pomf.se](mailto:neku@pomf.se) or [@Nekunekus](https://twitter.com/nekunekus). diff --git a/includes/check.sh b/includes/check.sh index 61e2aa1..9eb25f4 100644 --- a/includes/check.sh +++ b/includes/check.sh @@ -1,2 +1,2 @@ #! /bin/sh -find /home/neku/www/files/ -mmin +1440 -exec rm -f {} \; +find $(grep -oP '"CONFIG_FILES_PATH", "\K(.*)(?=")' config.php) -mtime +$(grep -oP '"CONFIG_MAX_RETENTION_TIME", "\K(.*)(?=")' config.php) -exec rm -f {} \; diff --git a/includes/config.template.php b/includes/config.template.php index 5d47d2e..864ed6e 100644 --- a/includes/config.template.php +++ b/includes/config.template.php @@ -1,6 +1,8 @@ Date: Sat, 14 May 2016 11:31:48 +0200 Subject: [PATCH 04/12] Further changes in README --- README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6a36173..9daab41 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,5 @@ Make the uguu/public/files and uguu/rain/cache directory modifiable to the web s * Putting a custom name into POST value 'name' will cause it to return a custom filename (yourpick.ext). E.g: - * curl -i -F name=test.jpg -F file=@localfile.jpg http://uguu.se/api.php?d=upload (HTML Response) - * curl -i -F name=test.jpg -F file=@localfile.jpg http://uguu.se/api.php?d=upload-tool (Plain text Response) - -This will probably get changed later since it's messy and unpractical. - -# Contact -[neku@pomf.se](mailto:neku@pomf.se) or [@Nekunekus](https://twitter.com/nekunekus). + * curl -i -F name=test.jpg -F file=@localfile.jpg http://path.to.uguu/api.php?d=upload (HTML Response) + * curl -i -F name=test.jpg -F file=@localfile.jpg http://path.to.uguu/api.php?d=upload-tool (Plain text Response) From c3efe77c0ea5a2f6ac2bf4f257d6f1fb6bdf2484 Mon Sep 17 00:00:00 2001 From: Pierre-Alain Bandinelli Date: Sat, 14 May 2016 11:37:06 +0200 Subject: [PATCH 05/12] Adding the public files folder --- public/files/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/files/.keep diff --git a/public/files/.keep b/public/files/.keep new file mode 100644 index 0000000..e69de29 From 5c82959949ba811f9aa78acae564766b5b2d1c02 Mon Sep 17 00:00:00 2001 From: Pierre-Alain Bandinelli Date: Sat, 14 May 2016 11:38:43 +0200 Subject: [PATCH 06/12] Adding cache folder --- rain/cache/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 rain/cache/.keep diff --git a/rain/cache/.keep b/rain/cache/.keep new file mode 100644 index 0000000..e69de29 From 8f66c23e8e4c14e71a6ed333e8a6ecd263404d83 Mon Sep 17 00:00:00 2001 From: Pierre-Alain Bandinelli Date: Sat, 14 May 2016 11:47:48 +0200 Subject: [PATCH 07/12] Adding options in the config file --- includes/config.template.php | 3 ++- index.php | 1 + rain/template/info.html | 2 +- rain/template/upload-done.html | 2 +- upload-done.php | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/includes/config.template.php b/includes/config.template.php index 864ed6e..4178ee2 100644 --- a/includes/config.template.php +++ b/includes/config.template.php @@ -4,5 +4,6 @@ define("CONFIG_ROOT_URL", "http://path.to.uguu"); define("CONFIG_FILES_PATH", "/path/to/uguu/public/files/"); define("CONFIG_ROOT_PATH", "/path/to/uguu/"); define("CONFIG_MAX_RETENTION_TIME", "60"); //Max retention time in minutes -define("CONFIG_RANDOM_LENGTH", "12"); +define("CONFIG_MAX_RETENTION_TEXT", "1 hour"); //Max retention time as a text to be displayed +define("CONFIG_RANDOM_LENGTH", "12"); //Length of the random chain appended to the filename define ("CONFIG_BLOCKED_EXTENSIONS", serialize(array("exe", "scr", "rar", "zip", "com", "vbs", "bat", "cmd", "html", "htm", "msi"))); diff --git a/index.php b/index.php index b7eeb7c..7310723 100644 --- a/index.php +++ b/index.php @@ -19,6 +19,7 @@ $tpl->draw("header"); if(isset($_GET['info'])) { $tpl->assign("url_filename", CONFIG_ROOT_URL); + $tpl->assign("retention_time", CONFIG_MAX_RETENTION_TEXT); $tpl->draw("info"); } else { $tpl->draw("upload"); diff --git a/rain/template/info.html b/rain/template/info.html index 6f1666e..4ee7e06 100644 --- a/rain/template/info.html +++ b/rain/template/info.html @@ -4,7 +4,7 @@
Info -

Store any filetype with a size up to 150MB for up to 1 hour. +

Store any filetype with a size up to 150MB for up to {retention_time}. Uguu cares about your privacy and stores NO logs.

diff --git a/rain/template/upload-done.html b/rain/template/upload-done.html index ff4a8cd..abd8a1b 100644 --- a/rain/template/upload-done.html +++ b/rain/template/upload-done.html @@ -5,7 +5,7 @@

File uploaded!

{$url_filename}

-

Your file will be available for download during 24 hours.

+

Your file will be available for download during {retention_time}.

diff --git a/upload-done.php b/upload-done.php index 3447c62..00b627d 100644 --- a/upload-done.php +++ b/upload-done.php @@ -8,6 +8,7 @@ $title = "Temp File Hosting"; $tpl->assign("title", $title); $tpl->draw("header"); $tpl->assign("url_filename", CONFIG_ROOT_URL.'/files/'.$n); +$tpl->assign("retention_time", CONFIG_MAX_RETENTION_TEXT); $tpl->draw("upload-done"); $tpl->draw("footer"); ?> From f2750d4234677ac5ab998305342107f3611d67d6 Mon Sep 17 00:00:00 2001 From: Pierre-Alain Bandinelli Date: Sat, 14 May 2016 11:49:38 +0200 Subject: [PATCH 08/12] Fixing bug in template --- rain/template/info.html | 2 +- rain/template/upload-done.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rain/template/info.html b/rain/template/info.html index 4ee7e06..0f2949e 100644 --- a/rain/template/info.html +++ b/rain/template/info.html @@ -4,7 +4,7 @@
Info -

Store any filetype with a size up to 150MB for up to {retention_time}. +

Store any filetype with a size up to 150MB for up to {$retention_time}. Uguu cares about your privacy and stores NO logs.

diff --git a/rain/template/upload-done.html b/rain/template/upload-done.html index abd8a1b..e08eb3e 100644 --- a/rain/template/upload-done.html +++ b/rain/template/upload-done.html @@ -5,7 +5,7 @@

File uploaded!

{$url_filename}

-

Your file will be available for download during {retention_time}.

+

Your file will be available for download during {$retention_time}.

From 697953e8f1ad6b3ace2bd3aa479bf5516a5be36d Mon Sep 17 00:00:00 2001 From: Pierre-Alain Bandinelli Date: Sat, 14 May 2016 11:56:42 +0200 Subject: [PATCH 09/12] Improving the README --- README.md | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9daab41..dc02f16 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,41 @@ # About Temp file sharing application source code, stores files and deletes after X amount of time. Forked from Uguu.se available [here](https://github.com/nokonoko/uguu). -# Install -Tested with: +# Tested with: * Nginx+PHP5-FPM (PHP 5.4) on Debian 7 Wheezy * Apache (PHP 5.4) on Ubuntu 14.04 LTS * Apache (PHP 5.6) on Debian 8 Jessie * Nginx+PHP5-FPM (PHP 5.6) on Debian 8 Jessie -Modify -* Modify includes/config.php (copy config.template.php as a starting point) to determine the path and URL to the app, the default retention time and other config points -* Execute check.sh with cron to delete old files: `crontab -e` and add `0,15,30,45 * * * * bash /path/to/check.sh` (or adapt if you know how cron works). -* Some extensions are blocked by default, this can be changed via includes/config.php's CONFIG_BLOCKED_EXTENSIONS value. +# Install: -Make the uguu/public/files and uguu/rain/cache directory modifiable to the web server user: -`chown -R www-data:www-data /path/to/uguu/public/files` and `chown -R www-data:www-data /path/to/uguu/rain/cache` +* Deploy base code, for example with `git clone ` +* Modify includes/config.php (copy config.template.php as a starting point) to set up the main options for Uguu. +* Some file extensions are blocked by default, this can be changed via includes/config.php's CONFIG_BLOCKED_EXTENSIONS value. +* Execute check.sh regularly with cron to delete old files: `crontab -e` and add `0,15,30,45 * * * * bash /path/to/check.sh` (or adapt if you know how cron works). +* Make the Uguu/public/files and Uguu/rain/cache directory modifiable by the web server user: +`chown -R www-data:www-data /path/to/Uguu/public/files` and `chown -R www-data:www-data /path/to/Uguu/rain/cache` +* Make sure the Uguu/public/files folder is not indexable, you may use a virtual host config similar to this one: + +``` + + ServerName path.to.uguu + + DocumentRoot /var/www/Uguu/ + + AllowOverride All + Require all granted + + + Alias "/files" "/var/www/Uguu/public/files/" + + AllowOverride None + Options -Indexes + Require all granted + + + +``` # Using the API From 6d4519c5d71eb85e64464f4010527857a7921255 Mon Sep 17 00:00:00 2001 From: Pierre-Alain Bandinelli Date: Sat, 14 May 2016 11:57:46 +0200 Subject: [PATCH 10/12] Changing README file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc02f16..17ed575 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Temp file sharing application source code, stores files and deletes after X amou # Install: -* Deploy base code, for example with `git clone ` +* Deploy base code, for example with `git clone https://github.com/pierre-alain-b/Uguu.git` * Modify includes/config.php (copy config.template.php as a starting point) to set up the main options for Uguu. * Some file extensions are blocked by default, this can be changed via includes/config.php's CONFIG_BLOCKED_EXTENSIONS value. * Execute check.sh regularly with cron to delete old files: `crontab -e` and add `0,15,30,45 * * * * bash /path/to/check.sh` (or adapt if you know how cron works). From 0296af0374180431bce5d53df044767c50b1295e Mon Sep 17 00:00:00 2001 From: Pierre-Alain Bandinelli Date: Sat, 14 May 2016 12:02:27 +0200 Subject: [PATCH 11/12] Using the footer template --- README.md | 1 + rain/template/footer.html | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 rain/template/footer.html diff --git a/README.md b/README.md index 17ed575..f34eddf 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ Temp file sharing application source code, stores files and deletes after X amou * Deploy base code, for example with `git clone https://github.com/pierre-alain-b/Uguu.git` * Modify includes/config.php (copy config.template.php as a starting point) to set up the main options for Uguu. * Some file extensions are blocked by default, this can be changed via includes/config.php's CONFIG_BLOCKED_EXTENSIONS value. +* Copy `rain/template/footer.template.html` as `rain/template/footer.html` and personalize the footer as you wish * Execute check.sh regularly with cron to delete old files: `crontab -e` and add `0,15,30,45 * * * * bash /path/to/check.sh` (or adapt if you know how cron works). * Make the Uguu/public/files and Uguu/rain/cache directory modifiable by the web server user: `chown -R www-data:www-data /path/to/Uguu/public/files` and `chown -R www-data:www-data /path/to/Uguu/rain/cache` diff --git a/rain/template/footer.html b/rain/template/footer.html deleted file mode 100644 index 99d4003..0000000 --- a/rain/template/footer.html +++ /dev/null @@ -1,15 +0,0 @@ -
-
-
-
-
Limitations
-

If you need to store files for a longer time, you can deploy your own version of Uguu, the sources are available on Github.

-
-
-
-
-
-
- - - From 47870a0f3782c964596d12f03db8d7f705dc03f3 Mon Sep 17 00:00:00 2001 From: Pierre-Alain Bandinelli Date: Sat, 14 May 2016 16:58:55 +0200 Subject: [PATCH 12/12] Adding an IMPORTANT section in the recommend Apache section --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index f34eddf..3326607 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,9 @@ Temp file sharing application source code, stores files and deletes after X amou Alias "/files" "/var/www/Uguu/public/files/" + + SetHandler default-handler + AllowOverride None Options -Indexes Require all granted