Changeset 92133 in vbox for trunk/src/VBox

Timestamp:

Oct 28, 2021 10:43:36 AM (4 years ago)

Author:

vboxsync

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

147952

Message:

Main,FE/VBoxManage: Allow changing the localhost reachable flag for the NAT attachment type, bugref:9896

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/MachineImpl.h (modified) (1 diff)
• Main/include/NATEngineImpl.h (modified) (1 diff)
• Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (1 diff)
• Main/src-server/NATEngineImpl.cpp (modified) (3 diffs)
• Main/xml/Settings.cpp (modified) (12 diffs)

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

@@ -153 +153 @@
     MODIFYVM_NATDNSPROXY,
     MODIFYVM_NATDNSHOSTRESOLVER,
+    MODIFYVM_NATLOCALHOSTREACHABLE,
     MODIFYVM_MACADDRESS,
     MODIFYVM_HIDPTR,
@@ -359 +360 @@
     { "--natdnsproxy",              MODIFYVM_NATDNSPROXY,               RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX },
     { "--natdnshostresolver",       MODIFYVM_NATDNSHOSTRESOLVER,        RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX },
+    { "--natlocalhostreachable",    MODIFYVM_NATLOCALHOSTREACHABLE,     RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX },
     { "--macaddress",               MODIFYVM_MACADDRESS,                RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--mouse",                    MODIFYVM_HIDPTR,                    RTGETOPT_REQ_STRING },
@@ -2128 +2130 @@
                 break;
             }
+
+            case MODIFYVM_NATLOCALHOSTREACHABLE:
+            {
+                if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC"))
+                    break;
+
+                ComPtr<INetworkAdapter> nic;
+                CHECK_ERROR_BREAK(sessionMachine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                ComPtr<INATEngine> engine;
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+
+                CHECK_ERROR(engine, COMSETTER(LocalhostReachable)(ValueUnion.f));
+                break;
+            }
+
             case MODIFYVM_MACADDRESS:
             {

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

@@ -24307 +24307 @@
   <interface
     name="INATEngine" extends="$unknown"
-    uuid="8faef61e-6e15-4f71-a6a5-94e707fafbcc"
+    uuid="a06253a7-dcd2-44e3-8689-9c9c4b6b6234"
     wsmap="managed"
     reservedMethods="4" reservedAttributes="8"
@@ -24354 +24354 @@
       <desc>Array of NAT port-forwarding rules in string representation, in the following
         format: "name,protocol id,host ip,host port,guest ip,guest port".</desc>
+    </attribute>
+    <attribute name="LocalhostReachable" type="boolean">
+      <desc>Whether traffic from the guest directed to 10.0.2.2 will reach the
+        host's loopback interface, i.e. localhost or 127.0.0.1.</desc>
     </attribute>
     <method name="setNetworkSettings">

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

@@ -548 +548 @@
     Utf8Str i_getDefaultNVRAMFilename();
     Utf8Str i_getSnapshotNVRAMFilename();
+    SettingsVersion_T i_getSettingsVersion(void);
 
     void i_composeSavedStateFilename(Utf8Str &strStateFilePath);

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

@@ -63 +63 @@
     HRESULT setHostIP(const com::Utf8Str &aHostIP);
     HRESULT getHostIP(com::Utf8Str &aBindIP);
+    HRESULT setLocalhostReachable(BOOL fLocalhostReachable);
+    HRESULT getLocalhostReachable(BOOL *pfLocalhostReachable);
     /* TFTP properties */
     HRESULT setTFTPPrefix(const com::Utf8Str &aTFTPPrefix);

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

@@ -5514 +5514 @@
                 hrc = natEngine->COMGETTER(AliasMode)(&aliasMode);                          H();
                 InsertConfigInteger(pCfg, "AliasMode", aliasMode);
+
+                BOOL fLocalhostReachable;
+                hrc = natEngine->COMGETTER(LocalhostReachable)(&fLocalhostReachable);       H();
+                InsertConfigInteger(pCfg, "LocalhostReachable", fLocalhostReachable);
 
                 /* port-forwarding */

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

@@ -7311 +7311 @@
 
     return strNVRAMFilePath;
+}
+
+/**
+ * Returns the version of the settings file.
+ */
+SettingsVersion_T Machine::i_getSettingsVersion(void)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), SettingsVersion_Null);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    return mData->pMachineConfigFile->getSettingsVersion();
 }
 

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

@@ -188 +188 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    /* so far nothing to do */
+    mData->m->fLocalhostReachable = false; /* Applies to new VMs only, see @bugref{9896} */
 }
 
@@ -199 +199 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    return mData->m->areDefaultSettings();
+    return mData->m->areDefaultSettings(mParent->i_getSettingsVersion());
 }
 
@@ -434 +434 @@
 }
 
+HRESULT NATEngine::setLocalhostReachable(BOOL fLocalhostReachable)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (mData->m->fLocalhostReachable != RT_BOOL(fLocalhostReachable))
+    {
+        mData->m.backup();
+        mData->m->fLocalhostReachable = RT_BOOL(fLocalhostReachable);
+        mParent->i_setModified(Machine::IsModified_NetworkAdapters);
+    }
+    return S_OK;
+}
+
+HRESULT NATEngine::getLocalhostReachable(BOOL *pfLocalhostReachable)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    *pfLocalhostReachable = mData->m->fLocalhostReachable;
+    return S_OK;
+}
+
 HRESULT NATEngine::setTFTPPrefix(const com::Utf8Str &aTFTPPrefix)
 {

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

@@ -1472 +1472 @@
     return m->fFileExists;
 }
