verdnatura/hedera-web
verdnatura
/
hedera-web
0
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge con master

This commit is contained in:
Juan Ferrer Toribio 2017-05-02 15:48:47 +02:00
parent b7bdef4bf9 871a089114
commit 25e9b37b75
11 changed files with 67 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forms/account/conf/conf.js
View File

@ -60,7 +60,7 @@ Hedera.Conf = new Class
}
else
{
Htk.Toast.showError (_('Password doesn\'t meet the requirements'));
Htk.Toast.showError (error.message);
this.$('old-password').select ();
}
}

68
rest/core/account.php
View File

@ -2,15 +2,8 @@
class Account
{
const USER = 1 << 1;
const PASS = 1 << 2;
static function sync ($db, $user, $password = NULL, $sync = self::USER)
static function sync ($db, $user, $password = NULL)
{
$conf = $db->getRow (
'SELECT sambaHost, homesHost, sshUser, sshPass FROM account.accountConfig');
$sshPass = base64_decode ($conf['sshPass']);
$hasAccount = $db->getValue (
'SELECT COUNT(*) > 0
FROM account.user u
@ -21,41 +14,49 @@ class Account
if (!$hasAccount)
return;
$conf = $db->getRow (
'SELECT sambaHost, homesHost, sshUser, sshPass
FROM account.accountConfig'
);
$sshPass = base64_decode ($conf['sshPass']);
$sambaSsh = new SshConnection ($conf['sambaHost']
$samba = new SshConnection ($conf['sambaHost']
,$conf['sshUser']
,$sshPass
);
$homes = new SshConnection ($conf['homesHost']
,$conf['sshUser']
,$sshPass
);
if ($sync & self::USER)
{
$userId = $db->getValue ('SELECT id FROM account.user WHERE name = #', [$user]);
$accConf = $db->getRow ('SELECT uidBase, domain FROM account.accountConfig');
$escUser = SshConnection::escape ($user);
$escUser = SshConnection::escape ($user);
$escUid = SshConnection::escape ($accConf['uidBase'] + $userId);
$escMail = SshConnection::escape ("$user@{$accConf['domain']}");
// Creates the Samba user and initializes it's home directory
$sambaSsh->exec (
"/mnt/cluster/scripts/create-user.sh $escUser $escUid $escMail");
$userId = $db->getValue (
'SELECT id FROM account.user WHERE name = #', [$user]);
$accConf = $db->getRow (
'SELECT uidBase, domain FROM account.accountConfig');
$homesSsh = new SshConnection ($conf['homesHost']
,$conf['sshUser']
,$sshPass
);
$homesSsh->exec (
"/mnt/storage/scripts/create-user.sh $escUser");
}
$escUid = SshConnection::escape ($accConf['uidBase'] + $userId);
$escMail = SshConnection::escape ("$user@{$accConf['domain']}");
if ($sync & self::PASS && !empty ($password))
{
$escUser = SshConnection::escape ($user);
$escPassword = SshConnection::escape ($password);
$sambaSsh->exec (
"/mnt/cluster/scripts/set-password.sh $escUser $escPassword");
$samba->exec (
"/mnt/cluster/scripts/create-user.sh $escUser $escUid $escMail");
$homes->exec (
"/mnt/storage/scripts/create-user.sh $escUser");
new SshConnection ($conf['homesHost'], $user, $password);
}
// Syncronizes the Samba password
if (empty ($password))
return;
$escPassword = SshConnection::escape ($password);
$samba->exec (
"/mnt/cluster/scripts/set-password.sh $escUser $escPassword");
new SshConnection ($conf['homesHost'], $user, $password);
}
}
@ -97,4 +98,3 @@ class SshConnection
return '"'. str_replace ('"', '\\"', $str) .'"';
}
}

2
rest/core/change-password.php
View File

@ -16,7 +16,7 @@ class ChangePassword extends Vn\Web\JsonRequest
$db->query ('CALL account.userChangePassword (#, #)',
[$oldPassword, $newPassword]);
Account::sync ($db, $_SESSION['user'], $newPassword, Account::PASS | Account::USER);
Account::sync ($db, $_SESSION['user'], $newPassword);
return TRUE;
}
}

7
rest/core/locale/es.json Executable file
View File

