Add salt in DB see #7683

1.10.x
Julio Montoya 10 years ago
parent b271967e75
commit 90d8cd5fb5
  1. 1
      composer.json
  2. 1
      src/Chamilo/CoreBundle/Migrations/Schema/V110/Version20150507152600.php
  3. 28
      src/Chamilo/CoreBundle/Migrations/Schema/V110/Version20150511133949.php
  4. 28
      src/Chamilo/UserBundle/Entity/User.php

@ -53,6 +53,7 @@
"symfony/validator": "2.6.4", "symfony/validator": "2.6.4",
"symfony/filesystem": "~2.6", "symfony/filesystem": "~2.6",
"symfony/security": "~2.6", "symfony/security": "~2.6",
"ircmaxell/password-compat": "~1.0.4",
"sylius/attribute": "0.13.0", "sylius/attribute": "0.13.0",
"sylius/translation": "0.13.0", "sylius/translation": "0.13.0",
"gedmo/doctrine-extensions": "~2.3", "gedmo/doctrine-extensions": "~2.3",

@ -3,7 +3,6 @@
namespace Chamilo\CoreBundle\Migrations\Schema\V110; namespace Chamilo\CoreBundle\Migrations\Schema\V110;
use Chamilo\CoreBundle\Entity\SettingsCurrent;
use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo; use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;

@ -0,0 +1,28 @@
<?php
namespace Chamilo\CoreBundle\Migrations\Schema\V110;
use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
use Doctrine\DBAL\Schema\Schema;
/**
* Add salt
*/
class Version20150511133949 extends AbstractMigrationChamilo
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->addSql('ALTER TABLE user ADD salt VARCHAR(255) NOT NULL');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('ALTER TABLE user DROP salt');
}
}

@ -4,29 +4,28 @@
namespace Chamilo\UserBundle\Entity; namespace Chamilo\UserBundle\Entity;
//use Chamilo\CoreBundle\Entity\UserFieldValues; //use Chamilo\CoreBundle\Entity\UserFieldValues;
use Sonata\UserBundle\Entity\BaseUser as BaseUser; use Chamilo\CoreBundle\Entity\ExtraFieldValues;
use Doctrine\ORM\Mapping as ORM;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Mapping as ORM;
use Sonata\UserBundle\Entity\BaseUser as BaseUser;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
use Symfony\Component\HttpFoundation\File\File;
use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Constraints as Assert;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\Validator\Mapping\ClassMetadata;
//use Chamilo\CoreBundle\Component\Auth; //use Chamilo\CoreBundle\Component\Auth;
use Doctrine\ORM\Event\LifecycleEventArgs;
//use FOS\MessageBundle\Model\ParticipantInterface; //use FOS\MessageBundle\Model\ParticipantInterface;
//use Chamilo\ThemeBundle\Model\UserInterface as ThemeUser; //use Chamilo\ThemeBundle\Model\UserInterface as ThemeUser;
//use Vich\UploaderBundle\Mapping\Annotation as Vich; //use Vich\UploaderBundle\Mapping\Annotation as Vich;
use Symfony\Component\HttpFoundation\File\File;
//use Application\Sonata\MediaBundle\Entity\Media; //use Application\Sonata\MediaBundle\Entity\Media;
//use Chamilo\UserBundle\Model\UserInterface as UserInterfaceModel; //use Chamilo\UserBundle\Model\UserInterface as UserInterfaceModel;
use Doctrine\Common\Collections\Collection;
//use Sylius\Component\Attribute\Model\AttributeValueInterface as BaseAttributeValueInterface; //use Sylius\Component\Attribute\Model\AttributeValueInterface as BaseAttributeValueInterface;
//use Sylius\Component\Variation\Model\OptionInterface as BaseOptionInterface; //use Sylius\Component\Variation\Model\OptionInterface as BaseOptionInterface;
//use Sylius\Component\Variation\Model\VariantInterface as BaseVariantInterface; //use Sylius\Component\Variation\Model\VariantInterface as BaseVariantInterface;
use Chamilo\CoreBundle\Entity\ExtraFieldValues;
/** /**
* @ORM\HasLifecycleCallbacks * @ORM\HasLifecycleCallbacks
* @ORM\Table(name="user") * @ORM\Table(name="user")
@ -256,6 +255,11 @@ class User extends BaseUser //implements ParticipantInterface, ThemeUser
*/ */
private $hrDeptId; private $hrDeptId;
/**
* @ORM\Column(type="string", length=255)
*/
protected $salt;
/** /**
* @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\CourseRelUser", mappedBy="user") * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\CourseRelUser", mappedBy="user")
**/ **/
@ -295,10 +299,6 @@ class User extends BaseUser //implements ParticipantInterface, ThemeUser
*/ */
//protected $groups; //protected $groups;
/**
* @ORM\Column(type="string", length=255)
*/
//protected $salt;
//private $isActive; //private $isActive;
@ -344,7 +344,7 @@ class User extends BaseUser //implements ParticipantInterface, ThemeUser
{ {
parent::__construct(); parent::__construct();
//$this->salt = sha1(uniqid(null, true)); $this->salt = sha1(uniqid(null, true));
$this->isActive = true; $this->isActive = true;
$this->active = 1; $this->active = 1;
$this->registrationDate = new \DateTime(); $this->registrationDate = new \DateTime();

Loading…
Cancel
Save