Build #1,922

Plan branch:

Build: #1922 was successful Scheduled with changes by Guus der Kinderen and Joshua Sattler <34030048+jsattler@users.noreply.github.com>

Stages & jobs

  1. Build and Package

  2. Copy to Website

Code commits

Openfire (master)

  • Guus der Kinderen

    Guus der Kinderen 7f3d0a18a6efdb5124c43fd06d323a2594d7475b

    OF-284: Additional commands for XEP-0133 (#2381)
    * OF-284: Add Missing Commands for XEP-0133 "Service Administration"

    This commit adds almost all ad-hoc commands that are defined in XEP-0133, but were missing in Openfire.

    Notable exceptions:
    - Get User Password - I deem it unsafe to store/expose plaintext credentials
    - Get User Last Login Time - Openfire does not track this data
    - Get User Statistics
    - Set Message of the Day - MotD functionality could possibly be added in the MotD plugin
    - Edit Message of the Day
    - Delete Message of the Day
    - Set Welcome Message - Welcome message functionality could possibly be added in the Registration plugin
    - Delete Welcome Message
    - Restart Service - Unsafe: what if the stop works, but the start does not?
    - Shut Down Service - Unsafe: we'll end up with admins complaining about an unreachable server

    * OF-284: Applied i18n to all adhoc commands

    All hardcoded, human readable labels have been replaces with a translatable i18n property value.

    * Update xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/EditAdminList.java

    Co-authored-by: Dan Caseley <dan@caseley.me.uk>

    * OF-284: Make ad-hoc 'session data' non-optional

    Prior to this, an optional SessionData object was passed along when executing stages of an ad-hoc command. This object was non-null only when the command had multiple stages. The rationale for this was that only multi-staged commands needed to carry over session state.

    The session data also includes a bit of metadata (the JID of the actor executing the command). This is desirable to have even when executing only a one-stage command.

    This commit makes the sessionData instance a non-optional argument.

    * OF-284: Ad-Hoc system properties and java.time

    Replaces JiveGlobals.getProperty with SystemProperty, and long-based time computation with calls to java.time.

    * OF-284: Do not error on missing optional data

    * Update xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetListRegisteredUsers.java

    Co-authored-by: Dan Caseley <dan@caseley.me.uk>

    * Default email to an empty string when missing

    * Reduce log level of optional database API mismatch

    * OF-284: Fix XML element reuse

    An XML element can only have one parent. By re-adding the same element to another parent, an error is thrown. Instead, use a copy that is detached.

    * OF-284: Better error messages for invalid JIDs

    * OF-284: Switch AuthenticateUser to use jid-single

    To be consistent with other fields, and makes sense anyway. Was causing an issue with Spark's registry of fields when 2 fields in the same namespace had different types.

    * OF-284: Fix duplicate field value setting

    ---------

    Co-authored-by: Dan Caseley <dan@caseley.me.uk>

    • i18n/src/main/resources/openfire_i18n.properties (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/database/DbConnectionManager.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommand.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandHandler.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandManager.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/SessionData.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/EditAdminList.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/EditAllowedList.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/EditBlockedList.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetAdminConsoleInfo.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetListActiveUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetListDisabledUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetListIdleUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetListOnlineUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetListRegisteredUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberActiveUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberDisabledUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberIdleUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberOnlineUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberRegisteredUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberUserSessions.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetServerStats.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetUsersPresence.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/HttpBindStatus.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/PacketsNotification.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/SendAnnouncementToOnlineUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/AddGroup.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/AddGroupUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroup.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroupUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/GetListGroupUsers.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/GetListGroups.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/UpdateGroup.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/muc/CreateMUCRoom.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/AddUser.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/AuthenticateUser.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/ChangeUserPassword.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/DeleteUser.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/DisableUser.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/EndUserSession.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/GetUserRoster.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/ReEnableUser.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/UserProperties.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupAdminAdded.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupAdminRemoved.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupCreated.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupDeleting.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupMemberAdded.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupMemberRemoved.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupModified.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserCreated.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserDeleting.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserModified.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardCreated.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardDeleting.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardModified.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/commands/generic/Ping.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PendingSubscriptionsCommand.java (version 7f3d0a18a6efdb5124c43fd06d323a2594d7475b)
  • Guus der Kinderen

    Guus der Kinderen 73e0a95e7e534ea642812948d90f13ed8926aefc

    OF-2782: Unsure SerializingCache retains functionality after cluster state change
    When a server joins or leaves a cluster, all clustered caches are recreated. SerializingCaches should be recreated as such.

    • xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactory.java (version 73e0a95e7e534ea642812948d90f13ed8926aefc)
    • xmppserver/src/main/java/org/jivesoftware/util/cache/SerializingCache.java (version 73e0a95e7e534ea642812948d90f13ed8926aefc)
    • xmppserver/src/test/java/org/jivesoftware/util/cache/CacheFactoryTest.java (version 73e0a95e7e534ea642812948d90f13ed8926aefc)
  • Guus der Kinderen

    Guus der Kinderen e57845ea6e93a687ef88c9b2420719486504863f

    OF-2781: Prevent ClassCastException when creating SerializingCache
    The newly created cache gets wrapped (so that its implementation can be changed on the fly, when clustering starts or stops). The previous implementation caused a ClassCastException that is herein prevented.

    • xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactory.java (version e57845ea6e93a687ef88c9b2420719486504863f)
    • xmppserver/src/test/java/org/jivesoftware/util/cache/CacheFactoryTest.java (version e57845ea6e93a687ef88c9b2420719486504863f)
  • Joshua Sattler <34030048+jsattler@users.noreply.github.com>

    Joshua Sattler <34030048+jsattler@users.noreply.github.com> 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d

    OF-2768: show 'Not available' for 'Registered' when date is null

    • i18n/src/main/resources/openfire_i18n.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_cs_CZ.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_de.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_es.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_fr.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_ja_JP.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_nl.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_pl_PL.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_pt_BR.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_pt_PT.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_ru_RU.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_sk.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_uk_UA.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • i18n/src/main/resources/openfire_i18n_zh_CN.properties (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • xmppserver/src/main/webapp/user-properties.jsp (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
    • xmppserver/src/main/webapp/user-summary.jsp (version 3b5e4f038b60fd3919a2ba5ab148d64c50773e5d)
  • Joshua Sattler <34030048+jsattler@users.noreply.github.com>

    Joshua Sattler <34030048+jsattler@users.noreply.github.com> 81e465f0dd13175533d5598c5009ce71e65a7b6f

    OF-2768: set `creationDate` and `modificationDate` to null by default
    When the implementation of the `UserProvider` does not provide a
    valid `creationDate` or `modificationDate` we want to default to
    null instead of setting those values to now.

    • xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapUserProvider.java (version 81e465f0dd13175533d5598c5009ce71e65a7b6f)