Merge pull request #141 from ONLYOFFICE/bugfix/65836

Bugfix/65836
ONLYOFFICE · Jan 12, 2024 · d5d87d4 · d5d87d4
2 parents 173ec16 + fe5b885
commit d5d87d4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/common/ASC.Socket.IO/app/hubs/files.js b/common/ASC.Socket.IO/app/hubs/files.js
@@ -89,7 +89,7 @@
 
       changeFunc(roomParts);
 
-      if (individual && !session.anonymous) {
+      if (individual) {
         if (Array.isArray(roomParts)) {
           changeFunc(roomParts.map((p) => `${p}-${userId}`));
         } else {

diff --git a/common/ASC.Socket.IO/app/middleware/auth.js b/common/ASC.Socket.IO/app/middleware/auth.js
@@ -92,16 +92,17 @@ module.exports = (socket, next) => {
       headers,
       basePath,
     })
-      .then((validation) => {
-        if (validation.status !== 0) {
+      .then(({ status, tenantId, linkId } = { }) => {
+        if (status !== 0) {
           const err = new Error("Invalid share key");
           logger.error("WS: share key validation failure:", err);
           return next(err);
         }
 
         logger.info(`WS: share key validation successful: key='${share}' sessionId='sess:${session.id}'`);
         session.anonymous = true;
-        session.portal = { tenantId: validation.tenantId };
+        session.portal = { tenantId };
+        session.user = { id: linkId }
         session.save();
         next();
       })

diff --git a/products/ASC.Files/Core/ApiModels/ResponseDto/ExternalShareDto.cs b/products/ASC.Files/Core/ApiModels/ResponseDto/ExternalShareDto.cs
@@ -60,6 +60,10 @@ public class ExternalShareDto : IMapFrom<ValidationInfo>
     /// <summary>Specifies whether to share the external data or not</summary>
     /// <type>System.Boolean, System</type>
     public bool Shared { get; set; }
+
+    /// <summary>Link ID</summary>
+    /// <type>System.Guid, System</type>
+    public Guid LinkId { get; set; }
 
     public void Mapping(Profile profile)
     {

diff --git a/products/ASC.Files/Core/Core/Security/ExternalShare.cs b/products/ASC.Files/Core/Core/Security/ExternalShare.cs
@@ -362,6 +362,10 @@ public class ValidationInfo
     /// <summary>Specifies whether to share the external data or not</summary>
     /// <type>System.Boolean, System</type>
     public bool Shared { get; set; }
+
+    /// <summary>Link ID</summary>
+    /// <type>System.Guid, System</type>
+    public Guid LinkId { get; set; }
 }
 
 public class ExternalShareData

diff --git a/products/ASC.Files/Core/Helpers/ExternalLinkHelper.cs b/products/ASC.Files/Core/Helpers/ExternalLinkHelper.cs
@@ -89,6 +89,7 @@ public async Task<ValidationInfo> ValidateAsync(string key, string password = nu
 
         result.Access = record.Share;
         result.TenantId = record.TenantId;
+        result.LinkId = linkId;
 
         if (_securityContext.IsAuthenticated)
         {