FIX: Revamped security measures

diff --git a/www/delete.php b/www/delete.php
index 6d68ae4486d4ce365fd0e31c7289bb17bd46ee89..e4ee5e7d12738c34c879afe6e49d905443acfabd 100644 (file)
--- a/www/delete.php
+++ b/www/delete.php
@@ -3,6 +3,7 @@ namespace phorkie;
 /**
  * Delete paste or ask for deletion
  */
 /**
  * Delete paste or ask for deletion
  */

+$pageRequiresLogin = '1';

 require_once 'www-header.php';
 
 $repo = new Repository();
 require_once 'www-header.php';
 
 $repo = new Repository();

diff --git a/www/display.php b/www/display.php
index 534a11959b9c1f0cc8b3fd5148e24a19dcd61c46..94b2ef9518451a93e0f6edf24b5be93523fb4834 100644 (file)
--- a/www/display.php
+++ b/www/display.php
@@ -3,7 +3,7 @@ namespace phorkie;
 /**
  * Display paste contents
  */
 /**
  * Display paste contents
  */

-$pageRequiresLogin = false;
+$pageRequiresLogin = '0';

 require_once 'www-header.php';
 
 $repo = new Repository();
 require_once 'www-header.php';
 
 $repo = new Repository();

diff --git a/www/doap.php b/www/doap.php
index f374dba0464244c163431321727f4aa9f5f69833..cc618451969efed4ace18d013ba85db00054ee2d 100644 (file)
--- a/www/doap.php
+++ b/www/doap.php
@@ -4,7 +4,7 @@ namespace phorkie;
  * Display DOAP of the paste.
  * Contains a machine-readable project description with Git URL.
  */
  * Display DOAP of the paste.
  * Contains a machine-readable project description with Git URL.
  */

-$pageRequiresLogin = false;
+$pageRequiresLogin = '0';

 require_once 'www-header.php';
 
 $repo = new Repository();
 require_once 'www-header.php';
 
 $repo = new Repository();

diff --git a/www/edit.php b/www/edit.php
index 897aada2b36bf67a2478f4440a91451bf88a107a..b925f0b0a95fb434175ff67e511d63a32818cd02 100644 (file)
--- a/www/edit.php
+++ b/www/edit.php
@@ -3,8 +3,8 @@ namespace phorkie;
 /**
  * Edit paste contents
  */
 /**
  * Edit paste contents
  */

+$pageRequiresLogin = '1';

 require_once 'www-header.php';
 require_once 'www-header.php';

-

 $repo = new Repository();
 $repo->loadFromRequest();
 
 $repo = new Repository();
 $repo->loadFromRequest();
 

diff --git a/www/fork.php b/www/fork.php
index 3d1c4b73d1979d2bb8b8e9813d58579b47261715..2832fe4e60fa32c1d5c1f2f85f06e3c91cb4e858 100644 (file)
--- a/www/fork.php
+++ b/www/fork.php
@@ -3,6 +3,7 @@
  * Fork a repository
  */
 namespace phorkie;
  * Fork a repository
  */
 namespace phorkie;

