From ad17c530b0aeb50eb6c16c1f7c1e9ceaecee074e Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Thu, 14 Jun 2018 15:27:06 +1200
Subject: [PATCH] only add the user to groups that exist in the target system

for https://bugs.launchpad.net/subiquity/+bug/1775228
("user is in debian-tor group on fresh install")
---
 subiquity/models/subiquity.py | 19 +++++++++++++++++--
 users-and-groups              |  1 +
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 users-and-groups

diff --git a/subiquity/models/subiquity.py b/subiquity/models/subiquity.py
index cb3bfc94..16486de7 100644
--- a/subiquity/models/subiquity.py
+++ b/subiquity/models/subiquity.py
@@ -20,6 +20,7 @@ import yaml
 
 from subiquitycore.models.identity import IdentityModel
 from subiquitycore.models.network import NetworkModel
+from subiquitycore.utils import run_command
 
 from .filesystem import FilesystemModel
 from .installpath import InstallpathModel
@@ -41,12 +42,24 @@ def setup_yaml():
 setup_yaml()
 
 
+def get_all_groups(dry_run):
+    command = ['chroot', '/target', 'getent', 'group']
+    if dry_run:
+        del command[:2]
+    cp = run_command(command, check=True)
+    groups = set()
+    for line in cp.stdout.splitlines():
+        groups.add(line.split(':')[0])
+    return groups
+
+
 class SubiquityModel:
     """The overall model for subiquity."""
 
     def __init__(self, common):
         root = '/'
-        if common['opts'].dry_run:
+        self.opts = common['opts']
+        if self.opts.dry_run:
             root = os.path.abspath(".subiquity")
         self.locale = LocaleModel(common['signal'])
         self.keyboard = KeyboardModel(root)
@@ -61,13 +74,15 @@ class SubiquityModel:
     def _cloud_init_config(self):
         user = self.identity.user
         users_and_groups_path = (
-            os.path.join(os.environ.get("SNAP", "/does-not-exist"),
+            os.path.join(os.environ.get("SNAP", "."),
                          "users-and-groups"))
         if os.path.exists(users_and_groups_path):
             groups = open(users_and_groups_path).read().split()
         else:
             groups = ['admin']
         groups.append('sudo')
+        all_groups = get_all_groups(self.opts.dry_run)
+        groups = [group for group in groups if group in all_groups]
         user_info = {
             'name': user.username,
             'gecos': user.realname,
diff --git a/users-and-groups b/users-and-groups
new file mode 100644
index 00000000..a707b6d1
--- /dev/null
+++ b/users-and-groups
@@ -0,0 +1 @@
+adm cdrom dip lpadmin plugdev sambashare debian-tor libvirtd lxd