Skip to content
Snippets Groups Projects
Commit ff35c494 authored by kentaro hayashi's avatar kentaro hayashi Committed by Yas Naoi
Browse files

Issue #3410961 by kentaro.hayashi, yas: Change password generation rules

parent b39baf5a
Branches
Tags
1 merge request!43Resolve #3410961 "Change password generation"
Pipeline #80578 passed
......@@ -11,9 +11,11 @@ services:
'@messenger',
'@openstack.factory',
'@openstack.ec2',
'@password_generator',
'@openstack_provider.password_generator',
'@datetime.time',
'@current_user',
'@uuid',
'@http_client'
]
openstack_provider.password_generator:
class: Drupal\openstack_provider\Service\OpenStackPasswordGenerator
<?php
namespace Drupal\openstack_provider\Service;
use Drupal\Core\Password\DefaultPasswordGenerator;
use Drupal\Core\Password\PasswordGeneratorInterface;
/**
* Provides a cloud-specific password generator.
*/
class OpenStackPasswordGenerator extends DefaultPasswordGenerator implements PasswordGeneratorInterface {
/**
* The allowed characters for the password in the cloud-specific class.
*
* @var string
*/
protected $allowedCharacters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()';
}
......@@ -16,7 +16,6 @@ use Drupal\Core\Extension\ExtensionPathResolver;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\File\FileSystemInterface;
use Drupal\Core\Messenger\Messenger;
use Drupal\Core\Password\DefaultPasswordGenerator;
use Drupal\Core\Session\AccountProxyInterface;
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\facade\Entity\TenantInterface;
......@@ -89,7 +88,7 @@ class OpenStackProviderService implements OpenStackProviderServiceInterface, Con
/**
* The password generator service.
*
* @var \Drupal\Core\Password\DefaultPasswordGenerator
* @var \Drupal\openstack_provider\Service\OpenStackPasswordGenerator
*/
private $passwordGenerator;
......@@ -154,7 +153,7 @@ class OpenStackProviderService implements OpenStackProviderServiceInterface, Con
* The OpenStack factory interface.
* @param \Drupal\aws_cloud\Service\Ec2\Ec2ServiceInterface $ec2_service
* The Ec2 service.
* @param \Drupal\Core\Password\DefaultPasswordGenerator $password_generator
* @param \Drupal\openstack_provider\Service\OpenStackPasswordGenerator $password_generator
* The password generator.
* @param \Drupal\Component\Datetime\TimeInterface $date_time
* The time object.
......@@ -174,7 +173,7 @@ class OpenStackProviderService implements OpenStackProviderServiceInterface, Con
Messenger $messenger,
OpenStackServiceFactoryInterface $openstack_service_factory_interface,
Ec2ServiceInterface $ec2_service,
DefaultPasswordGenerator $password_generator,
OpenStackPasswordGenerator $password_generator,
TimeInterface $date_time,
AccountProxyInterface $current_user,
Php $uuid,
......@@ -368,7 +367,7 @@ class OpenStackProviderService implements OpenStackProviderServiceInterface, Con
$project_name = $this->generateNameString($resource_prefix, 'project');
$username = $this->generateNameString($resource_prefix, 'user');
$role_name = $this->generateNameString($resource_prefix, 'role');
$password = $this->passwordGenerator->generate();
$password = $this->passwordGenerator->generate(12);
$project_id = $this->createOpenStackProject($domain_id, $project_name);
$role_id = $this->createOpenStackRole($role_name);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment