Feature/anonymous access

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 
 ## Added
+- opening documents for viewing by an anonymous user
 - edit button in ONLYOFFICE preview macro
 - link to docs cloud
 

src/main/java/onlyoffice/OnlyOfficeEditorServlet.java

@@ -76,17 +76,17 @@ public OnlyOfficeEditorServlet(final I18nResolver i18n, final UrlManager urlMana
     @Override
     public void doGet(final HttpServletRequest request, final HttpServletResponse response)
             throws ServletException, IOException {
-        if (!authContext.checkUserAuthorization(request, response)) {
-            return;
-        }
-
         ConfluenceUser user = AuthenticatedUserThreadLocal.get();
 
         String attachmentIdString = request.getParameter("attachmentId");
         String actionDataString = request.getParameter("actionData");
         String referer = request.getHeader("referer");
 
         if (attachmentIdString == null || attachmentIdString.isEmpty()) {
+            if (!authContext.checkUserAuthorization(request, response)) {
+                return;
+            }
+
             String fileName = request.getParameter("fileName");
             String fileExt = request.getParameter("fileExt");
             String pageId = request.getParameter("pageId");
@@ -118,7 +118,7 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
             }
 
             if (!attachmentUtil.checkAccess(attachmentId, user, false)) {
-                response.sendRedirect(attachment.getContainer().getUrlPath());
+                response.sendRedirect(authContext.getLoginUrl(request));
                 return;
             }
 

src/main/java/onlyoffice/OnlyOfficeFileProviderServlet.java

@@ -82,12 +82,12 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
             throw new SecurityException("Invalid link token!");
         }
 
-        String userKeyString = bodyFromToken.getString("userKey");
+        String userKeyString = bodyFromToken.has("userKey") ? bodyFromToken.getString("userKey") : null;
         String attachmentIdString = bodyFromToken.getString("attachmentId");
 
         UserAccessor userAccessor = (UserAccessor) ContainerManager.getComponent("userAccessor");
 
-        UserKey userKey = new UserKey(userKeyString);
+        UserKey userKey = userKeyString == null || userKeyString.equals("") ? null : new UserKey(userKeyString);
         ConfluenceUser user = userAccessor.getUserByKey(userKey);
         Long attachmentId = Long.parseLong(attachmentIdString);
 

src/main/java/onlyoffice/managers/auth/AuthContext.java

@@ -6,4 +6,5 @@
 
 public interface AuthContext {
     boolean checkUserAuthorization(HttpServletRequest request, HttpServletResponse response) throws IOException;
+    String getLoginUrl(HttpServletRequest request) throws IOException;
 }

src/main/java/onlyoffice/managers/auth/AuthContextImpl.java

@@ -44,7 +44,7 @@ public boolean checkUserAuthorization(final HttpServletRequest request, final Ht
         return true;
     }
 
-    private String getLoginUrl(final HttpServletRequest request) throws IOException {
+    public String getLoginUrl(final HttpServletRequest request) throws IOException {
         StringBuilder stringBuilder = new StringBuilder(request.getContextPath());
         String fullUrl = stringBuilder.append("/login.action?permissionViolation=true&os_destination=")
                 .append("plugins%2Fservlet%2Fonlyoffice%2Fdoceditor").append("?")

src/main/java/onlyoffice/managers/url/UrlManagerImpl.java

@@ -89,7 +89,10 @@ public String getFileUri(final Long attachmentId) {
         ConfluenceUser user = AuthenticatedUserThreadLocal.get();
 
         Map<String, String> params = new HashMap<>();
-        params.put("userKey", user.getKey().getStringValue());
+
+        if (user != null) {
+            params.put("userKey", user.getKey().getStringValue());
+        }
         params.put("attachmentId", attachmentId.toString());
         params.put("action", "download");
 

src/main/java/onlyoffice/utils/attachment/AttachmentUtilImpl.java

@@ -102,20 +102,12 @@ public Attachment getAttachmentByName(final String fileName, final Long pageId)
     }
 
     public boolean checkAccess(final Long attachmentId, final User user, final boolean forEdit) {
-        if (user == null) {
-            return false;
-        }
-
         Attachment attachment = attachmentManager.getAttachment(attachmentId);
 
         return checkAccess(attachment, user, forEdit);
     }
 
     public boolean checkAccess(final Attachment attachment, final User user, final boolean forEdit) {
-        if (user == null) {
-            return false;
-        }
-
         PermissionManager permissionManager = (PermissionManager) ContainerManager.getComponent("permissionManager");
 
         if (forEdit) {