maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

disable sending of emails when running tests completely when run on travis

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-11-27 12:05:56 +01:00
parent a86f10a4b4
commit 9756c792d7
6 changed files with 63 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
lib/classes/api/commands/class.EmailAccounts.php
View File

@@ -35,6 +35,8 @@ class EmailAccounts extends ApiCommand implements ResourceEntity
* optional email address to send account information to, default is the account that is being created * optional email address to send account information to, default is the account that is being created
* @param int $email_quota * @param int $email_quota
* optional quota if enabled in MB, default 0 * optional quota if enabled in MB, default 0
* @param bool $sendinfomail
* optional, sends the welcome message to the new account (needed for creation, without the user won't be able to login before any mail is received), default 1 (true)
* *
* @access admin, customer * @access admin, customer
* @throws Exception * @throws Exception
@@ -55,6 +57,7 @@ class EmailAccounts extends ApiCommand implements ResourceEntity
$email_password = $this->getParam('email_password'); $email_password = $this->getParam('email_password');
$alternative_email = $this->getParam('alternative_email', true, ''); $alternative_email = $this->getParam('alternative_email', true, '');
$quota = $this->getParam('email_quota', true, 0); $quota = $this->getParam('email_quota', true, 0);
$sendinfomail = $this->getParam('sendinfomail', true, 1);
// validation // validation
$quota = validate($quota, 'email_quota', '/^\d+$/', 'vmailquotawrong', array(), true); $quota = validate($quota, 'email_quota', '/^\d+$/', 'vmailquotawrong', array(), true);
@@ -184,62 +187,33 @@ class EmailAccounts extends ApiCommand implements ResourceEntity
Admins::increaseUsage($customer['adminid'], 'email_accounts_used'); Admins::increaseUsage($customer['adminid'], 'email_accounts_used');
Admins::increaseUsage($customer['adminid'], 'email_quota_used', '', $quota); Admins::increaseUsage($customer['adminid'], 'email_quota_used', '', $quota);
// replacer array for mail to create account on server if ($sendinfomail) {
$replace_arr = array( // replacer array for mail to create account on server
'EMAIL' => $email_full, $replace_arr = array(
'USERNAME' => $username, 'EMAIL' => $email_full,
'PASSWORD' => $password 'USERNAME' => $username,
); 'PASSWORD' => $password
);
// get the customers admin // get the customers admin
$stmt = Database::prepare("SELECT `name`, `email` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid`= :adminid"); $stmt = Database::prepare("SELECT `name`, `email` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid`= :adminid");
$admin = Database::pexecute_first($stmt, array( $admin = Database::pexecute_first($stmt, array(
"adminid" => $customer['adminid'] "adminid" => $customer['adminid']
)); ));
// get template for mail subject
$mail_subject = $this->getMailTemplate($customer, 'mails', 'pop_success_subject', $replace_arr, $this->lng['mails']['pop_success']['subject']);
// get template for mail body
$mail_body = $this->getMailTemplate($customer, 'mails', 'pop_success_mailbody', $replace_arr, $this->lng['mails']['pop_success']['mailbody']);
$_mailerror = false;
$mailerr_msg = "";
try {
$this->mailer()->SetFrom($admin['email'], getCorrectUserSalutation($admin));
$this->mailer()->Subject = $mail_subject;
$this->mailer()->AltBody = $mail_body;
$this->mailer()->MsgHTML(str_replace("\n", "<br />", $mail_body));
$this->mailer()->AddAddress($email_full);
$this->mailer()->Send();
} catch (phpmailerException $e) {
$mailerr_msg = $e->errorMessage();
$_mailerror = true;
} catch (Exception $e) {
$mailerr_msg = $e->getMessage();
$_mailerror = true;
}
if ($_mailerror) {
$this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_ERR, "[API] Error sending mail: " . $mailerr_msg);
standard_error('errorsendingmail', $email_full, true);
}
$this->mailer()->ClearAddresses();
// customer wants to send the e-mail to an alternative email address too
if (Settings::Get('panel.sendalternativemail') == 1) {
// get template for mail subject // get template for mail subject
$mail_subject = $this->getMailTemplate($customer, 'mails', 'pop_success_alternative_subject', $replace_arr, $this->lng['mails']['pop_success_alternative']['subject']); $mail_subject = $this->getMailTemplate($customer, 'mails', 'pop_success_subject', $replace_arr, $this->lng['mails']['pop_success']['subject']);
// get template for mail body // get template for mail body
$mail_body = $this->getMailTemplate($customer, 'mails', 'pop_success_alternative_mailbody', $replace_arr, $this->lng['mails']['pop_success_alternative']['mailbody']); $mail_body = $this->getMailTemplate($customer, 'mails', 'pop_success_mailbody', $replace_arr, $this->lng['mails']['pop_success']['mailbody']);
$_mailerror = false; $_mailerror = false;
$mailerr_msg = "";
try { try {
$this->mailer()->SetFrom($admin['email'], getCorrectUserSalutation($admin)); $this->mailer()->SetFrom($admin['email'], getCorrectUserSalutation($admin));
$this->mailer()->Subject = $mail_subject; $this->mailer()->Subject = $mail_subject;
$this->mailer()->AltBody = $mail_body; $this->mailer()->AltBody = $mail_body;
$this->mailer()->MsgHTML(str_replace("\n", "<br />", $mail_body)); $this->mailer()->MsgHTML(str_replace("\n", "<br />", $mail_body));
$this->mailer()->AddAddress($idna_convert->encode($alternative_email), getCorrectUserSalutation($customer)); $this->mailer()->AddAddress($email_full);
$this->mailer()->Send(); $this->mailer()->Send();
} catch (phpmailerException $e) { } catch (phpmailerException $e) {
$mailerr_msg = $e->errorMessage(); $mailerr_msg = $e->errorMessage();
@@ -251,12 +225,43 @@ class EmailAccounts extends ApiCommand implements ResourceEntity
if ($_mailerror) { if ($_mailerror) {
$this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_ERR, "[API] Error sending mail: " . $mailerr_msg); $this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_ERR, "[API] Error sending mail: " . $mailerr_msg);
standard_error(array( standard_error('errorsendingmail', $email_full, true);
'errorsendingmail'
), $alternative_email, true);
} }
$this->mailer()->ClearAddresses(); $this->mailer()->ClearAddresses();
// customer wants to send the e-mail to an alternative email address too
if (Settings::Get('panel.sendalternativemail') == 1) {
// get template for mail subject
$mail_subject = $this->getMailTemplate($customer, 'mails', 'pop_success_alternative_subject', $replace_arr, $this->lng['mails']['pop_success_alternative']['subject']);
// get template for mail body
$mail_body = $this->getMailTemplate($customer, 'mails', 'pop_success_alternative_mailbody', $replace_arr, $this->lng['mails']['pop_success_alternative']['mailbody']);
$_mailerror = false;
try {
$this->mailer()->SetFrom($admin['email'], getCorrectUserSalutation($admin));
$this->mailer()->Subject = $mail_subject;
$this->mailer()->AltBody = $mail_body;
$this->mailer()->MsgHTML(str_replace("\n", "<br />", $mail_body));
$this->mailer()->AddAddress($idna_convert->encode($alternative_email), getCorrectUserSalutation($customer));
$this->mailer()->Send();
} catch (phpmailerException $e) {
$mailerr_msg = $e->errorMessage();
$_mailerror = true;
} catch (Exception $e) {
$mailerr_msg = $e->getMessage();
$_mailerror = true;
}
if ($_mailerror) {
$this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_ERR, "[API] Error sending mail: " . $mailerr_msg);
standard_error(array(
'errorsendingmail'
), $alternative_email, true);
}
$this->mailer()->ClearAddresses();
}
} }
$this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_INFO, "[API] added email account for '" . $result['email_full'] . "'"); $this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_INFO, "[API] added email account for '" . $result['email_full'] . "'");

