Compare commits
No commits in common. "39daf5524c16894b08868a1691ebcacbdbaf4c52" and "e098b4e7a376848cfdb18666e37035df6febd8f4" have entirely different histories.
39daf5524c
...
e098b4e7a3
@ -12,8 +12,12 @@
|
||||
<category>tools</category>
|
||||
<bugs>https://github.com/sashetov/ctautomailhooks</bugs>
|
||||
<dependencies>
|
||||
<nextcloud min-version="15" max-version="25"/>
|
||||
<nextcloud min-version="15" max-version="15"/>
|
||||
</dependencies>
|
||||
<navigations>
|
||||
<navigation>
|
||||
<name>C T Auto Mail Hooks</name>
|
||||
<route>ctautomailhooks.page.index</route>
|
||||
</navigation>
|
||||
</navigations>
|
||||
</info>
|
||||
|
@ -4,11 +4,9 @@ use OCP\ILogger;
|
||||
use \OCP\IConfig;
|
||||
class Config {
|
||||
const CONFIG_KEY = 'ct_auto_mail_hooks';
|
||||
const CONFIG_KEY_MAILU_KEYS="mailu_keys";
|
||||
const CONFIG_KEY_MAILU_API="mailu_api";
|
||||
const CONFIG_KEY_GLESYS_KEYS="glesys_keys";
|
||||
const CONFIG_KEY_EMAIL_ADDR_SUFFIX="email_suffix";
|
||||
const CONFIG_KEY_EMAIL_ADDR_QUOTA_MB="quota";
|
||||
|
||||
const DEFAULT_EMAIL_ADDR_QUOTA_MB="200";
|
||||
private $logger;
|
||||
private $appConfiguration;
|
||||
@ -19,11 +17,8 @@ class Config {
|
||||
$this->appConfiguration =
|
||||
$nextCloudConfiguration->getSystemValue(self::CONFIG_KEY);
|
||||
}
|
||||
public function getMailUKeys() {
|
||||
return $this->getConfValue(self::CONFIG_KEY_MAILU_KEYS);
|
||||
}
|
||||
public function getMailUAPI() {
|
||||
return $this->getConfValue(self::CONFIG_KEY_MAILU_API);
|
||||
public function getGlesysKeys() {
|
||||
return $this->getConfValue(self::CONFIG_KEY_GLESYS_KEYS);
|
||||
}
|
||||
public function getEmailAddressSuffix() {
|
||||
return $this->getConfValue(self::CONFIG_KEY_EMAIL_ADDR_SUFFIX);
|
||||
|
@ -24,18 +24,17 @@ class UserHooks {
|
||||
}
|
||||
private function createUserCB() {
|
||||
return function (\OC\User\User $user, string $password) {
|
||||
$uid = $user->getUID();
|
||||
$name = $user->getDisplayName();
|
||||
$email_suffix = $this->config->getEmailAddressSuffix();
|
||||
$quota = $this->config->getEmailQuotaMB();
|
||||
$newuser = array(
|
||||
'email' => $user->getUID() . $this->config->getEmailAddressSuffix(),
|
||||
'displayed_name' => $user->getDisplayName(),
|
||||
'raw_password' => $password,
|
||||
'quota_bytes' => $this->config->getEmailQuotaMB() * 1024 * 1024,
|
||||
'enabled' => true,
|
||||
'enable_imap' => true,
|
||||
'spam_enable' => true,
|
||||
'spam_mark_as_read' => true,
|
||||
'spam_threshold' => 80
|
||||
'userid' => $uid,
|
||||
'password' => $password,
|
||||
'name' => $name,
|
||||
'email' => $uid . $email_suffix,
|
||||
'quota' => $quota // in MB
|
||||
);
|
||||
|
||||
if($this->createEmailAccount($newuser)) {
|
||||
$this->logger->warning(
|
||||
"Automatically created mail account for uid " . $uid
|
||||
@ -50,104 +49,129 @@ class UserHooks {
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private function deleteUserCB() {
|
||||
return function (\OC\User\User $user) {
|
||||
$email = $user->getUID() . $this->config->getEmailAddressSuffix();
|
||||
if($this->deleteEmailAccount($email)) {
|
||||
$this->logger->warning("Deleted mail account: " . $email, $this->logContext);
|
||||
} else {
|
||||
$this->logger->error("Error deleting mail account" . $email);
|
||||
}
|
||||
$uid = $user->getUID();
|
||||
$email_suffix = $this->config->getEmailAddressSuffix();
|
||||
$email = $uid . $email_suffix;
|
||||
$user_data = array('email' => $email);
|
||||
if($this->deleteEmailAccount($user_data))
|
||||
$this->logger->warning(
|
||||
"Deleted mail account: " . $email, $this->logContext);
|
||||
else $this->logger->error("Error deleting mail account" . $uid);
|
||||
};
|
||||
}
|
||||
|
||||
private function updateEmailPasswordCB() {
|
||||
return function (\OC\User\User $user, string $password) {
|
||||
$email = $user->getUID() . $this->config->getEmailAddressSuffix();
|
||||
if($this->updateEmailPassword($email, $password)) {
|
||||
$this->logger->warning("Updated glesys password for account: " . $email, $this->logContext);
|
||||
} else {
|
||||
$this->logger->error("Error updating mail password for account" . $email);
|
||||
}
|
||||
return function (
|
||||
\OC\User\User $user, string $password, string $recoverPassword) {
|
||||
$uid = $user->getUID();
|
||||
$email_suffix = $this->config->getEmailAddressSuffix();
|
||||
$email = $uid . $email_suffix;
|
||||
$user_data = array(
|
||||
'email' => $email,
|
||||
'password' => $password
|
||||
);
|
||||
if($this->updateEmailPassword($user_data))
|
||||
$this->logger->warning(
|
||||
"Updated glesys password for account: " . $email,
|
||||
$this->logContext);
|
||||
else $this->logger->error("Error deleting mail account" . $uid);
|
||||
};
|
||||
}
|
||||
|
||||
private function createImapFolders($user_data) {
|
||||
$server = 'mail.glesys.se';
|
||||
$email = $user_data['email'];
|
||||
$passw = $user_data['password'];
|
||||
$folders = array('Sent', 'Drafts', 'Trash', 'Junk', 'Archive');
|
||||
$mbox = \imap_open("{" . $server . "}", $email, $passw, OP_HALFOPEN);
|
||||
if(!$mbox){
|
||||
$message = "can't connect: " . \imap_last_error();
|
||||
$this->logger->error($message);
|
||||
return false;
|
||||
}
|
||||
foreach ($folders as $folder) {
|
||||
if (! @\imap_createmailbox(
|
||||
$mbox,
|
||||
\imap_utf7_encode("{".$server."}INBOX.".$folder))) {
|
||||
$message = 'Error creating ' . $folder . ' folder: ' .
|
||||
\imap_last_error();
|
||||
$this->logger->error($message);
|
||||
}
|
||||
}
|
||||
\imap_close($mbox);
|
||||
return true;
|
||||
}
|
||||
private function createEmailAccount($user_data) {
|
||||
$ch = curl_init($this.config->getMailUAPI . 'user');
|
||||
$payload = json_encode($user_data);
|
||||
$keys = $this->config->getGlesysKeys();
|
||||
$fields = array(
|
||||
'emailaccount' => $user_data['email'],
|
||||
'password' => $user_data['password'],
|
||||
'quota' => $user_data['quota']
|
||||
);
|
||||
$query = http_build_query($fields);
|
||||
$ch = curl_init();
|
||||
curl_setopt($ch, CURLOPT_URL,
|
||||
'https://api.glesys.com/email/createaccount/');
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
||||
curl_setopt($ch, CURLOPT_POST, 1);
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, $payload );
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json',
|
||||
'Authorization:' . $this->config->getMailUKeys()));
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true );
|
||||
curl_setopt($ch, CURLOPT_USERPWD, $keys);
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, $query);
|
||||
$result = curl_exec($ch);
|
||||
|
||||
if (curl_errno($ch)) {
|
||||
$message = 'createEmailAccount Error:' . curl_error($ch);
|
||||
$message = 'Error:' . curl_error($ch);
|
||||
$this->logger->error($message);
|
||||
return false;
|
||||
}
|
||||
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||
curl_close($ch);
|
||||
|
||||
if ($code == 200) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$this->logger->error("createEmailAccount returned ".$code." message: ".$result);
|
||||
$xml = simplexml_load_string($result);
|
||||
$code = $xml->status->code;
|
||||
if ($code == 200) return $this->createImapFolders($user_data);
|
||||
else $this->logger->warning(
|
||||
"Error: non-200 status: " . $xml->status->text);
|
||||
return false;
|
||||
}
|
||||
|
||||
private function deleteEmailAccount($user_data) {
|
||||
$ch = curl_init($this.config->getMailUAPI . 'user/' . urlencode($user_data->email));
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER, array('Authorization: ' . $this->config->getMailUKeys()));
|
||||
|
||||
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE");
|
||||
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true );
|
||||
private function deleteEmailAccount($user_data){
|
||||
$ch = curl_init();
|
||||
$keys = $this->config->getGlesysKeys();
|
||||
curl_setopt($ch, CURLOPT_URL, 'https://api.glesys.com/email/delete/');
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, "email=" . $user_data["email"]);
|
||||
curl_setopt($ch, CURLOPT_POST, 1);
|
||||
curl_setopt($ch, CURLOPT_USERPWD, $keys);
|
||||
$result = curl_exec($ch);
|
||||
|
||||
if (curl_errno($ch)) {
|
||||
$message = 'deleteEmailAccount Error:' . curl_error($ch);
|
||||
$message = 'Error: ' . curl_error($ch);
|
||||
$this->logger->error($message);
|
||||
return false;
|
||||
}
|
||||
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||
curl_close($ch);
|
||||
|
||||
if ($code == 200) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$this->logger->error("deleteEmailAccount returned ".$code." message: ".$result);
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
private function updateEmailPassword($user_data) {
|
||||
$ch = curl_init($this.config->getMailUAPI . 'user/' . urlencode($user_data->email));
|
||||
$payload = json_encode(array("raw_password" => $user_data['password']));
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, $payload );
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json',
|
||||
'Authorization:' . $this->config->getMailUKeys()));
|
||||
|
||||
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PATCH");
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true );
|
||||
$keys = $this->config->getGlesysKeys();
|
||||
$fields = array(
|
||||
'emailaccount' => $user_data['email'],
|
||||
'password' => $user_data['password']
|
||||
);
|
||||
$query = http_build_query($fields);
|
||||
$ch = curl_init();
|
||||
curl_setopt($ch, CURLOPT_URL,
|
||||
'https://api.glesys.com/email/editaccount/');
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
||||
curl_setopt($ch, CURLOPT_POST, 1);
|
||||
curl_setopt($ch, CURLOPT_USERPWD, $keys);
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, $query);
|
||||
$result = curl_exec($ch);
|
||||
|
||||
if (curl_errno($ch)) {
|
||||
$message = 'updateEmailPassword Error:' . curl_error($ch);
|
||||
$message = 'Error:' . curl_error($ch);
|
||||
$this->logger->error($message);
|
||||
return false;
|
||||
}
|
||||
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||
curl_close($ch);
|
||||
|
||||
if ($code == 200) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$this->logger->error("updateEmailPassword returned ".$code." message: ".$result);
|
||||
return false;
|
||||
$xml = simplexml_load_string($result);
|
||||
$code = $xml->status->code;
|
||||
if ($code != 200)
|
||||
$this->logger->warning(
|
||||
"Error: non-200 status: " . $xml->status->text);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user