Changeset 2527 in vbox for trunk/src/VBox

Timestamp:

May 7, 2007 4:19:14 PM (18 years ago)

Author:

vboxsync

Message:

Check VRDP multiconnection property. A new external authentication prototype for multiconnection.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (10 diffs)
• ConsoleVRDPServer.cpp (modified) (7 diffs)
• include/ConsoleImpl.h (modified) (1 diff)
• include/ConsoleVRDPServer.h (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -302 +302 @@
 
 #ifdef VRDP_MC
-    m_cAudioRefs = 0;
+    mcAudioRefs = 0;
+    mcVRDPClients = 0;
 #endif /* VRDP_MC */
 
@@ -457 +458 @@
     LogFlowFunc (("%d, %s, %s, %s\n", u32ClientId, pszUser, pszPassword, pszDomain));
 #else
+    uint32_t u32ClientId = 0;
     LogFlowFunc (("%s, %s, %s\n", pszUser, pszPassword, pszDomain));
 #endif /* VRDP_MC */
@@ -502 +504 @@
             ));
 
+    /* Multiconnection check. */
+    BOOL allowMultiConnection = FALSE;
+    hrc = console->mVRDPServer->COMGETTER(AllowMultiConnection) (&allowMultiConnection);
+    AssertComRCReturn (hrc, VERR_ACCESS_DENIED);
+
+    LogFlowFunc(("allowMultiConnection %d, console->mcVRDPClients = %d\n", allowMultiConnection, console->mcVRDPClients));
+
+    if (allowMultiConnection == FALSE)
+    {
+        /* Note: the variable is incremented in ClientConnect callback, which is called when the client
+         * is successfully connected, that is after the ClientLogon callback. Therefore the mcVRDPClients
+         * value is 0 for first client.
+         */
+        if (console->mcVRDPClients > 0)
+        {
+            /* Reject. */
+            LogRel(("VRDPAUTH: Multiple connections are not enabled. Access denied.\n"));
+            return VERR_ACCESS_DENIED;
+        }
+    }
+
     switch (authType)
     {
@@ -513 +536 @@
         {
             /* Call the external library. */
-            result = console->mConsoleVRDPServer->Authenticate (uuid, guestJudgement, pszUser, pszPassword, pszDomain);
+            result = console->mConsoleVRDPServer->Authenticate (uuid, guestJudgement, pszUser, pszPassword, pszDomain, u32ClientId);
 
             if (result != VRDPAuthDelegateToGuest)
@@ -572 +595 @@
                 LogRel(("VRDPAUTH: Guest judgement %d.\n", guestJudgement));
                 LogFlowFunc (("External auth called again with guest judgement = %d\n", guestJudgement));
-                result = console->mConsoleVRDPServer->Authenticate (uuid, guestJudgement, pszUser, pszPassword, pszDomain);
+                result = console->mConsoleVRDPServer->Authenticate (uuid, guestJudgement, pszUser, pszPassword, pszDomain, u32ClientId);
             }
             else
@@ -624 +647 @@
 #ifdef VBOX_VRDP
 #ifdef VRDP_MC
+    ASMAtomicIncU32(&console->mcVRDPClients);
+
     NOREF(u32ClientId);
     console->mDisplay->VideoAccelVRDP (true);
@@ -655 +680 @@
 #ifdef VBOX_VRDP
 #ifdef VRDP_MC
+    ASMAtomicDecU32(&console->mcVRDPClients);
+
     console->mDisplay->VideoAccelVRDP (false);
 #else
+    u32ClientId = 0;
     console->mDisplay->VideoAccelVRDP (false, 0);
 #endif /* VRDP_MC */
@@ -679 +707 @@
     if (fu32Intercepted & VRDP_CLIENT_INTERCEPT_AUDIO)
     {
-        console->m_cAudioRefs--;
-
-        if (console->m_cAudioRefs <= 0)
+        console->mcAudioRefs--;
+
+        if (console->mcAudioRefs <= 0)
         {
             if (console->mAudioSniffer)
@@ -705 +733 @@
 #endif /* VBOX_VRDP */
 
+    Guid uuid;
+    HRESULT hrc = console->mMachine->COMGETTER (Id) (uuid.asOutParam());
+    AssertComRC (hrc);
+
+    VRDPAuthType_T authType = VRDPAuthType_VRDPAuthNull;
+    hrc = console->mVRDPServer->COMGETTER(AuthType) (&authType);
+    AssertComRC (hrc);
+
+    if (authType == VRDPAuthType_VRDPAuthExternal)
+        console->mConsoleVRDPServer->AuthDisconnect (uuid, u32ClientId);
+
     LogFlowFuncLeave();
     return;
@@ -735 +774 @@
 #ifdef VBOX_VRDP
 #ifdef VRDP_MC
-    console->m_cAudioRefs++;
-
-    if (console->m_cAudioRefs == 1)
+    console->mcAudioRefs++;
+
+    if (console->mcAudioRefs == 1)
     {
         if (console->mAudioSniffer)

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -193 +193 @@
 
     mpfnAuthEntry = NULL;
+    mpfnAuthEntry2 = NULL;
 
     if (mAuthLibrary)
@@ -322 +323 @@
 
 VRDPAuthResult ConsoleVRDPServer::Authenticate (const Guid &uuid, VRDPAuthGuestJudgement guestJudgement,
-                                                const char *pszUser, const char *pszPassword, const char *pszDomain)
+                                                const char *pszUser, const char *pszPassword, const char *pszDomain,
+                                                uint32_t u32ClientId)
 {
     VRDPAUTHUUID rawuuid;
@@ -328 +330 @@
     memcpy (rawuuid, ((Guid &)uuid).ptr (), sizeof (rawuuid));
 
-    LogFlow(("ConsoleVRDPServer::Authenticate: uuid = %Vuuid, guestJudgement = %d, pszUser = %s, pszPassword = %s, pszDomain = %s\n",
-             rawuuid, guestJudgement, pszUser, pszPassword, pszDomain));
+    LogFlow(("ConsoleVRDPServer::Authenticate: uuid = %Vuuid, guestJudgement = %d, pszUser = %s, pszPassword = %s, pszDomain = %s, u32ClientId = %d\n",
+             rawuuid, guestJudgement, pszUser, pszPassword, pszDomain, u32ClientId));
 
     /*
@@ -362 +364 @@
         {
             /* Get the entry point. */
-            rc = RTLdrGetSymbol(mAuthLibrary, "VRDPAuth", (void**)&mpfnAuthEntry);
-            if (VBOX_FAILURE (rc))
-                LogRel(("VRDPAUTH: Failed to resolve import 'VRDPAuth'. Error code: %Vrc\n", rc));
+            mpfnAuthEntry2 = NULL;
+            int rc2 = RTLdrGetSymbol(mAuthLibrary, "VRDPAuth2", (void**)&mpfnAuthEntry2);
+            if (VBOX_FAILURE (rc2))
+            {
+                LogRel(("VRDPAUTH: Could not resolve import '%s'. Error code: %Vrc\n", "VRDPAuth2", rc2));
+                rc = rc2;
+            }
+
+            /* Get the entry point. */
+            mpfnAuthEntry = NULL;
+            rc2 = RTLdrGetSymbol(mAuthLibrary, "VRDPAuth", (void**)&mpfnAuthEntry);
+            if (VBOX_FAILURE (rc2))
+            {
+                LogRel(("VRDPAUTH: Could not resolve import '%s'. Error code: %Vrc\n", "VRDPAuth", rc2));
+                rc = rc2;
+            }
+
+            if (mpfnAuthEntry2 || mpfnAuthEntry)
+            {
+                LogRel(("VRDPAUTH: Using entry point '%s'.\n", mpfnAuthEntry2? "VRDPAuth2": "VRDPAuth"));
+                rc = VINF_SUCCESS;
+            }
         }
 
@@ -372 +393 @@
 
             mpfnAuthEntry = NULL;
+            mpfnAuthEntry2 = NULL;
 
             if (mAuthLibrary)
@@ -383 +405 @@
     }
 
-    Assert (mAuthLibrary && mpfnAuthEntry);
-
-    VRDPAuthResult result = mpfnAuthEntry (&rawuuid, guestJudgement, pszUser, pszPassword, pszDomain);
+    Assert (mAuthLibrary && (mpfnAuthEntry || mpfnAuthEntry2));
+
+    VRDPAuthResult result = mpfnAuthEntry?
+                                mpfnAuthEntry (&rawuuid, guestJudgement, pszUser, pszPassword, pszDomain):
+                                mpfnAuthEntry2 (&rawuuid, guestJudgement, pszUser, pszPassword, pszDomain, true, u32ClientId);
 
     switch (result)
@@ -408 +432 @@
 }
 
+void ConsoleVRDPServer::AuthDisconnect (const Guid &uuid, uint32_t u32ClientId)
+{
+    VRDPAUTHUUID rawuuid;
+
+    memcpy (rawuuid, ((Guid &)uuid).ptr (), sizeof (rawuuid));
+
+    LogFlow(("ConsoleVRDPServer::AuthDisconnect: uuid = %Vuuid, u32ClientId = %d\n",
+             rawuuid, u32ClientId));
+
+    Assert (mAuthLibrary && (mpfnAuthEntry || mpfnAuthEntry2));
+
+    if (mpfnAuthEntry2)
+        mpfnAuthEntry2 (&rawuuid, VRDPAuthGuestNotAsked, NULL, NULL, NULL, false, u32ClientId);
+}
 
 #ifdef VRDP_MC

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

@@ -405 +405 @@
 
 #ifdef VRDP_MC
-    int m_cAudioRefs;
+    int mcAudioRefs;
+    volatile uint32_t mcVRDPClients;
 
     static DECLCALLBACK(int)    vrdp_ClientLogon (void *pvUser, uint32_t u32ClientId, const char *pszUser, const char *pszPassword, const char *pszDomain);

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

@@ -45 +45 @@
 
     VRDPAuthResult Authenticate (const Guid &uuid, VRDPAuthGuestJudgement guestJudgement,
-                                 const char *pszUser, const char *pszPassword, const char *pszDomain);
+                                 const char *pszUser, const char *pszPassword, const char *pszDomain,
+                                 uint32_t u32ClientId);
+
+    void AuthDisconnect (const Guid &uuid, uint32_t u32ClientId);
 
 #ifdef VRDP_MC
@@ -169 +172 @@
 
     /* External authentication library handle. The library is loaded in the
-     * Authenticate  method and unloaded at the object destructor.
+     * Authenticate method and unloaded at the object destructor.
      */
     RTLDRMOD mAuthLibrary;
     PVRDPAUTHENTRY mpfnAuthEntry;
+    PVRDPAUTHENTRY2 mpfnAuthEntry2;
 };