Changeset 98665 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 21, 2023 7:49:56 AM (2 years ago)

Author:

vboxsync

Message:

Guest Control: Implemented the GuestSession::i_fsQueryInfo() + GuestSession::i_fsCreateTemp() calls. bugref:9783

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (1 diff)
• include/GuestSessionImpl.h (modified) (1 diff)
• src-client/GuestCtrlImpl.cpp (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h

@@ -1456 +1456 @@
     /** @}  */
 };
+
+
+/*******************************************************************************
+* Callback data structures.                                                    *
+*******************************************************************************/
+
+/**
+ * Callback data for guest file system operations.
+ */
+typedef struct CALLBACKDATA_FS_NOTIFY
+{
+    /** Callback data header. */
+    CALLBACKDATA_HEADER hdr;
+    /** Notification type (of type GUEST_FS_NOTIFYTYPE_XXX). */
+    uint32_t uType;
+    /** IPRT result of overall operation. */
+    uint32_t rc;
+    union
+    {
+        struct
+        {
+            GSTCTLFSOBJINFO objInfo;
+            /** Resolved user name. */
+            char           *pszUser;
+            /** Size (in bytes) of \a pszUser. */
+            uint32_t        cbUser;
+            /** Resolved user group(s). */
+            char           *pszGroups;
+            /** Size (in bytes) of \a pszGroups. */
+            uint32_t        cbGroups;
+        } QueryInfo;
+        struct
+        {
+            /** Path of created temporary file / directory. */
+            char    *pszPath;
+            /** Size (in bytes) of \a pszPath. */
+            uint32_t cbPath;
+        } CreateTemp;
+    } u;
+} CALLBACKDATA_FS_NOTIFY;
+/** Pointer to a CALLBACKDATA_FS_NOTIFY struct. */
+typedef CALLBACKDATA_FS_NOTIFY *PCALLBACKDATA_FS_NOTIFY;
 #endif /* !MAIN_INCLUDED_GuestCtrlImplPrivate_h */
 

trunk/src/VBox/Main/include/GuestSessionImpl.h

@@ -325 +325 @@
     bool                    i_isTerminated(void) const;
     int                     i_onRemove(void);
