From 48229cef64efcf9fb97660f5feacac8388277e68 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Thu, 24 Feb 2022 09:42:58 +0300 Subject: [PATCH] CB-1718 Restrict directory listing --- .../io/cloudbeaver/server/jetty/CBJettyServer.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java index dba2a21cb2..803cf03a5b 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java @@ -60,9 +60,16 @@ public class CBJettyServer { servletContextHandler.setResourceBase(application.getContentRoot()); String rootURI = application.getRootURI(); servletContextHandler.setContextPath(rootURI); - servletContextHandler.addServlet(new ServletHolder("static", new CBStaticServlet()), "/*"); + + ServletHolder staticServletHolder = new ServletHolder("static", new CBStaticServlet()); + staticServletHolder.setInitParameter("dirAllowed", "false"); + servletContextHandler.addServlet(staticServletHolder, "/*"); + + ServletHolder imagesServletHolder = new ServletHolder("images", new CBImageServlet()); + servletContextHandler.addServlet(imagesServletHolder, application.getServicesURI() + "images/*"); + servletContextHandler.addServlet(new ServletHolder("status", new CBStatusServlet()), "/status"); - servletContextHandler.addServlet(new ServletHolder("images", new CBImageServlet()), application.getServicesURI() + "images/*"); + servletContextHandler.addServlet(new ServletHolder("graphql", new GraphQLEndpoint()), application.getServicesURI() + "gql/*"); servletContextHandler.addEventListener(new CBServerContextListener());