aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mod_smacks: Set session.smacks after sending <enabled/> to fix tracebackMatthew Wild2022-08-291-2/+1
| | | | ...with opportunistic writes enabled.
* core.moduleapi: Check for local role-aware sessions before e.g. s2sKim Alvefur2022-08-291-9/+9
| | | | | The condition checked for s2sin but not s2sout, so would have ignored bidi-enabled s2sout sessions. Components as well.
* mod_smacks: Use new :add_error() in last remaining error result constructionMatthew Wild2022-08-291-2/+1
|
* mod_smacks: Split enable handling to stages, to allow easier SASL2 integrationMatthew Wild2022-08-291-21/+48
|
* util.stanza: Add add_error() to simplify adding error tags to existing stanzasMatthew Wild2022-08-292-25/+45
| | | | | Some fiddling is required now in error_reply() to ensure the cursor is in the same place as before this change (a lot of code apparently uses that feature).
* mod_component: Require 'from' attribute on stanzas by defaultMatthew Wild2022-08-281-16/+13
| | | | | | | | | | The old behaviour of falling back to the component domain when it is missing has been merged into the logic for the existing "validate_from_addresses" option (which is strict by default). ejabberd already rejects component stanzas with no 'from' (as the XEP requires), and this has led to compatibility issues for components that were seemingly working fine with Prosody.
* mod_external_services: Update tools.ietf.org URLKim Alvefur2022-08-271-1/+1
| | | | See bd9e006a7a74
* doap: Update for XEP-0215 advancement to StableKim Alvefur2022-08-271-1/+1
| | | | No other changes to account for.
* core.usermanager: Link to docs for new role API to make warning more actionableKim Alvefur2022-08-271-0/+1
|
* mod_smacks: Split resumption into multiple stages, to simplify ISR integrationMatthew Wild2022-08-261-63/+82
| | | | | This will allow us to return the success/failed as part of the SASL2 response, and *then* perform the stanza sync as a second step.
* mod_s2s: Simplify conditionals since all sessions should have .host nowKim Alvefur2022-08-262-3/+3
|
* Merge 0.12->trunkKim Alvefur2022-08-261-2/+2
|\
| * mod_s2s: Fix firing buffer drain eventsKim Alvefur2022-08-261-2/+2
| | | | | | | | | | Fixes the same kind of issue as in 65563530375b but once and for all, while improving similarity between incoming and outgoing connections.
* | mod_smacks: Don't close resuming session when failed due to overflowMatthew Wild2022-08-261-7/+8
| |
* | mod_smacks: Long overdue cleanup of resumption code, fixes some old TODOsMatthew Wild2022-08-263-52/+66
| |
* | mod_admin_shell: Rename variable to avoid confusion with global functionKim Alvefur2022-08-251-7/+7
| | | | | | | | For luacheck, but it doesn't actually complain about this right now
* | mod_admin_shell: Fix output from user:roles()Kim Alvefur2022-08-251-0/+1
| | | | | | | | | | It used _G.print instead of the shell session print, which would silently write to stdout
* | Merge role-auth->trunkMatthew Wild2022-08-2228-259/+837
|\ \
| * | CHANGES: Add role authMatthew Wild2022-08-221-0/+1
| | |
| * | mod_admin_shell: Ensure account has role before it is usableKim Alvefur2022-08-181-8/+16
| | | | | | | | | | | | | | | | | | | | | By creating the account first without a password it can't be used until the role has set. This is most important for restricted accounts, as a failure to set the role would lead to the account having more privileges than indented.
| * | mod_auth_insecure: Store creation and update timestamps on accountKim Alvefur2022-08-181-1/+3
| | | | | | | | | | | | | | | This ensures that the store is not empty in case no password is provided, so the underlying data storage won't consider the store empty.
| * | mod_admin_shell: Update help for user:create to reflect singular role argumentKim Alvefur2022-08-181-1/+1
| | |
| * | mod_auth_internal_hashed: Allow creating disabled account without passwordKim Alvefur2022-08-181-2/+2
| | | | | | | | | | | | | | | Otherwise, create_user(username, nil) leads to the account being deleted.
| * | mod_admin_shell: Update with new role management commands and help textMatthew Wild2022-08-181-39/+52
| | |
| * | core.usermanager: Update argument name in authz fallback methodKim Alvefur2022-08-181-1/+1
| | | | | | | | | | | | It's not plural
| * | core.usermanager: Remove obsolete authz fallback methodKim Alvefur2022-08-181-1/+0
| | |
| * | core.usermanager: Add missing methods to fallback authz providerKim Alvefur2022-08-181-0/+3
| | |
| * | core.usermanager: Add scoped luacheck ignore rule to reduce clutterKim Alvefur2022-08-181-11/+12
| | |
| * | mod_authz_internal: Expose convenience method to test if user can assume roleMatthew Wild2022-08-182-0/+20
| | |
| * | mod_authz_internal, and more: New iteration of role APIMatthew Wild2022-08-176-59/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes to the API (hopefully the last) introduce a cleaner separation between the user's primary (default) role, and their secondary (optional) roles. To keep the code sane and reduce complexity, a data migration is needed for people using stored roles in 0.12. This can be performed with prosodyctl mod_authz_internal migrate <host>
| * | util.roles: Add Teal interface declarationKim Alvefur2022-08-121-0/+32
| | |
| * | mod_admin_shell: Show session role in c2s:showKim Alvefur2022-08-151-1/+10
| | |
| * | usermanager: Add back temporary is_admin to warn about deprecated API usageMatthew Wild2022-08-151-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Goal: Introduce role-auth with minimal disruption is_admin() is unsafe in a system with per-session permissions, so it has been deprecated. Roll-out approach: 1) First, log a warning when is_admin() is used. It should continue to function normally, backed by the new role API. Nothing is really using per-session authz yet, so there is minimal security concern. The 'strict_deprecate_is_admin' global setting can be set to 'true' to force a hard failure of is_admin() attempts (it will log an error and always return false). 2) In some time (at least 1 week), but possibly longer depending on the number of affected deployments: switch 'strict_deprecate_is_admin' to 'true' by default. It can still be disabled for systems that need it. 3) Further in the future, before the next release, the option will be removed and is_admin() will be permanently disabled.
| * | usermanager: Remove concept of global authz providerMatthew Wild2022-08-121-46/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rationale: - Removes a bunch of code! - We don't have many cases where an actor is not bound to one of our hosts - A notable exception is the admin shell, but if we ever attempt to lock those sessions down, there is a load of other work that also has to be done. And it's not clear if we would need a global authz provider for that anyway. - Removes an extra edge case from the necessary mental model for operators - Sessions that aren't bound to a host generally are anonymous or have an alternative auth model (such as by IP addres). - With the encapsulation now provided by util.roles, ad-hoc "detached roles" can still be created anyway by code that needs them.
| * | usermanager: Fix method name of global authz provider (thanks Zash)Matthew Wild2022-08-121-1/+1
| | |
| * | usermanager: Remove obsolete function from global authz providerMatthew Wild2022-08-111-5/+0
| | |
| * | features: Add "permissions" feature for role-authMatthew Wild2022-08-111-0/+2
| | |
| * | usermanager: Handle local JIDs being passed to get/set_jid_role()Matthew Wild2022-08-011-1/+9
| | | | | | | | | | | | | | | There is no reasonable fallback for set_jid_role() because users may have multiple roles, so that's an error.
| * | core.usermanager: Add missing stub authz methods to global authz providerKim Alvefur2022-07-201-0/+7
| | | | | | | | | | | | Except, should we have a global authz provider at all?
| * | moduleapi: Stricter type check for actor in permission checkKim Alvefur2022-07-201-1/+1
| | | | | | | | | | | | | | | Non-table but truthy values would trigger "attempt to index a foo value" on the next line otherwise
| * | moduleapi: Remove redundant expansion of ':' prefix in permission namesKim Alvefur2022-07-201-1/+0
| | |
| * | moduleapi: Distribute permissions set from global modules to all hostsKim Alvefur2022-07-201-0/+8
| | | | | | | | | | | | | | | | | | Roles and permissions will always happen in the context of a host. Prevents error upon indexing since `hosts["*"] == nil`
| * | mod_tokenauth: New API that better fits how modules are using token authMatthew Wild2022-07-201-12/+40
| | | | | | | | | | | | | | | | | | This also updates the module to the new role API, and improves support for scope/role selection (currently treated as the same thing, which they almost are).
| * | mod_authz_internal: Use util.roles, some API changes and config supportMatthew Wild2022-07-193-95/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit was too awkward to split (hg record didn't like it), so: - Switch to the new util.roles lib to provide a consistent representation of a role object. - Change API method from get_role_info() to get_role_by_name() (touches sessionmanager and usermanager) - Change get_roles() to get_user_roles(), take a username instead of a JID This is more consistent with all other usermanager API methods. - Support configuration of custom roles and permissions via the config file (to be documented).
| * | util.roles: Add new utility module to consolidate role objects and methodsMatthew Wild2022-07-191-0/+100
| | |
| * | usermanager, mod_auth_*: Add get_account_info() returning creation/update timeMatthew Wild2022-07-123-2/+35
| | | | | | | | | | | | | | | | | | | | | This is useful for a number of things. For example, listing users that need to rotate their passwords after some event. It also provides a safer way for code to determine that a user password has changed without needing to set a handler for the password change event (which is a more fragile approach).
| * | core.moduleapi: Expand permission name ':' prefix earlierKim Alvefur2022-06-151-3/+3
| | | | | | | | | | | | | | | | | | Ensures it applies to the context as string case Somehow this fixes everything
| * | core.moduleapi: Fixup method nameKim Alvefur2022-06-151-1/+1
| | | | | | | | | | | | | | | | | | `get_user_role()` did not exist anywhere else. MattJ said `get_user_default_role()` was indented
| * | teal-src: update module.d.tl with new access control methodsMatthew Wild2022-06-151-0/+5
| | |
| * | Switch to a new role-based authorization framework, removing is_admin()Matthew Wild2022-06-1515-131/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We began moving away from simple "is this user an admin?" permission checks before 0.12, with the introduction of mod_authz_internal and the ability to dynamically change the roles of individual users. The approach in 0.12 still had various limitations however, and apart from the introduction of roles other than "admin" and the ability to pull that info from storage, not much actually changed. This new framework shakes things up a lot, though aims to maintain the same functionality and behaviour on the surface for a default Prosody configuration. That is, if you don't take advantage of any of the new features, you shouldn't notice any change. The biggest change visible to developers is that usermanager.is_admin() (and the auth provider is_admin() method) have been removed. Gone. Completely. Permission checks should now be performed using a new module API method: module:may(action_name, context) This method accepts an action name, followed by either a JID (string) or (preferably) a table containing 'origin'/'session' and 'stanza' fields (e.g. the standard object passed to most events). It will return true if the action should be permitted, or false/nil otherwise. Modules should no longer perform permission checks based on the role name. E.g. a lot of code previously checked if the user's role was prosody:admin before permitting some action. Since many roles might now exist with similar permissions, and the permissions of prosody:admin may be redefined dynamically, it is no longer suitable to use this method for permission checks. Use module:may(). If you start an action name with ':' (recommended) then the current module's name will automatically be used as a prefix. To define a new permission, use the new module API: module:default_permission(role_name, action_name) module:default_permissions(role_name, { action_name[, action_name...] }) This grants the specified role permission to execute the named action(s) by default. This may be overridden via other mechanisms external to your module. The built-in roles that developers should use are: - prosody:user (normal user) - prosody:admin (host admin) - prosody:operator (global admin) The new prosody:operator role is intended for server-wide actions (such as shutting down Prosody). Finally, all usage of is_admin() in modules has been fixed by this commit. Some of these changes were trickier than others, but no change is expected to break existing deployments. EXCEPT: mod_auth_ldap no longer supports the ldap_admin_filter option. It's very possible nobody is using this, but if someone is then we can later update it to pull roles from LDAP somehow.