mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-25 00:02:28 +02:00
Code Issues Releases Wiki Activity

v.2.14.5: unset old middleware, fixed userextension

Browse Source
This commit is contained in:
trendschau
2025-02-27 21:18:01 +01:00
parent 3c3a5ecd96
commit 9ca2236726
7 changed files with 74 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -18,6 +18,7 @@ data/css
node_modules
plugins/search
settings/settings.yaml
settings/secrets.yaml
settings/license.yaml
settings/users
zips

4
data/security/securitylog.txt
View File

@@ -4,3 +4,7 @@
127.0.0.1;2024-04-22 14:38:20;loginlink: loginlink for user member is not activated.
127.0.0.1;2024-04-23 11:16:24;loginlink: invalid data
127.0.0.1;2024-09-01 13:59:35;login: invalid data
127.0.0.1;2025-02-27 19:22:45;login: wrong password
127.0.0.1;2025-02-27 19:23:07;login: wrong password
127.0.0.1;2025-02-27 19:25:24;login: invalid data
127.0.0.1;2025-02-27 20:14:02;login: wrong password

1
settings/secrets.yaml Normal file
View File

@@ -0,0 +1 @@
chatgptKey: notneeded

75
system/typemill/Extensions/TwigUserExtension.php
View File

@@ -3,16 +3,25 @@
namespace Typemill\Extensions;
use Twig\Extension\AbstractExtension;
use Typemill\Models\User;
class TwigUserExtension extends AbstractExtension
{
protected $acl;
public function __construct($acl)
{
$this->acl = $acl;
}
public function getFunctions()
{
return [
new \Twig\TwigFunction('get_username', array($this, 'getUsername' )),
new \Twig\TwigFunction('is_loggedin', array($this, 'isLoggedin' )),
new \Twig\TwigFunction('is_allowed', array($this, 'isAllowed' )),
new \Twig\TwigFunction('is_role', array($this, 'isRole' )),
new \Twig\TwigFunction('get_role', array($this, 'getRole' )),
new \Twig\TwigFunction('get_username', array($this, 'getUsername' )),
new \Twig\TwigFunction('is_loggedin', array($this, 'isLoggedin' ))
];
}
@@ -26,11 +35,33 @@ class TwigUserExtension extends AbstractExtension
return false;
}
public function getUsername()
{
if(isset($_SESSION['username']))
{
return $_SESSION['username'];
}
return false;
}
public function isRole($role)
{
if(isset($_SESSION['role']) && $_SESSION['role'] == $role)
if(isset($_SESSION['username']))
{
return true;
$username = $_SESSION['username'];
$usermodel = new User();
$user = $usermodel->setUser($username);
if($user)
{
$userrole = $usermodel->getValue('userrole');
if($userrole === $role)
{
return true;
}
}
}
return false;
@@ -38,20 +69,42 @@ class TwigUserExtension extends AbstractExtension
public function getRole()
{
if(isset($_SESSION['role']))
if(isset($_SESSION['username']))
{
return $_SESSION['role'];
$username = $_SESSION['username'];
$usermodel = new User();
$user = $usermodel->setUser($username);
if($user)
{
$userrole = $usermodel->getValue('userrole');
return $userrole;
}
}
return false;
}
public function getUsername()
public function isAllowed($resource, $action)
{
if(isset($_SESSION['user']))
if(isset($_SESSION['username']))
{
return $_SESSION['user'];
$username = $_SESSION['username'];
$usermodel = new User();
$user = $usermodel->setUser($username);
if($user)
{
$userrole = $usermodel->getValue('userrole');
if($this->acl->isAllowed($userrole, $resource, $action))
{
return true;
}
}
}
return false;
}
}

1
system/typemill/Middleware/OldInputMiddleware.php
View File

@@ -22,6 +22,7 @@ class OldInputMiddleware
if(isset($_SESSION['old']))
{
$this->view->getEnvironment()->addGlobal('old', $_SESSION['old']);
unset($_SESSION['old']);
}
if(!empty($request->getParsedBody()))
{

2
system/typemill/settings/defaults.yaml
View File

@@ -1,4 +1,4 @@
version: '2.14.4'
version: '2.14.5'
title: 'Typemill'
author: 'Unknown'
copyright: false

4
system/typemill/system.php
View File

@@ -310,7 +310,7 @@ $container->set('assets', function() use ($assets){ return $assets; });
* TWIG TO CONTAINER *
****************************/
$container->set('view', function() use ($settings, $TwigGlobals, $urlinfo, $translations, $dispatcher) {
$container->set('view', function() use ($settings, $TwigGlobals, $urlinfo, $translations, $dispatcher, $acl) {
$twig = Twig::create(
[
@@ -335,7 +335,7 @@ $container->set('view', function() use ($settings, $TwigGlobals, $urlinfo, $tran
# add extensions
$twig->addExtension(new DebugExtension());
$twig->addExtension(new TwigUserExtension());
$twig->addExtension(new TwigUserExtension($acl));
$twig->addExtension(new TwigUrlExtension($urlinfo));
$twig->addExtension(new TwigLanguageExtension( $translations ));
$twig->addExtension(new TwigMarkdownExtension($urlinfo['baseurl'], $settings, $dispatcher));