more

open-amt-cloud-toolkit · Jul 10, 2024 · 60414df · 60414df
1 parent 83cc97e
commit 60414df
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/internal/flags/activate.go b/internal/flags/activate.go
@@ -29,6 +29,7 @@ func (f *Flags) handleActivateCommand() error {
 	f.amtActivateCommand.BoolVar(&f.SkipIPRenew, "skipIPRenew", false, "skip DHCP renewal of the IP address if AMT becomes enabled")
 	// for local activation in ACM mode need a few more items
 	f.amtActivateCommand.StringVar(&f.configContent, "config", "", "specify a config file or smb: file share URL")
+	f.amtActivateCommand.StringVar(&f.configContent, "configv2", "", "specify a config file or smb: file share URL")
 	f.amtActivateCommand.StringVar(&f.LocalConfig.ACMSettings.AMTPassword, "amtPassword", f.lookupEnvOrString("AMT_PASSWORD", ""), "amt password")
 	f.amtActivateCommand.StringVar(&f.LocalConfig.ACMSettings.ProvisioningCert, "provisioningCert", f.lookupEnvOrString("PROVISIONING_CERT", ""), "provisioning certificate")
 	f.amtActivateCommand.StringVar(&f.LocalConfig.ACMSettings.ProvisioningCertPwd, "provisioningCertPwd", f.lookupEnvOrString("PROVISIONING_CERT_PASSWORD", ""), "provisioning certificate password")
@@ -82,12 +83,17 @@ func (f *Flags) handleActivateCommand() error {
 			fmt.Println("must specify -ccm or -acm, but not both")
 			return utils.InvalidParameterCombination
 		}
-
-		err := f.handleLocalConfig()
-		if err != nil {
-			return utils.FailedReadingConfiguration
+		if f.configContentV2 != "" {
+			err := f.handleLocalConfigV2()
+			if err != nil {
+				return utils.FailedReadingConfiguration
+			}
+		} else {
+			err := f.handleLocalConfig()
+			if err != nil {
+				return utils.FailedReadingConfiguration
+			}
 		}
-
 		if f.LocalConfig.ACMSettings.AMTPassword == "" && f.Password == "" {
 			if rc := f.ReadNewPasswordTo(&f.Password, "New AMT Password"); rc != nil {
 				return rc

diff --git a/internal/flags/flags.go b/internal/flags/flags.go
@@ -15,6 +15,7 @@ import (
 	"rpc/internal/amt"
 	"rpc/internal/config"
 	"rpc/internal/smb"
+	pkgConfig "rpc/pkg/config"
 	"rpc/pkg/utils"
 	"strconv"
 	"strings"
@@ -76,8 +77,10 @@ type Flags struct {
 	UseACM                              bool
 	EchoPass                            bool
 	configContent                       string
+	configContentV2                     string
 	UUID                                string
 	LocalConfig                         config.Config
+	LocalConfigV2                       pkgConfig.Configuration
 	amtInfoCommand                      *flag.FlagSet
 	amtActivateCommand                  *flag.FlagSet
 	amtDeactivateCommand                *flag.FlagSet
@@ -345,3 +348,13 @@ func (f *Flags) handleLocalConfig() error {
 	}
 	return nil
 }
+
+func (f *Flags) handleLocalConfigV2() error {
+	content, err := pkgConfig.ReadAndDecryptFile(f.configContentV2, []byte(""))
+	if err != nil {
+		log.Error("config error: ", err)
+		return err
+	}
+
+	f.LocalConfigV2 = content
+}
diff --git a/pkg/config/decrypt.go b/pkg/config/decrypt.go
@@ -11,7 +11,7 @@ import (
 )
 
 // Decrypt ciphertext using AES-GCM with the provided key
-func decrypt(cipherText string, key []byte) ([]byte, error) {
+func Decrypt(cipherText string, key []byte) ([]byte, error) {
 	data, err := base64.StdEncoding.DecodeString(cipherText)
 	if err != nil {
 		return nil, err
@@ -41,13 +41,13 @@ func decrypt(cipherText string, key []byte) ([]byte, error) {
 }
 
 // Read encrypted data from file and decrypt it
-func readAndDecryptFile(filePath string, key []byte) (Configuration, error) {
+func ReadAndDecryptFile(filePath string, key []byte) (Configuration, error) {
 	encryptedData, err := ioutil.ReadFile(filePath)
 	if err != nil {
 		return Configuration{}, err
 	}
 
-	decryptedData, err := decrypt(string(encryptedData), key)
+	decryptedData, err := Decrypt(string(encryptedData), key)
 	if err != nil {
 		return Configuration{}, err
 	}

diff --git a/prf (1).yaml b/prf (1).yaml
@@ -0,0 +1 @@
+Fbqs6okyj0/xcIN8LIYmQlDOpoLp8SISkgetC53Ftc3WUjaax1g0qs9jndKM44fiTs2rHiJdchOtA+IatAwoQKzhyL1mpaapX5e+zYVlJq3roaZtO1ZF59etiVQLlEMHAYnJCj+SV1xxFzyxG+oDorKjj+zROsm6RRH/XKlGGY0CmYnS/QOJoR1COA2xNiuq/VqLKNv4Xas1kfEwRPmDNccpOblq81m8HHxJmuSD/cvHxwTTQ4b8mohKHenBrThxeEy5muD0ElyhPuEHlKdgCdM8UGifY5pvhqsuyrnuOXVpJXAKg9IYqYQkX06682zAO6UWdPpyDY2bgSVJW6nUsvlCl12uTIruqnVbRd1gnjEkxm1RFamYSlLwjQbQWn0w1lY2al/ELqtR4bFN+/X+EFkcHiCbTuJzp0dm7tBEKwS7v7jAa9x2GCUGGRtKWb8tL99AIqVmJiBDPjO3XYuSPGpDAtVOtNvMncNVvt199Y/7zP7CtN+fSOPeEM5KZ7wJBHkXMARZ+y7gXg0/Nx55sZGlpzEKCYNgw0JWBLWdYe8jHnUKNfPBhBL9xFgj+ybOTyz1G9HlzrFk3GQp94GDJf81uzN0MjyV0qtf50DyDM9T/uvaNhH0loBzf6FiSIXYlD0ljUtN5TPRnSn5Xu+6O0vZyywN+hio9eMGl7Q3/YLWEJ3BbxRE5g9Or5OxCMKRvHazsLUoQfgr4HbwW9zlwLeAIsoMBMqW0PDMO0ZSW41lF9Up8k78NdeeGL9PYlzv8DYDvzOj4RyCMv7RwGt6mmtTozi4WxwxGpMScmQh6Pmy4VJy45jY5AxEAno9XccB75ZIlikEOg/Tu3QDtCb6SZUdWsp1CIYTmsKuAlEsP8858VE+7T9GMufBpDkHAm99jdZjaIRbzkRSgP46ccL9tfmLHa1EfSCOVcNA3MfNSDJRWIa7jOoGz2CXTq+Y+BL41CRAIRM0HH9gJY3BXIzT4ELWkA4+pBa0d2WsEHZCxCKinh1KILez1Oj9IN0B5MIdjEzS834JHI/Nt/iKiv/P4hXhmtpwPNcB7b3OEIJIuJLcayQh2HgjRkz4YjoT1b/9RhQvf66ue7QrTzjEAoxZs0NA1VXqScEXil4xvEMHJBJOyYfnYanEQLYxzCOmf3g7AK9KrooKdMLmrLJU+jVhC8dCjg9SJd5EIVVvgdtTmvoFO5+OjmargL8xVtzgRWGSgNn17/dXLVAptvTk8RNbrOMeV0MeM36ldwAqItEiBedHdrV9tmCMbHFddd0mmOkNUvH09RN1EXW8/Nx4ZLP83r5/OHG6wFwXvzAMlaMwqxvQORyJwLySCj4B7v7DqRUYERGKlXCsaL9kJ/rmmoTg8eBDkgT/0QAOnFNniDYIRWR9uV0=
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fbqs6okyj0/xcIN8LIYmQlDOpoLp8SISkgetC53Ftc3WUjaax1g0qs9jndKM44fiTs2rHiJdchOtA+IatAwoQKzhyL1mpaapX5e+zYVlJq3roaZtO1ZF59etiVQLlEMHAYnJCj+SV1xxFzyxG+oDorKjj+zROsm6RRH/XKlGGY0CmYnS/QOJoR1COA2xNiuq/VqLKNv4Xas1kfEwRPmDNccpOblq81m8HHxJmuSD/cvHxwTTQ4b8mohKHenBrThxeEy5muD0ElyhPuEHlKdgCdM8UGifY5pvhqsuyrnuOXVpJXAKg9IYqYQkX06682zAO6UWdPpyDY2bgSVJW6nUsvlCl12uTIruqnVbRd1gnjEkxm1RFamYSlLwjQbQWn0w1lY2al/ELqtR4bFN+/X+EFkcHiCbTuJzp0dm7tBEKwS7v7jAa9x2GCUGGRtKWb8tL99AIqVmJiBDPjO3XYuSPGpDAtVOtNvMncNVvt199Y/7zP7CtN+fSOPeEM5KZ7wJBHkXMARZ+y7gXg0/Nx55sZGlpzEKCYNgw0JWBLWdYe8jHnUKNfPBhBL9xFgj+ybOTyz1G9HlzrFk3GQp94GDJf81uzN0MjyV0qtf50DyDM9T/uvaNhH0loBzf6FiSIXYlD0ljUtN5TPRnSn5Xu+6O0vZyywN+hio9eMGl7Q3/YLWEJ3BbxRE5g9Or5OxCMKRvHazsLUoQfgr4HbwW9zlwLeAIsoMBMqW0PDMO0ZSW41lF9Up8k78NdeeGL9PYlzv8DYDvzOj4RyCMv7RwGt6mmtTozi4WxwxGpMScmQh6Pmy4VJy45jY5AxEAno9XccB75ZIlikEOg/Tu3QDtCb6SZUdWsp1CIYTmsKuAlEsP8858VE+7T9GMufBpDkHAm99jdZjaIRbzkRSgP46ccL9tfmLHa1EfSCOVcNA3MfNSDJRWIa7jOoGz2CXTq+Y+BL41CRAIRM0HH9gJY3BXIzT4ELWkA4+pBa0d2WsEHZCxCKinh1KILez1Oj9IN0B5MIdjEzS834JHI/Nt/iKiv/P4hXhmtpwPNcB7b3OEIJIuJLcayQh2HgjRkz4YjoT1b/9RhQvf66ue7QrTzjEAoxZs0NA1VXqScEXil4xvEMHJBJOyYfnYanEQLYxzCOmf3g7AK9KrooKdMLmrLJU+jVhC8dCjg9SJd5EIVVvgdtTmvoFO5+OjmargL8xVtzgRWGSgNn17/dXLVAptvTk8RNbrOMeV0MeM36ldwAqItEiBedHdrV9tmCMbHFddd0mmOkNUvH09RN1EXW8/Nx4ZLP83r5/OHG6wFwXvzAMlaMwqxvQORyJwLySCj4B7v7DqRUYERGKlXCsaL9kJ/rmmoTg8eBDkgT/0QAOnFNniDYIRWR9uV0=