Changeset 102534 in vbox for trunk/src/VBox/Main/testcase

Timestamp:

Dec 8, 2023 11:06:41 AM (14 months ago)

Author:

vboxsync

Message:

Main/Unattended: Renamed the attribute "IUnattended::password" to "IUnattended::userPassword". Added new getter/setter attribute "IUnattended::adminPassword", to set a dedicated admin / root password. If not specified explicitly, the password from "IUnattended::userPassword" will be used. Extended testcases. bugref:10554

Location:

trunk/src/VBox/Main/testcase

Files:

• tstUnattendedScript-1.expected (modified) (9 diffs)
• tstUnattendedScript-1.template (modified) (1 diff)
• tstUnattendedScript.cpp (modified) (4 diffs)

trunk/src/VBox/Main/testcase/tstUnattendedScript-1.expected

@@ -31 +31 @@
 01=vboxuser
 02=changeme
-03=changeme
+03=adminpw
 04=VBox & VBox;
 05=911
@@ -75 +75 @@
 01=vboxuser
 02=changeme
-03=changeme
+03=adminpw
 04=VBox & VBox;
 05=911
@@ -119 +119 @@
 01=vboxuser
 02=changeme
-03=changeme
+03=adminpw
 04='VBox & VBox;'
 05=911
@@ -163 +163 @@
 01=vboxuser
 02=changeme
-03=changeme
+03=adminpw
 04='VBox & VBox;'
 05=911
@@ -207 +207 @@
 01=vboxuser
 02=changeme
-03=changeme
+03=adminpw
 04=VBox & VBox;
 05=911
@@ -251 +251 @@
 01=vboxuser
 02=changeme
-03=changeme
+03=adminpw
 04=VBox & VBox;
 05=911
@@ -295 +295 @@
 01=vboxuser
 02=changeme
-03=changeme
+03=adminpw
 04=VBox & VBox;
 05=911
@@ -339 +339 @@
 01=vboxuser
 02=changeme
-03=changeme
+03=adminpw
 04=VBox & VBox;
 05=911
@@ -384 +384 @@
 
 /*
- * SHAcrypt 512. Contains the word "changeme" as hashed results.
+ * SHAcrypt 512. Contains the word "changeme" (01) and "adminpw" (02) as hashed results.
  * Note: This uses a fixed salt ("testcase123") within UnattendedScript.cpp, so that we can compare the outputs.
  */
 01=$6$testcase123$AtdiLq2Dp.l/NRkh9/9Ai6Eapd6d0bGxCOmqErpuGa4unRjiohzK5YERWtLHKvAYx26X0YhIrgSFRimkaLToI1
-02=$6$testcase123$AtdiLq2Dp.l/NRkh9/9Ai6Eapd6d0bGxCOmqErpuGa4unRjiohzK5YERWtLHKvAYx26X0YhIrgSFRimkaLToI1
-
+02=$6$testcase123$.ul/vC02q6oasrgQH/gqtOwHCo0jALPhIY63uypm0Mb2kJeDT0yedResX/mMNVZkm0fuMj24tpxs9gMAm7sEC0
+

trunk/src/VBox/Main/testcase/tstUnattendedScript-1.template

@@ -384 +384 @@
 
 /*
- * SHAcrypt 512. Contains the word "changeme" as hashed results.
+ * SHAcrypt 512. Contains the word "changeme" (01) and "adminpw" (02) as hashed results.
  * Note: This uses a fixed salt ("testcase123") within UnattendedScript.cpp, so that we can compare the outputs.
  */

trunk/src/VBox/Main/testcase/tstUnattendedScript.cpp

@@ -59 +59 @@
 {
     mStrUser                            = "vboxuser";
-    mStrPassword                        = "changeme";
+    mStrUserPassword                    = "changeme";
+    mStrAdminPassword                   = "adminpw";
     mStrFullUserName                    = "VBox & VBox;";
     mStrProductKey                      = "911";
@@ -168 +169 @@
 }
 
-HRESULT Unattended::getPassword(com::Utf8Str &password)
+HRESULT Unattended::getUserPassword(com::Utf8Str &password)
 {
     RT_NOREF(password);
@@ -174 +175 @@
 }
 
-HRESULT Unattended::setPassword(const com::Utf8Str &password)
+HRESULT Unattended::setUserPassword(const com::Utf8Str &password)
+{
+    RT_NOREF(password);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::getAdminPassword(com::Utf8Str &password)
+{
+    RT_NOREF(password);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::setAdminPassword(const com::Utf8Str &password)
 {
     RT_NOREF(password);
@@ -544 +557 @@
 }
 
-Utf8Str const &Unattended::i_getPassword() const
-{
-    return mStrPassword;
+Utf8Str const &Unattended::i_getUserPassword() const
+{
+    return mStrUserPassword;
+}
+
+Utf8Str const &Unattended::i_getAdminPassword() const
+{
+    /* If no Administrator / 'root' password is being set, the user password will be used instead.
+     * Also see API documentation. */
+    return mStrAdminPassword.isEmpty() ? mStrUserPassword : mStrAdminPassword;
 }