+
+/**
+ * Returns the settings file version
+ *
+ * @returns Settings file version enum.
+ */
+SettingsVersion_T ConfigFileBase::getSettingsVersion()
+{
+    return m->sv;
+}
+
 
 /**
@@ -3030 +3041 @@
     fAliasLog(false),
     fAliasProxyOnly(false),
-    fAliasUseSamePorts(false)
+    fAliasUseSamePorts(false),
+    fLocalhostReachable(true) /* Historically this value is true. */
 {
 }
@@ -3061 +3073 @@
 
 /**
+ * Check whether the localhost-reachable setting is the default for the given settings version.
+ */
+bool NAT::areLocalhostReachableDefaultSettings(SettingsVersion_T sv) const
+{
+    return    (   fLocalhostReachable
+                && sv < SettingsVersion_v1_19)
+           || (   !fLocalhostReachable
+                && sv >= SettingsVersion_v1_19);
+}
+
+/**
  * Check if all settings have default values.
  */
-bool NAT::areDefaultSettings() const
-{
+bool NAT::areDefaultSettings(SettingsVersion_T sv) const
+{
+    /*
+     * Before settings version 1.19 localhost was reachable by default
+     * when using NAT which was changed with version 1.19+, see @bugref{9896}
+     * for more information.
+     */
     return strNetwork.isEmpty()
         && strBindIP.isEmpty()
@@ -3075 +3103 @@
         && areAliasDefaultSettings()
         && areTFTPDefaultSettings()
-        && mapRules.size() == 0;
+        && mapRules.size() == 0
+        && areLocalhostReachableDefaultSettings(sv);
 }
 
@@ -3102 +3131 @@
             && fAliasProxyOnly     == n.fAliasProxyOnly
             && fAliasUseSamePorts  == n.fAliasUseSamePorts
+            && fLocalhostReachable == n.fLocalhostReachable
             && mapRules            == n.mapRules);
 }
@@ -3145 +3175 @@
         && enmPromiscModePolicy == NetworkAdapterPromiscModePolicy_Deny
         && mode == NetworkAttachmentType_Null
-        && nat.areDefaultSettings()
+        && nat.areDefaultSettings(sv)
         && strBridgedName.isEmpty()
         && strInternalNetworkName.isEmpty()
@@ -3162 +3192 @@
  * Special check if settings of the non-current attachment type have default values.
  */
-bool NetworkAdapter::areDisabledDefaultSettings() const
-{
-    return (mode != NetworkAttachmentType_NAT ? nat.areDefaultSettings() : true)
+bool NetworkAdapter::areDisabledDefaultSettings(SettingsVersion_T sv) const
+{
+    return (mode != NetworkAttachmentType_NAT ? nat.areDefaultSettings(sv) : true)
         && (mode != NetworkAttachmentType_Bridged ? strBridgedName.isEmpty() : true)
         && (mode != NetworkAttachmentType_Internal ? strInternalNetworkName.isEmpty() : true)
@@ -4177 +4207 @@
         elmMode.getAttributeValue("tcprcv", nic.nat.u32TcpRcv);
         elmMode.getAttributeValue("tcpsnd", nic.nat.u32TcpSnd);
+        elmMode.getAttributeValue("localhost-reachable", nic.nat.fLocalhostReachable);
         const xml::ElementNode *pelmDNS;
         if ((pelmDNS = elmMode.findChildElement("DNS")))
@@ -6863 +6894 @@
                 {
                     /* m->sv >= SettingsVersion_v1_10 */
-                    if (!nic.areDisabledDefaultSettings())
+                    if (!nic.areDisabledDefaultSettings(m->sv))
                     {
                         xml::ElementNode *pelmDisabledNode = pelmAdapter->createChild("DisabledModes");
@@ -7251 +7282 @@
             // For the currently active network attachment type we have to
             // generate the tag, otherwise the attachment type is lost.
-            if (fEnabled || !nic.nat.areDefaultSettings())
+            if (fEnabled || !nic.nat.areDefaultSettings(m->sv))
             {
                 xml::ElementNode *pelmNAT = elmParent.createChild("NAT");
 
-                if (!nic.nat.areDefaultSettings())
+                if (!nic.nat.areDefaultSettings(m->sv))
                 {
                     if (nic.nat.strNetwork.length())
@@ -7271 +7302 @@
                     if (nic.nat.u32TcpSnd)
                         pelmNAT->setAttribute("tcpsnd", nic.nat.u32TcpSnd);
+                    if (!nic.nat.areLocalhostReachableDefaultSettings(m->sv))
+                        pelmNAT->setAttribute("localhost-reachable", nic.nat.fLocalhostReachable);
                     if (!nic.nat.areDNSDefaultSettings())
                     {
@@ -7962 +7995 @@
             return;
         }
+
+        NetworkAdaptersList::const_iterator netit;
+        for (netit = hardwareMachine.llNetworkAdapters.begin();
+             netit != hardwareMachine.llNetworkAdapters.end();
+             ++netit)
+        {
+            if (   netit->fEnabled
+                && netit->mode == NetworkAttachmentType_NAT
+                && !netit->nat.fLocalhostReachable)
+            {
+                m->sv = SettingsVersion_v1_19;
+                break;
+            }
+        }
     }