2
tests/Customers/CustomersTest.php
View File

@@ -35,7 +35,7 @@ class CustomersTest extends TestCase
'mysqls' => 15, 'mysqls' => 15,
'createstdsubdomain' => 1, 'createstdsubdomain' => 1,
'new_customer_password' => 'h0lYmo1y', 'new_customer_password' => 'h0lYmo1y',
'sendpassword' => 1, 'sendpassword' => TRAVIS_CI == 1 ? 0 : 1,
'phpenabled' => 1, 'phpenabled' => 1,
'store_defaultindex' => 1, 'store_defaultindex' => 1,
'custom_notes' => 'secret', 'custom_notes' => 'secret',

6
tests/Emails/EmailsTest.php
View File

@@ -372,7 +372,8 @@ class MailsTest extends TestCase
'emailaddr' => 'info@test2.local', 'emailaddr' => 'info@test2.local',
'email_password' => generatePassword(), 'email_password' => generatePassword(),
'alternative_email' => 'noone@example.com', 'alternative_email' => 'noone@example.com',
'email_quota' => 1337 'email_quota' => 1337,
'sendinfomail' => TRAVIS_CI == 1 ? 0 : 1
]; ];
$json_result = EmailAccounts::getLocal($customer_userdata, $data)->add(); $json_result = EmailAccounts::getLocal($customer_userdata, $data)->add();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
@@ -452,7 +453,8 @@ class MailsTest extends TestCase
$data = [ $data = [
'emailaddr' => 'info@test2.local', 'emailaddr' => 'info@test2.local',
'email_password' => generatePassword(), 'email_password' => generatePassword(),
'alternative_email' => 'noone@example.com' 'alternative_email' => 'noone@example.com',
'sendinfomail' => TRAVIS_CI == 1 ? 0 : 1
]; ];
$json_result = EmailAccounts::getLocal($customer_userdata, $data)->add(); $json_result = EmailAccounts::getLocal($customer_userdata, $data)->add();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];

