From df2bd5aec38fd065ec8d109383911bf814d2ed28 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 5 Jan 2022 10:21:25 +0100 Subject: [PATCH] Adapt to changes in Argeo Commons --- .../src/org/argeo/publishing/servlet/DbkServlet.java | 3 ++- .../org/argeo/support/odk/servlet/OdkFormListServlet.java | 4 +++- .../src/org/argeo/support/odk/servlet/OdkFormServlet.java | 3 ++- .../org/argeo/support/odk/servlet/OdkManifestServlet.java | 3 ++- .../argeo/support/odk/servlet/OdkSubmissionServlet.java | 7 +++++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java b/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java index c236e93..4025890 100644 --- a/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java +++ b/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java @@ -37,6 +37,7 @@ import org.apache.commons.io.IOUtils; import org.apache.xalan.processor.TransformerFactoryImpl; import org.argeo.api.cms.CmsTheme; import org.argeo.cms.servlet.ServletAuthUtils; +import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.docbook.DbkType; import org.argeo.docbook.DbkUtils; import org.argeo.jcr.Jcr; @@ -85,7 +86,7 @@ public class DbkServlet extends HttpServlet { Session session = null; try { - session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req); + session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req)); Node node = session.getNode(path); if (node.hasNode(DbkType.article.get())) { diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java index 36bdaae..7fde1ac 100644 --- a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java +++ b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java @@ -23,6 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.api.NodeConstants; import org.argeo.cms.servlet.ServletAuthUtils; +import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.entity.EntityType; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrxApi; @@ -54,7 +55,8 @@ public class OdkFormListServlet extends HttpServlet { String pathInfo = req.getPathInfo(); - Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, NodeConstants.SYS_WORKSPACE), req); + Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, NodeConstants.SYS_WORKSPACE), + new ServletHttpRequest(req)); // session = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE); Writer writer = resp.getWriter(); writer.append(""); diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java index cab562c..89bdf7e 100644 --- a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java +++ b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java @@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.FilenameUtils; import org.argeo.cms.servlet.ServletAuthUtils; +import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.jcr.Jcr; import org.argeo.support.odk.OdkForm; import org.argeo.support.odk.OdkNames; @@ -34,7 +35,7 @@ public class OdkFormServlet extends HttpServlet { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { resp.setContentType("text/xml; charset=utf-8"); - Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req); + Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req)); String pathInfo = req.getPathInfo(); if (pathInfo.startsWith("//")) diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java index 3510e06..9eb1cdc 100644 --- a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java +++ b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.output.NullOutputStream; import org.argeo.cms.servlet.ServletAuthUtils; +import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.entity.EntityMimeType; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrException; @@ -56,7 +57,7 @@ public class OdkManifestServlet extends HttpServlet { int serverPort = req.getServerPort(); String protocol = serverPort == 443 || req.isSecure() ? "https" : "http"; - Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req); + Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req)); try { Node node = session.getNode(pathInfo); diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java index 222c681..55bd9d2 100644 --- a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java +++ b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java @@ -24,8 +24,10 @@ import javax.servlet.http.Part; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.api.cms.CmsSession; +import org.argeo.cms.auth.HttpRequest; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.cms.servlet.ServletAuthUtils; +import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrUtils; import org.argeo.suite.SuiteUtils; @@ -53,12 +55,13 @@ public class OdkSubmissionServlet extends HttpServlet { resp.setDateHeader("Date", System.currentTimeMillis()); resp.setIntHeader("X-OpenRosa-Accept-Content-Length", 1024 * 1024); - Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req); + HttpRequest request = new ServletHttpRequest(req); + Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), request); try { // Node submissions = JcrUtils.mkdirs(session, // "/" + EntityType.form.get() + "/" + EntityNames.SUBMISSIONS_BASE); - CmsSession cmsSession = ServletAuthUtils.getCmsSession(req); + CmsSession cmsSession = ServletAuthUtils.getCmsSession(request); ClassLoader currentContextCl = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(ServletAuthUtils.class.getClassLoader()); -- 2.30.2