+$pageRequiresLogin = '1';

 require_once 'www-header.php';
 
 if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
 require_once 'www-header.php';
 
 if ($_SERVER['REQUEST_METHOD'] !== 'POST') {

diff --git a/www/list.php b/www/list.php
index 721d20c547370e541d8ff3c6f5528d73d2b176f6..cc8aa872c435e36c73cb4992d5861bc716aa24d5 100644 (file)
--- a/www/list.php
+++ b/www/list.php
@@ -3,7 +3,7 @@
  * List a repository
  */
 namespace phorkie;
  * List a repository
  */
 namespace phorkie;

-$pageRequiresLogin = false;
+$pageRequiresLogin = '0';

 require_once 'www-header.php';
 $rs = new Repositories();
 
 require_once 'www-header.php';
 $rs = new Repositories();
 

diff --git a/www/login.php b/www/login.php
index 150cf25c7624bd84aea7e16e380a59586ba906d3..a2cf97c211ebcaa69fc5fe5fa85b927ffa9da9c6 100644 (file)
--- a/www/login.php
+++ b/www/login.php
@@ -1,6 +1,5 @@
 <?php
 namespace phorkie;
 <?php
 namespace phorkie;

-$pageRequiresLogin = false;

 $noSecurityCheck = true;
 require_once 'www-header.php';
 
 $noSecurityCheck = true;
 require_once 'www-header.php';
 

diff --git a/www/new.php b/www/new.php
index 5d370f524344adeafd0d32a0fbc7a6a52d6a68a6..505ca50f4ea04c9dc75a67cb262241fbf2bc94d7 100644 (file)
--- a/www/new.php
+++ b/www/new.php
@@ -10,7 +10,7 @@ namespace phorkie;
  *
  * Creates and redirects to display page
  */
  *
  * Creates and redirects to display page
  */

-$pageRequiresLogin = true;
+$pageRequiresLogin = '1';

 require_once 'www-header.php';
 
 $repopo = new Repository_Post();
 require_once 'www-header.php';
 
 $repopo = new Repository_Post();

diff --git a/www/raw.php b/www/raw.php
index 634576db1dcceccca35e47ee98fd5bbb2a543a5a..bedaa1b54e58b5f1e334944452459afa87d3c70e 100644 (file)
--- a/www/raw.php
+++ b/www/raw.php
@@ -3,7 +3,7 @@ namespace phorkie;
 /**
  * Displays a file
  */
 /**
  * Displays a file
  */

-$pageRequiresLogin = false;
+$pageRequiresLogin = '0';

 require_once 'www-header.php';
 
 $repo = new Repository();
 require_once 'www-header.php';
 
 $repo = new Repository();

diff --git a/www/revision.php b/www/revision.php
index c4ce9e8eb2b98a3893c9c10dd28919293138c63e..9c2735da0f2fb949564ffe367d471b70c0704c46 100644 (file)
--- a/www/revision.php
+++ b/www/revision.php
@@ -3,7 +3,7 @@ namespace phorkie;
 /**
  * Display historic paste contents
  */
 /**
  * Display historic paste contents
  */

-$pageRequiresLogin = false;
+$pageRequiresLogin = '0';

 require_once 'www-header.php';
 
 $repo = new Repository();
 require_once 'www-header.php';
 
 $repo = new Repository();

diff --git a/www/search.php b/www/search.php
index 87019112ad7eee235c880bad31dab9ef58bf43d3..2621382e3d6c3a1d132b2918d2f94b4065db990e 100644 (file)
--- a/www/search.php
+++ b/www/search.php
@@ -3,7 +3,7 @@ namespace phorkie;
 /**
  * Search for a search term
  */
 /**
  * Search for a search term
  */

-$pageRequiresLogin = false;
+$pageRequiresLogin = '0';

 require_once 'www-header.php';
 
 if (!isset($_GET['q']) || $_GET['q'] == '') {
 require_once 'www-header.php';
 
 if (!isset($_GET['q']) || $_GET['q'] == '') {

diff --git a/www/www-security.php b/www/www-security.php
index 241f866f03c12fd6071db452e94de7242b8b3420..47e9a9eff591b6e137acd20a7a33918b1a8802a7 100644 (file)
--- a/www/www-security.php
+++ b/www/www-security.php
@@ -26,15 +26,23 @@ if (!isset($_SESSION['identity'])) {
     $logged_in = true;
 }
 
     $logged_in = true;
 }
 

-if ($logged_in) {
-    //logged in? all fine
-    return;
-} else if ($GLOBALS['phorkie']['auth']['secure'] == 2) {
-    //not logged in and security level 2 => error
-    require 'forbidden.php';
-} else if (isset($pageRequiresLogin) && !$pageRequiresLogin) {
+if ($pageRequiresLogin >= $GLOBALS['phorkie']['auth']['secure']) {
+    if ($logged_in) {
+        return;
+    }
+} else {

     return;
 }
 
     return;
 }
 

+// p / G / log_in = disp
+// 0 / 1 / true   = return
+// 0 / 1 / false  = block
+// 0 / 2 / true   = return
+// 0 / 2 / false  = return
+// 1 / 1 / true   = return
+// 1 / 1 / false  = block
+// 1 / 2 / true   = return
+// 1 / 2 / false  = block
+

 require 'forbidden.php';
 require 'forbidden.php';

-?>
\ No newline at end of file
+?>