OCM-13040 | test: Bastion proxy support username and password #81

jameszwang · 2024-12-12T09:02:19Z

No description provided.

pkg/test/vpc_client/bastion.go

xueli181114 · 2024-12-23T01:32:45Z

pkg/test/vpc_client/bastion.go

-		systemctl start squid
-		systemctl enable squid`, cidrBlock)
+	username := utils.RandomLabel(5)
+	password := utils.RandomLabel(10)


Have a try to see if there is another function can generate password with special characters.

Not find a function which can generate password with special characters, create a new fun named GeneratePassword() to implement it.

xueli181114 · 2024-12-23T01:34:05Z

pkg/test/vpc_client/bastion.go

+	username := utils.RandomLabel(5)
+	password := utils.RandomLabel(10)
+
+	hashedPassword, err := generateBcryptPassword(password)


Make a generate username and password function. The function is too huge.

Updated, create a new func generateWriteSquidPasswordFileCommand() to generate username/password, and put them into squid's password file.

xueli181114 · 2024-12-23T01:35:17Z

pkg/test/vpc_client/bastion.go

-		encodeUserData := base64.StdEncoding.EncodeToString([]byte(userData))
-		return vpc.LaunchBastion("", zone, encodeUserData, keypairName, privateKeyPath)
+	line := fmt.Sprintf("%s:%s\n", username, hashedPassword)
+	remoteFilePath := "/etc/squid/passwords"


Don't hardcode here.

Updated, create a const SquidPasswordFilePath.

xueli181114 · 2024-12-23T01:35:45Z

pkg/test/vpc_client/bastion.go

-		return vpc.LaunchBastion("", zone, encodeUserData, keypairName, privateKeyPath)
+	line := fmt.Sprintf("%s:%s\n", username, hashedPassword)
+	remoteFilePath := "/etc/squid/passwords"
+	hostName := fmt.Sprintf("%s:22", *instance.PublicIpAddress)


Don't make it hardcode here.

Updated, create a const SSHPort

xueli181114 · 2024-12-23T01:36:39Z

pkg/test/vpc_client/bastion.go

+	line := fmt.Sprintf("%s:%s\n", username, hashedPassword)
+	remoteFilePath := "/etc/squid/passwords"
+	hostName := fmt.Sprintf("%s:22", *instance.PublicIpAddress)
+	createFileCMD := fmt.Sprintf("sudo touch %s", remoteFilePath)


Generate a new function for the username/password written.

Updated, create a new func named generateWriteSquidPasswordFileCommand() to generate username and password.

xueli181114 · 2024-12-23T01:39:50Z

pkg/test/vpc_client/bastion.go

+		createFileCMD,
+		copyPasswordCMD,
+	}
+	privateKeyName := fmt.Sprintf("%s-%s", path.Join(privateKeyPath, keypairName), "keyPair.pem")


Make the keypath to a common function. Otherwise I have to maintain too many places and it will cause unexpected error during running.

Updated, create a new func GetPrivateKeyName() in aws utils.

xueli181114 · 2024-12-23T01:41:06Z

pkg/test/vpc_client/bastion.go

-	log.LogInfo("Found existing bastion: %s", *insts[0].InstanceId)
-	return &insts[0], nil
+
+	proxyUrl = fmt.Sprintf("http://%s:%s@%s:3128", username, password, *instance.PublicIpAddress)


net/url related packages to use an official function for the url generation.

Updated, using net/url construct proxy url.

xueli181114 · 2024-12-23T01:44:07Z

Put more logs to the code blocks.

jameszwang · 2024-12-23T09:27:26Z

Put more logs to the code blocks.

Updated, add info log and error log in related functions.

jameszwang force-pushed the ocm-13040 branch from b976ed6 to 0eef957 Compare December 12, 2024 09:16

xueli181114 reviewed Dec 12, 2024

View reviewed changes

pkg/test/vpc_client/bastion.go Outdated Show resolved Hide resolved