Skip to content

Commit 45d33e9

Browse files
SokolovValySokolovValy
committed
Changed location of policies for Udisks2 and PackageKit in the category tree
1 parent cde6170 commit 45d33e9

File tree

9 files changed

+820
-107
lines changed

9 files changed

+820
-107
lines changed

‎BaseALT.admx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,13 @@
134134
<parentCategory ref="ALT_Windows_Manager_Marco" />
135135
</category>
136136
<category name="ALT_Polkit" displayName="$(string.ALT_Polkit)" explainText="$(string.ALT_Polkit_Help)">
137-
<parentCategory ref="ALT_System" />
137+
<parentCategory ref="ALT_Services" />
138+
</category>
139+
<category name="ALT_Udisks2" displayName="$(string.ALT_Udisks2)" explainText="$(string.ALT_Udisks2_Help)">
140+
<parentCategory ref="ALT_Polkit" />
141+
</category>
142+
<category name="ALT_PackageKit" displayName="$(string.ALT_PackageKit)" explainText="$(string.ALT_PackageKit_Help)">
143+
<parentCategory ref="ALT_Polkit" />
138144
</category>
139145
</categories>
140146
</policyDefinitions>

‎BaseALTPackageKit.admx‎

Lines changed: 297 additions & 21 deletions
Large diffs are not rendered by default.

‎BaseALTPolkit.admx‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<!-- (c) 2022 BaseALT, Ltd. -->
33
<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
44
<policyNamespaces>
5-
<target prefix="polkit" namespace="BaseALT.Policies.Polkit" />
5+
<target prefix="udisks2" namespace="BaseALT.Policies.Udisks2" />
6+
<using prefix="polkit" namespace="BaseALT.Policies.Polkit" />
67
<using prefix="system" namespace="BaseALT.Policies.System" />
78
</policyNamespaces>
89
<resources minRequiredRevision="1.0" />
@@ -13,7 +14,7 @@
1314
name="org.freedesktop.udisks2.filesystem-mount"
1415
valuename="org.freedesktop.udisks2.filesystem-mount"
1516
presentation="$(presentation.OrgFreedesktopUdisks2FileSystemMount-pr)">
16-
<parentCategory ref="system:ALT_Polkit" />
17+
<parentCategory ref="system:ALT_Udisks2" />
1718
<supportedOn ref="system:SUPPORTED_AltP10" />
1819
<elements>
1920
<enum id="OrgFreedesktopUdisks2FileSystemMount_setter" valueName="org.freedesktop.udisks2.filesystem-mount" required="true">
@@ -64,7 +65,7 @@
6465
name="org.freedesktop.udisks2.filesystem-mount-user"
6566
valuename="org.freedesktop.udisks2.filesystem-mount"
6667
presentation="$(presentation.OrgFreedesktopUdisks2FileSystemMountUser-pr)">
67-
<parentCategory ref="system:ALT_Polkit" />
68+
<parentCategory ref="system:ALT_Udisks2" />
6869
<supportedOn ref="system:SUPPORTED_AltP10" />
6970
<elements>
7071
<enum id="OrgFreedesktopUdisks2FileSystemMount_setter" valueName="org.freedesktop.udisks2.filesystem-mount" required="true">
@@ -107,7 +108,7 @@
107108
name="org.freedesktop.udisks2.filesystem-mount-other-seat"
108109
valuename="org.freedesktop.udisks2.filesystem-mount-other-seat"
109110
presentation="$(presentation.OrgFreedesktopUdisks2FileSystemMount-pr)">
110-
<parentCategory ref="system:ALT_Polkit" />
111+
<parentCategory ref="system:ALT_Udisks2" />
111112
<supportedOn ref="system:SUPPORTED_AltP10" />
112113
<elements>
113114
<enum id="OrgFreedesktopUdisks2FileSystemMount_setter" valueName="org.freedesktop.udisks2.filesystem-mount-other-seat" required="true">
@@ -158,7 +159,7 @@
158159
name="org.freedesktop.udisks2.filesystem-mount-other-seat-user"
159160
valuename="org.freedesktop.udisks2.filesystem-mount-other-seat"
160161
presentation="$(presentation.OrgFreedesktopUdisks2FileSystemMountUser-pr)">
161-
<parentCategory ref="system:ALT_Polkit" />
162+
<parentCategory ref="system:ALT_Udisks2" />
162163
<supportedOn ref="system:SUPPORTED_AltP10" />
163164
<elements>
164165
<enum id="OrgFreedesktopUdisks2FileSystemMount_setter" valueName="org.freedesktop.udisks2.filesystem-mount-other-seat" required="true">
@@ -201,7 +202,7 @@
201202
name="org.freedesktop.udisks2.filesystem-mount-system"
202203
valuename="org.freedesktop.udisks2.filesystem-mount-system"
203204
presentation="$(presentation.OrgFreedesktopUdisks2FileSystemMount-pr)">
204-
<parentCategory ref="system:ALT_Polkit" />
205+
<parentCategory ref="system:ALT_Udisks2" />
205206
<supportedOn ref="system:SUPPORTED_AltP10" />
206207
<elements>
207208
<enum id="OrgFreedesktopUdisks2FileSystemMount_setter" valueName="org.freedesktop.udisks2.filesystem-mount-system" required="true">
@@ -252,7 +253,7 @@
252253
name="org.freedesktop.udisks2.filesystem-mount-system-user"
253254
valuename="org.freedesktop.udisks2.filesystem-mount-system"
254255
presentation="$(presentation.OrgFreedesktopUdisks2FileSystemMountUser-pr)">
255-
<parentCategory ref="system:ALT_Polkit" />
256+
<parentCategory ref="system:ALT_Udisks2" />
256257
<supportedOn ref="system:SUPPORTED_AltP10" />
257258
<elements>
258259
<enum id="OrgFreedesktopUdisks2FileSystemMount_setter" valueName="org.freedesktop.udisks2.filesystem-mount-system" required="true">
@@ -294,7 +295,7 @@
294295
key="Software\BaseALT\Policies\Polkit"
295296
name="org-freedesktop-udisks2-filesystem-mount-all"
296297
presentation="$(presentation.org-freedesktop-udisks2-filesystem-mount-all-pr)">
297-
<parentCategory ref="system:ALT_Polkit" />
298+
<parentCategory ref="system:ALT_Udisks2" />
298299
<supportedOn ref="system:SUPPORTED_AltP10" />
299300
<enabledList defaultKey="Software\BaseALT\Policies\Polkit">
300301
<item valueName="org.freedesktop.udisks2.filesystem-mount">
@@ -458,7 +459,7 @@
458459
key="Software\BaseALT\Policies\Polkit"
459460
name="org-freedesktop-udisks2-filesystem-mount-all-user"
460461
presentation="$(presentation.org-freedesktop-udisks2-filesystem-mount-all-user-pr)">
461-
<parentCategory ref="system:ALT_Polkit" />
462+
<parentCategory ref="system:ALT_Udisks2" />
462463
<supportedOn ref="system:SUPPORTED_AltP10" />
463464
<enabledList defaultKey="Software\BaseALT\Policies\Polkit">
464465
<item valueName="org.freedesktop.udisks2.filesystem-mount">

