From 53f1210a84817387bd21bd16751ed923b637b505 Mon Sep 17 00:00:00 2001
From: Pekka Helenius <fincer89@hotmail.com>
Date: Fri, 22 May 2020 09:05:03 +0300
Subject: [PATCH] Agent: check that passwd file is OK and readable

---
 tools/pamusb-agent | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tools/pamusb-agent b/tools/pamusb-agent
index a903b8f..ea2e3d6 100755
--- a/tools/pamusb-agent
+++ b/tools/pamusb-agent
@@ -275,11 +275,15 @@ udisksObjectManager = udisks.get_object_manager()
 sysUsers= []
 validUsers = []
 
-with open('/etc/passwd', 'r') as f:
-	for line in f.readlines():
-		sysUser = re.sub(r'^(.*?):.*', '\\1', line[:-1])
-		sysUsers.append(sysUser)
-	f.close()
+try:
+	with open('/etc/passwd', 'r') as f:
+		for line in f.readlines():
+			sysUser = re.sub(r'^(.*?):.*', '\\1', line[:-1])
+			sysUsers.append(sysUser)
+		f.close()
+except:
+	logger.error('Couldn\'t read system user names from "/etc/passwd". Process can\'t continue.')
+	sys.exit(1)
 
 logger.info('pamusb-agent up and running.')