diff --git a/src/main/java/io/kamax/mxisd/exception/TermsNotSignedException.java b/src/main/java/io/kamax/mxisd/exception/TermsNotSignedException.java new file mode 100644 index 0000000..a63881d --- /dev/null +++ b/src/main/java/io/kamax/mxisd/exception/TermsNotSignedException.java @@ -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 . + */ + +package io.kamax.mxisd.exception; + +public class TermsNotSignedException extends RuntimeException { + + public TermsNotSignedException() { + super("Please accept our updated terms of service before continuing"); + } +} diff --git a/src/main/java/io/kamax/mxisd/http/undertow/handler/CheckTermsHandler.java b/src/main/java/io/kamax/mxisd/http/undertow/handler/CheckTermsHandler.java index ffbf112..0e7e81d 100644 --- a/src/main/java/io/kamax/mxisd/http/undertow/handler/CheckTermsHandler.java +++ b/src/main/java/io/kamax/mxisd/http/undertow/handler/CheckTermsHandler.java @@ -23,6 +23,7 @@ package io.kamax.mxisd.http.undertow.handler; import io.kamax.mxisd.auth.AccountManager; import io.kamax.mxisd.config.PolicyConfig; import io.kamax.mxisd.exception.InvalidCredentialsException; +import io.kamax.mxisd.exception.TermsNotSignedException; import io.undertow.server.HttpHandler; import io.undertow.server.HttpServerExchange; import org.slf4j.Logger; @@ -66,7 +67,7 @@ public class CheckTermsHandler extends BasicHttpHandler { if (!accountManager.isTermAccepted(token, policies)) { log.error("Non accepting request from: {}", exchange.getHostAndPort()); - throw new InvalidCredentialsException(); + throw new TermsNotSignedException(); } log.trace("Access granted"); child.handleRequest(exchange); diff --git a/src/main/java/io/kamax/mxisd/http/undertow/handler/SaneHandler.java b/src/main/java/io/kamax/mxisd/http/undertow/handler/SaneHandler.java index eecdc40..8086775 100644 --- a/src/main/java/io/kamax/mxisd/http/undertow/handler/SaneHandler.java +++ b/src/main/java/io/kamax/mxisd/http/undertow/handler/SaneHandler.java @@ -83,6 +83,8 @@ public class SaneHandler extends BasicHttpHandler { respond(exchange, HttpStatus.SC_BAD_REQUEST, e.getErrorCode(), e.getError()); } catch (InvalidCredentialsException e) { 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) { respond(exchange, HttpStatus.SC_NOT_FOUND, "M_NOT_FOUND", e.getMessage()); } catch (NotImplementedException e) {