Add parsed login_time to server.Users fact.

Author: Fizzadar

pyinfra/facts/server.py

@@ -455,10 +455,15 @@ def process(self, output):
                     if group_name and group_name != group:
                         groups.append(group_name)
 
+                raw_login_time = None
+                login_time = None
+
                 # Parse lastlog info
                 # lastlog output varies, which is why I use regex to match login time
                 login = re.search(rex, lastlog)
-                login_time = login.group() if login else None
+                if login:
+                    raw_login_time = login.group()
+                    login_time = parse_date(raw_login_time)
 
                 users[entries[0]] = {
                     'home': entries[5] or None,
@@ -468,7 +473,8 @@ def process(self, output):
                     'groups': groups,
                     'uid': int(entries[2]),
                     'gid': int(entries[3]),
-                    'lastlog': login_time,
+                    'lastlog': raw_login_time,
+                    'login_time': login_time,
                 }
 
         return users

tests/facts/server.Users/mixed.json

@@ -23,7 +23,8 @@
             ],
             "uid": 0,
             "gid": 0,
-            "lastlog": "Sat Jun 5 12:03:23 -0600 2021"
+            "lastlog": "Sat Jun 5 12:03:23 -0600 2021",
+            "login_time": "2021-06-05T12:03:23-06:00"
         },
         "_tesTy.test": {
             "home": "/home/_tesTy.test",
@@ -35,7 +36,8 @@
             ],
             "uid": 1004,
             "gid": 1004,
-            "lastlog": "Sat Jun 12 13:43:42 -0600 2021"
+            "lastlog": "Sat Jun 12 13:43:42 -0600 2021",
+            "login_time": "2021-06-12T13:43:42-06:00"
         },
         "test.testy": {
             "home": "/home/test.testy",
@@ -45,7 +47,8 @@
             "groups": [],
             "uid": 1003,
             "gid": 1003,
-            "lastlog": "Fri Jun 11 22:26:04 -0600 2021"
+            "lastlog": "Fri Jun 11 22:26:04 -0600 2021",
+            "login_time": "2021-06-11T22:26:04-06:00"
         },
         "noshell": {
             "home": "/home/noshell",
@@ -55,7 +58,8 @@
             "groups": [],
             "uid": 1002,
             "gid": 1002,
-            "lastlog": null
+            "lastlog": null,
+            "login_time": null
         },
         "nohome": {
             "home": null,
@@ -65,7 +69,8 @@
             "groups": [],
             "uid": 1002,
             "gid": 1002,
-            "lastlog": null
+            "lastlog": null,
+            "login_time": null
         }
     }
 }

words.txt

@@ -185,6 +185,7 @@ keyid
 keyring
 keyscan
 keyserver
+lastlog
 Launchd
 launchd
 levelno