Changeset 97763 in vbox

Timestamp:

Dec 8, 2022 3:27:14 PM (2 years ago)

Author:

vboxsync

Message:

DnD/HostService: Don't send any host-specific messages to the guest when the required DnD mode for it is not set.

File:

• trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp

@@ -1070 +1070 @@
                  DnDHostMsgToStr(u32Function), u32Function, cParms, m_clientMap.size(), m_clientQueue.size()));
 
-    int rc;
+    uint32_t const uMode = modeGet();
+
+    /* Check if we've the right mode set. */
+    int rc = VERR_ACCESS_DENIED; /* Play safe. */
+    switch (u32Function)
+    {
+        /*
+         * Host -> Guest mode
+         */
+        case HOST_DND_FN_HG_EVT_ENTER:
+            RT_FALL_THROUGH();
+        case HOST_DND_FN_HG_EVT_MOVE:
+            RT_FALL_THROUGH();
+        case HOST_DND_FN_HG_EVT_LEAVE:
+            RT_FALL_THROUGH();
+        case HOST_DND_FN_HG_EVT_DROPPED:
+            RT_FALL_THROUGH();
+        case HOST_DND_FN_HG_SND_DATA_HDR:
+            RT_FALL_THROUGH();
+        case HOST_DND_FN_HG_SND_DATA:
+            RT_FALL_THROUGH();
+        case HOST_DND_FN_HG_SND_MORE_DATA:
+            RT_FALL_THROUGH();
+        case HOST_DND_FN_HG_SND_DIR:
+            RT_FALL_THROUGH();
+        case HOST_DND_FN_HG_SND_FILE_DATA:
+            RT_FALL_THROUGH();
+        case HOST_DND_FN_HG_SND_FILE_HDR:
+        {
+            if (   uMode == VBOX_DRAG_AND_DROP_MODE_HOST_TO_GUEST
+                || uMode == VBOX_DRAG_AND_DROP_MODE_BIDIRECTIONAL)
+                rc = VINF_SUCCESS;
+            else
+            {
+                LogRel2(("DnD: Host to guest mode is disabled, ignoring request from host\n"));
+            }
+            break;
+        }
+
+        /*
+         * Guest -> Host mode
+         */
+        case HOST_DND_FN_GH_REQ_PENDING:
+            RT_FALL_THROUGH();
+        case HOST_DND_FN_GH_EVT_DROPPED:
+        {
+            if (   uMode == VBOX_DRAG_AND_DROP_MODE_GUEST_TO_HOST
+                || uMode == VBOX_DRAG_AND_DROP_MODE_BIDIRECTIONAL)
+                rc = VINF_SUCCESS;
+            else
+            {
+                LogRel2(("DnD: Guest to host mode is disabled, ignoring request from host\n"));
+            }
+            break;
+        }
+
+        /*
+         * Both modes
+         */
+        case HOST_DND_FN_CANCEL:
+            if (uMode != VBOX_DRAG_AND_DROP_MODE_OFF)
+                rc = VINF_SUCCESS;
+            break;
+
+        /*
+         * Functions that always work.
+         */
+        case HOST_DND_FN_SET_MODE:
+            rc = VINF_SUCCESS;
+            break;
+
+        /*
+         * Forbid everything else not explicitly allowed.
+         */
+        default:
+            break;
+    }
+
+    if (RT_FAILURE(rc))
+        return rc;
+
     bool fSendToGuest = false; /* Whether to send the message down to the guest side or not. */
 
@@ -1151 +1231 @@
         if (fSendToGuest)
         {
-            if (modeGet() == VBOX_DRAG_AND_DROP_MODE_OFF)
-            {
-                /* Tell the host that a wrong drag'n drop mode is set. */
-                rc = VERR_ACCESS_DENIED;
-                break;
-            }
-
             if (m_clientMap.empty()) /* At least one client on the guest connected? */
             {