AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Mailgun API as mail transport

Browse Source
This commit is contained in:
Frederic Guillot
2015-06-07 22:17:50 -04:00
parent 4f32352fe6
commit e22da9d32a
15 changed files with 153 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/Webhook.php
View File

@@ -126,7 +126,7 @@ class Webhook extends Base
$this->response->text('Not Authorized', 401);
}
echo $this->mailgunWebhook->parsePayload($_POST) ? 'PARSED' : 'IGNORED';
echo $this->mailgun->receiveEmail($_POST) ? 'PARSED' : 'IGNORED';
}
/**

2
app/Core/Base.php
View File

@@ -22,7 +22,7 @@ use Pimple\Container;
* @property \Integration\GitlabWebhook $gitlabWebhook
* @property \Integration\HipchatWebhook $hipchatWebhook
* @property \Integration\Jabber $jabber
* @property \Integration\MailgunWebhook $mailgunWebhook
* @property \Integration\Mailgun $mailgun
* @property \Integration\Postmark $postmark
* @property \Integration\SendgridWebhook $sendgridWebhook
* @property \Integration\SlackWebhook $slackWebhook

3
app/Core/EmailClient.php
View File

@@ -31,6 +31,9 @@ class EmailClient extends Base
}
switch (MAIL_TRANSPORT) {
case 'mailgun':
$this->mailgun->sendEmail($email, $name, $subject, $html, $author);
break;
case 'postmark':
$this->postmark->sendEmail($email, $name, $subject, $html, $author);
break;

50
app/Core/HttpClient.php
View File

@@ -32,7 +32,7 @@ class HttpClient extends Base
const HTTP_USER_AGENT = 'Kanboard';
/**
* Send a POST HTTP request
* Send a POST HTTP request encoded in JSON
*
* @access public
* @param string $url
@@ -40,17 +40,49 @@ class HttpClient extends Base
* @param array $headers
* @return string
*/
public function post($url, array $data, array $headers = array())
public function postJson($url, array $data, array $headers = array())
{
return $this->doRequest(
$url,
json_encode($data),
array_merge(array('Content-type: application/json'), $headers)
);
}
/**
* Send a POST HTTP request encoded in www-form-urlencoded
*
* @access public
* @param string $url
* @param array $data
* @param array $headers
* @return string
*/
public function postForm($url, array $data, array $headers = array())
{
return $this->doRequest(
$url,
http_build_query($data),
array_merge(array('Content-type: application/x-www-form-urlencoded'), $headers)
);
}
/**
* Make the HTTP request
*
* @access private
* @param string $url
* @param array $content
* @param array $headers
* @return string
*/
private function doRequest($url, $content, array $headers)
{
if (empty($url)) {
return '';
}
$headers = array_merge(array(
'User-Agent: '.self::HTTP_USER_AGENT,
'Content-Type: application/json',
'Connection: close',
), $headers);
$headers = array_merge(array('User-Agent: '.self::HTTP_USER_AGENT, 'Connection: close'), $headers);
$context = stream_context_create(array(
'http' => array(
@@ -59,7 +91,7 @@ class HttpClient extends Base
'timeout' => self::HTTP_TIMEOUT,
'max_redirects' => self::HTTP_MAX_REDIRECTS,
'header' => implode("\r\n", $headers),
'content' => json_encode($data)
'content' => $content
)
));
@@ -75,7 +107,7 @@ class HttpClient extends Base
if (DEBUG) {
$this->container['logger']->debug('HttpClient: url='.$url);
$this->container['logger']->debug('HttpClient: payload='.var_export($data, true));
$this->container['logger']->debug('HttpClient: payload='.$content);
$this->container['logger']->debug('HttpClient: metadata='.var_export(@stream_get_meta_data($stream), true));
$this->container['logger']->debug('HttpClient: response='.$response);
}

2
app/Integration/HipchatWebhook.php
View File

@@ -89,7 +89,7 @@ class HipchatWebhook extends \Core\Base
$params['room_token']
);
$this->httpClient->post($url, $payload);
$this->httpClient->postJson($url, $payload);
}
}
}

38
app/Integration/MailgunWebhook.php → app/Integration/Mailgun.php
View File

