tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5271 from bummzack/5244-remove-email-subclasses

Browse Source 
Fix 5244: Removed Email Subclasses
This commit is contained in:
Daniel Hensby 2016-04-08 17:09:44 +01:00
commit d7289a17fc
7 changed files with 72 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dev/SapphireTest.php
View File

@ -192,7 +192,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
self::$is_running_test = true; self::$is_running_test = true;
// i18n needs to be set to the defaults or tests fail // i18n needs to be set to the defaults or tests fail
i18n::set_locale(i18n::default_locale()); i18n::set_locale(Config::inst()->get('i18n', 'default_locale'));
i18n::config()->date_format = null; i18n::config()->date_format = null;
i18n::config()->time_format = null; i18n::config()->time_format = null;
@ -223,12 +223,6 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
$prefix = defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : 'ss_'; $prefix = defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : 'ss_';
// Set up email
$this->originalMailer = Email::mailer();
$this->mailer = new TestMailer();
Injector::inst()->registerService($this->mailer, 'Mailer');
Config::inst()->remove('Email', 'send_all_emails_to');
// Todo: this could be a special test model // Todo: this could be a special test model
$this->model = DataModel::inst(); $this->model = DataModel::inst();
@ -289,6 +283,12 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
// Clear requirements // Clear requirements
Requirements::clear(); Requirements::clear();
// Set up email
$this->originalMailer = Email::mailer();
$this->mailer = new TestMailer();
Injector::inst()->registerService($this->mailer, 'Mailer');
Config::inst()->remove('Email', 'send_all_emails_to');
} }
/** /**

45
security/Member.php
View File

@ -865,7 +865,10 @@ class Member extends DataObject implements TemplateGlobalProvider {
&& $this->record['Password'] && $this->record['Password']
&& $this->config()->notify_password_change && $this->config()->notify_password_change
) { ) {
$e = Member_ChangePasswordEmail::create(); /** @var Email $e */
$e = Email::create();
$e->setSubject(_t('Member.SUBJECTPASSWORDCHANGED', "Your password has been changed", 'Email subject'));
$e->setTemplate('ChangePasswordEmail');
$e->populateTemplate($this); $e->populateTemplate($this);
$e->setTo($this->Email); $e->setTo($this->Email);
$e->send(); $e->send();
@ -1762,46 +1765,6 @@ class Member_GroupSet extends ManyManyList {
} }
} }
/**
* Class used as template to send an email saying that the password has been
* changed.
*
* @package framework
* @subpackage security
*/
class Member_ChangePasswordEmail extends Email {
protected $from = ''; // setting a blank from address uses the site's default administrator email
protected $subject = '';
protected $ss_template = 'ChangePasswordEmail';
public function __construct() {
parent::__construct();
$this->subject = _t('Member.SUBJECTPASSWORDCHANGED', "Your password has been changed", 'Email subject');
}
}
/**
* Class used as template to send the forgot password email
*
* @package framework
* @subpackage security
*/
class Member_ForgotPasswordEmail extends Email {
protected $from = ''; // setting a blank from address uses the site's default administrator email
protected $subject = '';
protected $ss_template = 'ForgotPasswordEmail';
public function __construct() {
parent::__construct();
$this->subject = _t('Member.SUBJECTPASSWORDRESET', "Your password reset link", 'Email subject');
}
}
/** /**
* Member Validator * Member Validator
* *

5
security/MemberLoginForm.php
View File

@ -325,7 +325,10 @@ JS;
if($member) { if($member) {
$token = $member->generateAutologinTokenAndStoreHash(); $token = $member->generateAutologinTokenAndStoreHash();
$e = Member_ForgotPasswordEmail::create(); /** @var Email $e */
$e = Email::create();
$e->setSubject(_t('Member.SUBJECTPASSWORDRESET', "Your password reset link", 'Email subject'));
$e->setTemplate('ForgotPasswordEmail');
$e->populateTemplate($member); $e->populateTemplate($member);
$e->populateTemplate(array( $e->populateTemplate(array(
'PasswordResetLink' => Security::getPasswordResetLink($member, $token) 'PasswordResetLink' => Security::getPasswordResetLink($member, $token)

2
templates/email/ChangePasswordEmail.ss
View File

@ -2,6 +2,6 @@
<p> <p>
<%t ChangePasswordEmail_ss.CHANGEPASSWORDTEXT1 'You changed your password for' is 'for a url' %> $AbsoluteBaseURL.<br /> <%t ChangePasswordEmail_ss.CHANGEPASSWORDTEXT1 'You changed your password for' is 'for a url' %> $AbsoluteBaseURL.<br />
<%t ChangePasswordEmail_ss.CHANGEPASSWORDFOREMAIL 'The password for account with email address {email} has been changed. If you didn't change your password please change your password using the link below' email=$Email %><br /> <%t ChangePasswordEmail_ss.CHANGEPASSWORDFOREMAIL 'The password for account with email address {email} has been changed. If you didn\'t change your password please change your password using the link below' email=$Email %><br />
<a href="Security/changepassword"><%t ChangePasswordEmail_ss.CHANGEPASSWORDTEXT3 'Change password' %></a> <a href="Security/changepassword"><%t ChangePasswordEmail_ss.CHANGEPASSWORDTEXT3 'Change password' %></a>
</p> </p>

36
tests/security/MemberTest.php
View File

@ -185,16 +185,44 @@ class MemberTest extends FunctionalTest {
* Test that changed passwords will send an email * Test that changed passwords will send an email
*/ */
public function testChangedPasswordEmaling() { public function testChangedPasswordEmaling() {
$oldSetting = Config::inst()->get('Member', 'notify_password_change');
Config::inst()->update('Member', 'notify_password_change', true);
$this->clearEmails(); $this->clearEmails();
$member = $this->objFromFixture('Member', 'test'); $member = $this->objFromFixture('Member', 'test');
$this->assertNotNull($member); $this->assertNotNull($member);
$valid = $member->changePassword('32asDF##$$%%'); $valid = $member->changePassword('32asDF##$$%%');
$this->assertTrue($valid->valid()); $this->assertTrue($valid->valid());
/*
$this->assertEmailSent("sam@silverstripe.com", null, "/changed password/", $this->assertEmailSent("dummy@silverstripe.tld", null, "Your password has been changed",
'/sam@silverstripe\.com.*32asDF##\$\$%%/'); '/dummy@silverstripe\.tld/');
*/
Config::inst()->update('Member', 'notify_password_change', $oldSetting);
}
/**
* Test that triggering "forgotPassword" sends an Email with a reset link
*/
public function testForgotPasswordEmaling() {
$this->clearEmails();
$this->autoFollowRedirection = false;
$member = $this->objFromFixture('Member', 'test');
$this->assertNotNull($member);
// Initiate a password-reset
$response = $this->post('Security/LostPasswordForm', array('Email' => $member->Email));
$this->assertEquals($response->getStatusCode(), 302);
// We should get redirected to Security/passwordsent
$this->assertContains('Security/passwordsent/dummy@silverstripe.tld',
urldecode($response->getHeader('Location')));
// Check existance of reset link
$this->assertEmailSent("dummy@silverstripe.tld", null, 'Your password reset link',
'/Security\/changepassword\?m='.$member->ID.'&t=[^"]+/');
} }
/** /**

2
tests/security/MemberTest.yml
View File

@ -42,7 +42,7 @@ Member:
test: test:
FirstName: Test FirstName: Test
Surname: User Surname: User
Email: sam@silverstripe.com Email: dummy@silverstripe.tld
Password: 1nitialPassword Password: 1nitialPassword
PasswordExpiry: 2030-01-01 PasswordExpiry: 2030-01-01
Groups: =>Group.securityadminsgroup Groups: =>Group.securityadminsgroup

46
tests/security/SecurityTest.php
View File

@ -305,13 +305,13 @@ class SecurityTest extends FunctionalTest {
*/ */
public function testExpiredPassword() { public function testExpiredPassword() {
/* BAD PASSWORDS ARE LOCKED OUT */ /* BAD PASSWORDS ARE LOCKED OUT */
$badResponse = $this->doTestLoginForm('sam@silverstripe.com' , 'badpassword'); $badResponse = $this->doTestLoginForm('dummy@silverstripe.tld' , 'badpassword');
$this->assertEquals(302, $badResponse->getStatusCode()); $this->assertEquals(302, $badResponse->getStatusCode());
$this->assertRegExp('/Security\/login/', $badResponse->getHeader('Location')); $this->assertRegExp('/Security\/login/', $badResponse->getHeader('Location'));
$this->assertNull($this->session()->inst_get('loggedInAs')); $this->assertNull($this->session()->inst_get('loggedInAs'));
/* UNEXPIRED PASSWORD GO THROUGH WITHOUT A HITCH */ /* UNEXPIRED PASSWORD GO THROUGH WITHOUT A HITCH */
$goodResponse = $this->doTestLoginForm('sam@silverstripe.com' , '1nitialPassword'); $goodResponse = $this->doTestLoginForm('dummy@silverstripe.tld' , '1nitialPassword');
$this->assertEquals(302, $goodResponse->getStatusCode()); $this->assertEquals(302, $goodResponse->getStatusCode());
$this->assertEquals( $this->assertEquals(
Controller::join_links(Director::absoluteBaseURL(), 'test/link'), Controller::join_links(Director::absoluteBaseURL(), 'test/link'),
@ -340,7 +340,7 @@ class SecurityTest extends FunctionalTest {
} }
public function testChangePasswordForLoggedInUsers() { public function testChangePasswordForLoggedInUsers() {
$goodResponse = $this->doTestLoginForm('sam@silverstripe.com' , '1nitialPassword'); $goodResponse = $this->doTestLoginForm('dummy@silverstripe.tld' , '1nitialPassword');
// Change the password // Change the password
$this->get('Security/changepassword?BackURL=test/back'); $this->get('Security/changepassword?BackURL=test/back');
@ -353,7 +353,7 @@ class SecurityTest extends FunctionalTest {
$this->assertEquals($this->idFromFixture('Member', 'test'), $this->session()->inst_get('loggedInAs')); $this->assertEquals($this->idFromFixture('Member', 'test'), $this->session()->inst_get('loggedInAs'));
// Check if we can login with the new password // Check if we can login with the new password
$goodResponse = $this->doTestLoginForm('sam@silverstripe.com' , 'changedPassword'); $goodResponse = $this->doTestLoginForm('dummy@silverstripe.tld' , 'changedPassword');
$this->assertEquals(302, $goodResponse->getStatusCode()); $this->assertEquals(302, $goodResponse->getStatusCode());
$this->assertEquals( $this->assertEquals(
Controller::join_links(Director::absoluteBaseURL(), 'test/link'), Controller::join_links(Director::absoluteBaseURL(), 'test/link'),
@ -372,9 +372,9 @@ class SecurityTest extends FunctionalTest {
// Request new password by email // Request new password by email
$response = $this->get('Security/lostpassword'); $response = $this->get('Security/lostpassword');
$response = $this->post('Security/LostPasswordForm', array('Email' => 'sam@silverstripe.com')); $response = $this->post('Security/LostPasswordForm', array('Email' => 'dummy@silverstripe.tld'));
$this->assertEmailSent('sam@silverstripe.com'); $this->assertEmailSent('dummy@silverstripe.tld');
// Load password link from email // Load password link from email
$admin = DataObject::get_by_id('Member', $admin->ID); $admin = DataObject::get_by_id('Member', $admin->ID);
@ -394,7 +394,7 @@ class SecurityTest extends FunctionalTest {
$this->assertEquals($this->idFromFixture('Member', 'test'), $this->session()->inst_get('loggedInAs')); $this->assertEquals($this->idFromFixture('Member', 'test'), $this->session()->inst_get('loggedInAs'));
// Check if we can login with the new password // Check if we can login with the new password
$goodResponse = $this->doTestLoginForm('sam@silverstripe.com' , 'changedPassword'); $goodResponse = $this->doTestLoginForm('dummy@silverstripe.tld' , 'changedPassword');
$this->assertEquals(302, $goodResponse->getStatusCode()); $this->assertEquals(302, $goodResponse->getStatusCode());
$this->assertEquals($this->idFromFixture('Member', 'test'), $this->session()->inst_get('loggedInAs')); $this->assertEquals($this->idFromFixture('Member', 'test'), $this->session()->inst_get('loggedInAs'));
@ -412,7 +412,7 @@ class SecurityTest extends FunctionalTest {
// Login with a wrong password for more than the defined threshold // Login with a wrong password for more than the defined threshold
for($i = 1; $i <= Member::config()->lock_out_after_incorrect_logins+1; $i++) { for($i = 1; $i <= Member::config()->lock_out_after_incorrect_logins+1; $i++) {
$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword'); $this->doTestLoginForm('dummy@silverstripe.tld' , 'incorrectpassword');
$member = DataObject::get_by_id("Member", $this->idFromFixture('Member', 'test')); $member = DataObject::get_by_id("Member", $this->idFromFixture('Member', 'test'));
if($i < Member::config()->lock_out_after_incorrect_logins) { if($i < Member::config()->lock_out_after_incorrect_logins) {
@ -442,7 +442,7 @@ class SecurityTest extends FunctionalTest {
} }
} }
$this->doTestLoginForm('sam@silverstripe.com' , '1nitialPassword'); $this->doTestLoginForm('dummy@silverstripe.tld' , '1nitialPassword');
$this->assertNull( $this->assertNull(
$this->session()->inst_get('loggedInAs'), $this->session()->inst_get('loggedInAs'),
'The user can\'t log in after being locked out, even with the right password' 'The user can\'t log in after being locked out, even with the right password'
@ -452,7 +452,7 @@ class SecurityTest extends FunctionalTest {
$member = DataObject::get_by_id("Member", $this->idFromFixture('Member', 'test')); $member = DataObject::get_by_id("Member", $this->idFromFixture('Member', 'test'));
$member->LockedOutUntil = date('Y-m-d H:i:s', time() - 30); $member->LockedOutUntil = date('Y-m-d H:i:s', time() - 30);
$member->write(); $member->write();
$this->doTestLoginForm('sam@silverstripe.com' , '1nitialPassword'); $this->doTestLoginForm('dummy@silverstripe.tld' , '1nitialPassword');
$this->assertEquals( $this->assertEquals(
$this->session()->inst_get('loggedInAs'), $this->session()->inst_get('loggedInAs'),
$member->ID, $member->ID,
@ -464,7 +464,7 @@ class SecurityTest extends FunctionalTest {
// Login again with wrong password, but less attempts than threshold // Login again with wrong password, but less attempts than threshold
for($i = 1; $i < Member::config()->lock_out_after_incorrect_logins; $i++) { for($i = 1; $i < Member::config()->lock_out_after_incorrect_logins; $i++) {
$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword'); $this->doTestLoginForm('dummy@silverstripe.tld' , 'incorrectpassword');
} }
$this->assertNull($this->session()->inst_get('loggedInAs')); $this->assertNull($this->session()->inst_get('loggedInAs'));
$this->assertContains( $this->assertContains(
@ -473,7 +473,7 @@ class SecurityTest extends FunctionalTest {
'The user can retry with a wrong password after the lockout expires' 'The user can retry with a wrong password after the lockout expires'
); );
$this->doTestLoginForm('sam@silverstripe.com' , '1nitialPassword'); $this->doTestLoginForm('dummy@silverstripe.tld' , '1nitialPassword');
$this->assertEquals( $this->assertEquals(
$this->session()->inst_get('loggedInAs'), $this->session()->inst_get('loggedInAs'),
$member->ID, $member->ID,
@ -488,8 +488,8 @@ class SecurityTest extends FunctionalTest {
// ATTEMPTING LOG-IN TWICE WITH ONE ACCOUNT AND TWICE WITH ANOTHER SHOULDN'T LOCK ANYBODY OUT // ATTEMPTING LOG-IN TWICE WITH ONE ACCOUNT AND TWICE WITH ANOTHER SHOULDN'T LOCK ANYBODY OUT
$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword'); $this->doTestLoginForm('dummy@silverstripe.tld' , 'incorrectpassword');
$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword'); $this->doTestLoginForm('dummy@silverstripe.tld' , 'incorrectpassword');
$this->doTestLoginForm('noexpiry@silverstripe.com' , 'incorrectpassword'); $this->doTestLoginForm('noexpiry@silverstripe.com' , 'incorrectpassword');
$this->doTestLoginForm('noexpiry@silverstripe.com' , 'incorrectpassword'); $this->doTestLoginForm('noexpiry@silverstripe.com' , 'incorrectpassword');
@ -503,7 +503,7 @@ class SecurityTest extends FunctionalTest {
// BUT, DOING AN ADDITIONAL LOG-IN WITH EITHER OF THEM WILL LOCK OUT, SINCE THAT IS THE 3RD FAILURE IN // BUT, DOING AN ADDITIONAL LOG-IN WITH EITHER OF THEM WILL LOCK OUT, SINCE THAT IS THE 3RD FAILURE IN
// THIS SESSION // THIS SESSION
$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword'); $this->doTestLoginForm('dummy@silverstripe.tld' , 'incorrectpassword');
$member1 = DataObject::get_by_id("Member", $this->idFromFixture('Member', 'test')); $member1 = DataObject::get_by_id("Member", $this->idFromFixture('Member', 'test'));
$this->assertNotNull($member1->LockedOutUntil); $this->assertNotNull($member1->LockedOutUntil);
@ -516,16 +516,16 @@ class SecurityTest extends FunctionalTest {
Security::config()->login_recording = true; Security::config()->login_recording = true;
/* UNSUCCESSFUL ATTEMPTS WITH WRONG PASSWORD FOR EXISTING USER ARE LOGGED */ /* UNSUCCESSFUL ATTEMPTS WITH WRONG PASSWORD FOR EXISTING USER ARE LOGGED */
$this->doTestLoginForm('sam@silverstripe.com', 'wrongpassword'); $this->doTestLoginForm('dummy@silverstripe.tld', 'wrongpassword');
$attempt = DataObject::get_one('LoginAttempt', array( $attempt = DataObject::get_one('LoginAttempt', array(
'"LoginAttempt"."Email"' => 'sam@silverstripe.com' '"LoginAttempt"."Email"' => 'dummy@silverstripe.tld'
)); ));
$this->assertTrue(is_object($attempt)); $this->assertTrue(is_object($attempt));
$member = DataObject::get_one('Member', array( $member = DataObject::get_one('Member', array(
'"Member"."Email"' => 'sam@silverstripe.com' '"Member"."Email"' => 'dummy@silverstripe.tld'
)); ));
$this->assertEquals($attempt->Status, 'Failure'); $this->assertEquals($attempt->Status, 'Failure');
$this->assertEquals($attempt->Email, 'sam@silverstripe.com'); $this->assertEquals($attempt->Email, 'dummy@silverstripe.tld');
$this->assertEquals($attempt->MemberID, $member->ID); $this->assertEquals($attempt->MemberID, $member->ID);
/* UNSUCCESSFUL ATTEMPTS WITH NONEXISTING USER ARE LOGGED */ /* UNSUCCESSFUL ATTEMPTS WITH NONEXISTING USER ARE LOGGED */
@ -545,16 +545,16 @@ class SecurityTest extends FunctionalTest {
Security::config()->login_recording = true; Security::config()->login_recording = true;
/* SUCCESSFUL ATTEMPTS ARE LOGGED */ /* SUCCESSFUL ATTEMPTS ARE LOGGED */
$this->doTestLoginForm('sam@silverstripe.com', '1nitialPassword'); $this->doTestLoginForm('dummy@silverstripe.tld', '1nitialPassword');
$attempt = DataObject::get_one('LoginAttempt', array( $attempt = DataObject::get_one('LoginAttempt', array(
'"LoginAttempt"."Email"' => 'sam@silverstripe.com' '"LoginAttempt"."Email"' => 'dummy@silverstripe.tld'
)); ));
$member = DataObject::get_one('Member', array( $member = DataObject::get_one('Member', array(
'"Member"."Email"' => 'sam@silverstripe.com' '"Member"."Email"' => 'dummy@silverstripe.tld'
)); ));
$this->assertTrue(is_object($attempt)); $this->assertTrue(is_object($attempt));
$this->assertEquals($attempt->Status, 'Success'); $this->assertEquals($attempt->Status, 'Success');
$this->assertEquals($attempt->Email, 'sam@silverstripe.com'); $this->assertEquals($attempt->Email, 'dummy@silverstripe.tld');
$this->assertEquals($attempt->MemberID, $member->ID); $this->assertEquals($attempt->MemberID, $member->ID);
} }