@ -0,0 +1,7 @@
{
"InvalidAction": "Acción inválida"
,"EmptyQuery": "Consulta vacía"
,"Invalid password": "Contraseña inválida"
,"Password does not meet requirements":
"La nueva contraseña no reune los requisitos de seguridad necesarios"
}

32
rest/core/query.php
View File

@ -53,35 +53,17 @@ class Query extends Vn\Web\JsonRequest
}
catch (Vn\Db\Exception $e)
{
$row = NULL;
$code = $e->getCode ();
$message = $e->getMessage ();
switch ($code)
if ($e->getCode () == 1644)
{
case 1644: // ER_SIGNAL_EXCEPTION
{
$sql = 'SELECT description, #code code
FROM sql_message WHERE code = #code';
$row = $db->getRow ($sql, ['code' => $message]);
break;
}
case 1305: // ER_SP_DOES_NOT_EXIST
{
if (strpos ($message, 'EXCEPTION') === FALSE)
break;
$dbMessage = $e->getMessage ();
$sql = 'SELECT description FROM sql_message WHERE code = #';
$message = $db->getValue ($sql, [$dbMessage]);
$sql = 'SELECT description, @err code
FROM sql_message WHERE code = @err';
$row = $db->getRow ($sql);
break;
}
if ($message)
throw new Lib\UserException ($message, $dbMessage);
}
if ($row)
throw new Lib\UserException ($row['description'], $row['code']);
else
throw $e;
throw $e;
}
return $results;

2
rest/core/set-password.php
View File

@ -19,7 +19,7 @@ class SetPassword extends Vn\Web\JsonRequest
$db->query ('CALL account.userSetPassword (#, #)',
[$setUser, $setPassword]);
Account::sync ($db, $setUser, $setPassword, Account::PASS);
Account::sync ($db, $setUser, $setPassword);
return TRUE;
}
}

2
rest/core/sync-user.php
View File

@ -12,7 +12,7 @@ class SyncUser extends Vn\Web\JsonRequest
function run ($db)
{
Account::sync ($db, $_REQUEST['syncUser'], NULL, Account::USER);
Account::sync ($db, $_REQUEST['syncUser'], NULL);
return TRUE;
}
}

2
rest/edi/load.php
View File

@ -84,7 +84,7 @@ class Load extends Edi\Method
$ediMessage->parse ($ediString, $this->ediSchema);
$db->query ('START TRANSACTION');
$db->query ('CALL message_new (#mailId, #sender, @message)',
$db->query ('CALL messageNew (#mailId, #sender, @message)',
[
'mailId' => $mailId,
'sender' => $sender

5
rest/edi/sql/batch-add.sql
View File

@ -1,6 +1,5 @@
CALL batch_new (
@message, #bgm, #aaj, #fec, #hor, #ref, #agj, #cat, #pac,
CALL batchNew (
@message, #art, #bgm, #aaj, #fec, #hor, #ref, #agj, #cat, #pac,
#sub, #kop, #ptd, #pro, #ori, #ptj, #qty, #pri, #klo, #s1, #s2, #s3,
#s4, #s5, #s6, #k1, #k2, #p1, #p2, #auction, #package
)

12
web/rest-service.php
View File

@ -50,9 +50,17 @@ class RestService extends Service
if ($method::PARAMS !== NULL && !$method->checkParams ($_REQUEST, $method::PARAMS))
throw new UserException (s('Missing parameters'));
Locale::addPath ("rest/{$_REQUEST['method']}");
Locale::addPath ('rest/'. dirname ($_REQUEST['method']));
try {
$res = $method->run ($methodDb);
}
catch (Db\Exception $e)
{
if ($e->getCode () == 1644)
throw new UserException (s($e->getMessage ()));
}
$res = $method->run ($methodDb);
$db->query ('CALL account.userLogout ()');
return $res;

3
web/service.php
View File

@ -2,6 +2,7 @@
namespace Vn\Web;
use Vn\Db;
use Vn\Lib\Locale;
use Vn\Lib\UserException;
@ -148,7 +149,7 @@ abstract class Service
$db->query ('CALL account.userLogin (#, #)',
[$user, $_POST['password']]);
}
catch (\Vn\Db\Exception $e)
catch (Db\Exception $e)
{
if ($e->getMessage () == 'INVALID_CREDENTIALS')
{