‎en-US/basealt.adml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@
5858
<string id="ALT_Windows_Manager_Marco_Help">Windows manager Marco settings</string>
5959
<string id="ALT_Windows_Manager_Marco_Keyboard">Keyboard settings</string>
6060
<string id="ALT_Windows_Manager_Marco_Keyboard_Help">Keyboard settings</string>
61-
<string id="ALT_Polkit">Polkit rules</string>
62-
<string id="ALT_Polkit_Help">Polkit rules</string>
61+
<string id="ALT_Polkit">Polkit Policies</string>
62+
<string id="ALT_Polkit_Help">Polkit Policies</string>
63+
<string id="ALT_PackageKit">PackageKit permissions</string>
64+
<string id="ALT_PackageKit_Help">PackageKit permissions</string>
65+
<string id="ALT_Udisks2">Udisks2 permissions</string>
66+
<string id="ALT_Udisks2_Help">Udisks2 permissions</string>
6367
</stringTable>
6468
</resources>
6569
</policyDefinitionResources>

‎en-US/basealtpackagekit.adml‎

Lines changed: 163 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
This policy grants or restricts users the right to install packages through the PackageKit package management interface.
1616

17-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
17+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
1818

1919
Enable - permission to mount with set rights;
2020

@@ -41,7 +41,7 @@ Action example: pkcon install "package_name"
4141

4242
This policy grants or restricts users the right to install packages through the PackageKit package management interface.
4343

44-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
44+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
4545

4646
Enable - permission to mount with set rights;
4747

@@ -68,7 +68,7 @@ Action example: pkcon install "package_name"
6868

6969
This policy grants or restricts users the right to uninstall packages through the PackageKit package management interface.
7070

71-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
71+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
7272

7373
Enable - permission to mount with set rights;
7474

@@ -95,7 +95,7 @@ Action example: pkcon remove "package_name"
9595

9696
This policy grants or restricts users the right to uninstall packages through the PackageKit package management interface.
9797

98-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
98+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
9999

100100
Enable - permission to mount with set rights;
101101

@@ -122,7 +122,7 @@ Action example: pkcon remove "package_name"
122122

