← Back to branch summary

~james-page/ubuntu/wily/juju-core/mir-fixes

~james-page/ubuntu/wily/juju-core/mir-fixes

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/utils/ssh/authorisedkeys.go

Committer: Package Import Robot
Author(s): James Page
Date: 2014-04-07 18:24:59 UTC
mfrom: (1.1.22)
Revision ID: package-import@ubuntu.com-20140407182459-1b6zvm5ygm4ki7yp

Tags: 1.18.0-0ubuntu1

https://launchpad.net/bugs/1287147

https://launchpad.net/bugs/1299588

https://launchpad.net/bugs/1301464

* New upstream release (LP: #1287147), including fixes for:
  - maas/lxc: LXC permission denied issue (LP: #1299588).
  - core: mega-watcher for machines does not include container
    addresses (LP: #1301464).

files added:
src/github.com/joyent

src/github.com/joyent/gocommon

src/github.com/joyent/gocommon/.gitignore

src/github.com/joyent/gocommon/COPYING

src/github.com/joyent/gocommon/COPYING.LESSER

src/github.com/joyent/gocommon/LICENSE

src/github.com/joyent/gocommon/README.md

src/github.com/joyent/gocommon/client

src/github.com/joyent/gocommon/client/client.go

src/github.com/joyent/gocommon/client/client_test.go

src/github.com/joyent/gocommon/errors

src/github.com/joyent/gocommon/errors/errors.go

src/github.com/joyent/gocommon/errors/errors_test.go

src/github.com/joyent/gocommon/gocommon.go

src/github.com/joyent/gocommon/gocommon_test.go

src/github.com/joyent/gocommon/http

src/github.com/joyent/gocommon/http/client.go

src/github.com/joyent/gocommon/http/client_test.go

src/github.com/joyent/gocommon/jpc

src/github.com/joyent/gocommon/jpc/jpc.go

src/github.com/joyent/gocommon/testing

src/github.com/joyent/gocommon/testing/httpsuite.go

src/github.com/joyent/gocommon/testing/httpsuite_test.go

src/github.com/joyent/gocommon/version.go

src/github.com/joyent/gocommon/version_test.go

src/github.com/joyent/gomanta

src/github.com/joyent/gomanta/.gitignore

src/github.com/joyent/gomanta/COPYING

src/github.com/joyent/gomanta/COPYING.LESSER

src/github.com/joyent/gomanta/LICENSE

src/github.com/joyent/gomanta/README.md

src/github.com/joyent/gomanta/gomanta.go

src/github.com/joyent/gomanta/gomanta_test.go

src/github.com/joyent/gomanta/localservices

src/github.com/joyent/gomanta/localservices/hook

src/github.com/joyent/gomanta/localservices/hook/service.go

src/github.com/joyent/gomanta/localservices/hook/service_test.go

src/github.com/joyent/gomanta/localservices/localservice.go

src/github.com/joyent/gomanta/localservices/manta

src/github.com/joyent/gomanta/localservices/manta/service.go

src/github.com/joyent/gomanta/localservices/manta/service_http.go

src/github.com/joyent/gomanta/localservices/manta/service_http_test.go

src/github.com/joyent/gomanta/localservices/manta/service_test.go

src/github.com/joyent/gomanta/manta

src/github.com/joyent/gomanta/manta/live_test.go

src/github.com/joyent/gomanta/manta/local_test.go

src/github.com/joyent/gomanta/manta/manta.go

src/github.com/joyent/gomanta/manta/manta_test.go

src/github.com/joyent/gosdc

src/github.com/joyent/gosdc/.gitignore

src/github.com/joyent/gosdc/COPYING

src/github.com/joyent/gosdc/COPYING.LESSER

src/github.com/joyent/gosdc/LICENSE

src/github.com/joyent/gosdc/README.md

src/github.com/joyent/gosdc/cloudapi

src/github.com/joyent/gosdc/cloudapi/cloudapi.go

src/github.com/joyent/gosdc/cloudapi/cloudapi_test.go

src/github.com/joyent/gosdc/cloudapi/live_test.go

src/github.com/joyent/gosdc/cloudapi/local_test.go

src/github.com/joyent/gosdc/gosdc.go

src/github.com/joyent/gosdc/gosdc_test.go

src/github.com/joyent/gosdc/localservices

src/github.com/joyent/gosdc/localservices/cloudapi

src/github.com/joyent/gosdc/localservices/cloudapi/service.go

src/github.com/joyent/gosdc/localservices/cloudapi/service_http.go

src/github.com/joyent/gosdc/localservices/cloudapi/service_http_test.go

src/github.com/joyent/gosdc/localservices/cloudapi/service_test.go

src/github.com/joyent/gosdc/localservices/hook

src/github.com/joyent/gosdc/localservices/hook/service.go

src/github.com/joyent/gosdc/localservices/hook/service_test.go

src/github.com/joyent/gosdc/localservices/localservice.go

src/github.com/joyent/gosign

src/github.com/joyent/gosign/.gitignore

src/github.com/joyent/gosign/COPYING

src/github.com/joyent/gosign/COPYING.LESSER

src/github.com/joyent/gosign/LICENSE

src/github.com/joyent/gosign/README.md

src/github.com/joyent/gosign/auth

src/github.com/joyent/gosign/auth/auth.go

src/github.com/joyent/gosign/auth/auth_test.go

src/github.com/joyent/gosign/gosign.go

src/github.com/joyent/gosign/gosign_test.go

src/launchpad.net/juju-core/provider/joyent/live_test.go

src/launchpad.net/juju-core/provider/joyent/local_test.go

src/launchpad.net/juju-core/provider/joyent/provider_test.go

src/launchpad.net/juju-core/provider/joyent/storage_test.go

files modified:
debian/changelog

src/launchpad.net/juju-core/charm/charm.go

src/launchpad.net/juju-core/charm/charm_test.go

src/launchpad.net/juju-core/charm/meta.go

src/launchpad.net/juju-core/charm/meta_test.go

src/launchpad.net/juju-core/charm/url.go

src/launchpad.net/juju-core/charm/url_test.go

src/launchpad.net/juju-core/cmd/juju/addmachine.go

src/launchpad.net/juju-core/cmd/juju/bootstrap_test.go

src/launchpad.net/juju-core/cmd/juju/common.go

src/launchpad.net/juju-core/cmd/juju/deploy.go

src/launchpad.net/juju-core/cmd/juju/environment_test.go

src/launchpad.net/juju-core/cmd/juju/publish.go

src/launchpad.net/juju-core/cmd/juju/status_test.go

src/launchpad.net/juju-core/cmd/juju/upgradecharm.go

src/launchpad.net/juju-core/cmd/juju/upgradejuju_test.go

src/launchpad.net/juju-core/cmd/plugins/juju-metadata/imagemetadata.go

src/launchpad.net/juju-core/cmd/plugins/juju-metadata/imagemetadata_test.go

src/launchpad.net/juju-core/cmd/plugins/juju-metadata/toolsmetadata_test.go

src/launchpad.net/juju-core/constraints/constraints_test.go

src/launchpad.net/juju-core/container/kvm/kvm_test.go

src/launchpad.net/juju-core/dependencies.tsv

src/launchpad.net/juju-core/environs/bootstrap/bootstrap_test.go

src/launchpad.net/juju-core/environs/bootstrap/synctools.go

src/launchpad.net/juju-core/environs/cloudinit/cloudinit.go

src/launchpad.net/juju-core/environs/config/config.go

src/launchpad.net/juju-core/environs/config/config_test.go

src/launchpad.net/juju-core/environs/instances/instancetype_test.go

src/launchpad.net/juju-core/environs/interface.go

src/launchpad.net/juju-core/environs/jujutest/livetests.go

src/launchpad.net/juju-core/environs/manual/init_test.go

src/launchpad.net/juju-core/environs/testing/tools.go

src/launchpad.net/juju-core/instance/instance_test.go

src/launchpad.net/juju-core/juju/apiconn_test.go

src/launchpad.net/juju-core/juju/arch/arch.go

src/launchpad.net/juju-core/juju/arch/arch_test.go

src/launchpad.net/juju-core/juju/testing/conn.go

src/launchpad.net/juju-core/juju/testing/instance.go

src/launchpad.net/juju-core/provider/all/all.go

src/launchpad.net/juju-core/provider/azure/environ_test.go

src/launchpad.net/juju-core/provider/azure/environprovider.go

src/launchpad.net/juju-core/provider/azure/environprovider_test.go

src/launchpad.net/juju-core/provider/common/bootstrap.go

src/launchpad.net/juju-core/provider/dummy/environs.go

src/launchpad.net/juju-core/provider/ec2/ec2.go

src/launchpad.net/juju-core/provider/ec2/export_test.go

src/launchpad.net/juju-core/provider/ec2/live_test.go

src/launchpad.net/juju-core/provider/ec2/local_test.go

src/launchpad.net/juju-core/provider/joyent/config.go

src/launchpad.net/juju-core/provider/joyent/config_test.go

src/launchpad.net/juju-core/provider/joyent/environ.go

src/launchpad.net/juju-core/provider/joyent/environ_firewall.go

src/launchpad.net/juju-core/provider/joyent/environ_instance.go

src/launchpad.net/juju-core/provider/joyent/export_test.go

src/launchpad.net/juju-core/provider/joyent/instance.go

src/launchpad.net/juju-core/provider/joyent/instance_firewall.go

src/launchpad.net/juju-core/provider/joyent/joyent_test.go

src/launchpad.net/juju-core/provider/joyent/provider.go

src/launchpad.net/juju-core/provider/joyent/storage.go

src/launchpad.net/juju-core/provider/local/environprovider.go

src/launchpad.net/juju-core/provider/maas/environprovider.go

src/launchpad.net/juju-core/provider/maas/environprovider_test.go

src/launchpad.net/juju-core/provider/manual/provider.go

src/launchpad.net/juju-core/provider/openstack/export_test.go

src/launchpad.net/juju-core/provider/openstack/local_test.go

src/launchpad.net/juju-core/provider/openstack/provider.go

src/launchpad.net/juju-core/scripts/win-installer/setup.iss

src/launchpad.net/juju-core/state/api/client.go

src/launchpad.net/juju-core/state/api/params/params.go

src/launchpad.net/juju-core/state/api/params/params_test.go

src/launchpad.net/juju-core/state/apiserver/client/client.go

src/launchpad.net/juju-core/state/apiserver/client/client_test.go

src/launchpad.net/juju-core/state/machine.go

src/launchpad.net/juju-core/state/megawatcher.go

src/launchpad.net/juju-core/state/megawatcher_internal_test.go

src/launchpad.net/juju-core/state/unit.go

src/launchpad.net/juju-core/state/unit_test.go

src/launchpad.net/juju-core/testing/environ.go

src/launchpad.net/juju-core/utils/ssh/authorisedkeys.go

src/launchpad.net/juju-core/utils/ssh/authorisedkeys_test.go

src/launchpad.net/juju-core/version/version.go

src/launchpad.net/juju-core/worker/provisioner/container_initialisation_test.go

src/launchpad.net/juju-core/worker/provisioner/export_test.go

src/launchpad.net/juju-core/worker/provisioner/kvm-broker_test.go

src/launchpad.net/juju-core/worker/provisioner/lxc-broker_test.go

src/launchpad.net/juju-core/worker/provisioner/provisioner.go

src/launchpad.net/juju-core/worker/provisioner/provisioner_task.go

src/launchpad.net/juju-core/worker/provisioner/provisioner_test.go

src/launchpad.net/juju-core/worker/uniter/modes.go

src/launchpad.net/juju-core/worker/uniter/uniter_test.go

Show diffs side-by-side

added added

removed removed

src/launchpad.net/juju-core/utils/ssh/authorisedkeys.go

264

264

existingNonKeyLines = append(existingNonKeyLines, line)

265

265

}

266

266

}

267

for _, newKey := range newKeys {

268

_, comment, err := KeyFingerprint(newKey)

269

if err != nil {

270

return err

271

}

272

if comment == "" {

273

return fmt.Errorf("cannot add ssh key without comment")

274

}

275

}

276

267

return writeAuthorisedKeys(user, append(existingNonKeyLines, newKeys...))

277

268

}

278

269

Older »