Skip to content

Commit a634b13

Browse files
hermanntoastclaude
andcommitted
Fix: a printer shared by multiple logged in users is only allowed for the last one
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 38d3cb9 commit a634b13

2 files changed

Lines changed: 104 additions & 5 deletions

File tree

‎usr/lib/python3/dist-packages/linuxmusterLinuxclient7/printers.py‎

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ def uninstallAllPrintersOfUser(username):
4141
installedPrinters = _getInstalledPrintersOfUser(username)
4242

4343
for installedPrinter in installedPrinters:
44-
if not _uninstallPrinter(installedPrinter):
44+
remainingUsers = [u for u in _getAllowedUsersOfPrinter(installedPrinter) if u != username]
45+
if len(remainingUsers) > 0:
46+
if not _setAllowedUsersOfPrinter(installedPrinter, remainingUsers):
47+
return False
48+
elif not _uninstallPrinter(installedPrinter):
4549
return False
4650

4751
return True
@@ -80,8 +84,12 @@ def _installPrinter(username, networkPath, name):
8084
logging.error(f"Refusing to install printer: invalid printer name '{name}'")
8185
return False
8286

87+
allowedUsers = _getAllowedUsersOfPrinter(name)
88+
if username not in allowedUsers:
89+
allowedUsers.append(username)
90+
8391
logging.info(f"Install Printer {name} on {networkPath}")
84-
installCommand = ["timeout", "10", "/usr/sbin/lpadmin", "-p", name, "-E", "-v", networkPath, "-m", "everywhere", "-u", f"allow:{username}"]
92+
installCommand = ["timeout", "10", "/usr/sbin/lpadmin", "-p", name, "-E", "-v", networkPath, "-m", "everywhere", "-u", f"allow:{','.join(allowedUsers)}"]
8593
logging.debug(f"* running '{' '.join(installCommand)}'")
8694
p = subprocess.call(installCommand, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
8795
if p == 0:
@@ -135,6 +143,52 @@ def _uninstallPrinter(name):
135143
logging.fatal(f"* Error Uninstalling Printer {name}!")
136144
return False
137145

146+
def _getAllowedUsersOfPrinter(name):
147+
"""
148+
Get the users which are allowed to use a printer
149+
150+
:param name: The name of the printer
151+
:type name: str
152+
:return: List of usernames, empty if the printer does not exist or is not restricted to specific users
153+
:rtype: list
154+
"""
155+
command = ["/usr/bin/lpstat", "-l", "-p", name]
156+
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, env={**os.environ, "LC_ALL": "C"})
157+
158+
if not result.returncode == 0:
159+
return []
160+
161+
allowedUsers = []
162+
inAllowedUsers = False
163+
for line in result.stdout.split("\n"):
164+
if line.strip() == "Users allowed:":
165+
inAllowedUsers = True
166+
elif inAllowedUsers and line.startswith("\t\t"):
167+
allowedUsers.append(line.strip())
168+
else:
169+
inAllowedUsers = False
170+
171+
if "(all)" in allowedUsers or "(none)" in allowedUsers:
172+
return []
173+
174+
return allowedUsers
175+
176+
def _setAllowedUsersOfPrinter(name, allowedUsers):
177+
"""
178+
Restrict a printer to the given users
179+
180+
:param name: The name of the printer
181+
:type name: str
182+
:param allowedUsers: The users which are allowed to use the printer
183+
:type allowedUsers: list
184+
:return: True on success, False otherwise
185+
:rtype: bool
186+
"""
187+
logging.info(f"Allow printer {name} only for {', '.join(allowedUsers)}")
188+
command = ["timeout", "10", "/usr/sbin/lpadmin", "-p", name, "-u", f"allow:{','.join(allowedUsers)}"]
189+
logging.debug(f"* running '{' '.join(command)}'")
190+
return subprocess.call(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0
191+
138192
def _printerNetworkPathIsValid(networkPath):
139193
"""
140194
Checks if a printer network path is an URI with an allowed scheme (e.g. `ipp://`)

‎usr/lib/python3/dist-packages/linuxmusterLinuxclient7/tests/test_printers.py‎

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,12 @@ def test_translateSambaToIpp():
4242
assert printers.translateSambaToIpp("\\\\\\printer1") == (False, None)
4343

4444

45+
@mock.patch("subprocess.run")
4546
@mock.patch("subprocess.call")
4647
@mock.patch("linuxmusterLinuxclient7.hooks.user.isRoot")
4748
@mock.patch("linuxmusterLinuxclient7.hooks.user.username")
48-
def test_installPrinter(mockUserUsername, mockUserIsRoot, mockSubprocessCall):
49+
def test_installPrinter(mockUserUsername, mockUserIsRoot, mockSubprocessCall, mockSubprocessRun):
50+
mockSubprocessRun.return_value = CompletedProcess(args=["lpstat", "-l", "-p", "printer1"], returncode=1)
4951
mockSubprocessCall.return_value = 0
5052
mockUserIsRoot.return_value = True
5153
mockUserUsername.return_value = "user1"
@@ -66,10 +68,12 @@ def test_installPrinter(mockUserUsername, mockUserIsRoot, mockSubprocessCall):
6668
assert printers.installPrinter("ipp://linuxmuster.lan/printers/printer1", "printer2")
6769
assert _getCallsTo(mockSubprocessCall, "sudo")[-1] == ['sudo', '/usr/share/linuxmuster-linuxclient7/scripts/sudoTools', 'install-printer', '--path', 'ipp://linuxmuster.lan/printers/printer1', '--name', 'printer2']
6870

71+
@mock.patch("subprocess.run")
6972
@mock.patch("subprocess.call")
7073
@mock.patch("linuxmusterLinuxclient7.hooks.user.isRoot")
7174
@mock.patch("linuxmusterLinuxclient7.hooks.user.username")
72-
def test_installPrinterError(mockUserUsername, mockUserIsRoot, mockSubprocessCall):
75+
def test_installPrinterError(mockUserUsername, mockUserIsRoot, mockSubprocessCall, mockSubprocessRun):
76+
mockSubprocessRun.return_value = CompletedProcess(args=["lpstat", "-l", "-p", "printer1"], returncode=1)
7377
mockSubprocessCall.return_value = 124
7478
mockUserIsRoot.return_value = True
7579
mockUserUsername.return_value = "user1"
@@ -90,7 +94,7 @@ def test_uninstallAllPrintersOfUser(mockSubprocessRun, mockSubprocessCall):
9094
mockSubprocessRun.return_value = CompletedProcess(args=["lpstat", "-U", "user1", "-p"], returncode=0, stdout=lpstatStdout)
9195

9296
assert printers.uninstallAllPrintersOfUser("user1")
93-
assert _getCallsTo(mockSubprocessRun, "/usr/bin/lpstat")[-1] == ['/usr/bin/lpstat', '-U', 'user1', '-p']
97+
assert ['/usr/bin/lpstat', '-U', 'user1', '-p'] in _getCallsTo(mockSubprocessRun, "/usr/bin/lpstat")
9498
assert _getCallsTo(mockSubprocessCall, "timeout") == [["timeout", "10", "/usr/sbin/lpadmin", "-x", "printer1"], ["timeout", "10", "/usr/sbin/lpadmin", "-x", "printer2"]]
9599

96100
mockSubprocessRun.return_value = CompletedProcess(args=["lpstat", "-U", "user1", "-p"], returncode=1)
@@ -109,6 +113,47 @@ def test_uninstallAllPrintersOfUserError(mockSubprocessRun, mockSubprocessCall):
109113
mockSubprocessRun.return_value = CompletedProcess(args=["lpstat", "-U", "user1", "-p"], returncode=0, stdout=lpstatStdout)
110114
mockSubprocessCall.return_value = 124
111115
assert not printers.uninstallAllPrintersOfUser("user1")
116+
117+
@mock.patch("subprocess.run")
118+
def test_getAllowedUsersOfPrinter(mockSubprocessRun):
119+
lpstatStdout = "printer printer1 is idle.\n\tUsers allowed:\n\t\tuser1\n\t\tuser2\n\tForms allowed:\n\t\t(none)\n"
120+
mockSubprocessRun.return_value = CompletedProcess(args=["lpstat", "-l", "-p", "printer1"], returncode=0, stdout=lpstatStdout)
121+
assert printers._getAllowedUsersOfPrinter("printer1") == ["user1", "user2"]
122+
assert mockSubprocessRun.call_args.kwargs["env"]["LC_ALL"] == "C"
123+
124+
lpstatStdout = "printer printer1 is idle.\n\tUsers allowed:\n\t\t(all)\n\tForms allowed:\n\t\t(none)\n"
125+
mockSubprocessRun.return_value = CompletedProcess(args=["lpstat", "-l", "-p", "printer1"], returncode=0, stdout=lpstatStdout)
126+
assert printers._getAllowedUsersOfPrinter("printer1") == []
127+
128+
mockSubprocessRun.return_value = CompletedProcess(args=["lpstat", "-l", "-p", "printer1"], returncode=1, stdout="")
129+
assert printers._getAllowedUsersOfPrinter("printer1") == []
130+
131+
@mock.patch("subprocess.run")
132+
@mock.patch("subprocess.call")
133+
@mock.patch("linuxmusterLinuxclient7.hooks.user.isRoot")
134+
def test_installPrinterKeepsAllowedUsers(mockUserIsRoot, mockSubprocessCall, mockSubprocessRun):
135+
mockUserIsRoot.return_value = True
136+
mockSubprocessCall.return_value = 0
137+
lpstatStdout = "printer printer1 is idle.\n\tUsers allowed:\n\t\tuser1\n\tForms allowed:\n\t\t(none)\n"
138+
mockSubprocessRun.return_value = CompletedProcess(args=["lpstat", "-l", "-p", "printer1"], returncode=0, stdout=lpstatStdout)
139+
140+
assert printers.installPrinter("ipp://linuxmuster.lan/printers/printer1", "printer1", "user2")
141+
assert _getCallsTo(mockSubprocessCall, "timeout")[-1][-2:] == ["-u", "allow:user1,user2"]
142+
143+
assert printers.installPrinter("ipp://linuxmuster.lan/printers/printer1", "printer1", "user1")
144+
assert _getCallsTo(mockSubprocessCall, "timeout")[-1][-2:] == ["-u", "allow:user1"]
145+
146+
@mock.patch("subprocess.call")
147+
@mock.patch("subprocess.run")
148+
def test_uninstallAllPrintersOfUserKeepsPrinterForOtherUsers(mockSubprocessRun, mockSubprocessCall):
149+
mockSubprocessCall.return_value = 0
150+
lpstatPrinters = CompletedProcess(args=["lpstat", "-U", "user1", "-p"], returncode=0, stdout="printer printer1 is idle. enabled since Sat 02 Jul 2022 06:07:39 PM CEST")
151+
lpstatAllowedUsers = CompletedProcess(args=["lpstat", "-l", "-p", "printer1"], returncode=0, stdout="printer printer1 is idle.\n\tUsers allowed:\n\t\tuser1\n\t\tuser2\n\tForms allowed:\n\t\t(none)\n")
152+
mockSubprocessRun.side_effect = [lpstatPrinters, lpstatAllowedUsers]
153+
154+
assert printers.uninstallAllPrintersOfUser("user1")
155+
assert _getCallsTo(mockSubprocessCall, "timeout") == [["timeout", "10", "/usr/sbin/lpadmin", "-p", "printer1", "-u", "allow:user2"]]
156+
112157
# --------------------
113158
# - Helper functions -
114159
# --------------------

0 commit comments

Comments
 (0)