Merge lp:~xnox/simplestreams/sensible-default-keyring into lp:simplestreams

[Dimitri John Ledkov]

Use sensible default for the cloud image keyring.

Now included in ubuntu-keyring, and available on all systems.

[Michał Sawicz (saviq)]

If doing this, should mirror_url default to http://cloud-images.ubuntu.com/releases?

After all, any mirror other than cloud-images will not sign its streams with the keyring being made default?

review: Needs Information

[Dimitri John Ledkov (xnox)]

We could default to that too. But an exact rsync mirror of cloud-images.ubuntu.com on the internal network, will still be signed with the same key, as long as it is not modified.

That's how our mirror networks work.... if you mirror it exactly, all signatures remain valid.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:460
https://jenkins.ubuntu.com/server/job/simplestreams-ci/52/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/52/console
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-arm64/52/console
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/52/console
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/52/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/52/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Fine by me, then.

review: Approve

[Scott Moser (smoser)]

The issue is that your default is very much not always sensible.

While the client (at least for you) might be primarily used to read data
from http://cloud-images.ubuntu.com/ which is signed by a key that is
in the keyring that youv'e given, that is not the only data that it
can read.

The behavior right now is
 a.) default to letting gpg use its default keyring (~/.gnupg or
 $GNUPGHOME)
 b.) allow user to provide a keyring

I do agree that it is annoying to have to provide a keyring path,
but I don't think that your solution is generally correct.

Here are some other signed streams that are not signed by a key
in the cloud-images keyring:
   http://streams.canonical.com/juju/tools/
   http://download.cirros-cloud.net/

If you set the default to the provided keyring, you will actually
break a user that has added the identities to their ~/.gnugp
that signed those streams.

So to fix this right, possibly we could have default keyring
based on the input url?

review: Needs Fixing

[Scott Moser (smoser)]

Hi.
We've moved simplestreams from bzr on launchpad to git on launchpad.
I'm going to mark this merge proposal as Rejected based only on
the fact that it is a bzr based merge proposal.

Please feel free to re-submit the merge proposal using the launchpad git.
Hopefully the cloud-init doc at
 http://cloudinit.readthedocs.io/en/latest/topics/hacking.html
should give you an idea on how to do that.

Unmerged revisions

460. By Dimitri John Ledkov on 2018-03-06

Have a sensible default for the simplestreams keyring, now shipped by all ubuntu systems.

=== modified file 'bin/sstream-mirror'
--- bin/sstream-mirror	2015-10-29 18:21:50 +0000
+++ bin/sstream-mirror	2018-03-06 10:59:23 +0000
@@ -82,7 +82,8 @@
     parser.add_argument('--log-file', default=sys.stderr,
                         type=argparse.FileType('w'))
 
-    parser.add_argument('--keyring', action='store', default=None,
+    parser.add_argument('--keyring', action='store',
+                        default='/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg',
                         help='keyring to be specified to gpg via --keyring')
     parser.add_argument('--no-verify', '-U', action='store_false',
                         dest='verify', default=True,

=== modified file 'bin/sstream-query'
--- bin/sstream-query	2016-11-28 14:54:35 +0000
+++ bin/sstream-query	2018-03-06 10:59:23 +0000
@@ -98,7 +98,8 @@
     parser.add_argument('--log-file', default=sys.stderr,
                         type=argparse.FileType('w'))
 
-    parser.add_argument('--keyring', action='store', default=None,
+    parser.add_argument('--keyring', action='store',
+                        default='/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg',
                         help='keyring to be specified to gpg via --keyring')
     parser.add_argument('--no-verify', '-U', action='store_false',
                         dest='verify', default=True,

=== modified file 'bin/sstream-sync'
--- bin/sstream-sync	2016-11-28 14:54:35 +0000
+++ bin/sstream-sync	2018-03-06 10:59:23 +0000
@@ -85,7 +85,8 @@
     parser.add_argument('--log-file', default=sys.stderr,
                         type=argparse.FileType('w'))
 
-    parser.add_argument('--keyring', action='store', default=None,
+    parser.add_argument('--keyring', action='store',
+                        default='/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg',
                         help='keyring to be specified to gpg via --keyring')
     parser.add_argument('--no-verify', '-U', action='store_false',
                         dest='verify', default=True,

=== modified file 'tools/sstream-mirror-glance'
--- tools/sstream-mirror-glance	2016-08-04 14:34:49 +0000
+++ tools/sstream-mirror-glance	2018-03-06 10:59:23 +0000
@@ -94,7 +94,8 @@
     parser.add_argument('--log-file', default=sys.stderr,
                         type=argparse.FileType('w'))
 
-    parser.add_argument('--keyring', action='store', default=None,
+    parser.add_argument('--keyring', action='store',
+                        default='/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg',
                         help='The keyring for gpg --keyring')
 
     parser.add_argument('source_mirror')