123123
This policy grants or restricts users the right to update packages installed on the system through the PackageKit package management interface.
124124

125-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
125+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
126126

127127
Enable - permission to mount with set rights;
128128

@@ -147,7 +147,7 @@ Action example: pkcon update
147147
<string id="org-freedesktop-packagekit-system-update-user">Permission to update packages</string>
148148
<string id="org-freedesktop-packagekit-system-update-user_help">Permission to update packages
149149

150-
This policy grants or restricts users the right to update packages installed on the system through the PackageKit package management interface.
150+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
151151

152152
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
153153

@@ -176,7 +176,7 @@ Action example: pkcon update
176176

177177
This policy grants or restricts users the right to update system package sources using the PackageKit package management interface.
178178

179-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
179+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
180180

181181
Enable - permission to mount with set rights;
182182

@@ -203,7 +203,7 @@ Action example: pkcon refresh
203203

204204
This policy grants or restricts users the right to update system package sources using the PackageKit package management interface.
205205

206-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
206+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
207207

208208
Enable - permission to mount with set rights;
209209

@@ -230,7 +230,7 @@ Action example: pkcon refresh
230230

231231
This policy grants or restricts users the right to restore the package system if it has problems, such as missing dependencies, through the PackageKit package management interface.
232232

233-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
233+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
234234

235235
Enable - permission to mount with set rights;
236236

@@ -257,7 +257,7 @@ Action example: pkcon repair
257257

258258
This policy grants or restricts users the right to restore the package system if it has problems, such as missing dependencies, through the PackageKit package management interface.
259259

260-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
260+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
261261

262262
Enable - permission to mount with set rights;
263263

@@ -284,7 +284,7 @@ Action example: pkcon repair
284284

285285
This policy grants or restricts users to edit package sources on the system through the PackageKit package management interface.
286286

287-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
287+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
288288

289289
Enable - permission to mount with set rights;
290290

@@ -309,7 +309,7 @@ Possible values:
309309

310310
This policy grants or restricts users to edit package sources on the system through the PackageKit package management interface.
311311

312-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
312+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
313313

314314
Enable - permission to mount with set rights;
315315

@@ -334,7 +334,7 @@ Possible values:
334334

335335
This policy grants or restricts user rights to install untrusted or unverified packages for external PackageKit package management.
336336

337-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
337+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
338338

339339
Enable - permission to mount with set rights;
340340

@@ -359,7 +359,156 @@ Possible values:
359359

360360
This policy grants or restricts user rights to install untrusted or unverified packages for external PackageKit package management.
361361

