feat: adds flags to amtinfo for displaying certs

config-wifi.yaml

@@ -0,0 +1,23 @@
+wifiConfigs:
+  - profileName: 'exampleWifiWPA2' # friendly name (ex. Profile name)
+    ssid: 'exampleSSID'
+    priority: 1
+    authenticationMethod: 4
+    encryptionMethod: 4
+    pskPassphrase: 'example123!@#'
+    ieee8021xProfileName: ''
+  - profileName: 'exampleWifi8021x' # friendly name (ex. Profile name)
+    ssid: 'ssid'
+    priority: 2
+    authenticationMethod: 7
+    encryptionMethod: 4
+    pskPassphrase: ''
+    ieee8021xProfileName: 'exampleIeee8021xEAP-TLS'
+ieee8021xConfigs:
+  - profileName: 'exampleIeee8021xEAP-TLS'
+    username: "exampleUserName"
+    password: "" # 8021x password if authenticationProtocol is PEAPv0/EAP-MSCHAPv2(2)
+    authenticationProtocol: 0 #8021x profile (ex. EAP-TLS(0))
+    clientCert: 'testCert'
+    caCert: 'testCert'
+    privateKey: 'testKey'

go.mod

@@ -3,7 +3,7 @@ module rpc
 go 1.20
 
 // uncomment if developing with go-wsman-messages locally
-// replace github.com/open-amt-cloud-toolkit/go-wsman-messages => ../go-wsman-messages
+replace github.com/open-amt-cloud-toolkit/go-wsman-messages => ../go-wsman-messages
 
 require (
 	github.com/gorilla/websocket v1.5.0

internal/amt/commands.go

@@ -227,6 +227,7 @@ func (amt AMTCommand) GetDNSSuffix() (string, error) {
 }
 
 func (amt AMTCommand) GetCertificateHashes() ([]CertHashEntry, error) {
+	// TODO: process flag -system and -user
 	err := amt.PTHI.Open(false)
 	amtEntryList := []CertHashEntry{}
 	if err != nil {

internal/config/local.go

@@ -2,22 +2,41 @@ package config
 
 type (
 	Config struct {
-		Password          string
-		IEEE8021XSettings `yaml:"ieee801xConfig"`
-		ACMSettings       `yaml:"acmactivate"`
+		Password         string `yaml:"password"`
+		WifiConfigs      `yaml:"wifiConfigs"`
+		Ieee8021xConfigs `yaml:"ieee8021xConfigs"`
+		ACMSettings      `yaml:"acmactivate"`
 	}
-	IEEE8021XSettings struct {
-		Name                   string `yaml:"name"`
-		AuthenticationMethod   int    `yaml:"authenticationMethod"`
-		EncryptionMethod       int    `yaml:"encryptionMethod"`
-		SSID                   string `yaml:"ssid"`
+	WifiConfigs []WifiConfig
+	WifiConfig  struct {
+		ProfileName          string `yaml:"profileName"`
+		SSID                 string `yaml:"ssid"`
+		Priority             int    `yaml:"priority"`
+		AuthenticationMethod int    `yaml:"authenticationMethod"`
+		EncryptionMethod     int    `yaml:"encryptionMethod"`
+		PskPassphrase        string `yaml:"pskPassphrase"`
+		Ieee8021xProfileName string `yaml:"ieee8021xProfileName"`
+	}
+	SecretConfig struct {
+		Secrets []Secret `yaml:"secrets"`
+	}
+	Secret struct {
+		ProfileName   string `yaml:"profileName"`
+		PskPassphrase string `yaml:"pskPassphrase"`
+		PrivateKey    string `yaml:"privateKey"`
+		Password      string `yaml:"password"`
+	}
+	Ieee8021xConfigs []Ieee8021xConfig
+	Ieee8021xConfig  struct {
+		ProfileName            string `yaml:"profileName"`
 		Username               string `yaml:"username"`
+		Password               string `yaml:"password"`
 		AuthenticationProtocol int    `yaml:"authenticationProtocol"`
-		Priority               int    `yaml:"priority"`
 		ClientCert             string `yaml:"clientCert"`
 		CACert                 string `yaml:"caCert"`
 		PrivateKey             string `yaml:"privateKey"`
 	}
+
 	ACMSettings struct {
 		AMTPassword         string `yaml:"amtPassword"`
 		ProvisioningCert    string `yaml:"provisioningCert"`

internal/flags/activate.go

@@ -21,7 +21,7 @@ func (f *Flags) handleActivateCommand() int {
 		return nil
 	})
 	// for local activation in ACM mode need a few more items
-	f.amtActivateCommand.StringVar(&f.configContent, "config", "", "specify a config file ")
+	f.amtActivateCommand.StringVar(&f.configContent, "configFile", "", "specify a config file ")
 	f.amtActivateCommand.StringVar(&f.LocalConfig.ACMSettings.AMTPassword, "amtPassword", "", "amt password")
 	f.amtActivateCommand.StringVar(&f.LocalConfig.ACMSettings.ProvisioningCert, "provisioningCert", "", "provisioning certificate")
 	f.amtActivateCommand.StringVar(&f.LocalConfig.ACMSettings.ProvisioningCertPwd, "provisioningCertPwd", "", "provisioning certificate password")

internal/flags/activate_test.go

@@ -180,15 +180,15 @@ func TestHandleActivateCommandLocal(t *testing.T) {
 			wantResult: utils.MissingOrIncorrectPassword,
 		},
 		"should fail if acm and local config file error": {
-			cmdLine:    "./rpc activate -local -acm -config ./nofilehere.txt",
-			wantResult: utils.IncorrectCommandLineParameters,
+			cmdLine:    "./rpc activate -local -acm -configFile ./nofilehere.txt",
+			wantResult: utils.FailedReadingConfiguration,
 		},
 		"should fail if acm and ACM Settings not specified": {
 			cmdLine:    "./rpc activate -local -acm",
 			wantResult: utils.IncorrectCommandLineParameters,
 		},
 		"should pass if acm with example config file": {
-			cmdLine:    "./rpc activate -local -acm -config ../../config.yaml",
+			cmdLine:    "./rpc activate -local -acm -configFile ../../config.yaml",
 			wantResult: utils.Success,
 		},
 		"should pass wif acm and ACM Settings specified": {