2020 safe. Lifetime calculation rewritten. Documentation updated. Update information...

diff --git a/CHANGELOG b/CHANGELOG
index 2afb306a5866edfb45543f6467c876156636b5c6..1fd6566f1bae7dceb5ff477bb078ca45f6c732d7 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 TBA version x.x Lithium
+* Update information now included
+* Rewritten lifetime calculation
 
 20191223 version 0.2-beta Helium
 * First public beta release

diff --git a/TODO b/TODO
index 80befee935475b01c1ca7789226d1bee137f1ebc..0240a0de74635c5767342fd4de13078782d638a8 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,3 +8,4 @@
 * abstract storage to support different storage solutions
 * config file for client script
 * proxy setting for client script
+* Lifetimecheck as cronjob

diff --git a/client/selfpaste.default.sh b/client/selfpaste.default.sh
index b1c6988d0804f93ace8e9705b2240246ee1f3e55..65dea84bbfff84bbf8a290a138dd8f5ba1029878 100644 (file)
--- a/client/selfpaste.default.sh
+++ b/client/selfpaste.default.sh
@@ -6,7 +6,7 @@
 # COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 # along with this program.  If not, see http://www.sun.com/cddl/cddl.html
 #
-# 2020 https://www.bananas-playground.net/projekt/selfpaste
+# 2019 - 2020 https://://www.bananas-playground.net/projekt/selfpaste
 
 command -v curl >/dev/null 2>&1 || { echo >&2 "I require curl (https://curl.haxx.se/) but it's not installed.  Aborting."; exit 1; }
 command -v jq >/dev/null 2>&1 || { echo >&2 "I require jq (https://stedolan.github.io/jq/) but it's not installed.  Aborting."; exit 1; }

diff --git a/documentation/lifetime.txt b/documentation/lifetime.txt
index f010fe216ddac6e547401e793056cab4f5904b4e..2010874212b95ab41172918d54f9f03e732f0b0e 100644 (file)
--- a/documentation/lifetime.txt
+++ b/documentation/lifetime.txt
@@ -1,3 +1,4 @@
-The default lifetime of a paste is 7 days. Anything older will be deleted.
+The default lifetime of a paste is 30 days. Anything older will be deleted.
+The config value is on days.
 
 The default flood prevention time maximum is 30 sec.
\ No newline at end of file

diff --git a/documentation/security.txt b/documentation/security.txt
index dea5fd1cdedca9cde5b021ecb070f4556698ca06..dc98d858ad875a230b53209594796ca10efce77c 100644 (file)
--- a/documentation/security.txt
+++ b/documentation/security.txt
@@ -3,7 +3,7 @@ Unless you:
 
     - Keep your secret a secret
     - Do not use it publicly
-    - Do not promote it as a new paste plattform
+    - Do not promote it as a new paste platform
     - Change your secret often
 
 

diff --git a/documentation/update.txt b/documentation/update.txt
new file mode 100644 (file)
index 0000000..20d28a7
--- /dev/null
+++ b/documentation/update.txt
@@ -0,0 +1,2 @@
+If you update from a previous version make sure every update step is done
+since your current used version.
\ No newline at end of file

diff --git a/webroot/config.default.php b/webroot/config.default.php
index 017141025410cf21068285834f803d9524e82114..a613853cde60bb45cc5c6e45fee8dd792ee15d45 100644 (file)
--- a/webroot/config.default.php
+++ b/webroot/config.default.php
@@ -7,7 +7,7 @@
  * COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
  * along with this program.  If not, see http://www.sun.com/cddl/cddl.html
  *
- * 2020 https://www.bananas-playground.net/projekt/selfpaste
+ * 2019 - 2020 https://://www.bananas-playground.net/projekt/selfpaste
  */
 
 # this is your installation secret. Could be anything.
