Changeset 34574 in vbox

Timestamp:

Dec 1, 2010 3:01:02 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68369

Message:

Make vrde auth library configurable per VM.

Location:

trunk

Files:

• include/VBox/settings.h (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)
• src/VBox/Main/ConsoleVRDPServer.cpp (modified) (1 diff)
• src/VBox/Main/VRDEServerImpl.cpp (modified) (4 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/VRDEServerImpl.h (modified) (2 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

trunk/include/VBox/settings.h

@@ -293 +293 @@
     AuthType_T      authType;
     uint32_t        ulAuthTimeout;
+    com::Utf8Str    strAuthLibrary;
     bool            fAllowMultiConnection,
                     fReuseSingleConnection,

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -309 +309 @@
                      "                            [--vrdeproperty <name=[value]>]\n"
                      "                            [--vrdeauthtype null|external|guest]\n"
+                     "                            [--vrdeauthlibrary default|<name>\n"
                      "                            [--vrdemulticon on|off]\n"
                      "                            [--vrdereusecon on|off]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -142 +142 @@
     MODIFYVM_VRDEPROPERTY,
     MODIFYVM_VRDEAUTHTYPE,
+    MODIFYVM_VRDEAUTHLIBRARY,
     MODIFYVM_VRDEMULTICON,
     MODIFYVM_VRDEREUSECON,
@@ -265 +266 @@
     { "--vrdeproperty",             MODIFYVM_VRDEPROPERTY,              RTGETOPT_REQ_STRING },
     { "--vrdeauthtype",             MODIFYVM_VRDEAUTHTYPE,              RTGETOPT_REQ_STRING },
+    { "--vrdeauthlibrary",          MODIFYVM_VRDEAUTHLIBRARY,           RTGETOPT_REQ_STRING },
     { "--vrdemulticon",             MODIFYVM_VRDEMULTICON,              RTGETOPT_REQ_BOOL_ONOFF },
     { "--vrdereusecon",             MODIFYVM_VRDEREUSECON,              RTGETOPT_REQ_BOOL_ONOFF },
@@ -1935 +1937 @@
             }
 
+            case MODIFYVM_VRDEAUTHLIBRARY:
+            {
+                ComPtr<IVRDEServer> vrdeServer;
+                machine->COMGETTER(VRDEServer)(vrdeServer.asOutParam());
+                ASSERT(vrdeServer);
+
+                if (vrdeServer)
+                {
+                    if (strcmp(ValueUnion.psz, "default") != 0)
+                    {
+                        Bstr bstr(ValueUnion.psz);
+                        CHECK_ERROR(vrdeServer, COMSETTER(AuthLibrary)(bstr.raw()));
+                    }
+                    else
+                        CHECK_ERROR(vrdeServer, COMSETTER(AuthLibrary)(NULL));
+                }
+                break;
+            }
+
             case MODIFYVM_VRDPMULTICON:
                 vrdeWarningDeprecatedOption("multicon");

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -1490 +1490 @@
     {
         /* Load the external authentication library. */
-
-        ComPtr<IMachine> machine;
-        mConsole->COMGETTER(Machine)(machine.asOutParam());
-
-        ComPtr<IVirtualBox> virtualBox;
-        machine->COMGETTER(Parent)(virtualBox.asOutParam());
-
-        ComPtr<ISystemProperties> systemProperties;
-        virtualBox->COMGETTER(SystemProperties)(systemProperties.asOutParam());
-
         Bstr authLibrary;
-        systemProperties->COMGETTER(VRDEAuthLibrary)(authLibrary.asOutParam());
+        mConsole->getVRDEServer()->COMGETTER(AuthLibrary)(authLibrary.asOutParam());
 
         Utf8Str filename = authLibrary;

trunk/src/VBox/Main/VRDEServerImpl.cpp

@@ -87 +87 @@
     mData->mAuthType             = AuthType_Null;
     mData->mAuthTimeout          = 0;
+    mData->mAuthLibrary.setNull();
     mData->mEnabled              = FALSE;
     mData->mAllowMultiConnection = FALSE;
@@ -206 +207 @@
     mData->mAuthType = data.authType;
     mData->mAuthTimeout = data.ulAuthTimeout;
+    mData->mAuthLibrary = data.strAuthLibrary;
     mData->mAllowMultiConnection = data.fAllowMultiConnection;
     mData->mReuseSingleConnection = data.fReuseSingleConnection;
@@ -232 +234 @@
     data.fEnabled = !!mData->mEnabled;
     data.authType = mData->mAuthType;
+    data.strAuthLibrary = mData->mAuthLibrary;
     data.ulAuthTimeout = mData->mAuthTimeout;
     data.fAllowMultiConnection = !!mData->mAllowMultiConnection;
@@ -570 +573 @@
         mParent->onVRDEServerChange();
 #endif
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP VRDEServer::COMGETTER(AuthLibrary) (BSTR *aLibrary)
+{
+    CheckComArgOutPointerValid(aLibrary);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    Bstr bstrLibrary;
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    bstrLibrary = mData->mAuthLibrary;
+    alock.release();
+
+    if (bstrLibrary.isEmpty())
+    {
+        /* Get the global setting. */
+        ComPtr<ISystemProperties> systemProperties;
+        HRESULT hrc = mParent->getVirtualBox()->COMGETTER(SystemProperties)(systemProperties.asOutParam());
+
+        if (SUCCEEDED(hrc))
+            hrc = systemProperties->COMGETTER(VRDEAuthLibrary)(bstrLibrary.asOutParam());
+
+        if (FAILED(hrc))
+            return setError(hrc, "failed to query the library setting\n");
+    }
+
+    bstrLibrary.cloneTo(aLibrary);
+
+    return S_OK;
+}
+
+STDMETHODIMP VRDEServer::COMSETTER(AuthLibrary) (IN_BSTR aLibrary)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /* the machine needs to be mutable */
+    AutoMutableStateDependency adep(mParent);
+    if (FAILED(adep.rc())) return adep.rc();
+
+    Bstr bstrLibrary(aLibrary);
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (mData->mAuthLibrary != bstrLibrary)
+    {
+        mData.backup();
+        mData->mAuthLibrary = bstrLibrary;
+
+        /* leave the lock before informing callbacks */
+        alock.release();
+
+        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);
+        mParent->setModified(Machine::IsModified_VRDEServer);
+        mlock.release();
+
+        mParent->onVRDEServerChange(/* aRestart */ TRUE);
     }
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -12631 +12631 @@
   <interface
     name="IVRDEServer" extends="$unknown"
-    uuid="468ab3d3-4808-489e-a301-05d60e959fbc"
+    uuid="444e5d4a-ecd9-4c38-af95-a2fbfd69b486"
     wsmap="managed"
     >
@@ -12677 +12677 @@
         The name of Extension Pack providing VRDE for this VM.  Overrides
         <link to="ISystemProperties::defaultVRDEExtPack"/>.
+      </desc>
+    </attribute>
+
+    <attribute name="AuthLibrary" type="wstring">
+      <desc>
+        Library used for authentication of RDP clients by this VM. Overrides
+        <link to="ISystemProperties::VRDEAuthLibrary"/>.
       </desc>
     </attribute>

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

@@ -35 +35 @@
     {
         BOOL mEnabled;
+        Bstr mAuthLibrary;
         AuthType_T mAuthType;
         ULONG mAuthTimeout;
@@ -85 +86 @@
     STDMETHOD(COMGETTER(VRDEExtPack))(BSTR *aExtPack);
     STDMETHOD(COMSETTER(VRDEExtPack))(IN_BSTR aExtPack);
+    STDMETHOD(COMGETTER(AuthLibrary)) (BSTR *aValue);
+    STDMETHOD(COMSETTER(AuthLibrary)) (IN_BSTR aValue);
 
     // IVRDEServer methods

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1386 +1386 @@
                   && (authType                  == v.authType)
                   && (ulAuthTimeout             == v.ulAuthTimeout)
+                  && (strAuthLibrary            == v.strAuthLibrary)
                   && (fAllowMultiConnection     == v.fAllowMultiConnection)
                   && (fReuseSingleConnection    == v.fReuseSingleConnection)
@@ -2474 +2475 @@
             }
 
+            pelmHwChild->getAttributeValue("authLibrary", hw.vrdeSettings.strAuthLibrary);
             pelmHwChild->getAttributeValue("authTimeout", hw.vrdeSettings.ulAuthTimeout);
             pelmHwChild->getAttributeValue("allowMultiConnection", hw.vrdeSettings.fAllowMultiConnection);
@@ -3441 +3443 @@
     if (m->sv >= SettingsVersion_v1_11)
     {
+        if (hw.vrdeSettings.strAuthLibrary.length())
+            pelmVRDE->setAttribute("authLibrary", hw.vrdeSettings.strAuthLibrary);
         if (hw.vrdeSettings.strVrdeExtPack.isNotEmpty())
             pelmVRDE->setAttribute("VRDEExtPack", hw.vrdeSettings.strVrdeExtPack);
@@ -4332 +4336 @@
              || mediaRegistry.llFloppyImages.size()
              || !hardwareMachine.vrdeSettings.strVrdeExtPack.isEmpty()
+             || !hardwareMachine.vrdeSettings.strAuthLibrary.isEmpty()
              || machineUserData.strOsType == "JRockitVE"
            )