4
tests/Ftps/FtpsTest.php
View File

@@ -138,7 +138,7 @@ class FtpsTest extends TestCase
'ftp_password' => 'h4xXx0r', 'ftp_password' => 'h4xXx0r',
'path' => '/', 'path' => '/',
'ftp_description' => 'testing', 'ftp_description' => 'testing',
'sendinfomail' => 1 'sendinfomail' => TRAVIS_CI == 1 ? 0 : 1
]; ];
$json_result = Ftps::getLocal($customer_userdata, $data)->add(); $json_result = Ftps::getLocal($customer_userdata, $data)->add();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
@@ -236,7 +236,7 @@ class FtpsTest extends TestCase
'ftp_password' => 'h4xXx0r', 'ftp_password' => 'h4xXx0r',
'path' => '/', 'path' => '/',
'ftp_description' => 'testing', 'ftp_description' => 'testing',
'sendinfomail' => 1 'sendinfomail' => TRAVIS_CI == 1 ? 0 : 1
]; ];
$json_result = Ftps::getLocal($admin_userdata, $data)->add(); $json_result = Ftps::getLocal($admin_userdata, $data)->add();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];

2
tests/Mysqls/MysqlsTest.php
View File

@@ -25,7 +25,7 @@ class MysqlsTest extends TestCase
$data = [ $data = [
'mysql_password' => generatePassword(), 'mysql_password' => generatePassword(),
'description' => 'testdb', 'description' => 'testdb',
'sendinfomail' => true 'sendinfomail' => TRAVIS_CI == 1 ? 0 : 1
]; ];
$json_result = Mysqls::getLocal($customer_userdata, $data)->add(); $json_result = Mysqls::getLocal($customer_userdata, $data)->add();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];

2
tests/bootstrap.php
View File

@@ -4,10 +4,12 @@ if (file_exists('/etc/froxlor-test.pwd') && file_exists('/etc/froxlor-test.rpwd'
// froxlor jenkins test-system // froxlor jenkins test-system
$pwd = trim(file_get_contents('/etc/froxlor-test.pwd')); $pwd = trim(file_get_contents('/etc/froxlor-test.pwd'));
$rpwd = trim(file_get_contents('/etc/froxlor-test.rpwd')); $rpwd = trim(file_get_contents('/etc/froxlor-test.rpwd'));
define('TRAVIS_CI', 0);
} else { } else {
// travis-ci.org // travis-ci.org
$pwd = 'fr0xl0r.TravisCI'; $pwd = 'fr0xl0r.TravisCI';
$rpwd = 'fr0xl0r.TravisCI'; $rpwd = 'fr0xl0r.TravisCI';
define('TRAVIS_CI', 1);
} }
$userdata_content = "<?php $userdata_content = "<?php