IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore AppController

Browse Source
This commit is contained in:
Christine Slotty 2020-07-10 13:47:58 +02:00
parent a27a5af25f
commit 994fc42fac
1 changed files with 229 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/Controller/AppController.php
View File

@ -44,8 +44,8 @@ class AppController extends Controller
* *
* @return void * @return void
*/ */
public function initialize() public function initialize()
{ {
parent::initialize(); parent::initialize();
$this->loadComponent('RequestHandler', [ $this->loadComponent('RequestHandler', [
@ -54,28 +54,6 @@ public function initialize()
$this->loadComponent('Flash'); $this->loadComponent('Flash');
$this->loadComponent('Auth', [ $this->loadComponent('Auth', [
<<<<<<< Updated upstream
'loginAction' => [
'controller' => 'ServerUsers',
'action' => 'login'
],
'loginRedirect' => [
'controller' => 'Transactions',
'action' => 'index'
],
'logoutRedirect' => [
'controller' => 'Pages',
'action' => 'display',
'gradido'
],
'authenticate' => [
'all' => ['userModel' => 'ServerUsers'],
'Form' => [
'userModel' => 'ServerUsers',
]
]
=======
'loginAction' => [ 'loginAction' => [
'controller' => 'ServerUsers', 'controller' => 'ServerUsers',
'action' => 'login' 'action' => 'login'
@ -109,14 +87,14 @@ public function initialize()
// load current balance // load current balance
$session = $this->getRequest()->getSession(); $session = $this->getRequest()->getSession();
$state_user_id = $session->read('StateUser.id'); $state_user_id = $session->read('StateUser.id');
if ($state_user_id) { if($state_user_id) {
$stateBalancesTable = TableRegistry::getTableLocator()->get('stateBalances'); $stateBalancesTable = TableRegistry::getTableLocator()->get('stateBalances');
$stateBalanceQuery = $stateBalancesTable $stateBalanceQuery = $stateBalancesTable
->find('all') ->find('all')
->select('amount') ->select('amount')
->contain(false) ->contain(false)
->where(['state_user_id' => $state_user_id]); ->where(['state_user_id' => $state_user_id]);
if ($stateBalanceQuery->count() == 1) { if($stateBalanceQuery->count() == 1) {
//var_dump($stateBalanceEntry->first()); //var_dump($stateBalanceEntry->first());
$session->write('StateUser.balance', $stateBalanceQuery->first()->amount); $session->write('StateUser.balance', $stateBalanceQuery->first()->amount);
//echo "stateUser.balance: " . $session->read('StateUser.balance'); //echo "stateUser.balance: " . $session->read('StateUser.balance');
@ -124,7 +102,7 @@ public function initialize()
} }
// load error count // load error count
if ($state_user_id) { if($state_user_id) {
$stateErrorsTable = TableRegistry::getTableLocator()->get('stateErrors'); $stateErrorsTable = TableRegistry::getTableLocator()->get('stateErrors');
$stateErrorQuery = $stateErrorsTable $stateErrorQuery = $stateErrorsTable
->find('all') ->find('all')
@ -142,26 +120,28 @@ public function initialize()
$GLOBALS["side"] = $side; $GLOBALS["side"] = $side;
$subside = $this->request->getParam('action'); $subside = $this->request->getParam('action');
$passedArguments = $this->request->getParam('pass'); $passedArguments = $this->request->getParam('pass');
if ($passedArguments) { if($passedArguments) {
$GLOBALS["passed"] = $passedArguments[0]; $GLOBALS["passed"] = $passedArguments[0];
} }
$GLOBALS["subside"] = $subside; $GLOBALS["subside"] = $subside;
// server login // server login
if ($this->Auth->user('id')) { if($this->Auth->user('id')) {
$GLOBALS['ServerUser'] = $this->Auth->user(); $GLOBALS['ServerUser'] = $this->Auth->user();
} }
// login server url // login server url
$loginServer = Configure::read('LoginServer'); $loginServer = Configure::read('LoginServer');
if ($loginServer && isset($loginServer['url'])) { if($loginServer && isset($loginServer['url'])) {
$this->loginServerUrl = $loginServer['url'] . '/'; $this->loginServerUrl = $loginServer['url'] . '/';
} else { } else {
$this->loginServerUrl = Router::url('/', true); $this->loginServerUrl = Router::url('/', true);
} }
}
protected function requestLogin()
}
protected function requestLogin()
{ {
$session = $this->getRequest()->getSession(); $session = $this->getRequest()->getSession();
// check login // check login
@ -169,44 +149,41 @@ protected function requestLogin()
//$this->Cookie->configKey('User', 'encryption', false); //$this->Cookie->configKey('User', 'encryption', false);
$session_id = intval($this->request->getCookie('GRADIDO_LOGIN', '')); $session_id = intval($this->request->getCookie('GRADIDO_LOGIN', ''));
$ip = $this->request->clientIp(); $ip = $this->request->clientIp();
if (!$session->check('client_ip')) { if(!$session->check('client_ip')) {
$session->write('client_ip', $ip); $session->write('client_ip', $ip);
} }
// login server cannot detect host ip // login server cannot detect host ip
// TODO: update login server, recognize nginx real ip header // TODO: update login server, recognize nginx real ip header
$loginServer = Configure::read('LoginServer'); $loginServer = Configure::read('LoginServer');
if ($session_id != 0) { if($session_id != 0) {
$userStored = $session->read('StateUser'); $userStored = $session->read('StateUser');
$transactionPendings = $session->read('Transactions.pending'); $transactionPendings = $session->read('Transactions.pending');
$transactionExecutings = $session->read('Transaction.executing'); $transactionExecutings = $session->read('Transaction.executing');
if ($session->read('session_id') != $session_id || if($session->read('session_id') != $session_id ||
( $userStored && (!isset($userStored['id']) || !$userStored['email_checked'])) || ( $userStored && (!isset($userStored['id']) || !$userStored['email_checked'])) ||
intval($transactionPendings) > 0 || intval($transactionPendings) > 0 ||
intval($transactionExecutings) > 0) { intval($transactionExecutings) > 0 ) {
$http = new Client(); $http = new Client();
try { try {
$url = $loginServer['host'] . ':' . $loginServer['port']; $url = $loginServer['host'] . ':' . $loginServer['port'];
( $userStored && !isset($userStored['id'])) ||
intval($transactionPendings) > 0 ||
intval($transactionExecutings) > 0) {
$http = new Client();
try {
$url = $loginServer['host'] . ':' . $loginServer['port'];
$response = $http->get($url . '/login', ['session_id' => $session_id]); $response = $http->get($url . '/login', ['session_id' => $session_id]);
$json = $response->getJson(); $json = $response->getJson();
if (isset($json) && count($json) > 0) { if(isset($json) && count($json) > 0) {
if ($json['state'] === 'success') {
if($json['state'] === 'success') {
//echo "email checked: " . $json['user']['email_checked'] . "; <br>"; //echo "email checked: " . $json['user']['email_checked'] . "; <br>";
if ($session->read('session_id') != $session_id || if($session->read('session_id') != $session_id ||
( $userStored && !isset($userStored['id']))) { ( $userStored && !isset($userStored['id']))) {
$session->destroy(); $session->destroy();
} }
foreach ($json['user'] as $key => $value) { foreach($json['user'] as $key => $value) {
$session->write('StateUser.' . $key, $value); $session->write('StateUser.' . $key, $value );
} }
//var_dump($json); //var_dump($json);
$transactionPendings = $json['Transaction.pending']; $transactionPendings = $json['Transaction.pending'];
@ -217,26 +194,26 @@ if ($session_id != 0) {
$session->write('session_id', $session_id); $session->write('session_id', $session_id);
$stateUserTable = TableRegistry::getTableLocator()->get('StateUsers'); $stateUserTable = TableRegistry::getTableLocator()->get('StateUsers');
if (isset($json['user']['public_hex']) && $json['user']['public_hex'] != '') { if(isset($json['user']['public_hex']) && $json['user']['public_hex'] != '') {
$public_key_bin = hex2bin($json['user']['public_hex']); $public_key_bin = hex2bin($json['user']['public_hex']);
$stateUserQuery = $stateUserTable $stateUserQuery = $stateUserTable
->find('all') ->find('all')
->where(['public_key' => $public_key_bin]) ->where(['public_key' => $public_key_bin])
->contain(['StateBalances']); ->contain(['StateBalances']);
if ($stateUserQuery->count() == 1) { if($stateUserQuery->count() == 1) {
$stateUser = $stateUserQuery->first(); $stateUser = $stateUserQuery->first();
if ($stateUser->first_name != $json['user']['first_name'] || if($stateUser->first_name != $json['user']['first_name'] ||
$stateUser->last_name != $json['user']['last_name'] || $stateUser->last_name != $json['user']['last_name'] ||
$stateUser->email != $json['user']['email']) { $stateUser->email != $json['user']['email']) {
$stateUser->first_name = $json['user']['first_name']; $stateUser->first_name = $json['user']['first_name'];
$stateUser->last_name = $json['user']['last_name']; $stateUser->last_name = $json['user']['last_name'];
$stateUser->email = $json['user']['email']; $stateUser->email = $json['user']['email'];
if (!$stateUserTable->save($stateUser)) { if(!$stateUserTable->save($stateUser)) {
$this->Flash->error(__('error updating state user ' . json_encode($stateUser->errors()))); $this->Flash->error(__('error updating state user ' . json_encode($stateUser->errors())));
} }
} }
//var_dump($stateUser); //var_dump($stateUser);
if (count($stateUser->state_balances) > 0) { if(count($stateUser->state_balances) > 0) {
$session->write('StateUser.balance', $stateUser->state_balances[0]->amount); $session->write('StateUser.balance', $stateUser->state_balances[0]->amount);
} }
$session->write('StateUser.id', $stateUser->id); $session->write('StateUser.id', $stateUser->id);
@ -247,7 +224,7 @@ if ($session_id != 0) {
$newStateUser->first_name = $json['user']['first_name']; $newStateUser->first_name = $json['user']['first_name'];
$newStateUser->last_name = $json['user']['last_name']; $newStateUser->last_name = $json['user']['last_name'];
$newStateUser->email = $json['user']['email']; $newStateUser->email = $json['user']['email'];
if (!$stateUserTable->save($newStateUser)) { if(!$stateUserTable->save($newStateUser)) {
$this->Flash->error(__('error saving state user ' . json_encode($newStateUser->errors()))); $this->Flash->error(__('error saving state user ' . json_encode($newStateUser->errors())));
} }
$session->write('StateUser.id', $newStateUser->id); $session->write('StateUser.id', $newStateUser->id);
@ -260,7 +237,7 @@ if ($session_id != 0) {
return $this->redirect($this->loginServerUrl . 'account/error500/noPubkey', 303); return $this->redirect($this->loginServerUrl . 'account/error500/noPubkey', 303);
} }
} else { } else {
if ($json['state'] === 'not found') { if($json['state'] === 'not found' ) {
$this->Flash->error(__('invalid session')); $this->Flash->error(__('invalid session'));
} else { } else {
$this->Flash->error(__('Konto ist nicht aktiviert!')); $this->Flash->error(__('Konto ist nicht aktiviert!'));
@ -269,7 +246,7 @@ if ($session_id != 0) {
return $this->redirect($this->loginServerUrl . 'account/', 303); return $this->redirect($this->loginServerUrl . 'account/', 303);
} }
} }
} catch (\Exception $e) { } catch(\Exception $e) {
$msg = $e->getMessage(); $msg = $e->getMessage();
$this->Flash->error(__('error http request: ') . $msg); $this->Flash->error(__('error http request: ') . $msg);
return $this->redirect(['controller' => 'Dashboard', 'action' => 'errorHttpRequest']); return $this->redirect(['controller' => 'Dashboard', 'action' => 'errorHttpRequest']);
@ -279,7 +256,7 @@ if ($session_id != 0) {
} else { } else {
// no login // no login
//die("no login"); //die("no login");
if (isset($loginServer['path'])) { if(isset($loginServer['path'])) {
return $this->redirect($loginServer['path'], 303); return $this->redirect($loginServer['path'], 303);
} else { } else {
return $this->redirect($this->loginServerUrl . 'account/', 303); return $this->redirect($this->loginServerUrl . 'account/', 303);
@ -291,13 +268,12 @@ if ($session_id != 0) {
/* /*
public function beforeFilter(Event $event) public function beforeFilter(Event $event)
{ {
//$this->Auth->allow(['display']); //$this->Auth->allow(['display']);
} }
*/ */
public function addAdminError($controller, $action, array $returnTable, $state_user_id) public function addAdminError($controller, $action, array $returnTable, $state_user_id) {
{ if(!is_array($returnTable)) {
if (!is_array($returnTable)) {
$this->addAdminError('AppController', 'addAdminError', ['state' => 'error', 'msg' => 'returnTable isn\'t array', 'details' => gettype($returnTable)], $state_user_id); $this->addAdminError('AppController', 'addAdminError', ['state' => 'error', 'msg' => 'returnTable isn\'t array', 'details' => gettype($returnTable)], $state_user_id);
return false; return false;
} }
@ -307,40 +283,37 @@ if ($session_id != 0) {
$adminErrorEntity->controller = $controller; $adminErrorEntity->controller = $controller;
$adminErrorEntity->action = $action; $adminErrorEntity->action = $action;
$adminErrorEntity->state = $returnTable['state']; $adminErrorEntity->state = $returnTable['state'];
if (isset($returnTable['msg'])) { if(isset($returnTable['msg'])) {
$adminErrorEntity->msg = $returnTable['msg']; $adminErrorEntity->msg = $returnTable['msg'];
} else { } else {
$adminErrorEntity->msg = __('(Leere Message)'); $adminErrorEntity->msg = __('(Leere Message)');
} }
if (isset($returnTable['details'])) { if(isset($returnTable['details'])) {
$adminErrorEntity->details = $returnTable['details']; $adminErrorEntity->details = $returnTable['details'];
} else { } else {
$adminErrorEntity->details = __('(Leere Details)'); $adminErrorEntity->details = __('(Leere Details)');
} }
if (!$adminErrorTable->save($adminErrorEntity)) { if(!$adminErrorTable->save($adminErrorEntity)) {
$this->Flash->error( $this->Flash->error(
__('Serious error, couldn\'t save to db, please write the admin: ' . $this->getAdminEmailLink()), __('Serious error, couldn\'t save to db, please write the admin: ' . $this->getAdminEmailLink()),
['escape' => false] ['escape' => false]);
);
} }
return true; return true;
} }
public function getAdminEmailLink($text = '') public function getAdminEmailLink($text = '') {
{
$serverAdminEmail = Configure::read('ServerAdminEmail'); $serverAdminEmail = Configure::read('ServerAdminEmail');
return '<a href="mailto:' . $serverAdminEmail . '">'. $serverAdminEmail . '</a>'; return '<a href="mailto:' . $serverAdminEmail . '">'. $serverAdminEmail . '</a>';
} }
public function returnJsonEncoded($json) public function returnJsonEncoded($json) {
{
$this->autoRender = false; $this->autoRender = false;
$response = $this->response->withType('application/json'); $response = $this->response->withType('application/json');
return $response->withStringBody($json); return $response->withStringBody($json);
} }
public function returnJson($array) public function returnJson($array) {
{
$this->autoRender = false; $this->autoRender = false;
$response = $this->response->withType('application/json'); $response = $this->response->withType('application/json');
return $response->withStringBody(json_encode($array)); return $response->withStringBody(json_encode($array));
@ -354,4 +327,5 @@ if ($session_id != 0) {
$lastDay = $lastDay->addMonth(1); $lastDay = $lastDay->addMonth(1);
return [$firstDay, $lastDay]; return [$firstDay, $lastDay];
} }
} }