+#ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
+    int                     i_onFsNotify(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
+#endif
     int                     i_onSessionStatusChange(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
     PathStyle_T             i_getGuestPathStyle(void);

trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

@@ -231 +231 @@
                     break;
 
+                /* File system stuff. */
+#ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
+                case GUEST_MSG_FS_NOTIFY:
+                    vrc = pSession->i_dispatchToThis(pCtxCb, pSvcCb);
+                    break;
+#endif
                 /* Session stuff. */
                 case GUEST_MSG_SESSION_NOTIFY:

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -1254 +1254 @@
             if (RT_SUCCESS(vrc))
             {
-                /// @todo To be implemented
+                PCALLBACKDATA_FS_NOTIFY const pFsNotify = (PCALLBACKDATA_FS_NOTIFY)pEvent->Payload().Raw();
+                AssertPtrReturn(pFsNotify, VERR_INVALID_POINTER);
+                vrcGuest = (int)pFsNotify->rc;
+                if (RT_SUCCESS(vrcGuest))
+                {
+                    AssertReturn(pFsNotify->uType == GUEST_FS_NOTIFYTYPE_CREATE_TEMP, VERR_INVALID_PARAMETER);
+                    AssertReturn(pFsNotify->u.CreateTemp.cbPath, VERR_INVALID_PARAMETER);
+                    strName = pFsNotify->u.CreateTemp.pszPath;
+                    RTStrFree(pFsNotify->u.CreateTemp.pszPath);
+                }
+                else
+                {
+                    if (pvrcGuest)
+                        *pvrcGuest = vrcGuest;
+                    vrc = VERR_GSTCTL_GUEST_ERROR;
+                }
+            }
+            else
+            {
+                if (vrc == VERR_GSTCTL_GUEST_ERROR)
+                {
+                    if (pvrcGuest)
+                        *pvrcGuest = pEvent->GuestResult();
+                }
             }
         }
@@ -1527 +1550 @@
             break;
 
+#ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
+        case GUEST_MSG_FS_NOTIFY:
+            vrc = i_onFsNotify(pCbCtx, pSvcCbData);
+            break;
+#endif
         case GUEST_MSG_SESSION_NOTIFY: /* Guest Additions >= 4.3.0. */
             vrc = i_onSessionStatusChange(pCbCtx, pSvcCbData);
@@ -1951 +1979 @@
             return vrc;
 
-        uint32_t fFlags = GSTCTL_QUERYINFO_F_NONE;
-        if (fFollowSymlinks)
-            fFlags |= GSTCTL_QUERYINFO_F_FOLLOW_LINK;
+        uint32_t const fFlags = fFollowSymlinks ? GSTCTL_QUERYINFO_F_FOLLOW_LINK : GSTCTL_QUERYINFO_F_ON_LINK;
 
         /* Prepare HGCM call. */
@@ -1959 +1985 @@
         int i = 0;
         HGCMSvcSetU32(&paParms[i++], pEvent->ContextID());
-        HGCMSvcSetPv (&paParms[i++], (void*)strPath.c_str(), (ULONG)strPath.length() + 1);
+        HGCMSvcSetStr(&paParms[i++], strPath.c_str());
         HGCMSvcSetU32(&paParms[i++], GSTCTLFSOBJATTRADD_UNIX /* Implicit */);
         HGCMSvcSetU32(&paParms[i++], fFlags);
@@ -1971 +1997 @@
             if (RT_SUCCESS(vrc))
             {
-                /// @todo To be implemented
-            #if 0
-                const ComPtr<IEvent> pThisEvent = pEvent->Event();
-                if (pThisEvent.isNotNull()) /* Make sure that we actually have an event associated. */
+                PCALLBACKDATA_FS_NOTIFY const pFsNotify = (PCALLBACKDATA_FS_NOTIFY)pEvent->Payload().Raw();
+                AssertPtrReturn(pFsNotify, VERR_INVALID_POINTER);
+                vrcGuest = (int)pFsNotify->rc;
+                if (RT_SUCCESS(vrcGuest))
                 {
-                    if (pType)
-                    {
-                        HRESULT hrc = pThisEvent->COMGETTER(Type)(pType);
-                        if (FAILED(hrc))
-                            vrc = VERR_COM_UNEXPECTED;
-                    }
-                    if (   RT_SUCCESS(vrc)
-                        && ppEvent)
-                        pThisEvent.queryInterfaceTo(ppEvent);
-
-                    unconst(pThisEvent).setNull();
-                }
-
-                if (pEvent->Payload().Size() == sizeof(GSTCTLFSOBJINFO))
-                {
-                    HRESULT hrc1 = pFileEvent->COMGETTER(Data)(ComSafeArrayAsOutParam(data));
-                    ComAssertComRC(hrc1);
-
+                    AssertReturn(pFsNotify->uType == GUEST_FS_NOTIFYTYPE_QUERY_INFO, VERR_INVALID_PARAMETER);
                     objData.Init(strPath);
-
-                    PGSTCTLFSOBJINFO
-
-                    objData.FromGuestFsObjInfo((PGSTCTLFSOBJINFO)pEvent->Payload().Raw());
+                    vrc = objData.FromGuestFsObjInfo(&pFsNotify->u.QueryInfo.objInfo);
+                    RTStrFree(pFsNotify->u.QueryInfo.pszUser);
+                    RTStrFree(pFsNotify->u.QueryInfo.pszGroups);
                 }
                 else
-                    vrc = VERR_INVALID_PARAMETER;
-            #endif
+                {
+                    if (pvrcGuest)
+                        *pvrcGuest = vrcGuest;
+                    vrc = VERR_GSTCTL_GUEST_ERROR;
+                }
             }
             else
@@ -2231 +2242 @@
 }
 
