StephanRichter/Widerhall
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

Merge branch 'main' into lang_de

Browse Source
This commit is contained in:
Stephan Richter
2022-04-22 18:36:07 +02:00
parent 4d2fea5083 6abee6e977
commit 49845a076a
15 changed files with 277 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/main/java/de/srsoftware/widerhall/data/MailingList.java
View File

@@ -3,14 +3,12 @@ package de.srsoftware.widerhall.data;
import de.srsoftware.widerhall.Configuration;
import de.srsoftware.widerhall.mail.ImapClient;
import de.srsoftware.widerhall.mail.MessageHandler;
import de.srsoftware.widerhall.mail.ProblemListener;
import de.srsoftware.widerhall.mail.SmtpClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.mail.Address;
import javax.mail.Flags;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.*;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.ws.rs.HEAD;
@@ -28,7 +26,7 @@ import static de.srsoftware.widerhall.data.User.PERMISSION_ADMIN;
/**
* this class encapsulates a MailingList db object
*/
public class MailingList implements MessageHandler {
public class MailingList implements MessageHandler, ProblemListener {
public static final String KEY_FORWARD_FROM = "forward_from";
public static final String KEY_FORWARD_ATTACHED = "forward_attached";
public static final String KEY_HIDE_RECEIVERS = "hide_receivers";
@@ -62,11 +60,11 @@ public class MailingList implements MessageHandler {
private static final int HIDDEN = 0;
private static final int DEFAULT_STATE = STATE_PENDING|STATE_HIDE_RECEIVERS|STATE_PUBLIC_ARCHIVE;
private static final String RETAINED_FOLDER = "retained";
private final String name;
private final String email;
private static final String LAST_ERROR = "last_error";
private String email, name, lastError;
private int state;
private final SmtpClient smtp;
private final ImapClient imap;
private SmtpClient smtp;
private ImapClient imap;
private static final HashMap<String,MailingList> cache = new HashMap<>();
@@ -89,7 +87,7 @@ public class MailingList implements MessageHandler {
this.name = name;
this.state = state;
this.smtp = new SmtpClient(smtpHost,smtpPort,smtpUser,smtpPass);
this.imap = new ImapClient(imapHost,imapPort,imapUser,imapPass,inbox);
this.imap = new ImapClient(imapHost,imapPort,imapUser,imapPass,inbox,this);
}
public MailingList archive(boolean enabled) throws SQLException {
@@ -134,7 +132,8 @@ public class MailingList implements MessageHandler {
.append(SMTP_PORT).append(" ").append(INT).append(", ")
.append(SMTP_USER).append(" ").append(VARCHAR).append(", ")
.append(SMTP_PASS).append(" ").append(VARCHAR).append(", ")
.append(STATE).append(" ").append(INT)
.append(STATE).append(" ").append(INT).append(", ")
.append(LAST_ERROR).append(" ").append(TEXT)
.append(");");
Database.open().query(sql).compile().run();
}
@@ -147,7 +146,10 @@ public class MailingList implements MessageHandler {
public MailingList enable(boolean enable) throws SQLException {
if (!enable) imap.stop();
setFlag(STATE_ENABLED,enable);
if (enable) imap.start().addListener(this);
if (enable) {
setLastError(null);
imap.start().addListener(this);
}
return this;
}
@@ -274,12 +276,15 @@ public class MailingList implements MessageHandler {
public static MailingList load(String listEmail) {
if (listEmail == null) return null;
var ml = cache.get(listEmail);
if (ml == null) try {
try {
var rs = Database.open()
.select(TABLE_NAME)
.where(EMAIL,listEmail)
.compile().exec();
if (rs.next()) ml = MailingList.from(rs);
if (rs.next()) {
if (ml == null ) ml = MailingList.from(rs);
ml.lastError = rs.getString(LAST_ERROR);
}
} catch (SQLException e) {
LOG.debug("Konnte Mailing-Liste nicht laden: ",e);
}
@@ -353,6 +358,7 @@ public class MailingList implements MessageHandler {
map.put(EMAIL,Map.of(PREFIX,parts[0],DOMAIN,parts[1]));
map.put(NAME, name);
map.put(STATE, stateMap());
map.put(LAST_ERROR, lastError);
return map;
}
@@ -382,6 +388,16 @@ public class MailingList implements MessageHandler {
return name;
}
@Override
public void onImapException(MessagingException e) {
try {
if (e instanceof AuthenticationFailedException afe) this.enable(false);
setLastError(e.getMessage());
} catch (SQLException sqle) {
LOG.warn("Database error during onImapException ({})",e.getMessage(),sqle);
}
}
@Override
public void onMessageReceived(Message message) throws MessagingException {
LOG.info("Nachricht empfangen: {}",message.getFrom());
@@ -478,6 +494,7 @@ public class MailingList implements MessageHandler {
if (smtp.port() != 0) map.put(SMTP_PORT, smtp.port());
if (smtp.username() != null) map.put(SMTP_USER, smtp.username());
map.put(STATE,stateMap());
if (lastError != null) map.put(LAST_ERROR, lastError);
return map;
}
@@ -551,6 +568,10 @@ public class MailingList implements MessageHandler {
return this;
}
private void setLastError(String message) throws SQLException {
Database.open().update(TABLE_NAME).set(LAST_ERROR,message).where(EMAIL,email()).run();
}
public Map<String,Integer> stateMap(){
var map = new HashMap<String,Integer>();
if (hasState(STATE_ENABLED)) map.put("enabled",VISIBLE);
@@ -665,4 +686,32 @@ public class MailingList implements MessageHandler {
return new ArrayList<InternetAddress>().stream();
}
}
public void update(String name, String email, String imapHost, Integer imapPort, String imapUser, String imapPass, String inbox, String smtpHost, Integer smtpPort, String smtpUser, String smtpPass) throws SQLException {
imap.stop();
Database.open()
.update(TABLE_NAME)
.set(EMAIL, email)
.set(NAME, name)
.set(IMAP_HOST, imapHost)
.set(IMAP_PORT, imapPort)
.set(IMAP_USER, imapUser)
.set(IMAP_PASS, imapPass)
.set(INBOX,inbox)
.set(SMTP_HOST, smtpHost)
.set(SMTP_PORT, smtpPort)
.set(SMTP_USER, smtpUser)
.set(SMTP_PASS, smtpPass)
.where(EMAIL,email())
.compile()
.run();
if (!this.email.equals(email)){
ListMember.updateListEmail(this.email,email);
this.email = email;
}
this.name = name;
smtp = new SmtpClient(smtpHost,smtpPort,smtpUser,smtpPass);
imap = new ImapClient(imapHost,imapPort,imapUser,imapPass,inbox,this);
if (this.hasState(STATE_ENABLED)) imap.start().addListener(this);
}
}