@@ -23,7 +23,7 @@ define('SELFPASTE_ALLOWED_FILETYPES','text/plain,text/comma-separated-values,tex
 # needed to respond with the correct link for your paste
 # please NO / at the end
 define('SELFPASTE_URL','http://your.tld/path/selfpaste/webroot');
-# time in seconds how long a paste will be available. Default 7 days = 604800 sec
-define('SELFPASTE_PASTE_LIFETIME',604800);
+# time in days how long a paste will be available. Default 30 days
+define('SELFPASTE_PASTE_LIFETIME',30);
 # time in seconds how long the flood protection should take action. Default 30sec
 define('SELFPASTE_FLOOD_LIFETIME',30);

diff --git a/webroot/index.php b/webroot/index.php
index ce48e0b1ade1094726e896c1cf96e570741be211..a16ad8fe826b80741ffa9f5fa9f645992d3f6a91 100644 (file)
--- a/webroot/index.php
+++ b/webroot/index.php
@@ -7,7 +7,7 @@
  * COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
  * along with this program.  If not, see http://www.sun.com/cddl/cddl.html
  *
- * 2020 https://www.bananas-playground.net/projekt/selfpaste
+ * 2019 - 2020 https://://www.bananas-playground.net/projekt/selfpaste
  */
 
 # global debug setting

diff --git a/webroot/lib/mancubus.class.php b/webroot/lib/mancubus.class.php
index 0eed321a0da506b92136fb5a15911f3f65b628ee..5168548cc2ec4a6b88923b764ca5323a49a2e06d 100644 (file)
--- a/webroot/lib/mancubus.class.php
+++ b/webroot/lib/mancubus.class.php
@@ -7,7 +7,7 @@
  * COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
  * along with this program.  If not, see http://www.sun.com/cddl/cddl.html
  *
- * 2020 https://www.bananas-playground.net/projekt/selfpaste
+ * 2019 - 2020 https://://www.bananas-playground.net/projekt/selfpaste
  */
 
 /**
@@ -307,7 +307,7 @@ class Mancubus {
      */
     private function _checkLifetime() {
         $iterator = new RecursiveDirectoryIterator(SELFPASTE_UPLOAD_DIR);
-        $now = time();
+        $datepointInThePastInSec = strtotime('-'.SELFPASTE_PASTE_LIFETIME.' days');
 
         foreach (new RecursiveIteratorIterator($iterator) as $file) {
             $fname = $file->getFilename();
@@ -315,8 +315,10 @@ class Mancubus {
                 || Summoner::startsWith($file->getFilename(),'.')
                 || isset($fname[4])
             ) continue;
-            if ($now - $file->getCTime() >= SELFPASTE_PASTE_LIFETIME) {
-                unlink(SELFPASTE_UPLOAD_DIR.'/'.$fname);
+            if ($file->getMTime() <= $datepointInThePastInSec) {
+                if(is_writable($file->getPathname())) {
+                    unlink($file->getPathname());
+                }
             }
         }
     }

diff --git a/webroot/lib/summoner.class.php b/webroot/lib/summoner.class.php
index cd3424022a7e7d27dab16ba3a93f6861ce53ab5c..7c2ea3a173e23b8976962538b2383879a9cb202f 100644 (file)
--- a/webroot/lib/summoner.class.php
+++ b/webroot/lib/summoner.class.php
@@ -7,7 +7,7 @@
  * COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
  * along with this program.  If not, see http://www.sun.com/cddl/cddl.html
  *
- * 2020 https://www.bananas-playground.net/projekt/selfpaste
+ * 2019 - 2020 https://://www.bananas-playground.net/projekt/selfpaste
  */
 
 /**

diff --git a/webroot/view/created.inc.php b/webroot/view/created.inc.php
index 46ce74691c982d5873bee15fad191d803e074a41..aee9608b5b0dbeacbed366c8fa63802ba2b2395e 100644 (file)
--- a/webroot/view/created.inc.php
+++ b/webroot/view/created.inc.php
@@ -7,6 +7,6 @@
  * COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
  * along with this program.  If not, see http://www.sun.com/cddl/cddl.html
  *
- * 2020 https://www.bananas-playground.net/projekt/selfpaste
+ * 2019 - 2020 https://://www.bananas-playground.net/projekt/selfpaste
  */
 echo json_encode($contentBody)."\n";
\ No newline at end of file

diff --git a/webroot/view/view.inc.php b/webroot/view/view.inc.php
index fcca9a5c1c083d2036825afb950e545dd0800dde..42a7bf4595334179707b0b0e59e7bebb4cf258fc 100644 (file)
--- a/webroot/view/view.inc.php
+++ b/webroot/view/view.inc.php
@@ -7,7 +7,7 @@
  * COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
  * along with this program.  If not, see http://www.sun.com/cddl/cddl.html
  *
- * 2020 https://www.bananas-playground.net/projekt/selfpaste
+ * 2019 - 2020 https://://www.bananas-playground.net/projekt/selfpaste
  */
 if (file_exists($contentBody)) {
     header('Expires: 0');

diff --git a/webroot/view/welcome.inc.php b/webroot/view/welcome.inc.php
index b8dda95c818afa90c0f9df349a0d5e1142c8f504..542a7b74b7d4fef3a0dd50fab4e2ab4ffc98df36 100644 (file)
--- a/webroot/view/welcome.inc.php
+++ b/webroot/view/welcome.inc.php
@@ -7,7 +7,7 @@
  * COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
  * along with this program.  If not, see http://www.sun.com/cddl/cddl.html
  *
- * 2020 https://www.bananas-playground.net/projekt/selfpaste
+ * 2019 - 2020 https://://www.bananas-playground.net/projekt/selfpaste
  */
 ?>
 <!DOCTYPE HTML>