tomas.kracmar/ma1sd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap with the CheckTermsHandler is necessary.

Browse Source
This commit is contained in:
Anatoly Sablin
2019-11-25 23:35:56 +03:00
parent f9daf4d58a
commit a97273fe77
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/kamax/mxisd/HttpMxisd.java
View File

@@ -219,7 +219,10 @@ public class HttpMxisd {
routingHandler.add(method, apiHandler.getPath(IdentityServiceAPI.V1), httpHandler); routingHandler.add(method, apiHandler.getPath(IdentityServiceAPI.V1), httpHandler);
} }
if (matrixConfig.isV2()) { if (matrixConfig.isV2()) {
HttpHandler handlerWithTerms = CheckTermsHandler.around(m.getAccMgr(), httpHandler, getPolicyObjects(apiHandler)); List<PolicyConfig.PolicyObject> policyObjects = getPolicyObjects(apiHandler);
HttpHandler handlerWithTerms = policyObjects.isEmpty()
? httpHandler
: CheckTermsHandler.around(m.getAccMgr(), httpHandler, policyObjects);
HttpHandler wrappedHandler = useAuthorization ? AuthorizationHandler.around(m.getAccMgr(), handlerWithTerms) : handlerWithTerms; HttpHandler wrappedHandler = useAuthorization ? AuthorizationHandler.around(m.getAccMgr(), handlerWithTerms) : handlerWithTerms;
routingHandler.add(method, apiHandler.getPath(IdentityServiceAPI.V2), wrappedHandler); routingHandler.add(method, apiHandler.getPath(IdentityServiceAPI.V2), wrappedHandler);
} }

5
src/main/java/io/kamax/mxisd/http/undertow/handler/CheckTermsHandler.java
View File

@@ -54,6 +54,11 @@ public class CheckTermsHandler extends BasicHttpHandler {
@Override @Override
public void handleRequest(HttpServerExchange exchange) throws Exception { public void handleRequest(HttpServerExchange exchange) throws Exception {
if (policies == null || policies.isEmpty()) {
child.handleRequest(exchange);
return;
}
String token = findAccessToken(exchange).orElse(null); String token = findAccessToken(exchange).orElse(null);
if (token == null) { if (token == null) {
log.error("Unauthorized request from: {}", exchange.getHostAndPort()); log.error("Unauthorized request from: {}", exchange.getHostAndPort());