-/**
- * Handles guest session status changes from the guest.
+#ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
+/**
+ * Handles guest file system notifications.
  *
  * @returns VBox status code.
  * @param   pCbCtx              Host callback context from HGCM service.
  * @param   pSvcCbData          HGCM service callback data.
+ */
+int GuestSession::i_onFsNotify(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData)
+{
+    AssertPtrReturn(pCbCtx, VERR_INVALID_POINTER);
+    AssertPtrReturn(pSvcCbData, VERR_INVALID_POINTER);
+
+    if (pSvcCbData->mParms < 4)
+        return VERR_INVALID_PARAMETER;
+
+    CALLBACKDATA_FS_NOTIFY dataCb;
+    RT_ZERO(dataCb);
+    /* pSvcCb->mpaParms[0] always contains the context ID. */
+    int vrc = HGCMSvcGetU32(&pSvcCbData->mpaParms[1], &dataCb.uType);
+    AssertRCReturn(vrc, vrc);
+    vrc = HGCMSvcGetU32(&pSvcCbData->mpaParms[2], &dataCb.rc);
+    AssertRCReturn(vrc, vrc);
+
+    int const vrcGuest = (int)dataCb.rc;
+
+    if (RT_SUCCESS(vrcGuest))
+    {
+        switch (dataCb.uType)
+        {
+            case GUEST_FS_NOTIFYTYPE_QUERY_INFO:
+            {
+                AssertBreakStmt(pSvcCbData->mParms >= 7, VERR_INVALID_PARAMETER);
+                PGSTCTLFSOBJINFO pObjInfo;
+                uint32_t         cbObjInfo;
+                vrc = HGCMSvcGetPv(&pSvcCbData->mpaParms[3], (void **)&pObjInfo, &cbObjInfo);
+                AssertRCBreak(vrc);
+                AssertBreakStmt(cbObjInfo == sizeof(GSTCTLFSOBJINFO), VERR_INVALID_PARAMETER);
+                memcpy(&dataCb.u.QueryInfo.objInfo, pObjInfo, sizeof(GSTCTLFSOBJINFO));
+
+                char    *pszUser;
+                uint32_t cbUser;
+                vrc = HGCMSvcGetStr(&pSvcCbData->mpaParms[4], &pszUser, &cbUser);
+                AssertRCBreak(vrc);
+                dataCb.u.QueryInfo.pszUser = RTStrDup(pszUser);
+                AssertPtrBreakStmt(dataCb.u.QueryInfo.pszUser, vrc = VERR_NO_MEMORY);
+                dataCb.u.QueryInfo.cbUser  = cbUser;
+
+                char    *pszGroups;
+                uint32_t cbGroups;
+                vrc = HGCMSvcGetStr(&pSvcCbData->mpaParms[5], &pszGroups, &cbGroups);
+                AssertRCBreak(vrc);
+                dataCb.u.QueryInfo.pszGroups = RTStrDup(pszGroups);
+                AssertPtrBreakStmt(dataCb.u.QueryInfo.pszGroups, vrc = VERR_NO_MEMORY);
+                dataCb.u.QueryInfo.cbGroups  = cbGroups;
+
+                /** @todo ACLs not implemented yet. */
+                break;
+            }
+
+            case GUEST_FS_NOTIFYTYPE_CREATE_TEMP:
+            {
+                char    *pszPath;
+                uint32_t cbPath;
+                vrc = HGCMSvcGetStr(&pSvcCbData->mpaParms[3], &pszPath, &cbPath);
+                AssertRCBreak(vrc);
+                dataCb.u.CreateTemp.pszPath = RTStrDup(pszPath);
+                AssertPtrBreakStmt(dataCb.u.CreateTemp.pszPath, vrc = VERR_NO_MEMORY);
+                dataCb.u.CreateTemp.cbPath  = cbPath;
+                break;
+            }
+
+            case GUEST_FS_NOTIFYTYPE_UNKNOWN:
+                RT_FALL_THROUGH();
+            default:
+                vrc = VERR_NOT_SUPPORTED;
+                break;
+        }
+    }
+
+    try
+    {
+        GuestWaitEventPayload evPayload(dataCb.uType, &dataCb, sizeof(dataCb));
+        vrc = signalWaitEventInternal(pCbCtx, dataCb.rc, &evPayload);
+    }
+    catch (int vrcEx) /* Thrown by GuestWaitEventPayload constructor. */
+    {
+        vrc = vrcEx;
+    }
+
+    return vrc;
+}
+#endif /* VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS */
+
+/**
+ * Handles guest session status changes from the guest.
+ *
+ * @returns VBox status code.
+ * @param   pCbCtx              Host callback context from HGCM service.
+ * @param   pSvcCbData          HGCM service callback data.
  *
  * @note    Takes the read lock (for session ID lookup).
@@ -2243 +2348 @@
 {
     AssertPtrReturn(pCbCtx, VERR_INVALID_POINTER);
-    /* pCallback is optional. */
     AssertPtrReturn(pSvcCbData, VERR_INVALID_POINTER);