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

added new state bits to MailingList, implemented form for editing those

Browse Source
This commit is contained in:
Stephan Richter
2022-04-22 10:25:24 +02:00
parent 5710a89b52
commit 7bf492e469
8 changed files with 120 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,13 @@ import static de.srsoftware.widerhall.data.User.PERMISSION_ADMIN;
* this class encapsulates a MailingList db object
*/
public class MailingList implements MessageHandler {
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";
public static final String KEY_REPLY_TO_LIST = "reply_to_list";
public static final String KEY_OPEN_FOR_GUESTS = "open_for_guests";
public static final String KEY_OPEN_FOR_SUBSCRIBERS = "open_for_subscribers";
public static final String KEY_ARCHIVE = "archive";
private static final Logger LOG = LoggerFactory.getLogger(MailingList.class);
private static final String IMAP_HOST = "imap_host";
private static final String IMAP_PORT = "imap_port";
@@ -47,10 +54,11 @@ public class MailingList implements MessageHandler {
public static final int STATE_REPLY_TO_LIST = 32; // set REPLY TO field to list address?
public static final int STATE_OPEN_FOR_GUESTS = 64; // allow anyone to send via this list?
public static final int STATE_PUBLIC_ARCHIVE = 128; // save received messages in archive?
public static final int STATE_OPEN_FOR_MODS = 256; // allow mods to send via this list?
public static final int STATE_OPEN_FOR_SUBSCRIBERS = 256; // allow mods to send via this list?
public static final int STATE_MODS_CAN_CREATE_MODS = 512; // allow mods to make subscribers to mods?
private static final int VISIBLE = 1;
private static final int HIDDEN = 0;
private static final int DEFAULT_STATE = STATE_PENDING|STATE_HIDE_RECEIVERS|STATE_PUBLIC_ARCHIVE|STATE_OPEN_FOR_MODS;
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;
@@ -227,6 +235,20 @@ public class MailingList implements MessageHandler {
return setFlag(STATE_HIDE_RECEIVERS,hide);
}
public boolean isAllowedSender(String senderEmail){
if (senderEmail == null || senderEmail.isBlank()) return false;
try {
var user = User.load(senderEmail);
if (user == null) return this.isOpenForGuests();
var member = ListMember.load(this,user);
if (member == null) return this.isOpenForGuests();
if (member.isModerator()) return true;
if (member.isSubscriber()) return this.isOpenForSubscribers();
} catch (SQLException e) {
LOG.warn("Failed to load User for {}",senderEmail,e);
}
return this.isOpenForGuests();
}
/**
* test, whether the current ML is subscribable by a given user
* @param user
@@ -244,6 +266,14 @@ public class MailingList implements MessageHandler {
}
}
public boolean isOpenForGuests(){
return hasState(STATE_OPEN_FOR_GUESTS);
}
public boolean isOpenForSubscribers(){
return hasState(STATE_OPEN_FOR_GUESTS|STATE_OPEN_FOR_SUBSCRIBERS);
}
/**
* Load a ML object by it's identifying email address.
* This is a cached method: if the ML has been loaded before, the already-loaded object will be returned.
@@ -334,7 +364,7 @@ public class MailingList implements MessageHandler {
Address from = message.getFrom()[0];
if (from instanceof InternetAddress internetAddress){
var senderEmail = ((InternetAddress) from).getAddress();
if (!hasState(STATE_OPEN_FOR_GUESTS) && !this.hashMember(senderEmail)){
if (!isAllowedSender(senderEmail)) {
retainMessage(message);
sentRetentionNotification(senderEmail);
return;
@@ -344,10 +374,14 @@ public class MailingList implements MessageHandler {
forward(message);
}
public MailingList open(boolean open) throws SQLException {
public MailingList openForGuests(boolean open) throws SQLException {
return setFlag(STATE_OPEN_FOR_GUESTS,open);
}
public MailingList openForSubscribers(boolean open) throws SQLException {
return setFlag(STATE_OPEN_FOR_SUBSCRIBERS,open);
}
/**
* provide the set of mailing lists that are publicy open to subscriptions
* @return
@@ -490,7 +524,8 @@ public class MailingList implements MessageHandler {
if (hasState(STATE_FORWARD_ATTACHED)) map.put("forward_attached",HIDDEN);
if (hasState(STATE_HIDE_RECEIVERS)) map.put("hide_receivers",HIDDEN);
if (hasState(STATE_REPLY_TO_LIST)) map.put("reply_to_list",HIDDEN);
if (hasState(STATE_OPEN_FOR_GUESTS)) map.put("open",VISIBLE);
if (hasState(STATE_OPEN_FOR_GUESTS)) map.put("open_for_guests",HIDDEN);
if (hasState(STATE_OPEN_FOR_SUBSCRIBERS)) map.put("open_for_subscribers",HIDDEN);
if (hasState(STATE_PUBLIC_ARCHIVE)) map.put("archive",VISIBLE);
return map;
}

40
src/main/java/de/srsoftware/widerhall/web/Rest.java
View File

@@ -21,6 +21,7 @@ import java.util.Map;
import static de.srsoftware.widerhall.Constants.*;
import static de.srsoftware.widerhall.Util.t;
import static de.srsoftware.widerhall.data.MailingList.*;
public class Rest extends HttpServlet {
private static final Logger LOG = LoggerFactory.getLogger(Rest.class);
@@ -56,6 +57,19 @@ public class Rest extends HttpServlet {
return Map.of(SUCCESS,"Updated user permissions");
}
private List<? extends Object> archive(HttpServletRequest req) {
var list = Util.getMailingList(req);
if (list != null){
try {
return Post.find(list).stream().map(Post::safeMap).toList();
} catch (SQLException e) {
e.printStackTrace();
}
}
LOG.debug("list: {}",list.email());
return List.of();
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
String error = handleGet(req, resp);
@@ -144,18 +158,7 @@ public class Rest extends HttpServlet {
}
}
private List<? extends Object> archive(HttpServletRequest req) {
var list = Util.getMailingList(req);
if (list != null){
try {
return Post.find(list).stream().map(Post::safeMap).toList();
} catch (SQLException e) {
e.printStackTrace();
}
}
LOG.debug("list: {}",list.email());
return List.of();
}
public String handlePost(HttpServletRequest req, HttpServletResponse resp){
@@ -232,12 +235,13 @@ public class Rest extends HttpServlet {
private Map listDetail(MailingList list, User user) {
if (list == null) return Map.of(ERROR,"no list email provided!");
var map = new HashMap<>();
if (list.hasState(MailingList.STATE_FORWARD_FROM)) map.put("forward_from",true);
if (list.hasState(MailingList.STATE_FORWARD_ATTACHED)) map.put("forward_attached",true);
if (list.hasState(MailingList.STATE_HIDE_RECEIVERS)) map.put("hide_receivers",true);
if (list.hasState(MailingList.STATE_REPLY_TO_LIST)) map.put("reply_to_list",true);
if (list.hasState(MailingList.STATE_OPEN_FOR_GUESTS)) map.put("open",true);
if (list.hasState(MailingList.STATE_PUBLIC_ARCHIVE)) map.put("archive",true);
if (list.hasState(MailingList.STATE_FORWARD_FROM)) map.put(KEY_FORWARD_FROM,true);
if (list.hasState(MailingList.STATE_FORWARD_ATTACHED)) map.put(KEY_FORWARD_ATTACHED,true);
if (list.hasState(MailingList.STATE_HIDE_RECEIVERS)) map.put(KEY_HIDE_RECEIVERS,true);
if (list.hasState(MailingList.STATE_REPLY_TO_LIST)) map.put(KEY_REPLY_TO_LIST,true);
if (list.isOpenForGuests()) map.put(KEY_OPEN_FOR_GUESTS,true);
if (list.isOpenForSubscribers()) map.put(KEY_OPEN_FOR_SUBSCRIBERS,true);
if (list.hasState(MailingList.STATE_PUBLIC_ARCHIVE)) map.put(KEY_ARCHIVE,true);
return map;
}

14
src/main/java/de/srsoftware/widerhall/web/Web.java
View File

@@ -21,6 +21,7 @@ import java.util.Map;
import static de.srsoftware.widerhall.Constants.*;
import static de.srsoftware.widerhall.Util.t;
import static de.srsoftware.widerhall.data.MailingList.*;
public class Web extends TemplateServlet {
public static final String WEB_ROOT = "/web";
@@ -300,12 +301,13 @@ public class Web extends TemplateServlet {
if (!error){
try {
list.forwardFrom(Util.getCheckbox(req, "forward_from"))
.forwardAttached(Util.getCheckbox(req, "forward_attached"))
.hideReceivers(Util.getCheckbox(req, "hide_receivers"))
.replyToList(Util.getCheckbox(req, "reply_to_list"))
.open(Util.getCheckbox(req,"open"))
.archive(Util.getCheckbox(req,"archive"));
list.forwardFrom(Util.getCheckbox(req, KEY_FORWARD_FROM))
.forwardAttached(Util.getCheckbox(req, KEY_FORWARD_ATTACHED))
.hideReceivers(Util.getCheckbox(req, KEY_HIDE_RECEIVERS))
.replyToList(Util.getCheckbox(req, KEY_REPLY_TO_LIST))
.openForGuests(Util.getCheckbox(req,KEY_OPEN_FOR_GUESTS))
.openForSubscribers(Util.getCheckbox(req,KEY_OPEN_FOR_SUBSCRIBERS))
.archive(Util.getCheckbox(req,KEY_ARCHIVE));
data.put(NOTES,t("Sucessfully updated MailingList!"));
} catch (SQLException e){
LOG.warn("Failed to update MailingList:",e);

2
src/main/resources/logback.xml
View File

@@ -11,6 +11,6 @@
<appender-ref ref="STDOUT" />
</root>
<logger name="de.srsoftware" level="INFO" />
<logger name="de.srsoftware" level="DEBUG" />
</configuration>