(openmeetings) branch master updated: [OPENMEETINGS-2826] recording reference is switched to sid

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 402aa47bf [OPENMEETINGS-2826] recording reference is switched to sid
402aa47bf is described below

commit 402aa47bf9dfdbd6d4bfb6e200b1b53757ab347f
Author: Maxim Solodovnik <solo...@apache.org>
AuthorDate: Wed Oct 21 10:33:46 2026 +0700

    [OPENMEETINGS-2826] recording reference is switched to sid
---
 .../apache/openmeetings/web/room/RoomResourceReference.java   |  2 +-
 .../web/user/record/RecordingResourceReference.java           | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
index 76639459f..07710dcec 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
@@ -98,7 +98,7 @@ public class RoomResourceReference extends 
FileItemResourceReference<FileItem> {
                }
                WebSession ws = WebSession.get();
                Client c = cm.getBySid(sid);
-               if (id == null || !ws.isSignedIn() || c == null) {
+               if (id == null || !ws.isSignedIn() || c == null || 
!getUserId().equals(c.getUserId())) {
                        return null;
                }
                FileItem f = (FileItem)fileDao.getAny(id);
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
index a518e6bc2..f927ef7c4 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
@@ -64,7 +64,7 @@ public abstract class RecordingResourceReference extends 
FileItemResourceReferen
                PageParameters params = attributes.getParameters();
                StringValue inId = params.get("id");
                String ruid = params.get("ruid").toString();
-               String uid = params.get("uid").toString();
+               String sid = params.get("sid").toString();
                String wbItemId = params.get("wuid").toString();
                Long id = null;
                try {
@@ -77,12 +77,12 @@ public abstract class RecordingResourceReference extends 
FileItemResourceReferen
                        id = getRecordingId();
                }
                if (id != null && ws.isSignedIn()) {
-                       return getRecording(id, ruid, uid, wbItemId);
+                       return getRecording(id, ruid, sid, wbItemId);
                }
                return null;
        }
 
-       private Recording getRecording(Long id, String ruid, String uid, String 
wbItemId) {
+       private Recording getRecording(Long id, String ruid, String sid, String 
wbItemId) {
                log.debug("Recording with id {} is requested", id);
                Recording r = recDao.get(id);
                if (r == null || r.getType() == Type.FOLDER || r.isDeleted()) {
@@ -91,7 +91,10 @@ public abstract class RecordingResourceReference extends 
FileItemResourceReferen
                if (id.equals(getRecordingId())) {
                        return r;
                }
-               Client c = cm.get(uid);
+               Client c = cm.getBySid(sid);
+               if (c != null && !getUserId().equals(c.getUserId())) {
+                       c = null;
+               }
                if (isAtWb(c, ruid, wbItemId, r.getId())) {
                        return r; // item IS on WB
                }