Fix user fact comments wtih spaces parsing by refactoring fact (#597)

* Fix user fact comments wtih spaces parsing by refactoring fact

* Fixed flake8 issues with whitespaces

Author: sysadmin75

pyinfra/facts/server.py

@@ -428,55 +428,38 @@ class Users(FactBase):
 
     command = '''
         for i in `cat /etc/passwd | cut -d: -f1`; do
-            ID=`id $i`;
-            META=`cat /etc/passwd | grep ^$i: | cut -d: -f5-7`;
-            echo "$ID $META";
+            ENTRY=`grep ^$i: /etc/passwd`;
+            echo "$ENTRY|`id -gn $i`|`id -Gn $i`";
         done
     '''.strip()
 
     default = dict
 
-    regex = r'^uid=([0-9]+)\(([a-zA-Z0-9_\.\-]+)\) gid=([0-9]+)\(([a-zA-Z0-9_\.\-]+)\) groups=([a-zA-Z0-9_\.\-,\(\)\s]+) (.*)$'  # noqa
-    group_regex = r'^[0-9]+\(([a-zA-Z0-9_\.\-]+)\)$'
-
     def process(self, output):
         users = {}
+
         for line in output:
-            matches = re.match(self.regex, line)
+            entry, group, user_groups = line.split('|')
 
-            if matches:
+            if entry:
                 # Parse out the comment/home/shell
-                comment_home_shell = matches.group(6).split(':')
-                comment = comment_home_shell[0] or None
-                home = comment_home_shell[1] or None
-                shell = comment_home_shell[2] or None
+                entries = entry.split(':')
 
-                # Main user group, uid & gid
-                uid = int(matches.group(1))
-                gid = int(matches.group(3))
-                group = matches.group(4)
-
-                # Parse the groups
+                # Parse groups
                 groups = []
-                for group_matches in matches.group(5).split(','):
-                    name = re.match(self.group_regex, group_matches.strip())
-                    if name:
-                        name = name.group(1)
-                    else:
-                        continue  # pragma: no cover
-
+                for group_name in user_groups.split(' '):
                     # We only want secondary groups here
-                    if name != group:
-                        groups.append(name)
+                    if group_name and group_name != group:
+                        groups.append(group_name)
 
-                users[matches.group(2)] = {
+                users[entries[0]] = {
+                    'home': entries[5] or None,
+                    'comment': entries[4] or None,
+                    'shell': entries[6] or None,
                     'group': group,
                     'groups': groups,
-                    'comment': comment,
-                    'home': home,
-                    'shell': shell,
-                    'uid': uid,
-                    'gid': gid,
+                    'uid': int(entries[2]),
+                    'gid': int(entries[3]),
                 }
 
         return users

tests/facts/server.Users/mixed.json

@@ -1,12 +1,12 @@
 {
     "output": [
-        "uid=0(root) gid=0(wheel) groups=0(wheel), 2(kmem), 3(sys), 4(tty), 5(operator), 20(staff), 31(guest) root:/root:/bin/ks",
-        "uid=1003(test.testy) gid=1003(test.testy) groups=1003(test.testy) Testy,,,:/home/test.testy:/bin/ksh",
-        "uid=1004(_tesTy.test) gid=1004(_tesTy.test) groups=1004(_tesTy.test),1001(pyinfra) :/home/_tesTy.test:/bin/ksh",
-        "uid=1002(noshell) gid=1002(noshell) groups=1002(noshell) noshell:/home/noshell:",
-        "uid=1002(nohome) gid=1002(nohome) groups=1002(nohome) nohome::/bin/bash"
+        "root:x:0:0:root:/root:/bin/ks|wheel|wheel kmem sys tty operator staff guest",
+        "_tesTy.test:x:1004:1004::/home/_tesTy.test:/bin/ksh|_tesTy.test|_tesTy.test pyinfra",
+        "test.testy:x:1003:1003:Testy,,,:/home/test.testy:/bin/ksh|test.testy|",
+        "noshell:x:1002:1002:noshell comment with spaces:/home/noshell:|noshell|",
+        "nohome:x:1002:1002:nohome comment::/bin/bash|nohome|"
     ],
-    "command": "for i in `cat /etc/passwd | cut -d: -f1`; do\n            ID=`id $i`;\n            META=`cat /etc/passwd | grep ^$i: | cut -d: -f5-7`;\n            echo \"$ID $META\";\n        done",
+    "command": "for i in `cat /etc/passwd | cut -d: -f1`; do\n            ENTRY=`grep ^$i: /etc/passwd`;\n            echo \"$ENTRY|`id -gn $i`|`id -Gn $i`\";\n        done",
     "fact": {
         "root": {
             "home": "/root",
@@ -46,7 +46,7 @@
         },
         "noshell": {
             "home": "/home/noshell",
-            "comment": "noshell",
+            "comment": "noshell comment with spaces",
             "shell": null,
             "group": "noshell",
             "groups": [],
@@ -55,7 +55,7 @@
         },
         "nohome": {
             "home": null,
-            "comment": "nohome",
+            "comment": "nohome comment",
             "shell": "/bin/bash",
             "group": "nohome",
             "groups": [],