362-
Disable/Not configured - permissions are determined by system settings - default settings for polkit actions;
362+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
363+
364+
Enable - permission to mount with set rights;
365+
366+
Possible values:
367+
368+
«No» - Not authorized;
369+
370+
«Yes» - Authorized;
371+
372+
«Auth_self» - Authentication by the owner of the session that the client originates from is required. Note that this is not restrictive enough for most uses on multi-user systems; auth_admin* is generally recommended;
373+
374+
«Auth_admin» - Authentication by an administrative user is required;
375+
376+
«Auth_self_keep» - Like auth_self but the authorization is kept for a brief period (e.g. five minutes). The warning about auth_self above applies likewise;
377+
378+
«Auth_admin_keep» - Like auth_admin but the authorization is kept for a brief period (e.g. five minutes).
379+
380+
</string>
381+
382+
<string id="org-freedesktop-packagekit-package-reinstall">Permission to install unverified packages</string>
383+
<string id="org-freedesktop-packagekit-package-reinstall_help">Permission to install unverified packages
384+
385+
This policy grants or restricts users the right to reinstall packages through the PackageKit package management interface.
386+
387+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
388+
389+
Enable - permission to mount with set rights;
390+
391+
Possible values:
392+
393+
«No» - Not authorized;
394+
395+
«Yes» - Authorized;
396+
397+
«Auth_self» - Authentication by the owner of the session that the client originates from is required. Note that this is not restrictive enough for most uses on multi-user systems; auth_admin* is generally recommended;
398+
399+
«Auth_admin» - Authentication by an administrative user is required;
400+
401+
«Auth_self_keep» - Like auth_self but the authorization is kept for a brief period (e.g. five minutes). The warning about auth_self above applies likewise;
402+
403+
«Auth_admin_keep» - Like auth_admin but the authorization is kept for a brief period (e.g. five minutes).
404+
405+
</string>
406+
407+
<string id="org-freedesktop-packagekit-package-reinstall-user">Permission to install unverified packages</string>
408+
<string id="org-freedesktop-packagekit-package-reinstall-user_help">Permission to install unverified packages
409+
410+
This policy grants or restricts users the right to reinstall packages through the PackageKit package management interface.
411+
412+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
413+
414+
Enable - permission to mount with set rights;
415+
416+
Possible values:
417+
418+
«No» - Not authorized;
419+
420+
«Yes» - Authorized;
421+
422+
«Auth_self» - Authentication by the owner of the session that the client originates from is required. Note that this is not restrictive enough for most uses on multi-user systems; auth_admin* is generally recommended;
423+
424+
«Auth_admin» - Authentication by an administrative user is required;
425+
426+
«Auth_self_keep» - Like auth_self but the authorization is kept for a brief period (e.g. five minutes). The warning about auth_self above applies likewise;
427+
428+
«Auth_admin_keep» - Like auth_admin but the authorization is kept for a brief period (e.g. five minutes).
429+
430+
</string>
431+
432+
<string id="org-freedesktop-packagekit-package-eula-accept">Permission to accept the license agreement</string>
433+
<string id="org-freedesktop-packagekit-package-eula-accept_help">Permission to accept the license agreement
434+
435+
This policy grants or restricts the right to accept the software user agreement through the PackageKit package management interface.
436+
437+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
438+
439+
Enable - permission to mount with set rights;
440+
441+
Possible values:
442+
443+
«No» - Not authorized;
444+
445+
«Yes» - Authorized;
446+
447+
«Auth_self» - Authentication by the owner of the session that the client originates from is required. Note that this is not restrictive enough for most uses on multi-user systems; auth_admin* is generally recommended;
448+
449+
«Auth_admin» - Authentication by an administrative user is required;
450+
451+
«Auth_self_keep» - Like auth_self but the authorization is kept for a brief period (e.g. five minutes). The warning about auth_self above applies likewise;
452+
453+
«Auth_admin_keep» - Like auth_admin but the authorization is kept for a brief period (e.g. five minutes).
454+
455+
</string>
456+
457+
<string id="org-freedesktop-packagekit-package-eula-accept-user">Permission to accept the license agreement</string>
458+
<string id="org-freedesktop-packagekit-package-eula-accept-user_help">Permission to accept the license agreement
459+
460+
This policy grants or restricts the right to accept the software user agreement through the PackageKit package management interface.
461+
462+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
463+
464+
Enable - permission to mount with set rights;
465+
466+
Possible values:
467+
468+
«No» - Not authorized;
469+
470+
«Yes» - Authorized;
471+
472+
«Auth_self» - Authentication by the owner of the session that the client originates from is required. Note that this is not restrictive enough for most uses on multi-user systems; auth_admin* is generally recommended;
473+
474+
«Auth_admin» - Authentication by an administrative user is required;
475+
476+
«Auth_self_keep» - Like auth_self but the authorization is kept for a brief period (e.g. five minutes). The warning about auth_self above applies likewise;
477+
478+
«Auth_admin_keep» - Like auth_admin but the authorization is kept for a brief period (e.g. five minutes).
479+
480+
</string>
481+
482+
<string id="org-freedesktop-packagekit-system-trust-signing-key">Разрешение на добавление ключа электронной подписи</string>
483+
<string id="org-freedesktop-packagekit-system-trust-signing-key_help">Разрешение на добавление ключа электронной подписи
484+
485+
This policy grants or restricts users the right to add the signing key to the list of trusted keys in the system through the PackageKit package management interface.
486+
487+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
488+
489+
Enable - permission to mount with set rights;
490+
491+
Possible values:
492+
493+
«No» - Not authorized;
494+
495+
«Yes» - Authorized;
496+
497+
«Auth_self» - Authentication by the owner of the session that the client originates from is required. Note that this is not restrictive enough for most uses on multi-user systems; auth_admin* is generally recommended;
498+
499+
«Auth_admin» - Authentication by an administrative user is required;
500+
501+
«Auth_self_keep» - Like auth_self but the authorization is kept for a brief period (e.g. five minutes). The warning about auth_self above applies likewise;
502+
503+
«Auth_admin_keep» - Like auth_admin but the authorization is kept for a brief period (e.g. five minutes).
504+
</string>
505+
506+
<string id="org-freedesktop-packagekit-system-trust-signing-key-user">Разрешение на добавление ключа электронной подписи</string>
507+
<string id="org-freedesktop-packagekit-system-trust-signing-key-user_help">Разрешение на добавление ключа электронной подписи
508+
509+
This policy grants or restricts users the right to add the signing key to the list of trusted keys in the system through the PackageKit package management interface.
510+
511+
Disable/Not configured - Permissions are determined by system settings. Default is «Auth_admin»
363512

364513
Enable - permission to mount with set rights;
365514

0 commit comments

Comments
 (0)