Changeset 49047 in vbox for trunk/src

Timestamp:

Oct 11, 2013 6:23:11 AM (11 years ago)

Author:

vboxsync

Message:

pr6927. the state of CD/DVD image is checked, only ISO image is granted to export, host CD/DVD isn't exported now.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

@@ -326 +326 @@
             if (FAILED(rc)) throw rc;
 
-            Utf8Str strTargetVmdkName;
+            Utf8Str strTargetImageName;
             Utf8Str strLocation;
             LONG64  llSize = 0;
@@ -334 +334 @@
             {
                 Bstr bstrLocation;
+
                 rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
                 if (FAILED(rc)) throw rc;
@@ -348 +349 @@
                 if (FAILED(rc)) throw rc;
 
-                Bstr bstrBaseName;
-                rc = pBaseMedium->COMGETTER(Name)(bstrBaseName.asOutParam());
-                if (FAILED(rc)) throw rc;
-
-                Utf8Str strTargetName = Utf8Str(locInfo.strPath).stripPath().stripSuffix();
-                strTargetVmdkName = Utf8StrFmt("%s-disk%d.vmdk", strTargetName.c_str(), ++pAppliance->m->cDisks);
-                if (strTargetVmdkName.length() > RTTAR_NAME_MAX)
+                Utf8Str strName = Utf8Str(locInfo.strPath).stripPath().stripSuffix();
+                strTargetImageName = Utf8StrFmt("%s-disk%d.vmdk", strName.c_str(), ++pAppliance->m->cDisks);
+                if (strTargetImageName.length() > RTTAR_NAME_MAX)
                     throw setError(VBOX_E_NOT_SUPPORTED,
-                                tr("Cannot attach disk '%s' -- file name too long"), strTargetVmdkName.c_str());
+                                tr("Cannot attach disk '%s' -- file name too long"), strTargetImageName.c_str());
 
                 // force reading state, or else size will be returned as 0
@@ -369 +366 @@
                      && pMedium)
             {
+                /*
+                 * check the minimal rules to grant access to export an image
+                 * 1. no host drive CD/DVD image
+                 * 2. the image must be accessible and readable
+                 * 3. only ISO image is exported
+                 */
+
+                //1. no host drive CD/DVD image 
+                BOOL fHostDrive = false;
+                rc = pMedium->COMGETTER(HostDrive)(&fHostDrive);
+                if (FAILED(rc)) throw rc;
+
+                if(fHostDrive)
+                    continue;
+
+                //2. the image must be accessible and readable 
+                MediumState_T ms;
+                rc = pMedium->RefreshState(&ms);
+                if (FAILED(rc)) throw rc;
+
+                if (ms != MediumState_Created)
+                    continue;
+
+                //3. only ISO image is exported 
                 Bstr bstrLocation;
                 rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
                 if (FAILED(rc)) throw rc;
+
                 strLocation = bstrLocation;
 
-                // find the source's base medium for two things:
-                // 1) we'll use its name to determine the name of the target disk, which is readable,
-                //    as opposed to the UUID filename of a differencing image, if pMedium is one
-                // 2) we need the size of the base image so we can give it to addEntry(), and later
-                //    on export, the progress will be based on that (and not the diff image)
-                ComPtr<IMedium> pBaseMedium;
-                rc = pMedium->COMGETTER(Base)(pBaseMedium.asOutParam());
-                        // returns pMedium if there are no diff images
-                if (FAILED(rc)) throw rc;
-
-                Bstr bstrBaseName;
-                rc = pBaseMedium->COMGETTER(Name)(bstrBaseName.asOutParam());
-                if (FAILED(rc)) throw rc;
-
-                Utf8Str strTargetName = Utf8Str(locInfo.strPath).stripPath().stripSuffix();
-                strTargetVmdkName = Utf8StrFmt("%s-disk%d.iso", strTargetName.c_str(), ++pAppliance->m->cDisks);
-                if (strTargetVmdkName.length() > RTTAR_NAME_MAX)
+                Utf8Str ext = strLocation;
+                ext.assignEx(RTPathSuffix(ext.c_str()));//returns extension with dot (".iso")
+
+                int eq = ext.compare(".iso", Utf8Str::CaseInsensitive);
+                if (eq != 0)
+                    continue;
+
+                Utf8Str strName = Utf8Str(locInfo.strPath).stripPath().stripSuffix();
+                strTargetImageName = Utf8StrFmt("%s-disk%d.iso", strName.c_str(), ++pAppliance->m->cDisks);
+                if (strTargetImageName.length() > RTTAR_NAME_MAX)
                     throw setError(VBOX_E_NOT_SUPPORTED,
-                                tr("Cannot attach image '%s' -- file name too long"), strTargetVmdkName.c_str());
-
-                // force reading state, or else size will be returned as 0
-                MediumState_T ms;
-                rc = pBaseMedium->RefreshState(&ms);
-                if (FAILED(rc)) throw rc;
-
-                rc = pBaseMedium->COMGETTER(Size)(&llSize);
+                                tr("Cannot attach image '%s' -- file name too long"), strTargetImageName.c_str());
+
+                rc = pMedium->COMGETTER(Size)(&llSize);
                 if (FAILED(rc)) throw rc;
             }
@@ -469 +479 @@
                     Log(("Adding VirtualSystemDescriptionType_HardDiskImage, disk size: %RI64\n", llSize));
                     pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskImage,
-                                       strTargetVmdkName,   // disk ID: let's use the name
-                                       strTargetVmdkName,   // OVF value:
+                                       strTargetImageName,   // disk ID: let's use the name
+                                       strTargetImageName,   // OVF value:
                                        strLocation, // vbox value: media path
                                        (uint32_t)(llSize / _1M),
@@ -477 +487 @@
 
                 case DeviceType_DVD:
-                {
-                    if (!pMedium)
-                        break;
-
-                    /* get info about whether medium is a real drive/device or not */
-                    BOOL fHostDrive = false;
-                    rc = pMedium->COMGETTER(HostDrive)(&fHostDrive);
-
-                    /* Only virtual CD-ROM is exported, the real device/drive isn't exported */
-                    if(!fHostDrive)
-                        pNewDesc->addEntry(VirtualSystemDescriptionType_CDROM,
-                                           strTargetVmdkName,   // disk ID
-                                           strTargetVmdkName,   // OVF value
-                                           strLocation, // vbox value
-                                           (uint32_t)(llSize / _1M),// ulSize
-                                           strExtra);
-                }
+                    Log(("Adding VirtualSystemDescriptionType_CDROM, disk size: %RI64\n", llSize));
+                    pNewDesc->addEntry(VirtualSystemDescriptionType_CDROM,
+                                       strTargetImageName,   // disk ID
+                                       strTargetImageName,   // OVF value
+                                       strLocation, // vbox value
+                                       (uint32_t)(llSize / _1M),// ulSize
+                                       strExtra);
                 break;
 
@@ -1813 +1813 @@
         // fill the machine config
         vsdescThis->m->pMachine->copyMachineDataToSettings(*pConfig);
+
         // write the machine config to the vbox:Machine element
         pConfig->buildMachineXML(*pelmVBoxMachine,
@@ -2131 +2132 @@
                     waitForAsyncProgress(pTask->pProgress, pProgress3);
                 }
-                else
+                else//pDiskEntry->type == VirtualSystemDescriptionType_CDROM
                 {
                     //copy/clone CD/DVD image