Respect 3PID session policy for remote sending with phone numbers
This commit is contained in:
@@ -196,7 +196,7 @@ public class SessionMananger {
|
|||||||
storage.updateThreePidSession(session.getDao());
|
storage.updateThreePidSession(session.getDao());
|
||||||
log.info("Session {} has been validated locally", session.getId());
|
log.info("Session {} has been validated locally", session.getId());
|
||||||
|
|
||||||
if (ThreePidMedium.PhoneNumber.is(session.getThreePid().getMedium()) && session.isValidated()) {
|
if (ThreePidMedium.PhoneNumber.is(session.getThreePid().getMedium()) && session.isValidated() && policy.toRemote()) {
|
||||||
createRemote(sid, secret);
|
createRemote(sid, secret);
|
||||||
// FIXME make the message configurable/customizable (templates?)
|
// FIXME make the message configurable/customizable (templates?)
|
||||||
throw new MessageForClientException("You will receive a NEW code from another number. Enter it below");
|
throw new MessageForClientException("You will receive a NEW code from another number. Enter it below");
|
||||||
|
@@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
* mxisd - Matrix Identity Server Daemon
|
||||||
|
* Copyright (C) 2018 Kamax Sàrl
|
||||||
|
*
|
||||||
|
* 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.threepid.connector.phone;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class BlackholePhoneConnector implements IPhoneConnector {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void send(String recipient, String content) {
|
||||||
|
//dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getId() {
|
||||||
|
return "BLACKHOLE";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Reference in New Issue
Block a user