Merge lp:~larryprice/libertine/restrict-container-id into lp:libertine

[Larry Price]

Enforce click requirements for container ID.

Enforce click requirements for container ID.

Note that this does not "fix" the bug, but instead prevents this situation from occurring.

[Christopher Townsend (townsend)]

Indeed, it conforms to u-a-l's requirements. +1

review: Approve

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:271
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/63/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/225
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/183
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/183
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/183
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/183
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/183
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/183
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/171/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/228
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/213
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/213
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/213
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/206
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/206/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/206
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/206/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/206
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/206/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/206
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/206/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/206
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/206/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/206
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/206/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/63/rebuild

review: Approve (continuous-integration)

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2016-07-15 18:39:58 +0000
+++ tools/libertine-container-manager	2016-07-29 18:00:15 +0000
@@ -21,6 +21,7 @@
 import getpass
 import os
 import sys
+import re
 
 from apt.debfile import DebPackage
 from libertine import LibertineContainer
@@ -41,11 +42,12 @@
             print("Invalid distro %s" % args.distro, file=sys.stderr)
             sys.exit(1)
 
-        if args.id and self.containers_config.container_exists(args.id):
-            print("Container id \'%s\' is already used." % args.id, file=sys.stderr)
-            sys.exit(1)
-        elif not args.id:
-            args.id = get_unique_container_id(distro)
+        if self.containers_config.container_exists(args.id):
+            print("Container id '%s' is already used." % args.id, file=sys.stderr)
+            sys.exit(1)
+        elif re.match("^[a-z0-9][a-z0-9+.-]+$", args.id) is None:
+            print("Container id '%s' invalid. ID must be of form ([a-z0-9][a-z0-9+.-]+)." % args.id, file=sys.stderr)
+            sys.exit(1)
 
         if not args.type:
             container_type = self.host_info.select_container_type_by_kernel()
@@ -323,7 +325,7 @@
     parser_create.add_argument(
         '-i', '--id',
         required=True,
-        help=("Container identifier. Required."))
+        help=("Container identifier of form ([a-z0-9][a-z0-9+.-]+). Required."))
     parser_create.add_argument(
         '-t', '--type',
         help=("Type of Libertine container to create. Either 'lxc' or 'chroot'."))

=== modified file 'tools/libertine-container-manager.1'
--- tools/libertine-container-manager.1	2016-07-12 16:25:52 +0000
+++ tools/libertine-container-manager.1	2016-07-29 18:00:15 +0000
@@ -81,7 +81,7 @@
 .IP
 .BR \-i " ID, " \-\-id " ID" ""
 .RS 14
-Container identifier. Required.
+Container identifier of form ([a-z0-9][a-z0-9+.-]+). Required.
 .RE
 .IP
 .BR \-t " TYPE, " \-\-type " TYPE" ""