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;
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())) {
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;
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();
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;
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("//"))
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;
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);
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;
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