Make auth keys processing more robust

Make auth keys processing more robust

Auth keys are stored in the environment as a string.
A common utility function is used to extract the keys
from this string so that empty lines and comments
are ignored.

https://code.launchpad.net/~wallyworld/juju-core/more-robust-sshkey-processing/+merge/199732

(do not edit description out of merge proposal)

[wallyworld, 2013-12-20 00:34:49]

Please take a look.

[thumper, 2013-12-20 01:09:04]

https://codereview.appspot.com/44420044/diff/1/environs/bootstrap/bootstrap.go
File environs/bootstrap/bootstrap.go (right):

https://codereview.appspot.com/44420044/diff/1/environs/bootstrap/bootstrap.g...
environs/bootstrap/bootstrap.go:29: // Apparently this can never happen, so it's
not tested. But, one day,
FYI, maybe soon we'll be able to handle this.

https://codereview.appspot.com/44420044/diff/1/utils/ssh/authorisedkeys.go
File utils/ssh/authorisedkeys.go (right):

https://codereview.appspot.com/44420044/diff/1/utils/ssh/authorisedkeys.go#ne...
utils/ssh/authorisedkeys.go:42: if len(strings.Trim(key, " \r")) == 0 {
How about doing:
  key = strings.Trim(key, " \r")
then
  len(key)

otherwise if you get a comment that starts with a space, you return it.

https://codereview.appspot.com/44420044/diff/1/utils/ssh/authorisedkeys_test.go
File utils/ssh/authorisedkeys_test.go (right):

https://codereview.appspot.com/44420044/diff/1/utils/ssh/authorisedkeys_test....
utils/ssh/authorisedkeys_test.go:224: {sshKey + "\n#comment\n",
[]string{sshKey}},
add one for:
{sshKey + "\n #comment\n", []string{sshKey}},

[wallyworld, 2013-12-20 01:45:09]

Please take a look.

https://codereview.appspot.com/44420044/diff/1/utils/ssh/authorisedkeys.go
File utils/ssh/authorisedkeys.go (right):

https://codereview.appspot.com/44420044/diff/1/utils/ssh/authorisedkeys.go#ne...
utils/ssh/authorisedkeys.go:42: if len(strings.Trim(key, " \r")) == 0 {
On 2013/12/20 01:09:04, thumper wrote:
> How about doing:
>   key = strings.Trim(key, " \r")
> then
>   len(key)
> 
> otherwise if you get a comment that starts with a space, you return it.

Done.

https://codereview.appspot.com/44420044/diff/1/utils/ssh/authorisedkeys_test.go
File utils/ssh/authorisedkeys_test.go (right):

https://codereview.appspot.com/44420044/diff/1/utils/ssh/authorisedkeys_test....
utils/ssh/authorisedkeys_test.go:224: {sshKey + "\n#comment\n",
[]string{sshKey}},
On 2013/12/20 01:09:04, thumper wrote:
> add one for:
> {sshKey + "\n #comment\n", []string{sshKey}},

Done.

[thumper, 2013-12-20 01:46:30]

LGTM

[rog, 2013-12-20 09:31:03]

LGTM with one thought below

https://codereview.appspot.com/44420044/diff/20001/utils/ssh/authorisedkeys.go
File utils/ssh/authorisedkeys.go (right):

https://codereview.appspot.com/44420044/diff/20001/utils/ssh/authorisedkeys.g...
utils/ssh/authorisedkeys.go:42: key = strings.Trim(key, " \r")
strings.TrimSpace ?