Add forgotten M_TERMS_NOT_SIGNED error message.

This commit is contained in:
Anatoliy Sablin
2021-01-13 20:02:24 +03:00
parent c25647156a
commit a0f6fe9b0d
3 changed files with 32 additions and 1 deletions

View File

@@ -0,0 +1,28 @@
/*
* ma1sd - Matrix Identity Server Daemon
* Copyright (C) 2020 Anatoliy SAblin
*
* https://www.github.com/ma1uta/ma1sd/
*
* 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.exception;
public class TermsNotSignedException extends RuntimeException {
public TermsNotSignedException() {
super("Please accept our updated terms of service before continuing");
}
}

View File

@@ -23,6 +23,7 @@ package io.kamax.mxisd.http.undertow.handler;
import io.kamax.mxisd.auth.AccountManager; import io.kamax.mxisd.auth.AccountManager;
import io.kamax.mxisd.config.PolicyConfig; import io.kamax.mxisd.config.PolicyConfig;
import io.kamax.mxisd.exception.InvalidCredentialsException; import io.kamax.mxisd.exception.InvalidCredentialsException;
import io.kamax.mxisd.exception.TermsNotSignedException;
import io.undertow.server.HttpHandler; import io.undertow.server.HttpHandler;
import io.undertow.server.HttpServerExchange; import io.undertow.server.HttpServerExchange;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -66,7 +67,7 @@ public class CheckTermsHandler extends BasicHttpHandler {
if (!accountManager.isTermAccepted(token, policies)) { if (!accountManager.isTermAccepted(token, policies)) {
log.error("Non accepting request from: {}", exchange.getHostAndPort()); log.error("Non accepting request from: {}", exchange.getHostAndPort());
throw new InvalidCredentialsException(); throw new TermsNotSignedException();
} }
log.trace("Access granted"); log.trace("Access granted");
child.handleRequest(exchange); child.handleRequest(exchange);

View File

@@ -83,6 +83,8 @@ public class SaneHandler extends BasicHttpHandler {
respond(exchange, HttpStatus.SC_BAD_REQUEST, e.getErrorCode(), e.getError()); respond(exchange, HttpStatus.SC_BAD_REQUEST, e.getErrorCode(), e.getError());
} catch (InvalidCredentialsException e) { } catch (InvalidCredentialsException e) {
respond(exchange, HttpStatus.SC_UNAUTHORIZED, "M_UNAUTHORIZED", e.getMessage()); respond(exchange, HttpStatus.SC_UNAUTHORIZED, "M_UNAUTHORIZED", e.getMessage());
} catch (TermsNotSignedException e) {
respond(exchange, HttpStatus.SC_FORBIDDEN, "M_TERMS_NOT_SIGNED", e.getMessage());
} catch (ObjectNotFoundException e) { } catch (ObjectNotFoundException e) {
respond(exchange, HttpStatus.SC_NOT_FOUND, "M_NOT_FOUND", e.getMessage()); respond(exchange, HttpStatus.SC_NOT_FOUND, "M_NOT_FOUND", e.getMessage());
} catch (NotImplementedException e) { } catch (NotImplementedException e) {