From: Mathieu Baudier Date: Wed, 5 Jan 2022 09:45:13 +0000 (+0100) Subject: Rename remote auth interfaces X-Git-Tag: argeo-suite-2.3.3~34 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=ce100ada2264b524a4188a1d7e6a2d21a64bcf91 Rename remote auth interfaces --- 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 4025890..26a0fed 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 @@ -36,7 +36,7 @@ import javax.xml.transform.stream.StreamSource; 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.auth.RemoteAuthUtils; import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.docbook.DbkType; import org.argeo.docbook.DbkUtils; @@ -86,7 +86,7 @@ public class DbkServlet extends HttpServlet { Session session = null; try { - session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req)); + session = RemoteAuthUtils.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 7fde1ac..11a9ccb 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 @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse; 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.auth.RemoteAuthUtils; import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.entity.EntityType; import org.argeo.jcr.Jcr; @@ -55,7 +55,7 @@ public class OdkFormListServlet extends HttpServlet { String pathInfo = req.getPathInfo(); - Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, NodeConstants.SYS_WORKSPACE), + Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, NodeConstants.SYS_WORKSPACE), new ServletHttpRequest(req)); // session = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE); Writer writer = resp.getWriter(); 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 89bdf7e..9f84e52 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 @@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.FilenameUtils; -import org.argeo.cms.servlet.ServletAuthUtils; +import org.argeo.cms.auth.RemoteAuthUtils; import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.jcr.Jcr; import org.argeo.support.odk.OdkForm; @@ -35,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), new ServletHttpRequest(req)); + Session session = RemoteAuthUtils.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 9eb1cdc..63472fc 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 @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.output.NullOutputStream; -import org.argeo.cms.servlet.ServletAuthUtils; +import org.argeo.cms.auth.RemoteAuthUtils; import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.entity.EntityMimeType; import org.argeo.jcr.Jcr; @@ -57,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), new ServletHttpRequest(req)); + Session session = RemoteAuthUtils.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 55bd9d2..1d40743 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,9 +24,9 @@ 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.auth.RemoteAuthRequest; +import org.argeo.cms.auth.RemoteAuthUtils; 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; @@ -55,16 +55,16 @@ public class OdkSubmissionServlet extends HttpServlet { resp.setDateHeader("Date", System.currentTimeMillis()); resp.setIntHeader("X-OpenRosa-Accept-Content-Length", 1024 * 1024); - HttpRequest request = new ServletHttpRequest(req); - Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), request); + RemoteAuthRequest request = new ServletHttpRequest(req); + Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, null), request); try { // Node submissions = JcrUtils.mkdirs(session, // "/" + EntityType.form.get() + "/" + EntityNames.SUBMISSIONS_BASE); - CmsSession cmsSession = ServletAuthUtils.getCmsSession(request); + CmsSession cmsSession = RemoteAuthUtils.getCmsSession(request); ClassLoader currentContextCl = Thread.currentThread().getContextClassLoader(); - Thread.currentThread().setContextClassLoader(ServletAuthUtils.class.getClassLoader()); + Thread.currentThread().setContextClassLoader(RemoteAuthUtils.class.getClassLoader()); Session adminSession = null; try { // TODO centralise at a deeper level