unistack-org/cloudinit
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #317 from crawford/json

Browse Source 
configdrive: check metadata length before parsing
This commit is contained in:
Alex Crawford 2015-02-13 10:22:57 -08:00
commit 19ce7ac849
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
datasource/configdrive/configdrive.go
View File

@ -60,7 +60,7 @@ func (cd *configDrive) FetchMetadata() (metadata datasource.Metadata, err error)
} `json:"network_config"` } `json:"network_config"`
} }
if data, err = cd.tryReadFile(path.Join(cd.openstackVersionRoot(), "meta_data.json")); err != nil { if data, err = cd.tryReadFile(path.Join(cd.openstackVersionRoot(), "meta_data.json")); err != nil || len(data) == 0 {
return return
} }
if err = json.Unmarshal([]byte(data), &m); err != nil { if err = json.Unmarshal([]byte(data), &m); err != nil {

4
datasource/configdrive/configdrive_test.go
View File

@ -29,6 +29,10 @@ func TestFetchMetadata(t *testing.T) {
metadata datasource.Metadata metadata datasource.Metadata
}{ }{
{
root: "/",
files: test.MockFilesystem{"/openstack/latest/meta_data.json": ""},
},
{ {
root: "/", root: "/",
files: test.MockFilesystem{"/openstack/latest/meta_data.json": `{"ignore": "me"}`}, files: test.MockFilesystem{"/openstack/latest/meta_data.json": `{"ignore": "me"}`},