big update : session authentification guard, some exemaples and docs

Emmanuel ROY · Emmanuel ROY · commit 5be76d38f63e · 2021-02-17T13:39:05.000+01:00
diff --git a/application/class/Application.php b/application/class/Application.php
@@ -23,10 +23,6 @@ public function __construct()
 
     public function launch()
     {
-        //on declare la session lors du chargement du controlleur,
-        // ainsi on instancie la page précédente et le javascript et le css asynchrone
-        \MVC\Object\Session::createAndTestSession();
-
         $controlleur = new Controlleur($this);
         //si la page n'est un controlleur d'action alors on affiche l'écran
         if (!$this->url->page['control']) {
diff --git a/application/class/Asynchonous.php b/application/class/Asynchonous.php
@@ -0,0 +1,38 @@
+<?php
+
+
+namespace MVC\Classe;
+
+class Asynchonous
+{
+    private $_css;
+    private $_javascript;
+
+    public function __construct()
+    {
+        $this->_css = "";
+        $this->_javascript = "";
+    }
+
+    public function addCss($code)
+    {
+        $this->_css .= "\n";
+        $this->_css .= $code;
+    }
+
+    public function addJs($code)
+    {
+        $this->_javascript .= "\n";
+        $this->_javascript .= $code;
+    }
+
+    public function printCss()
+    {
+        echo $this->_css;
+    }
+
+    public function printJs()
+    {
+        echo $this->_javascript;
+    }
+}
diff --git a/application/class/Bdd.php b/application/class/Bdd.php
@@ -6,7 +6,7 @@ class Bdd
 {
     public $bdd;
 
-    public function __construct($bdd = 'default')
+    public function __construct($bdd = 'bdd')
     {
         switch ($bdd) {
             case 'bdd1':
diff --git a/application/class/Controlleur.php b/application/class/Controlleur.php
@@ -37,6 +37,15 @@ public function __construct($application)
                     require TRAITEMENT_PATH . DIRECTORY_SEPARATOR . $application->url->page['name'] . '.php';
                 } else {
                     $this->modele = new Modele($application->url->page);
+                    if(isset($this->modele->page['authentification']) && $this->modele->page['authentification'] == 'yes'){
+                        //on declare la session lors du chargement du controlleur,
+                        // ainsi on instancie la page précédente et le javascript et le css asynchrone
+                        \MVC\Object\Session::createAndTestSession();
+                    }else{
+                        \MVC\Object\Session::sessionStart();
+                        \MVC\Object\History::setPagePrecedente();
+                        \MVC\Object\Asynchronous::declare();
+                    }
                     $this->vue = new Vue($this);
                 }
         }
diff --git a/application/class/Url.php b/application/class/Url.php
@@ -192,8 +192,10 @@ public static function absolute_link_rewrite($isControlPatern, $page, $params =
                 $scheme = 'http';
             }
             $base_url = $scheme . "://" . $url;
+            $url = $base_url;
         }else{
             $base_url = PATH_URL;
+            $url = $base_url . BASE_SERVER_DIRECTORY;
         }
         if ($isControlPatern) {
             $uri = self::controlLink_rewrite($page, $params);
@@ -202,6 +204,10 @@ public static function absolute_link_rewrite($isControlPatern, $page, $params =
         }
 
 
-        return ( $base_url . BASE_SERVER_DIRECTORY  . $uri);
+        return (  $url . $uri);
+    }
+
+    public static function getBaseDirectory(){
+        return '/' . BASE_SERVER_DIRECTORY;
     }
 }
diff --git a/application/config/app-parameters.php.skel b/application/config/app-parameters.php.skel
@@ -7,7 +7,6 @@
 define("BASE_SERVER_DIRECTORY", "");
 
 // Optionnel! il n'est nécessaire que si vous l'utilisez dans les fichiers de traitement ou dans une commande console
-// si vous l'utilisez dans les fichiers de traitement -> il est plus simple d'utiliser l'Objet page précédente
-define('PATH_URL',"http://www.domain.org");
+define('PATH_URL',"http://www.domain.org/");
 
 define('ENV', "DEV");
diff --git a/application/include/conduits/DocConduit.php b/application/include/conduits/DocConduit.php
@@ -8,7 +8,7 @@ class DocConduit extends Conduit
     // Route('/docs')
     public function index()
     {
-
+        \MVC\Object\Session::createAndTestSession();
         $files = array();
 
         if ($handle = opendir(DATA_PATH . '/docs')) {
@@ -36,7 +36,7 @@ public function index()
     // Route('/docs/file/{file}')
     public function readfile()
     {
-
+        \MVC\Object\Session::createAndTestSession();
         $markdown = file_get_contents(DATA_PATH . '/docs/' . $this->file);
 
         $my_html = MarkdownExtra::defaultTransform($markdown);
diff --git a/application/include/conduits/FooConduit.php b/application/include/conduits/FooConduit.php
@@ -8,13 +8,15 @@ class FooConduit extends Conduit
     // Route('/foo')
     public function index()
     {
+        \MVC\Object\Session::createAndTestSession();
         echo "blob of foo";
         return $this->render('foo', array('page_title' => 'Foo', 'description' => 'FooConduit'));
     }
 
     // Route('/foo/{id}')
     public function load()
     {
+        \MVC\Object\Session::createAndTestSession();
         echo "load of foo";
         return $this->render('foo', array('page_title' => 'Foo', 'description' => 'FooConduit', 'id' => $this->id));
     }
diff --git a/application/include/conduits/IndexConduit.php b/application/include/conduits/IndexConduit.php
@@ -8,6 +8,7 @@ class IndexConduit extends Conduit
     // Route('/')
     public function homepage()
     {
+        \MVC\Object\Session::createAndTestSession();
         echo "IndexControlleur";
         return $this->render('index', array("templating_a"=>'blade',"templating_b"=>'twig',"templating_c"=>'edge'));
     }
diff --git a/application/include/modeles/admin.model b/application/include/modeles/admin.model
@@ -1,6 +1,10 @@
 name : admin
 page_title : Administration de l'application
 description : Administration de l'application
+
 engine : blade
-params : params
+authentification : yes
+
+ariane : {acceuil}
+arianelink : {index}
 
diff --git a/application/include/modeles/beers.model b/application/include/modeles/beers.model
@@ -1,5 +1,10 @@
 name : beers
 page_title : module_title
 description : module_description
-params : module_params
+
+engine : blade
+authentification : yes
+
+ariane : {acceuil}
+arianelink : {index}
 
diff --git a/application/include/modeles/cgu.model b/application/include/modeles/cgu.model
@@ -1,5 +1,9 @@
 name : cgu
 page_title: Conditions Générale d'Utilisation de l'application
 description : abracadabla
+
 engine : blade
-params : params
+authentification : yes
+
+ariane : {acceuil}
+arianelink : {index}
diff --git a/application/include/modeles/donate.model b/application/include/modeles/donate.model
@@ -1,5 +1,10 @@
 name : donate
 page_title : Be a sponsor
 description : Page permettant de devenir un sponsor du framework SAND
-params : module_params
+
+engine : blade
+authentification : yes
+
+ariane : {acceuil}
+arianelink : {index}
 
diff --git a/application/include/modeles/error-access-denied.model b/application/include/modeles/error-access-denied.model
@@ -1,5 +1,10 @@
 name : error-access-denied
 page_title : Page 403 (Accès restreint) de l'application
 description : Page 403 (Accès restreint) de l'application
-params : module_params
+
+engine : blade
+authentification : no
+
+ariane : {acceuil}
+arianelink : {index}
 
diff --git a/application/include/modeles/error.model b/application/include/modeles/error.model
@@ -1,4 +1,9 @@
 name : error
 page_title: Page 404 (Page Non Trouvé) de l'application
 description : Page 404 (Page Non Trouvé) de l'application
-params : params
+
+engine : blade
+authentification : no
+
+ariane : {acceuil}
+arianelink : {index}
diff --git a/application/include/modeles/gitlist.model b/application/include/modeles/gitlist.model
@@ -1,5 +1,10 @@
 name : gitlist
 page_title : Dépot Git
 description : Le dépot de travail du framework
-engine: blade
+
+engine : blade
+authentification : yes
+
+ariane : {acceuil, dépot git du framework}
+arianelink : {index, gitlist}
 
diff --git a/application/include/modeles/index.model b/application/include/modeles/index.model
@@ -1,7 +1,10 @@
 name : index
 page_title : Accueil de l'application
 description : zatou stra bracadabla
+
 engine : blade
+authentification : yes
+
 ariane : {acceuil}
 arianelink : {index}
 
diff --git a/application/include/modeles/policy.model b/application/include/modeles/policy.model
@@ -1,5 +1,9 @@
 name : policy
 page_title: Politique de Confidentialité de l'application
 description : abracadabla
+
 engine : blade
-params : params
+authentification : yes
+
+ariane : {acceuil}
+arianelink : {index}
diff --git a/application/include/vues/layout/body.blade.php b/application/include/vues/layout/body.blade.php
@@ -64,7 +64,7 @@
             <div id="breadcrumbs" class="fullwidth">
                 <div class="container">
                     <nav aria-label="breadcrumb">
-                        <ol class="breadcrumb">
+                        <ol class="breadcrumb-sand">
                             @foreach($ariane as $value)
                                 @if($value == end($ariane))
                                     <li class="breadcrumb-item active" aria-current="page">{{$value}}</li>
diff --git a/application/include/vues/system/system.blade.php b/application/include/vues/system/system.blade.php
@@ -45,14 +45,16 @@
     <script src="{{ \MVC\Classe\Url::asset_rewrite('assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.min.js')}}"></script>
     <script src="{{ \MVC\Classe\Url::asset_rewrite('assets/js/custom.js')}}"></script>
 
-    /*
-    SCRIPT JS permettant de ne valider qu'une seule fois un formulaire
-        ATTENTION tous les formulaires sont affecté
-        Lors d'une validation bootstrap personnalisé veuillez utilisé
-         la class do-resubmit sur le formulaire afin de permettre
-         l'activation supplémentaire du bouton.
-    */
     <script>
+
+        /*
+        SCRIPT JS permettant de ne valider qu'une seule fois un formulaire
+            ATTENTION tous les formulaires sont affecté
+            Lors d'une validation bootstrap personnalisé veuillez utilisé
+             la class do-resubmit sur le formulaire afin de permettre
+             l'activation supplémentaire du bouton.
+        */
+
         window.onload = function() {
             let PreventAllforms = document.querySelectorAll("form");
             Array.prototype.slice.call(PreventAllforms)
diff --git a/application/modules/gitlist/themes/default_without_html/twig/layout.twig b/application/modules/gitlist/themes/default_without_html/twig/layout.twig
@@ -1,7 +1,6 @@
 
-        <link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ theme }}/css/style.css">
-        <link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ theme }}/css/gitgraph.css">
-        <link rel="shortcut icon" type="image/png" href="{{ app.request.basepath }}/themes/{{ theme }}/img/favicon.png" 
+         <link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ theme }}/css/style.css">
+         <link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ theme }}/css/gitgraph.css">
         <!--[if lt IE 9]>
         <script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/html5.js"></script>
         <![endif]-->