@@ -6,13 +6,39 @@ use HTML_To_Markdown;
use Core\Tool;
/**
* Mailgun Webhook
* Mailgun Integration
*
* @package integration
* @author Frederic Guillot
*/
class MailgunWebhook extends \Core\Base
class Mailgun extends \Core\Base
{
/**
* Send a HTML email
*
* @access public
* @param string $email
* @param string $name
* @param string $subject
* @param string $html
* @param string $author
*/
public function sendEmail($email, $name, $subject, $html, $author)
{
$headers = array(
'Authorization: Basic '.base64_encode('api:'.MAILGUN_API_TOKEN)
);
$payload = array(
'from' => sprintf('%s <%s>', $author, MAIL_FROM),
'to' => sprintf('%s <%s>', $name, $email),
'subject' => $subject,
'html' => $html,
);
$this->httpClient->postForm('https://api.mailgun.net/v3/'.MAILGUN_DOMAIN.'/messages', $payload, $headers);
}
/**
* Parse incoming email
*
@@ -20,7 +46,7 @@ class MailgunWebhook extends \Core\Base
* @param array $payload Incoming email
* @return boolean
*/
public function parsePayload(array $payload)
public function receiveEmail(array $payload)
{
if (empty($payload['sender']) || empty($payload['subject']) || empty($payload['recipient'])) {
return false;
@@ -30,7 +56,7 @@ class MailgunWebhook extends \Core\Base
$user = $this->user->getByEmail($payload['sender']);
if (empty($user)) {
$this->container['logger']->debug('MailgunWebhook: ignored => user not found');
$this->container['logger']->debug('Mailgun: ignored => user not found');
return false;
}
@@ -38,13 +64,13 @@ class MailgunWebhook extends \Core\Base
$project = $this->project->getByIdentifier(Tool::getMailboxHash($payload['recipient']));
if (empty($project)) {
$this->container['logger']->debug('MailgunWebhook: ignored => project not found');
$this->container['logger']->debug('Mailgun: ignored => project not found');
return false;
}
// The user must be member of the project
if (! $this->projectPermission->isMember($project['id'], $user['id'])) {
$this->container['logger']->debug('MailgunWebhook: ignored => user is not member of the project');
$this->container['logger']->debug('Mailgun: ignored => user is not member of the project');
return false;
}

2
app/Integration/Postmark.php
View File

@@ -36,7 +36,7 @@ class Postmark extends \Core\Base
'HtmlBody' => $html,
);
$this->httpClient->post('https://api.postmarkapp.com/email', $payload, $headers);
$this->httpClient->postJson('https://api.postmarkapp.com/email', $payload, $headers);
}
/**

2
app/Integration/SlackWebhook.php
View File

@@ -69,7 +69,7 @@ class SlackWebhook extends \Core\Base
$payload['text'] .= '|'.t('view the task on Kanboard').'>';
}
$this->httpClient->post($this->getWebhookUrl($project_id), $payload);
$this->httpClient->postJson($this->getWebhookUrl($project_id), $payload);
}
}
}

2
app/Model/Webhook.php
View File

@@ -30,7 +30,7 @@ class Webhook extends Base
$url .= '?token='.$token;
}
return $this->httpClient->post($url, $values);
return $this->httpClient->postJson($url, $values);
}
}
}

2
app/ServiceProvider/ClassProvider.php
View File

@@ -78,7 +78,7 @@ class ClassProvider implements ServiceProviderInterface
'GitlabWebhook',
'HipchatWebhook',
'Jabber',
'MailgunWebhook',
'Mailgun',
'Postmark',
'SendgridWebhook',
'SlackWebhook',

2
app/constants.php
View File

@@ -65,6 +65,8 @@ defined('MAIL_SMTP_PASSWORD') or define('MAIL_SMTP_PASSWORD', '');
defined('MAIL_SMTP_ENCRYPTION') or define('MAIL_SMTP_ENCRYPTION', null);
defined('MAIL_SENDMAIL_COMMAND') or define('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs');
defined('POSTMARK_API_TOKEN') or define('POSTMARK_API_TOKEN', '');
defined('MAILGUN_API_TOKEN') or define('MAILGUN_API_TOKEN', '');
defined('MAILGUN_DOMAIN') or define('MAILGUN_DOMAIN', '');
// Enable or disable "Strict-Transport-Security" HTTP header
defined('ENABLE_HSTS') or define('ENABLE_HSTS', true);