mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-05-06 08:15:48 -04:00
config: disable user-facing version Azure SEV SNP fetch for v2.8 (#1882)
* config: disable user-facing version fetch for Azure SEV SNP don't allow "latest" value and disable user-facing version fetcher for Azure SEV SNP Co-authored-by: @derpsteb * fix unittests * attestation: getTrustedKey --------- Co-authored-by: Otto Bittner <cobittner@posteo.net>
This commit is contained in:
parent
7c07e3be18
commit
c7b22d314a
5 changed files with 121 additions and 48 deletions
|
@ -41,20 +41,21 @@ func TestDefaultConfig(t *testing.T) {
|
|||
assert.NotNil(def)
|
||||
}
|
||||
|
||||
func TestDefaultConfigWritesLatestVersion(t *testing.T) {
|
||||
conf := Default()
|
||||
bt, err := yaml.Marshal(conf)
|
||||
require := require.New(t)
|
||||
require.NoError(err)
|
||||
// TODO(elchead): activate latest logic for next release AB#3036
|
||||
// func TestDefaultConfigWritesLatestVersion(t *testing.T) {
|
||||
// conf := Default()
|
||||
// bt, err := yaml.Marshal(conf)
|
||||
// require := require.New(t)
|
||||
// require.NoError(err)
|
||||
|
||||
var mp configMap
|
||||
require.NoError(yaml.Unmarshal(bt, &mp))
|
||||
assert := assert.New(t)
|
||||
assert.Equal("latest", mp.getAzureSEVSNPVersion("microcodeVersion"))
|
||||
assert.Equal("latest", mp.getAzureSEVSNPVersion("teeVersion"))
|
||||
assert.Equal("latest", mp.getAzureSEVSNPVersion("snpVersion"))
|
||||
assert.Equal("latest", mp.getAzureSEVSNPVersion("bootloaderVersion"))
|
||||
}
|
||||
// var mp configMap
|
||||
// require.NoError(yaml.Unmarshal(bt, &mp))
|
||||
// assert := assert.New(t)
|
||||
// assert.Equal("latest", mp.getAzureSEVSNPVersion("microcodeVersion"))
|
||||
// assert.Equal("latest", mp.getAzureSEVSNPVersion("teeVersion"))
|
||||
// assert.Equal("latest", mp.getAzureSEVSNPVersion("snpVersion"))
|
||||
// assert.Equal("latest", mp.getAzureSEVSNPVersion("bootloaderVersion"))
|
||||
//}
|
||||
|
||||
func TestReadConfigFile(t *testing.T) {
|
||||
testCases := map[string]struct {
|
||||
|
@ -63,29 +64,41 @@ func TestReadConfigFile(t *testing.T) {
|
|||
wantResult *Config
|
||||
wantErr bool
|
||||
}{
|
||||
"mix of Latest and uint as version value": {
|
||||
// TODO(elchead): activate latest logic for next release AB#3036
|
||||
//"mix of Latest and uint as version value": {
|
||||
// config: func() configMap {
|
||||
// conf := Default()
|
||||
// m := getConfigAsMap(conf, t)
|
||||
// m.setAzureSEVSNPVersion("microcodeVersion", "Latest") // check uppercase also works
|
||||
// m.setAzureSEVSNPVersion("teeVersion", 2)
|
||||
// m.setAzureSEVSNPVersion("bootloaderVersion", 1)
|
||||
// return m
|
||||
// }(),
|
||||
|
||||
// configName: constants.ConfigFilename,
|
||||
// wantResult: func() *Config {
|
||||
// conf := Default()
|
||||
// conf.Attestation.AzureSEVSNP.BootloaderVersion = AttestationVersion{
|
||||
// Value: 1,
|
||||
// IsLatest: false,
|
||||
// }
|
||||
// conf.Attestation.AzureSEVSNP.TEEVersion = AttestationVersion{
|
||||
// Value: 2,
|
||||
// IsLatest: false,
|
||||
// }
|
||||
// return conf
|
||||
// }(),
|
||||
//},
|
||||
// TODO(elchead): activate latest logic for next release AB#3036
|
||||
"refuse invalid latest value": {
|
||||
config: func() configMap {
|
||||
conf := Default()
|
||||
m := getConfigAsMap(conf, t)
|
||||
m.setAzureSEVSNPVersion("microcodeVersion", "Latest") // check uppercase also works
|
||||
m.setAzureSEVSNPVersion("teeVersion", 2)
|
||||
m.setAzureSEVSNPVersion("bootloaderVersion", 1)
|
||||
m.setAzureSEVSNPVersion("microcodeVersion", "latest")
|
||||
return m
|
||||
}(),
|
||||
|
||||
configName: constants.ConfigFilename,
|
||||
wantResult: func() *Config {
|
||||
conf := Default()
|
||||
conf.Attestation.AzureSEVSNP.BootloaderVersion = AttestationVersion{
|
||||
Value: 1,
|
||||
IsLatest: false,
|
||||
}
|
||||
conf.Attestation.AzureSEVSNP.TEEVersion = AttestationVersion{
|
||||
Value: 2,
|
||||
IsLatest: false,
|
||||
}
|
||||
return conf
|
||||
}(),
|
||||
wantErr: true,
|
||||
},
|
||||
"refuse invalid version value": {
|
||||
config: func() configMap {
|
||||
|
@ -876,9 +889,9 @@ func (c configMap) setAzureSEVSNPVersion(versionType string, value interface{})
|
|||
c["attestation"].(configMap)["azureSEVSNP"].(configMap)[versionType] = value
|
||||
}
|
||||
|
||||
func (c configMap) getAzureSEVSNPVersion(versionType string) interface{} {
|
||||
return c["attestation"].(configMap)["azureSEVSNP"].(configMap)[versionType]
|
||||
}
|
||||
//func (c configMap) getAzureSEVSNPVersion(versionType string) interface{} {
|
||||
// return c["attestation"].(configMap)["azureSEVSNP"].(configMap)[versionType]
|
||||
//}
|
||||
|
||||
// getConfigAsMap returns a map of the config.
|
||||
func getConfigAsMap(conf *Config, t *testing.T) (res configMap) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue