]> git.proxmox.com Git - pve-access-control.git/log
pve-access-control.git
10 days agoapi: permissions: allow users to check their own tokens
Fabian Grünbichler [Tue, 5 Nov 2024 08:30:39 +0000 (09:30 +0100)]
api: permissions: allow users to check their own tokens

even if they lack Sys.Audit on /access - since tokens are self-service,
checking whether the ACLs work as expected should also be doable for every
user.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Tested-by: Daniel Kral <d.kral@proxmox.com>
10 days agoapi: permissions: allow users to view their own permissions
Fabian Grünbichler [Tue, 5 Nov 2024 08:30:38 +0000 (09:30 +0100)]
api: permissions: allow users to view their own permissions

even when specifying an explicit userid matching their own.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Tested-by: Daniel Kral <d.kral@proxmox.com>
4 months agopveum: user token: rename remove command to delete with alias
Thomas Lamprecht [Mon, 22 Jul 2024 16:33:11 +0000 (18:33 +0200)]
pveum: user token: rename remove command to delete with alias

All other groups use delete for deleting users/groups/... so it makes
sense to do so for the user token command group too.

Add an alias for the old command for backwards compatibility to avoid
that scrips and muscle memory break.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 months agopveum: indentation clean-up
Thomas Lamprecht [Mon, 22 Jul 2024 16:32:37 +0000 (18:32 +0200)]
pveum: indentation clean-up

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 months agoapi: ACL update: fix handling of Permissions.Modify
Fabian Grünbichler [Thu, 11 Jul 2024 11:44:07 +0000 (13:44 +0200)]
api: ACL update: fix handling of Permissions.Modify

With the PVE 8.0 major release, the scope of
non-"Permissions.Modify"-based ACL update privileges were reduced (so
that users with for example, VM.Allocate on a VM could only delegate
their own privileges, but not arbitrary other ones). that additional
logic had a wrong guard and was accidentally triggered for calls where
the user had the "Permissions.Modify" privilege on the modified ACL
path, but without propagation set.

A user with "Permissions.Modify" on a path should be able to set
arbitrary ACLs for that path, even without propagation.

Reported on the forum: https://forum.proxmox.com/threads/151032/

Fixes: 46bfd59 ("acls: restrict less-privileged ACL modifications")
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
7 months agobump version to 8.1.4
Thomas Lamprecht [Mon, 22 Apr 2024 11:45:27 +0000 (13:45 +0200)]
bump version to 8.1.4

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
7 months agofix #5335: sort ACL entries in user.cfg
Daniel Krambrock via pve-devel [Thu, 11 Apr 2024 08:09:09 +0000 (10:09 +0200)]
fix #5335: sort ACL entries in user.cfg

Stable sorting in user.cfg config file allows tracking changes by
checking into git or when using automation like ansible.

Signed-off-by: Daniel Krambrock <krambrock@hrz.uni-marburg.de>
Tested-by: Folge Gleumes <f.gleumes@proxmox.com>
8 months agobump version to 8.1.3
Thomas Lamprecht [Fri, 22 Mar 2024 13:14:39 +0000 (14:14 +0100)]
bump version to 8.1.3

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
8 months agojobs: realm sync: fix scheduled LDAP syncs not applying attributes correctly
Christoph Heiss [Tue, 19 Mar 2024 13:48:43 +0000 (14:48 +0100)]
jobs: realm sync: fix scheduled LDAP syncs not applying attributes correctly

This was reported by a user in the forum [0].

The cause was that the user-* standard options were not registered
when the sync was called from the scheduler, resulting in the
following error:

  pvescheduler[2849]: skipping attribute mapping 'cn'->'comment' for user 'test@samba0' - no such standard option 'user-comment'

Fix this by simply importing the PVE::API2::User module, thus ensuring
the options get registered.

[0] https://forum.proxmox.com/threads/ldap-integration-comment-email-first-name-lastname.143490/

Fixes: cb93636 ("LDAP sync: improve validation of synced attributes")
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
Tested-by: Fiona Ebner <f.ebner@proxmox.com>
8 months agouser: password change: require confirmation-password parameter
Wolfgang Bumiller [Fri, 15 Mar 2024 12:41:29 +0000 (13:41 +0100)]
user: password change: require confirmation-password parameter

Add a new 'confirmation-password' parameter to the change-password
endpoint and require non-root users to confirm their passwords.

Doing so avoids that an attacker that has direct access to a computer
where a user is logged in to the PVE interface can change the password
of said user and thus either prolong their possibility to attack,
and/or create a denial of service situation, where the original user
cannot login into the PVE host using their old credentials.

Note that this might sound worse than it is, as for this attack to
work the attacker needs either:
- physical access to an unlocked computer that is currently logged in
  to a PVE host
- having taken over such a computer already through some unrelated
  vulnerability

As these required pre-conditions are pretty big implications, which
allow (temporary) access to all of the resources (including PVE ones)
that the user can control, we see this as slight improvement that
won't hurt, might protect one in some specific cases that is simply
too cheap not to do.

For now we avoid additional confirmation through a second factor,
as that is a much higher complexity without that much gain, and some
forms like (unauthenticated) button press on a WebAuthn token or the
TOTP code would be easy to circumvent in the physical access case and
in the local access case one might be able to MITM themselves too.

Reported-by: Wouter Arts <security@wth-security.nl>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
 [ TL: extend commit message ]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
8 months agoreturn ruid in reauth_user_for_user_modification, add param name
Wolfgang Bumiller [Fri, 15 Mar 2024 12:44:27 +0000 (13:44 +0100)]
return ruid in reauth_user_for_user_modification, add param name

since the upcoming use case in change_password uses the returned $ruid
and the parameter is called 'confirmation-password' there

also generalize the error so it does not mention TFA

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
8 months agomove/rename root_permission_check to RPCEnvironment
Wolfgang Bumiller [Fri, 15 Mar 2024 12:40:48 +0000 (13:40 +0100)]
move/rename root_permission_check to RPCEnvironment

now called "reauth_user_for_user_modification" since we
re-authenticate the current user while they are trying to modify
their (or others') password/tfa settings

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
8 months agotfa: prototype fixup
Wolfgang Bumiller [Mon, 18 Mar 2024 08:20:23 +0000 (09:20 +0100)]
tfa: prototype fixup

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
8 months agobump version to 8.1.2
Thomas Lamprecht [Wed, 28 Feb 2024 14:42:20 +0000 (15:42 +0100)]
bump version to 8.1.2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
8 months agoadd Sys.AccessNetwork privilege
Thomas Lamprecht [Mon, 19 Feb 2024 15:25:51 +0000 (16:25 +0100)]
add Sys.AccessNetwork privilege

We have some API endpoints that can access the network from the POV of
a Proxmox VE node, like e.g., the one for downloading a template/ISO
image directly to a PVE storage from an HTTP URL, and the matching
query-url-metadata that makes this functionality much more convenient
to use in the UI. But the downside of such calls is naturally that
they basically allow to scan the whole network via HTTP URLs, and
potentially even download some image that the user should not have
access to and adding to a VM that the user controls.

Due to that we limited the exposure of those API endpoints to
Sys.Modify on / (in addition to e.g. basic storage privs) for the
initial addition of the feature, as we were not sure about user
adoption and if a separate privilege could be justified.

Since we got a handful requests like #5254 this justification is now
met, so add a 'Sys.AccessNetwork' privilege.
That name should make it clear that having that privilege will allow
access to the network and the sys(tem) prefix should underline that
it's about the host systems network. Add it such, that it will only be
available for the most powerful of our built-in special roles, namely
the Administration one, besides naturally the all-powerful root@pam
special user.

Admins can then e.g. create new roles that include Sys.AccessNetwork
and Datastore.AllocateTemplate which can then be used for allowing
automation to download images while adhering to the Least Privilege
Principle.

Buglink: https://bugzilla.proxmox.com/show_bug.cgi?id=5254
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Reviewed-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
9 months agotests: split long expected-permission list over multiple lines
Thomas Lamprecht [Mon, 19 Feb 2024 14:12:22 +0000 (15:12 +0100)]
tests: split long expected-permission list over multiple lines

for a better overview and to allow slightly easier tracking of any
change, like adding a new privilege.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
9 months agospecial roles: code-style improvements for generation of special roles
Thomas Lamprecht [Mon, 19 Feb 2024 13:40:10 +0000 (14:40 +0100)]
special roles: code-style improvements for generation of special roles

no semantic change intended

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
9 months agobump version to 8.1.1
Thomas Lamprecht [Thu, 8 Feb 2024 18:03:31 +0000 (19:03 +0100)]
bump version to 8.1.1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
9 months agoLDAP sync: fix-up assembling valid attribute set
Thomas Lamprecht [Thu, 8 Feb 2024 18:03:10 +0000 (19:03 +0100)]
LDAP sync: fix-up assembling valid attribute set

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
9 months agobump version to 8.1.0
Thomas Lamprecht [Thu, 8 Feb 2024 16:58:05 +0000 (17:58 +0100)]
bump version to 8.1.0

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
9 months agooidc: enforce generic URI regex for the ACR value
Gabriel Goller [Tue, 6 Feb 2024 10:11:01 +0000 (11:11 +0100)]
oidc: enforce generic URI regex for the ACR value

Restrict the acr-value regex a little bit so as to align the behavior
with PBS. The openid documentation says that the acr-value *should* be
an URI [0]. Added a regex that loosely disallows some of the reserved
URI characters specified in the RFC [1].

Values like:
 * "urn:mace:incommon:iap:silver"
 * "urn:comsolve.nl:idp:contract:rba:location"
SHOULD work, but values like:
 * "urn:#ace:incommon:iap:silver"
 * "urn:"omsolve.nl:idp:contract:rba:location"
should NOT work.

This is related to the fix [2] for bug #5190 in PBS, but different as
there we had to make the verifier more flexible, whereas here we make
it stricter – mostly to have both projects aligned to avoid confusion.

[0]: https://openid.net/specs/openid-connect-core-1_0.html
[1]: https://www.rfc-editor.org/rfc/rfc2396.txt
[2]: https://git.proxmox.com/?p=proxmox-backup.git;a=commit;h=e0222ce83c28397d493c70825e873943c1223c67

Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
9 months agoapi: user: limit email to 254 characters and user comment to 2048
Thomas Lamprecht [Thu, 8 Feb 2024 16:31:04 +0000 (17:31 +0100)]
api: user: limit email to 254 characters and user comment to 2048

For email the reasoning is:

>  In addition to restrictions on syntax, there is a length limit on
>  email addresses.  That limit is a maximum of 64 characters (octets)
>  in the "local part" (before the "@") and a maximum of 255
>  characters (octets) in the domain part (after the "@") for a total
>  length of 320 characters. However, there is a restriction in RFC
>  2821 on the length of an address in MAIL and RCPT commands of 254
>  characters.  Since addresses that do not fit in those fields are
>  not normally useful, the upper limit on address lengths should
>  normally be considered to be 254.
-- https://www.rfc-editor.org/errata_search.php?rfc=3696&eid=1690

And for user-comments, we normally show those as single line and using
2048 bytes as maximum, while also a rather arbitrary number it allows
for about 2.5 times more users on a system (full name + comment can be
up to 4 KiB vs 10 KiB), and we can re-raise this relatively easily
again if there are somewhat reasonable complaints.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
9 months agoapi: user: limit maximum length for certain properties
Fiona Ebner [Thu, 8 Feb 2024 09:45:41 +0000 (10:45 +0100)]
api: user: limit maximum length for certain properties

The user.cfg file resides on the cluster filesystem where files have
a maximum allowed size (currently 1 MiB).

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
9 months agoLDAP sync: bail if there is no schema to verify an attribute's value
Thomas Lamprecht [Thu, 8 Feb 2024 12:13:45 +0000 (13:13 +0100)]
LDAP sync: bail if there is no schema to verify an attribute's value

Should not matter for now, but better to to catch explicitly, e.g., if
anybody ever adds new attributes or changes the default options names
without adapting this too.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
9 months agoLDAP sync: build valid-target-attribute list on the fly to avoid coupling
Thomas Lamprecht [Thu, 8 Feb 2024 11:10:31 +0000 (12:10 +0100)]
LDAP sync: build valid-target-attribute list on the fly to avoid coupling

Build the set of valid target attributes on the fly by using the
existing ldap => ours mapping. This avoids that one needs to adapt
both lists when changing this, which even though it should be caught
on testing, is needlessly adding friction.

The is-known-target-attr check could never trigger as this was already
checked in the parent before even calling the verify method, so just
remove it.

Rename the `verify_sync_attribute` to `verify_sync_attribute_value` to
clarify that it really only checks the value of an attribute, not the
attribute (key) itself.

As a side-benefit, this also makes the code shorter and avoids a
permanent global variable using up (a tiny amount of) space.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
9 months agoLDAP sync: improve validation of synced attributes
Fiona Ebner [Thu, 8 Feb 2024 09:45:40 +0000 (10:45 +0100)]
LDAP sync: improve validation of synced attributes

and skip the ones not fitting our schema, while warning the user about
them.

Also warns the user if the specified 'sync_attributes' mapping
contains entries for attributes that don't exist, e.g.
'enabled=active' (since the property on PVE side is called 'enable').

For the 'enable' property, any value coming from the server led to the
user being enabled, even "0", because it is a string. This is not
changed by this patch, by not trying to validate or parse a boolean.

In get_users(), the username is also set in the returned hash, but
without the realm. This doesn't seem to be necessary for syncing,
because the username with the realm is used as a hash key and that's
what's relied upon when updating the config. But the tests require it
to be set, so that is not changed by this patch either.

Relies on the user properties (other than username) to be standard
options called 'user-XYZ'. Could be improved by moving the schema for
user properties from the API module to a module that can be accessed
by both API and plugin here and creating a helper for accessing it.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
9 months agoapi: user: add pattern for user keys option
Fiona Ebner [Thu, 8 Feb 2024 09:45:39 +0000 (10:45 +0100)]
api: user: add pattern for user keys option

While nowadays, most entries should be just 'x', there can also still
be legacy entries with 'x!u2f', 'x!yubico' and base32 encoded secrets.
For example, some users might be syncing them from LDAP.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
11 months agobuild: fix file list
Fabian Grünbichler [Thu, 7 Dec 2023 11:36:40 +0000 (12:36 +0100)]
build: fix file list

this file is installed by a sub-dir Makefile, it does not exist in
src/PVE/API2.

the error is not fatal, but printed during build:

 install: cannot stat 'RealmSync.pm': No such file or directory

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
12 months agobump version to 8.0.7
Wolfgang Bumiller [Mon, 20 Nov 2023 11:24:32 +0000 (12:24 +0100)]
bump version to 8.0.7

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
12 months agopools: record parent/subpool information
Fabian Grünbichler [Mon, 20 Nov 2023 07:22:40 +0000 (08:22 +0100)]
pools: record parent/subpool information

and ensure a missing intermediate pool exists at all times.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
12 months agofix #1148: allow up to three levels of pool nesting
Fabian Grünbichler [Mon, 20 Nov 2023 07:22:39 +0000 (08:22 +0100)]
fix #1148: allow up to three levels of pool nesting

with ACLs being inherited along the pool hierarchy.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
12 months agobump version to 8.0.6
Thomas Lamprecht [Fri, 17 Nov 2023 07:27:08 +0000 (08:27 +0100)]
bump version to 8.0.6

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agoacl: add missing SDN ACL paths to allowed list
Fabian Grünbichler [Wed, 8 Nov 2023 06:55:17 +0000 (07:55 +0100)]
acl: add missing SDN ACL paths to allowed list

else it's not actually possible to define ACLs on them, which means they are
effectively root only instead of allowing their intended permission scheme.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
12 months agoperms: fix wrong /pools entry in default set of ACL paths
Fabian Grünbichler [Wed, 8 Nov 2023 10:29:29 +0000 (11:29 +0100)]
perms: fix wrong /pools entry in default set of ACL paths

/pools is not an allowed ACL path, so this would add a bogus entry into the
effective permissions in case something got propagated from /.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
15 months agobump version to 8.0.5
Wolfgang Bumiller [Fri, 11 Aug 2023 11:35:37 +0000 (13:35 +0200)]
bump version to 8.0.5

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
15 months agofixup comments about config locks
Wolfgang Bumiller [Fri, 11 Aug 2023 11:30:13 +0000 (13:30 +0200)]
fixup comments about config locks

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
15 months agoldap: add opt-in `check-connection` param to perform a bind check
Christoph Heiss [Thu, 10 Aug 2023 12:37:07 +0000 (14:37 +0200)]
ldap: add opt-in `check-connection` param to perform a bind check

Removes the dreaded DN regex, instead introducing a optional
connect/bind check on creation/update, aligning it with the way PBS does
it.

Additionally, it has the benefit that instead of letting a sync fail on
the first try due to e.g. bad bind credentials, it gives the user some
direct feedback when trying to add/update a LDAP realm, if enabled.

Should be rather a corner case, but it's the easiest way for us to
accomodate and the most versatile for users needing this.

This is part of the result of a previous discussion [0], and the same
approach is already implemented for PBS [1].

[0] https://lists.proxmox.com/pipermail/pve-devel/2023-May/056839.html
[1] https://lists.proxmox.com/pipermail/pbs-devel/2023-June/006237.html

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
15 months agobump pve-common dependency to 8.0.8
Wolfgang Bumiller [Fri, 11 Aug 2023 11:30:47 +0000 (13:30 +0200)]
bump pve-common dependency to 8.0.8

required for next patch introducing the check-connection parameter for
ldap based realms

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
16 months agoapi: domains: fix setting only the realm authentication password
Christoph Heiss [Thu, 20 Jul 2023 14:48:47 +0000 (16:48 +0200)]
api: domains: fix setting only the realm authentication password

Previously, if one tried to only update e.g. the bind password for an
LDAP realm, it would fail with an rather unhelpful error message:

  # pveum realm modify ldap -password foo
  update auth server failed: no options specified

The root cause was that the `password` parameter was removed early from
the parameter object, which than would fail the check whether it is
empty or not.

Thus, additionally check if only `password` was specified and if so,
allow it.

Reported-by: Friedrich Weber <f.weber@proxmox.com>
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
16 months agobump version to 8.0.4
Wolfgang Bumiller [Thu, 20 Jul 2023 08:59:56 +0000 (10:59 +0200)]
bump version to 8.0.4

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
16 months agoauth: tfa: fail if realm requires TFA but no challenge is generated
Friedrich Weber [Wed, 19 Jul 2023 15:38:04 +0000 (17:38 +0200)]
auth: tfa: fail if realm requires TFA but no challenge is generated

Before 0f3d14d6 ("auth: tfa: read tfa.cfg also if the user.cfg entry
has no "x" marker"), `user_get_tfa` failed if the realm required TFA,
but the user's `keys` attribute was empty. Since 0f3d14d6,
`user_get_tfa` fails if the realm requires TFA, but neither user.cfg
nor tfa.cfg define any second factors for that user.

However, both before and after 0f3d14d6, a realm that requires TOTP
allows a user to login without a second factor if they have at least
one configured factor in tfa.cfg and all factors are disabled -- for
example if they have only a disabled TOTP factor. This behavior is
unwanted, as users can then circumvent the realm-mandated TFA
requirement by disabling their own TOTP factor.

This happens because a user with a disabled TOTP factor in tfa.cfg
passes the check in `user_get_tfa`. Hence, `authenticate_2nd_new_do`
proceeds to call `authentication_challenge`, which does not generate a
challenge (and returns undef) because the user has no enabled factors.
Consequently, `authenticate_2nd_new_do` returns undef and allows login
without a second factor.

Note that this does not happen for realms that require Yubico TFA,
because for these realms, `authenticate_2nd_new_do` does not call
`authentication_challenge` and instead generates a challenge in any
case, regardless of whether the user has enabled Yubico factors or
not.

This patch fixes the issue by moving the check out of `user_get_tfa`,
and instead letting `authenticate_2nd_new_do` fail if the realm
requires TFA but `authentication_challenge` generates no challenge
(returns undef). This also saves a call to `api_list_user_tfa` that
was introduced in 0f3d14d6.

This patch still allows users to login with a recovery key to a realm
that requires TFA , which is the intended behavior.

Suggested-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Friedrich Weber <f.weber@proxmox.com>
16 months agoadd fixme comments about pending pve-rs improvements
Wolfgang Bumiller [Fri, 14 Jul 2023 12:16:19 +0000 (14:16 +0200)]
add fixme comments about pending pve-rs improvements

Alternatively we could potentially move the realm-tfa check to after
`authentication_challenge`.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
16 months agoauth: tfa: read tfa.cfg also if the user.cfg entry has no "x" marker
Friedrich Weber [Fri, 14 Jul 2023 11:49:50 +0000 (13:49 +0200)]
auth: tfa: read tfa.cfg also if the user.cfg entry has no "x" marker

Previously, `user_get_tfa` read the `keys` user attribute from
user.cfg to determine whether a user has second factors configured.
`keys` could contain TOTP secrets or Yubico key IDs (for realms that
require TFA), or the marker "x" to signify that second factors are
defined in tfa.cfg, in which case `user_get_tfa` would additionally
read tfa.cfg.

However, syncing an LDAP realm with `remove-vanished=properties`
erases the `keys` attribute, and thus the "x" marker (unless custom
`sync_attributes` with a mapping for `keys` are defined). This would
allow TFA-enabled users to log in without a second factor after a
realm sync. This issue was first reported in the forum [1].

To fix this issue, `user_get_tfa` now reads tfa.cfg unconditionally,
and thus independently of the value of `keys`. In other words, the "x"
marker is now irrelevant for authentication. The reasoning for this
change is that most current setups define second factors in tfa.cfg
anyway.

Special care is needed to avoid breaking realms that require TFA: In
that case, `user_get_tfa` must fail authentication if neither user.cfg
nor tfa.cfg define any second factors.

This patch changes the behavior of a hypothetical (and not officially
supported) LDAP realm setup in which `sync_attributes: keys=attr` and
`remove-vanished=properties` is used to maintain `keys` in the LDAP
directory. In such a setup, an admin could enable/disable TFA for a
user who has an enabled second factor in tfa.cfg by editing their LDAP
entry and switching between "x" and "". With this patch, TFA is always
enabled for that user.

This patch makes the "x" marker irrelevant for authentication, but PVE
still *writes* it if the user has second factors configured in
tfa.cfg. This behavior is kept for now to avoid issues in cluster
upgrade scenarios, where some nodes that still rely on the "x" marker
could allow logins without a second factor.

[1] https://forum.proxmox.com/threads/130440/

Suggested-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Friedrich Weber <f.weber@proxmox.com>
17 months agobump version to 8.0.3
Thomas Lamprecht [Wed, 21 Jun 2023 17:45:32 +0000 (19:45 +0200)]
bump version to 8.0.3

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agodrop assert_new_tfa_config_available for Proxmox VE 8
Thomas Lamprecht [Wed, 21 Jun 2023 17:43:37 +0000 (19:43 +0200)]
drop assert_new_tfa_config_available for Proxmox VE 8

All nodes should be new enough, especially as this is understood
since pve-manager 7.0-15 and users must upgrade to 7.4 before
upgrading to Proxmox VE 8

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agopveum: list tfa: sort by user ID
Thomas Lamprecht [Wed, 21 Jun 2023 17:41:31 +0000 (19:41 +0200)]
pveum: list tfa: sort by user ID

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agopveum: list tfa: recovery keys have no descriptions
Thomas Lamprecht [Wed, 21 Jun 2023 17:27:41 +0000 (19:27 +0200)]
pveum: list tfa: recovery keys have no descriptions

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agobump version to 8.0.2
Thomas Lamprecht [Wed, 21 Jun 2023 16:13:58 +0000 (18:13 +0200)]
bump version to 8.0.2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoapi: tfa: add missing links for child-routes
Thomas Lamprecht [Thu, 15 Jun 2023 14:55:41 +0000 (16:55 +0200)]
api: tfa: add missing links for child-routes

making this more useable in things like pvesh or the HTML formatter

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoapi: tfa: don't block tokens from viewing and list TFA entries
Thomas Lamprecht [Thu, 15 Jun 2023 07:23:33 +0000 (09:23 +0200)]
api: tfa: don't block tokens from viewing and list TFA entries

The `allowtoken` property is a total, unconditional block on using
API tokens on an endpoint. We reserve those only for a limited set of
security critical endpoints like changing passwords or second
factors, or creating a (cookie) ticket, which are exempt from this
limitations, so require to have limited access to them too.

Anyhow, listing and getting TFA entries for users, where the API
token has the correct permissions granted, is not critical, as the
API token cannot gain more permissions than they have from that
info, so drop the total block on those GET methods.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoapi: users: sort groups
Thomas Lamprecht [Wed, 14 Jun 2023 14:07:55 +0000 (16:07 +0200)]
api: users: sort groups

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agobump version to 8.0.1
Thomas Lamprecht [Fri, 9 Jun 2023 14:12:05 +0000 (16:12 +0200)]
bump version to 8.0.1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agotfa: cope with native versions in cluster version check
Thomas Lamprecht [Fri, 9 Jun 2023 14:06:43 +0000 (16:06 +0200)]
tfa: cope with native versions in cluster version check

Reported-by: Friedrich Weber <f.weber@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agobump version to 8.0.0
Thomas Lamprecht [Fri, 9 Jun 2023 08:14:36 +0000 (10:14 +0200)]
bump version to 8.0.0

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoapi: roles: forbid creatin new roles starting with "PVE" namespace
Thomas Lamprecht [Thu, 8 Jun 2023 07:31:19 +0000 (09:31 +0200)]
api: roles: forbid creatin new roles starting with "PVE" namespace

makes our reasoning when adding new top-level privileges way easier
in the future.
We already had two major upgrades with role additions where we had to
add special checks in the upgrade script and breaking changes, so
let's reserve any role starting with PVE (case-insensitive to avoid
confusion potential) and forbid creating those via API.

We might also think about letting the config parser choke on that, as
otherwise one could still create them via editing the config
manually.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoapi: roles: cleanup imports
Thomas Lamprecht [Thu, 8 Jun 2023 07:29:25 +0000 (09:29 +0200)]
api: roles: cleanup imports

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoapi: roles: whitespace and indendation clean-ups
Thomas Lamprecht [Thu, 8 Jun 2023 07:22:00 +0000 (09:22 +0200)]
api: roles: whitespace and indendation clean-ups

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agobump version to 8.0.0~3
Thomas Lamprecht [Wed, 7 Jun 2023 17:06:58 +0000 (19:06 +0200)]
bump version to 8.0.0~3

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agotests: adapt new test for admin ACL with mapping privs
Thomas Lamprecht [Wed, 7 Jun 2023 17:12:04 +0000 (19:12 +0200)]
tests: adapt new test for admin ACL with mapping privs

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoadd privileges and paths for cluster resource mapping
Dominik Csapak [Tue, 6 Jun 2023 13:52:00 +0000 (15:52 +0200)]
add privileges and paths for cluster resource mapping

uses the privileges:

Mapping.Use
Mapping.Modify
Mapping.Audit

on /mapping/{TYPE}/{id}

so that we can assign privileges on resource level

this will generate new roles (PVEMappingUser, PVEMappingAdmin,
PVEMappingAuditor)

note that every user with Permissions.Modify on '/' and propagate can add these
new roles to themselves

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
17 months agoadd new SDN.use privilege in PVESDNUser role
Alexandre Derumier [Tue, 6 Jun 2023 13:19:25 +0000 (15:19 +0200)]
add new SDN.use privilege in PVESDNUser role

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
FG: fix test
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
17 months agocheck_sdn_bridge: check bridge first
Fabian Grünbichler [Wed, 7 Jun 2023 09:34:33 +0000 (11:34 +0200)]
check_sdn_bridge: check bridge first

it's cheap, so let's use it for early returning

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
17 months agocheck_sdn_bridge: correctly handle noerr
Fabian Grünbichler [Wed, 7 Jun 2023 09:33:39 +0000 (11:33 +0200)]
check_sdn_bridge: correctly handle noerr

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
17 months agorpcenvironnment: add check_sdn_bridge
Alexandre Derumier [Tue, 6 Jun 2023 13:19:24 +0000 (15:19 +0200)]
rpcenvironnment: add check_sdn_bridge

check if user have access to 1 vlan of the bridge
or the bridge itself

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
17 months agoaccess control: add /sdn/zones/<zone>/<vnet>/<vlan> path
Alexandre Derumier [Tue, 6 Jun 2023 13:19:18 +0000 (15:19 +0200)]
access control: add /sdn/zones/<zone>/<vnet>/<vlan> path

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
FG: add missing /sdn/zones path

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
17 months agorpcenv: api permission heuristic: query Sys.Modify for root ACL-path
Alexandre Derumier [Mon, 27 Mar 2023 10:18:20 +0000 (12:18 +0200)]
rpcenv: api permission heuristic: query Sys.Modify for root ACL-path

Ensures that we can use this in the capabilities heuristic check in
the web UI

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
17 months agobump version to 8.0.0~2
Thomas Lamprecht [Wed, 7 Jun 2023 09:34:33 +0000 (11:34 +0200)]
bump version to 8.0.0~2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoacls: restrict less-privileged ACL modifications
Fabian Grünbichler [Mon, 5 Jun 2023 14:21:37 +0000 (16:21 +0200)]
acls: restrict less-privileged ACL modifications

there are currently three possibilities to modify ACLs without the
'Permissions.Modify' privilege in PVE::RPCEnvironment::check_perm_modify:

    if ($path =~ m|^/storage/.+$|) {
push @$testperms, 'Datastore.Allocate';
    } elsif ($path =~ m|^/vms/.+$|) {
push @$testperms, 'VM.Allocate';
    } elsif ($path =~ m|^/pool/.+$|) {
push @$testperms, 'Pool.Allocate';
    }

lock those down by only allowing the currently authenticated user to hand out a
subset of their own privileges, never more.

for example, this still allows a PVEVMAdmin to create ACLs for other
users/tokens with PVEVMUser (on '/vm/XXX'), but not with Administrator or
PVEPermAdmin.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
17 months agoroles: restrict Permissions.Modify to Administrator
Fabian Grünbichler [Mon, 5 Jun 2023 14:21:36 +0000 (16:21 +0200)]
roles: restrict Permissions.Modify to Administrator

to reduce the chances of accidentally handing out privilege modification
privileges. the old default setup of having Permissions.Modify in PVESysAdmin
and PVEAdmin weakened the distinction between those roles and Administrator.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
17 months agofix module namespace of realm sync API
Thomas Lamprecht [Wed, 7 Jun 2023 07:37:46 +0000 (09:37 +0200)]
fix module namespace of realm sync API

it isn't mounted in PVE::API2::AccessControl and it doesn't lives
anywhere in /access, so using that is just confusing.

Both, API and backend could simply move to manager, but as we already
got an api package here and it does somewhat fits into the topic lets
keep it here for now.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoapi: realm sync: die early if no job options
Thomas Lamprecht [Wed, 7 Jun 2023 07:33:16 +0000 (09:33 +0200)]
api: realm sync: die early if no job options

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoapi: realm sync: code cleanups
Thomas Lamprecht [Wed, 7 Jun 2023 07:32:26 +0000 (09:32 +0200)]
api: realm sync: code cleanups

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agorealm sync: cleanup imports
Thomas Lamprecht [Wed, 7 Jun 2023 07:31:39 +0000 (09:31 +0200)]
realm sync: cleanup imports

with: perlimports -i --no-padding

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoadd realm-sync plugin for jobs and CRUD api for realm-sync-jobs
Dominik Csapak [Tue, 17 Jan 2023 11:46:54 +0000 (12:46 +0100)]
add realm-sync plugin for jobs and CRUD api for realm-sync-jobs

to be able to define automated jobs that sync ldap/ad

The jobs plugin contains special handling when no node is given, since
we only want it to run on a single node when that triggers. For that,
we save a statefile in /etc/pve/priv/jobs/ which contains the
node/time/upid of the node that runs the job. The first node that
is able to lock the realm (via cfs_lock_domain) "wins" and may
sync from the ldap.

in case a specific node was selected, this is omitted and the Jobs
handling will not let it run on other nodes anyway

the API part is our usual sectionconfig CRUD api, but specialized
for the specific type of job.

the api will be at /cluster/jobs/realm-sync
(this must be done in pve-manager)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
 [ T: resolve merge conflict due to packaging/source split ]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agoapi: user index: only include existing tfa lock flags
Wolfgang Bumiller [Tue, 6 Jun 2023 09:18:56 +0000 (11:18 +0200)]
api: user index: only include existing tfa lock flags

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
17 months agobump version to 8.0.0~1
Wolfgang Bumiller [Mon, 5 Jun 2023 12:52:39 +0000 (14:52 +0200)]
bump version to 8.0.0~1

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
17 months agoapi: include tfa lock status in user list
Wolfgang Bumiller [Fri, 2 Jun 2023 09:28:34 +0000 (11:28 +0200)]
api: include tfa lock status in user list

this means /access/users is now a 'protected' call to get
access to 'priv/tfa.cfg'

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
17 months agotfa: update list_tfa return schema
Wolfgang Bumiller [Thu, 1 Jun 2023 10:26:10 +0000 (12:26 +0200)]
tfa: update list_tfa return schema

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
17 months agocli: add 'tfa unlock' command
Wolfgang Bumiller [Tue, 30 May 2023 09:55:08 +0000 (11:55 +0200)]
cli: add 'tfa unlock' command

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
17 months agoapi: add /access/users/<userid>/unlock-tfa api call
Wolfgang Bumiller [Tue, 30 May 2023 11:39:15 +0000 (13:39 +0200)]
api: add /access/users/<userid>/unlock-tfa api call

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
17 months agotfa: enable lockout of users via tfa.cfg
Wolfgang Bumiller [Tue, 16 May 2023 11:43:53 +0000 (13:43 +0200)]
tfa: enable lockout of users via tfa.cfg

This will be accompanied by a change in pve-rs to finally
enable this.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
17 months agobump pve-rs dep to 0.8.3
Wolfgang Bumiller [Mon, 5 Jun 2023 10:59:26 +0000 (12:59 +0200)]
bump pve-rs dep to 0.8.3

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
17 months agopam: set PAM_RHOST
Wolfgang Bumiller [Thu, 1 Jun 2023 09:36:54 +0000 (11:36 +0200)]
pam: set PAM_RHOST

This allows pam modules to restrict users by host. For
instance, you could restrict root@pam to only 127.0.0.1.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
17 months agocli: add 'tfa list' command
Wolfgang Bumiller [Tue, 30 May 2023 11:00:04 +0000 (13:00 +0200)]
cli: add 'tfa list' command

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
17 months agodrop support for old login API
Wolfgang Bumiller [Tue, 16 May 2023 11:56:13 +0000 (13:56 +0200)]
drop support for old login API

The new-format parameter for the ticket call is now ignored
and assumed 1.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
17 months agoapi: drop old verify_tfa api call
Wolfgang Bumiller [Tue, 16 May 2023 11:48:45 +0000 (13:48 +0200)]
api: drop old verify_tfa api call

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
18 months agodepend on pve-rs 0.8.0
Wolfgang Bumiller [Mon, 22 May 2023 08:27:15 +0000 (10:27 +0200)]
depend on pve-rs 0.8.0

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
18 months agoadd anyevent to build deps
Wolfgang Bumiller [Tue, 16 May 2023 12:23:15 +0000 (14:23 +0200)]
add anyevent to build deps

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
18 months agobump version to 7.99.0
Thomas Lamprecht [Sun, 21 May 2023 10:06:18 +0000 (12:06 +0200)]
bump version to 7.99.0

use a pre-release like version as we got some breaking changes
planned for access control, so might be nice to get (most of) them in
a 8.0.0 for simpler versioned  dependencies (>= 8~), but it's also
just a bit of an experiment to see how doing such things plays out,
in the end we can cope with whatever versioning for dependency as bug
fixes might make it necessary to have a more specific version
boundary anyway.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 months agod/control: raise standards version compliance to 4.6.2
Thomas Lamprecht [Sun, 21 May 2023 10:38:00 +0000 (12:38 +0200)]
d/control: raise standards version compliance to 4.6.2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 months agod/control: define compat level via build-depends and raise to 13
Thomas Lamprecht [Sun, 21 May 2023 09:18:56 +0000 (11:18 +0200)]
d/control: define compat level via build-depends and raise to 13

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 months agooathkeygen: modernize and improve error handling slightly
Thomas Lamprecht [Sun, 21 May 2023 10:34:19 +0000 (12:34 +0200)]
oathkeygen: modernize and improve error handling slightly

Note that this could also just be documented doing:

 dd if=/dev/urandom bs=1 count=10 2>/dev/null | base32

And using TOTP apps that can scan QR codes is much better UX anyway,
but its to trivial to bother deprecating it now and we'd still depend
on libmime-base32-perl, so really nothing gained in removing or
rewriting in shell..

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 months agobuildsys: add sbuild convenience target
Thomas Lamprecht [Sun, 21 May 2023 10:06:06 +0000 (12:06 +0200)]
buildsys: add sbuild convenience target

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 months agobuildsys: cleanup and expand clean target
Thomas Lamprecht [Sun, 21 May 2023 10:05:12 +0000 (12:05 +0200)]
buildsys: cleanup and expand clean target

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 months agosrc makefiles: convert to use simple parenthesis
Thomas Lamprecht [Sun, 21 May 2023 09:47:08 +0000 (11:47 +0200)]
src makefiles: convert to use simple parenthesis

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 months agobuildsys: drop useless packaging variable/includes in src
Thomas Lamprecht [Sun, 21 May 2023 09:46:27 +0000 (11:46 +0200)]
buildsys: drop useless packaging variable/includes in src

and allow overriding the PACKAGE variable, making it actually useful

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 months agobuildsys: rework clean target, avoid doc-gen one
Thomas Lamprecht [Sun, 21 May 2023 09:42:21 +0000 (11:42 +0200)]
buildsys: rework clean target, avoid doc-gen one

1. this really doesn't change often
2. the synopsis and opts should be in the owner repo anyway
3. the original one simply deleted all *.adoc files, far to
   aggressive

Avoids pve-docs dependency for building the DSC (without having to
pass the ugly no-pre-clean option).

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 months agobuildsys: derive upload dist automatically
Thomas Lamprecht [Sun, 21 May 2023 09:19:16 +0000 (11:19 +0200)]
buildsys: derive upload dist automatically

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 months agobuildsys: don't pass arch for an arch: all package
Thomas Lamprecht [Sun, 21 May 2023 09:18:36 +0000 (11:18 +0200)]
buildsys: don't pass arch for an arch: all package

it was wrong too anyway, if, one would need to use the
$(DEB_HOST_ARCH), as that's the one package is built for.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 months agouse combined dpkg packaging variable makefile fragment
Thomas Lamprecht [Sun, 21 May 2023 08:53:20 +0000 (10:53 +0200)]
use combined dpkg packaging variable makefile fragment

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>