Repository: openmeetings Updated Branches: refs/heads/master c59c2dccc -> 306baba48
no jira: CSRF filter should be added to the application Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/306baba4 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/306baba4 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/306baba4 Branch: refs/heads/master Commit: 306baba486d0370c954a837139e600f5835d693e Parents: c59c2dc Author: Maxim Solodovnik <[email protected]> Authored: Tue May 16 10:25:15 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue May 16 10:27:53 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/web/app/Application.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/306baba4/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index 307124d..d5a637c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -93,6 +93,9 @@ import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler import org.apache.wicket.core.request.handler.ListenerRequestHandler; import org.apache.wicket.core.request.mapper.MountedMapper; import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.protocol.http.CsrfPreventionRequestCycleListener; +import org.apache.wicket.protocol.ws.api.WebSocketMessageBroadcastHandler; +import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.Url; import org.apache.wicket.request.component.IRequestablePage; @@ -138,7 +141,17 @@ public class Application extends AuthenticatedWebApplication implements IApplica //chain of Resource Loaders, if not found it will search in Wicket's internal //Resource Loader for a the property key getResourceSettings().getStringResourceLoaders().add(0, new LabelResourceLoader()); + //FIXME TODO v3 on the way getJavaScriptLibrarySettings().setJQueryReference(JQueryResourceReference.getV2()); + getRequestCycleListeners().add(new CsrfPreventionRequestCycleListener() { + @Override + protected boolean isChecked(IRequestHandler handler) { + if (handler instanceof WebSocketRequestHandler || handler instanceof WebSocketMessageBroadcastHandler) { + return false; + } + return super.isChecked(handler); + } + }); super.init();
