Merge branch 'main' into user/sdou/ukiStubArm64

Author: SeanDougherty

test/vmtests/vmtests/utils/ssh_client.py

@@ -10,8 +10,7 @@
 from threading import Thread
 from typing import Any, Dict, List, Optional, Union
 
-# CodeQL [SM04242] false positive: Paramiko is used in test-only code, not in production.
-# The warning is acceptable as it does not affect released artifacts.
+# CodeQL [SM04242] Paramiko is used in test-only code, not in production. The warning is acceptable as it does not affect released artifacts.
 from paramiko import AutoAddPolicy, SSHClient
 from paramiko.channel import ChannelFile, ChannelStderrFile
 from paramiko.ssh_exception import NoValidConnectionsError, SSHException

toolkit/tools/pkg/imagecustomizerlib/customizeusers.go

@@ -52,7 +52,11 @@ func addOrUpdateUser(user imagecustomizerapi.User, baseConfigPath string, imageC
 	}
 
 	hashedPassword := ""
+	shouldUpdatePassword := false
+
 	if user.Password != nil {
+		shouldUpdatePassword = true
+
 		passwordIsFile := user.Password.Type == imagecustomizerapi.PasswordTypePlainTextFile ||
 			user.Password.Type == imagecustomizerapi.PasswordTypeHashedFile
 
@@ -92,10 +96,12 @@ func addOrUpdateUser(user imagecustomizerapi.User, baseConfigPath string, imageC
 				user.HomeDirectory, user.Name)
 		}
 
-		// Update the user's password.
-		err = userutils.UpdateUserPassword(imageChroot.RootDir(), user.Name, hashedPassword)
-		if err != nil {
-			return err
+		// Only update password if explicitly provided
+		if shouldUpdatePassword {
+			err = userutils.UpdateUserPassword(imageChroot.RootDir(), user.Name, hashedPassword)
+			if err != nil {
+				return err
+			}
 		}
 	} else {
 		var uidStr string