Add mechanisms for 3PID invite expiration and AS integration
- Integration with AS and a fallback user to decline expired invites (#120) - Rework of the AS feature to make it more independent/re-usable - Skeleton for admin interface via bot to manage invites (#138)
This commit is contained in:
Max Dor
@@ -23,11 +23,16 @@ package io.kamax.mxisd.as;
|
||||
import com.google.gson.JsonObject;
|
||||
import io.kamax.matrix.MatrixID;
|
||||
import io.kamax.matrix._MatrixID;
|
||||
import io.kamax.matrix.client.MatrixClientContext;
|
||||
import io.kamax.matrix.client.as.MatrixApplicationServiceClient;
|
||||
import io.kamax.matrix.event.EventKey;
|
||||
import io.kamax.matrix.json.GsonUtil;
|
||||
import io.kamax.mxisd.as.processor.MembershipEventProcessor;
|
||||
import io.kamax.mxisd.as.processor.MessageEventProcessor;
|
||||
import io.kamax.mxisd.backend.sql.synapse.Synapse;
|
||||
import io.kamax.mxisd.config.MatrixConfig;
|
||||
import io.kamax.mxisd.config.AppServiceConfig;
|
||||
import io.kamax.mxisd.config.MxisdConfig;
|
||||
import io.kamax.mxisd.exception.ConfigurationException;
|
||||
import io.kamax.mxisd.exception.HttpMatrixException;
|
||||
import io.kamax.mxisd.exception.NotAllowedException;
|
||||
import io.kamax.mxisd.notification.NotificationManager;
|
||||
@@ -36,6 +41,7 @@ import io.kamax.mxisd.storage.IStorage;
|
||||
import io.kamax.mxisd.storage.ormlite.dao.ASTransactionDao;
|
||||
import io.kamax.mxisd.util.GsonParser;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -54,65 +60,145 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
public class AppSvcManager {
|
||||
|
||||
private transient final Logger log = LoggerFactory.getLogger(AppSvcManager.class);
|
||||
private static final Logger log = LoggerFactory.getLogger(AppSvcManager.class);
|
||||
|
||||
private final GsonParser parser;
|
||||
private final AppServiceConfig cfg;
|
||||
private final IStorage store;
|
||||
private final GsonParser parser = new GsonParser();
|
||||
|
||||
private MatrixConfig cfg;
|
||||
private IStorage store;
|
||||
private MatrixApplicationServiceClient client;
|
||||
private Map<String, EventTypeProcessor> processors = new HashMap<>();
|
||||
private Map<String, CompletableFuture<String>> transactionsInProgress = new ConcurrentHashMap<>();
|
||||
|
||||
private Map<String, CompletableFuture<String>> transactionsInProgress;
|
||||
|
||||
public AppSvcManager(MxisdConfig cfg, IStorage store, ProfileManager profiler, NotificationManager notif, Synapse synapse) {
|
||||
this.cfg = cfg.getMatrix();
|
||||
public AppSvcManager(MxisdConfig mxisdCfg, IStorage store, ProfileManager profiler, NotificationManager notif, Synapse synapse) {
|
||||
this.cfg = mxisdCfg.getAppsvc();
|
||||
this.store = store;
|
||||
|
||||
parser = new GsonParser();
|
||||
transactionsInProgress = new ConcurrentHashMap<>();
|
||||
/*
|
||||
We process the configuration to make sure all is fine and setting default values if needed
|
||||
*/
|
||||
|
||||
processors.put("m.room.member", new MembershipProcessor(cfg.getMatrix(), profiler, notif, synapse));
|
||||
// By default, the feature is enabled
|
||||
cfg.setEnabled(ObjectUtils.defaultIfNull(cfg.isEnabled(), false));
|
||||
|
||||
processConfig();
|
||||
if (!cfg.isEnabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (Objects.isNull(cfg.getEndpoint().getToAS().getUrl())) {
|
||||
throw new ConfigurationException("App Service: Endpoint: To AS: URL");
|
||||
}
|
||||
|
||||
if (Objects.isNull(cfg.getEndpoint().getToAS().getToken())) {
|
||||
throw new ConfigurationException("App Service: Endpoint: To AS: Token", "Must be set, even if to an empty string");
|
||||
}
|
||||
|
||||
if (Objects.isNull(cfg.getEndpoint().getToHS().getUrl())) {
|
||||
throw new ConfigurationException("App Service: Endpoint: To HS: URL");
|
||||
}
|
||||
|
||||
if (Objects.isNull(cfg.getEndpoint().getToHS().getToken())) {
|
||||
throw new ConfigurationException("App Service: Endpoint: To HS: Token", "Must be set, even if to an empty string");
|
||||
}
|
||||
|
||||
// We set a default status for each feature individually
|
||||
cfg.getFeature().getAdmin().setEnabled(ObjectUtils.defaultIfNull(cfg.getFeature().getAdmin().getEnabled(), cfg.isEnabled()));
|
||||
cfg.getFeature().setCleanExpiredInvite(ObjectUtils.defaultIfNull(cfg.getFeature().getCleanExpiredInvite(), cfg.isEnabled()));
|
||||
cfg.getFeature().setInviteById(ObjectUtils.defaultIfNull(cfg.getFeature().getInviteById(), false));
|
||||
|
||||
if (cfg.getFeature().getAdmin().getEnabled()) {
|
||||
if (StringUtils.isBlank(cfg.getUser().getMain())) {
|
||||
throw new ConfigurationException("App Service admin feature is enabled, but no main user configured");
|
||||
}
|
||||
|
||||
if (cfg.getUser().getMain().startsWith("@") || cfg.getUser().getMain().contains(":")) {
|
||||
throw new ConfigurationException("App Service: Users: Main ID: Is not a localpart");
|
||||
}
|
||||
}
|
||||
|
||||
if (cfg.getFeature().getCleanExpiredInvite()) {
|
||||
if (StringUtils.isBlank(cfg.getUser().getInviteExpired())) {
|
||||
throw new ConfigurationException("App Service user for Expired Invite is not set");
|
||||
}
|
||||
|
||||
if (cfg.getUser().getMain().startsWith("@") || cfg.getUser().getMain().contains(":")) {
|
||||
throw new ConfigurationException("App Service: Users: Expired Invite ID: Is not a localpart");
|
||||
}
|
||||
}
|
||||
|
||||
MatrixClientContext mxContext = new MatrixClientContext();
|
||||
mxContext.setDomain(mxisdCfg.getMatrix().getDomain());
|
||||
mxContext.setToken(cfg.getEndpoint().getToHS().getToken());
|
||||
mxContext.setHsBaseUrl(cfg.getEndpoint().getToHS().getUrl());
|
||||
client = new MatrixApplicationServiceClient(mxContext);
|
||||
|
||||
processors.put("m.room.member", new MembershipEventProcessor(client, mxisdCfg, profiler, notif, synapse));
|
||||
processors.put("m.room.message", new MessageEventProcessor(client));
|
||||
|
||||
processSynapseConfig(mxisdCfg);
|
||||
}
|
||||
|
||||
private void processConfig() {
|
||||
String synapseRegFile = cfg.getListener().getSynapse().getRegistrationFile();
|
||||
if (StringUtils.isNotBlank(synapseRegFile)) {
|
||||
SynapseRegistrationYaml syncCfg = SynapseRegistrationYaml.parse(cfg.getListener());
|
||||
private void processSynapseConfig(MxisdConfig cfg) {
|
||||
String synapseRegFile = cfg.getAppsvc().getRegistration().getSynapse().getFile();
|
||||
|
||||
Representer rep = new Representer();
|
||||
rep.getPropertyUtils().setBeanAccess(BeanAccess.FIELD);
|
||||
Yaml yaml = new Yaml(rep);
|
||||
String synCfgRaw = yaml.dump(syncCfg);
|
||||
if (StringUtils.isBlank(synapseRegFile)) {
|
||||
log.info("No synapse registration file path given - skipping generation...");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
IOUtils.write(synCfgRaw, new FileOutputStream(synapseRegFile), StandardCharsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Unable to write synapse appservice registration file", e);
|
||||
}
|
||||
SynapseRegistrationYaml syncCfg = SynapseRegistrationYaml.parse(cfg.getAppsvc(), cfg.getMatrix().getDomain());
|
||||
|
||||
Representer rep = new Representer();
|
||||
rep.getPropertyUtils().setBeanAccess(BeanAccess.FIELD);
|
||||
Yaml yaml = new Yaml(rep);
|
||||
|
||||
// SnakeYAML set the type of object on the first line, which can fail to be parsed on synapse
|
||||
// We therefore need to split the resulting string, remove the first line, and then write it
|
||||
List<String> lines = new ArrayList<>(Arrays.asList(yaml.dump(syncCfg).split("\\R+")));
|
||||
if (StringUtils.equals(lines.get(0), "!!" + SynapseRegistrationYaml.class.getCanonicalName())) {
|
||||
lines.remove(0);
|
||||
}
|
||||
|
||||
try (FileOutputStream os = new FileOutputStream(synapseRegFile)) {
|
||||
IOUtils.writeLines(lines, System.lineSeparator(), os, StandardCharsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Unable to write synapse appservice registration file", e);
|
||||
}
|
||||
}
|
||||
|
||||
private void ensureEnabled() {
|
||||
if (!cfg.isEnabled()) {
|
||||
throw new HttpMatrixException(503, "M_NOT_AVAILABLE", "This feature is disabled");
|
||||
}
|
||||
}
|
||||
|
||||
public AppSvcManager withToken(String token) {
|
||||
ensureEnabled();
|
||||
|
||||
if (StringUtils.isBlank(token)) {
|
||||
throw new HttpMatrixException(401, "M_UNAUTHORIZED", "No HS token");
|
||||
}
|
||||
|
||||
if (!StringUtils.equals(cfg.getListener().getToken().getHs(), token)) {
|
||||
if (!StringUtils.equals(cfg.getEndpoint().getToAS().getToken(), token)) {
|
||||
throw new NotAllowedException("Invalid HS token");
|
||||
}
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public void processUser(String userId) {
|
||||
client.createUser(MatrixID.asAcceptable(userId).getLocalPart());
|
||||
}
|
||||
|
||||
public CompletableFuture<String> processTransaction(String txnId, InputStream is) {
|
||||
ensureEnabled();
|
||||
|
||||
if (StringUtils.isEmpty(txnId)) {
|
||||
throw new IllegalArgumentException("Transaction ID cannot be empty");
|
||||
}
|
||||
|
||||
synchronized (this) {
|
||||
Optional<ASTransactionDao> dao = store.getTransactionResult(cfg.getListener().getLocalpart(), txnId);
|
||||
Optional<ASTransactionDao> dao = store.getTransactionResult(cfg.getUser().getMain(), txnId);
|
||||
if (dao.isPresent()) {
|
||||
log.info("AS Transaction {} already processed - returning computed result", txnId);
|
||||
return CompletableFuture.completedFuture(dao.get().getResult());
|
||||
@@ -143,7 +229,7 @@ public class AppSvcManager {
|
||||
|
||||
try {
|
||||
log.info("Saving transaction details to store");
|
||||
store.insertTransactionResult(cfg.getListener().getLocalpart(), txnId, end, result);
|
||||
store.insertTransactionResult(cfg.getUser().getMain(), txnId, end, result);
|
||||
} finally {
|
||||
log.debug("Removing CompletedFuture from transaction map");
|
||||
transactionsInProgress.remove(txnId);
|
||||
|
||||
@@ -1,110 +0,0 @@
|
||||
/*
|
||||
* mxisd - Matrix Identity Server Daemon
|
||||
* Copyright (C) 2019 Kamax Sarl
|
||||
*
|
||||
* https://www.kamax.io/
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.kamax.mxisd.as;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
import io.kamax.matrix.MatrixID;
|
||||
import io.kamax.matrix.ThreePidMedium;
|
||||
import io.kamax.matrix._MatrixID;
|
||||
import io.kamax.matrix._ThreePid;
|
||||
import io.kamax.matrix.event.EventKey;
|
||||
import io.kamax.mxisd.backend.sql.synapse.Synapse;
|
||||
import io.kamax.mxisd.config.MatrixConfig;
|
||||
import io.kamax.mxisd.notification.NotificationManager;
|
||||
import io.kamax.mxisd.profile.ProfileManager;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class MembershipProcessor implements EventTypeProcessor {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(MembershipProcessor.class);
|
||||
|
||||
private final MatrixConfig cfg;
|
||||
private ProfileManager profiler;
|
||||
private NotificationManager notif;
|
||||
private Synapse synapse;
|
||||
|
||||
public MembershipProcessor(MatrixConfig cfg, ProfileManager profiler, NotificationManager notif, Synapse synapse) {
|
||||
this.cfg = cfg;
|
||||
this.profiler = profiler;
|
||||
this.notif = notif;
|
||||
this.synapse = synapse;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void process(JsonObject ev, _MatrixID sender, String roomId) {
|
||||
JsonObject content = EventKey.Content.findObj(ev).orElseGet(() -> {
|
||||
log.debug("No content found, falling back to full object");
|
||||
return ev;
|
||||
});
|
||||
|
||||
if (!StringUtils.equals("invite", EventKey.Membership.getStringOrNull(content))) {
|
||||
log.debug("This is not an invite event, skipping");
|
||||
return;
|
||||
}
|
||||
|
||||
String inviteeId = EventKey.StateKey.getStringOrNull(ev);
|
||||
if (StringUtils.isBlank(inviteeId)) {
|
||||
log.warn("Invalid event: No invitee ID, skipping");
|
||||
return;
|
||||
}
|
||||
|
||||
_MatrixID invitee = MatrixID.asAcceptable(inviteeId);
|
||||
if (!StringUtils.equals(invitee.getDomain(), cfg.getDomain())) {
|
||||
log.debug("Ignoring invite for {}: not a local user");
|
||||
return;
|
||||
}
|
||||
|
||||
log.info("Got invite from {} to {}", sender.getId(), inviteeId);
|
||||
|
||||
boolean wasSent = false;
|
||||
List<_ThreePid> tpids = profiler.getThreepids(invitee).stream()
|
||||
.filter(tpid -> ThreePidMedium.Email.is(tpid.getMedium()))
|
||||
.collect(Collectors.toList());
|
||||
log.info("Found {} email(s) in identity store for {}", tpids.size(), inviteeId);
|
||||
|
||||
for (_ThreePid tpid : tpids) {
|
||||
log.info("Found Email to notify about room invitation: {}", tpid.getAddress());
|
||||
Map<String, String> properties = new HashMap<>();
|
||||
profiler.getDisplayName(sender).ifPresent(name -> properties.put("sender_display_name", name));
|
||||
try {
|
||||
synapse.getRoomName(roomId).ifPresent(name -> properties.put("room_name", name));
|
||||
} catch (RuntimeException e) {
|
||||
log.warn("Could not fetch room name", e);
|
||||
log.info("Unable to fetch room name: Did you integrate your Homeserver as documented?");
|
||||
}
|
||||
|
||||
IMatrixIdInvite inv = new MatrixIdInvite(roomId, sender, invitee, tpid.getMedium(), tpid.getAddress(), properties);
|
||||
notif.sendForInvite(inv);
|
||||
log.info("Notification for invite of {} sent to {}", inviteeId, tpid.getAddress());
|
||||
wasSent = true;
|
||||
}
|
||||
|
||||
log.info("Was notification sent? {}", wasSent);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
package io.kamax.mxisd.as;
|
||||
|
||||
import io.kamax.mxisd.config.ListenerConfig;
|
||||
import io.kamax.mxisd.config.AppServiceConfig;
|
||||
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
@@ -29,20 +29,28 @@ import java.util.Objects;
|
||||
|
||||
public class SynapseRegistrationYaml {
|
||||
|
||||
public static SynapseRegistrationYaml parse(ListenerConfig cfg) {
|
||||
public static SynapseRegistrationYaml parse(AppServiceConfig cfg, String domain) {
|
||||
SynapseRegistrationYaml yaml = new SynapseRegistrationYaml();
|
||||
|
||||
yaml.setId("appservice-mxisd");
|
||||
yaml.setUrl(cfg.getUrl());
|
||||
yaml.setAsToken(cfg.getToken().getAs());
|
||||
yaml.setHsToken(cfg.getToken().getHs());
|
||||
yaml.setSenderLocalpart(cfg.getLocalpart());
|
||||
cfg.getUsers().forEach(template -> {
|
||||
yaml.setId(cfg.getRegistration().getSynapse().getId());
|
||||
yaml.setUrl(cfg.getEndpoint().getToAS().getUrl());
|
||||
yaml.setAsToken(cfg.getEndpoint().getToHS().getToken());
|
||||
yaml.setHsToken(cfg.getEndpoint().getToAS().getToken());
|
||||
yaml.setSenderLocalpart(cfg.getUser().getMain());
|
||||
|
||||
if (cfg.getFeature().getCleanExpiredInvite()) {
|
||||
Namespace ns = new Namespace();
|
||||
ns.setRegex(template.getTemplate());
|
||||
ns.setExclusive(true);
|
||||
ns.setRegex("@" + cfg.getUser().getInviteExpired() + ":" + domain);
|
||||
yaml.getNamespaces().getUsers().add(ns);
|
||||
});
|
||||
}
|
||||
|
||||
if (cfg.getFeature().getInviteById()) {
|
||||
Namespace ns = new Namespace();
|
||||
ns.setExclusive(false);
|
||||
ns.setRegex("@*:" + domain);
|
||||
yaml.getNamespaces().getUsers().add(ns);
|
||||
}
|
||||
|
||||
return yaml;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,176 @@
|
||||
/*
|
||||
* mxisd - Matrix Identity Server Daemon
|
||||
* Copyright (C) 2019 Kamax Sarl
|
||||
*
|
||||
* https://www.kamax.io/
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.kamax.mxisd.as.processor;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
import io.kamax.matrix.MatrixID;
|
||||
import io.kamax.matrix.ThreePidMedium;
|
||||
import io.kamax.matrix._MatrixID;
|
||||
import io.kamax.matrix._ThreePid;
|
||||
import io.kamax.matrix.client.as.MatrixApplicationServiceClient;
|
||||
import io.kamax.matrix.event.EventKey;
|
||||
import io.kamax.matrix.hs._MatrixRoom;
|
||||
import io.kamax.mxisd.as.EventTypeProcessor;
|
||||
import io.kamax.mxisd.as.IMatrixIdInvite;
|
||||
import io.kamax.mxisd.as.MatrixIdInvite;
|
||||
import io.kamax.mxisd.backend.sql.synapse.Synapse;
|
||||
import io.kamax.mxisd.config.MxisdConfig;
|
||||
import io.kamax.mxisd.notification.NotificationManager;
|
||||
import io.kamax.mxisd.profile.ProfileManager;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class MembershipEventProcessor implements EventTypeProcessor {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(MembershipEventProcessor.class);
|
||||
|
||||
private MatrixApplicationServiceClient client;
|
||||
|
||||
private final MxisdConfig cfg;
|
||||
private ProfileManager profiler;
|
||||
private NotificationManager notif;
|
||||
private Synapse synapse;
|
||||
|
||||
public MembershipEventProcessor(
|
||||
MatrixApplicationServiceClient client,
|
||||
MxisdConfig cfg,
|
||||
ProfileManager profiler,
|
||||
NotificationManager notif,
|
||||
Synapse synapse
|
||||
) {
|
||||
this.client = client;
|
||||
this.cfg = cfg;
|
||||
this.profiler = profiler;
|
||||
this.notif = notif;
|
||||
this.synapse = synapse;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void process(JsonObject ev, _MatrixID sender, String roomId) {
|
||||
JsonObject content = EventKey.Content.findObj(ev).orElseGet(() -> {
|
||||
log.debug("No content found, falling back to full object");
|
||||
return ev;
|
||||
});
|
||||
|
||||
String targetId = EventKey.StateKey.getStringOrNull(ev);
|
||||
if (StringUtils.isBlank(targetId)) {
|
||||
log.warn("Invalid event: No invitee ID, skipping");
|
||||
return;
|
||||
}
|
||||
|
||||
_MatrixID target = MatrixID.asAcceptable(targetId);
|
||||
if (!StringUtils.equals(target.getDomain(), cfg.getMatrix().getDomain())) {
|
||||
log.debug("Ignoring invite for {}: not a local user");
|
||||
return;
|
||||
}
|
||||
|
||||
log.info("Got membership event from {} to {} for room {}", sender.getId(), targetId, roomId);
|
||||
|
||||
boolean isForMainUser = StringUtils.equals(target.getLocalPart(), cfg.getAppsvc().getUser().getMain());
|
||||
boolean isForExpInvUser = StringUtils.equals(target.getLocalPart(), cfg.getAppsvc().getUser().getInviteExpired());
|
||||
boolean isUs = isForMainUser || isForExpInvUser;
|
||||
|
||||
if (StringUtils.equals("join", EventKey.Membership.getStringOrNull(content))) {
|
||||
if (!isForMainUser) {
|
||||
log.warn("We joined the room {} for another identity as the main user, which is not supported. Leaving...", roomId);
|
||||
|
||||
client.getUser(target.getLocalPart()).getRoom(roomId).tryLeave().ifPresent(err -> {
|
||||
log.warn("Could not decline invite to room {}: {} - {}", roomId, err.getErrcode(), err.getError());
|
||||
});
|
||||
}
|
||||
} else if (StringUtils.equals("invite", EventKey.Membership.getStringOrNull(content))) {
|
||||
if (isForMainUser) {
|
||||
processForMainUser(roomId, sender);
|
||||
} else if (isForExpInvUser) {
|
||||
processForExpiredInviteUser(roomId, target);
|
||||
} else {
|
||||
processForUserIdInvite(roomId, sender, target);
|
||||
}
|
||||
} else if (StringUtils.equals("leave", EventKey.Membership.getStringOrNull(content))) {
|
||||
_MatrixRoom room = client.getRoom(roomId);
|
||||
if (!isUs && room.getJoinedUsers().size() == 1) {
|
||||
// TODO we need to find out if this is only us remaining and leave the room if so, using the right client for it
|
||||
}
|
||||
} else {
|
||||
log.debug("This is not an supported type of membership event, skipping");
|
||||
}
|
||||
}
|
||||
|
||||
private void processForMainUser(String roomId, _MatrixID sender) {
|
||||
List<String> roles = profiler.getRoles(sender);
|
||||
if (Collections.disjoint(roles, cfg.getAppsvc().getFeature().getAdmin().getAllowedRoles())) {
|
||||
log.info("Sender does not have any of the required roles, denying");
|
||||
client.getRoom(roomId).tryLeave().ifPresent(err -> {
|
||||
log.warn("Could not decline invite to room {}: {} - {}", roomId, err.getErrcode(), err.getError());
|
||||
});
|
||||
} else {
|
||||
client.getRoom(roomId).tryJoin().ifPresent(err -> {
|
||||
log.warn("Could not join room {}: {} - {}", roomId, err.getErrcode(), err.getError());
|
||||
client.getRoom(roomId).tryLeave().ifPresent(err1 -> {
|
||||
log.warn("Could not decline invite to room {} after failed join: {} - {}", roomId, err1.getErrcode(), err1.getError());
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private void processForExpiredInviteUser(String roomId, _MatrixID invitee) {
|
||||
client.getUser(invitee.getLocalPart()).getRoom(roomId).tryLeave().ifPresent(err -> {
|
||||
log.warn("Could not decline invite to room {}: {} - {}", roomId, err.getErrcode(), err.getError());
|
||||
});
|
||||
}
|
||||
|
||||
private void processForUserIdInvite(String roomId, _MatrixID sender, _MatrixID invitee) {
|
||||
String inviteeId = invitee.getId();
|
||||
|
||||
boolean wasSent = false;
|
||||
List<_ThreePid> tpids = profiler.getThreepids(invitee).stream()
|
||||
.filter(tpid -> ThreePidMedium.Email.is(tpid.getMedium()))
|
||||
.collect(Collectors.toList());
|
||||
log.info("Found {} email(s) in identity store for {}", tpids.size(), inviteeId);
|
||||
|
||||
for (_ThreePid tpid : tpids) {
|
||||
log.info("Found Email to notify about room invitation: {}", tpid.getAddress());
|
||||
Map<String, String> properties = new HashMap<>();
|
||||
profiler.getDisplayName(sender).ifPresent(name -> properties.put("sender_display_name", name));
|
||||
try {
|
||||
synapse.getRoomName(roomId).ifPresent(name -> properties.put("room_name", name));
|
||||
} catch (RuntimeException e) {
|
||||
log.warn("Could not fetch room name", e);
|
||||
log.info("Unable to fetch room name: Did you integrate your Homeserver as documented?");
|
||||
}
|
||||
|
||||
IMatrixIdInvite inv = new MatrixIdInvite(roomId, sender, invitee, tpid.getMedium(), tpid.getAddress(), properties);
|
||||
notif.sendForInvite(inv);
|
||||
log.info("Notification for invite of {} sent to {}", inviteeId, tpid.getAddress());
|
||||
wasSent = true;
|
||||
}
|
||||
|
||||
log.info("Was notification sent? {}", wasSent);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
/*
|
||||
* mxisd - Matrix Identity Server Daemon
|
||||
* Copyright (C) 2019 Kamax Sarl
|
||||
*
|
||||
* https://www.kamax.io/
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.kamax.mxisd.as.processor;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
import io.kamax.matrix._MatrixID;
|
||||
import io.kamax.matrix._MatrixUserProfile;
|
||||
import io.kamax.matrix.client.as.MatrixApplicationServiceClient;
|
||||
import io.kamax.matrix.hs._MatrixRoom;
|
||||
import io.kamax.matrix.json.event.MatrixJsonRoomMessageEvent;
|
||||
import io.kamax.mxisd.as.EventTypeProcessor;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class MessageEventProcessor implements EventTypeProcessor {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(MessageEventProcessor.class);
|
||||
|
||||
private final MatrixApplicationServiceClient client;
|
||||
|
||||
public MessageEventProcessor(MatrixApplicationServiceClient client) {
|
||||
this.client = client;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void process(JsonObject ev, _MatrixID sender, String roomId) {
|
||||
_MatrixRoom room = client.getRoom(roomId);
|
||||
List<_MatrixID> joinedUsers = room.getJoinedUsers().stream().map(_MatrixUserProfile::getId).collect(Collectors.toList());
|
||||
boolean joinedWithMainUser = joinedUsers.contains(client.getWhoAmI());
|
||||
boolean isAdminPrivate = joinedWithMainUser && joinedUsers.size() == 2;
|
||||
|
||||
MatrixJsonRoomMessageEvent msgEv = new MatrixJsonRoomMessageEvent(ev);
|
||||
if (StringUtils.equals("m.notice", msgEv.getBodyType())) {
|
||||
log.info("Ignoring automated message");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!StringUtils.equals("m.text", msgEv.getBodyType())) {
|
||||
log.info("Unsupported message event type: {}", msgEv.getBodyType());
|
||||
return;
|
||||
}
|
||||
|
||||
String command = msgEv.getBody();
|
||||
if (!isAdminPrivate) {
|
||||
if (StringUtils.equals(command, "!mxisd")) {
|
||||
// TODO show help
|
||||
}
|
||||
if (!StringUtils.startsWith(command, "!mxisd ")) {
|
||||
// Not for us
|
||||
return;
|
||||
}
|
||||
|
||||
command = command.substring("!mxisd ".length());
|
||||
}
|
||||
|
||||
if (StringUtils.equals("ping", command)) {
|
||||
room.sendText("Pong!");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user