diff --git a/application/objets/Session.php b/application/objets/Session.php
@@ -35,7 +35,7 @@ public static function sessionStart()
     public static function authentification()
     {
         self::sessionStart();
-        $_SESSION['user_login'] = 'root';
+        $_SESSION['user_login'] = 'anonymous';
         $_SESSION['acl_admin'] = 0;
     }
 
@@ -46,7 +46,7 @@ public static function casAuthentification()
             require_once CONFIG_PATH . DIRECTORY_SEPARATOR . 'cas-authentification-config.php';
 
             // Enable debugging
-            \phpCAS::setLogger();
+            \phpCAS::setDebug(LOG_PATH.'/cas.log');
             // Enable verbose error messages. Disable in production!
             \phpCAS::setVerbose(true);
 
diff --git a/application/objets/XssToken.php b/application/objets/XssToken.php
@@ -7,7 +7,7 @@ class XssToken
 
     public static function getNew($title,$message,$type)
     {
-        $_SESSION['xss_token'] = generateUniqueToken('xss',25);
+        $_SESSION['xss_token'] = self::generateUniqueToken('xss',25);
     }
 
     public static function remove(){
diff --git a/application/traitements/ajax-example.php b/application/traitements/ajax-example.php
@@ -2,6 +2,8 @@
 
 header("Content-Type: text/plain");
 
+\MVC\Object\Session::createAndTestSession();
+
 $bdd = new Bdd();
 $dns = \MVC\Domain\Dns::getDNS($bdd, $url_params['ip']);
 $alias = array();
diff --git a/application/traitements/traitement-example.php b/application/traitements/traitement-example.php
@@ -1,5 +1,7 @@
 <?php
 
+\MVC\Object\Session::createAndTestSession();
+
 $path = PATH_URL;
 $bdd = new \MVC\Classe\Bdd();
 
diff --git a/console/skel/module.model b/console/skel/module.model
@@ -1,7 +1,6 @@
 name : %%MODULE%%
 page_title : module_title
 description : module_description
-engine : blade
 ariane : {%%MODULE%%}
 arianelink : {%%MODULE%%}
 
diff --git a/console/skel/page.model b/console/skel/page.model
@@ -2,6 +2,7 @@ name : %%PAGE%%
 page_title : module_title
 description : module_description
 engine : %%ENGINE%%
+authentification : no
 ariane : {acceuil, %%PAGE%%}
 arianelink : {index, %%PAGE%%}
 
diff --git a/data/docs/03. Le controleur REST ou HTML.md b/data/docs/03. Le controleur REST ou HTML.md
@@ -12,7 +12,7 @@ C'est un choix applicatif qu'il faut faire au moment de la contruction de l'appl
 Vous devez instancier le fichier `application/include/controlleurs/{Name}HttpReponse.php`
 qui est une classe peut implémenter `MVC\Classe\Implement\RestReponse` ou `MVC\Classe\Implement\HttpReponse` sachant que la différence se situe au niveau des méthodes qu'il doit instancier.
 
-*Voici un exemple avec `RestResponse`
+##Voici un exemple avec `RestResponse`
 ```php
 <?php  
   
@@ -58,7 +58,7 @@ class NameHttpReponse extends RestReponse
  }
 ```
 
-*voici un exemple avec `HttpResponse`
+##voici un exemple avec `HttpResponse`
 ```php
 <?php  
   
diff --git a/public/assets/css/custom.css b/public/assets/css/custom.css
@@ -90,6 +90,13 @@ dl, ol, ul {
     background-color: whitesmoke;
     font-size: 0.7rem;
 }
+.breadcrumb-sand {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0 0;
+    margin-bottom: 1rem;
+    list-style: none;
+}
 /** Page content spacing **/
 #page-content{
     padding-top: 2rem;
diff --git a/public/themes/default_without_html/css/style.css b/public/themes/default_without_html/css/style.css

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ class Bdd`
`6`	`6`	`{`
`7`	`7`	`public $bdd;`
`8`	`8`
`9`		`- public function __construct($bdd = 'default')`
	`9`	`+ public function __construct($bdd = 'bdd')`
`10`	`10`	`{`
`11`	`11`	`switch ($bdd) {`
`12`	`12`	`case 'bdd1':`
Original file line number	Diff line number	Diff line change
`@@ -192,8 +192,10 @@ public static function absolute_link_rewrite($isControlPatern, $page, $params =`
`192`	`192`	`$scheme = 'http';`
`193`	`193`	`}`
`194`	`194`	`$base_url = $scheme . "://" . $url;`
	`195`	`+ $url = $base_url;`
`195`	`196`	`}else{`
`196`	`197`	`$base_url = PATH_URL;`
	`198`	`+ $url = $base_url . BASE_SERVER_DIRECTORY;`
`197`	`199`	`}`
`198`	`200`	`if ($isControlPatern) {`
`199`	`201`	`$uri = self::controlLink_rewrite($page, $params);`
`@@ -202,6 +204,10 @@ public static function absolute_link_rewrite($isControlPatern, $page, $params =`
`202`	`204`	`}`
`203`	`205`
`204`	`206`
`205`		`- return ( $base_url . BASE_SERVER_DIRECTORY . $uri);`
	`207`	`+ return ( $url . $uri);`
	`208`	`+ }`
	`209`	`+`
	`210`	`+ public static function getBaseDirectory(){`
	`211`	`+ return '/' . BASE_SERVER_DIRECTORY;`
`206`	`212`	`}`
`207`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,15 @@ class FooConduit extends Conduit`
`8`	`8`	`// Route('/foo')`
`9`	`9`	`public function index()`
`10`	`10`	`{`
	`11`	`+ \MVC\Object\Session::createAndTestSession();`
`11`	`12`	`echo "blob of foo";`
`12`	`13`	`return $this->render('foo', array('page_title' => 'Foo', 'description' => 'FooConduit'));`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`// Route('/foo/{id}')`
`16`	`17`	`public function load()`
`17`	`18`	`{`
	`19`	`+ \MVC\Object\Session::createAndTestSession();`
`18`	`20`	`echo "load of foo";`
`19`	`21`	`return $this->render('foo', array('page_title' => 'Foo', 'description' => 'FooConduit', 'id' => $this->id));`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ class IndexConduit extends Conduit`
`8`	`8`	`// Route('/')`
`9`	`9`	`public function homepage()`
`10`	`10`	`{`
	`11`	`+ \MVC\Object\Session::createAndTestSession();`
`11`	`12`	`echo "IndexControlleur";`
`12`	`13`	`return $this->render('index', array("templating_a"=>'blade',"templating_b"=>'twig',"templating_c"=>'edge'));`
`13`	`14`	`}`