diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-29 20:09:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-29 20:09:15 +0000 |
| commit | e8b76d1cd62cc4974741bd08ebef8216164cb8fe (patch) | |
| tree | 5a7b7638b8d81ab520d5d0f642d8e06a33e28299 | |
| parent | 79f43a31e338799e6c59218c099ae25549375759 (diff) | |
| parent | f57b61de71b2eaa31d889f7147968f8db4892e47 (diff) | |
| download | nova-e8b76d1cd62cc4974741bd08ebef8216164cb8fe.tar.gz nova-e8b76d1cd62cc4974741bd08ebef8216164cb8fe.tar.xz nova-e8b76d1cd62cc4974741bd08ebef8216164cb8fe.zip | |
Merge "Fix authorized_keys file permissions"
| -rw-r--r-- | nova/tests/test_virt_disk.py | 4 | ||||
| -rw-r--r-- | nova/virt/disk/api.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/tests/test_virt_disk.py b/nova/tests/test_virt_disk.py index e6a57e085..0c51e8267 100644 --- a/nova/tests/test_virt_disk.py +++ b/nova/tests/test_virt_disk.py @@ -67,7 +67,7 @@ class VirtDiskTest(test.TestCase): "key was injected by Nova\nmysshkey\n", 'gid': 100, 'uid': 100, - 'mode': 0700}) + 'mode': 0600}) vfs.teardown() @@ -101,7 +101,7 @@ class VirtDiskTest(test.TestCase): "key was injected by Nova\nmysshkey\n", 'gid': 100, 'uid': 100, - 'mode': 0700}) + 'mode': 0600}) vfs.teardown() diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index 3d7d0f516..304781a64 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -443,6 +443,7 @@ def _inject_key_into_fs(key, fs): ]) _inject_file_into_fs(fs, keyfile, key_data, append=True) + fs.set_permissions(keyfile, 0600) _setup_selinux_for_keys(fs, sshdir) |