Code commits

Openfire (master)

  • daryl herzmann <akrherz@iastate.edu>

    daryl herzmann <akrherz@iastate.edu> 3d7f14157f6282023d2a11f1c3d91b790995f1f0

    Merge pull request #1730 from igniterealtime/dependabot/maven/xmppserver/junit-junit-4.13.1
    Bump junit from 4.12 to 4.13.1 in /xmppserver

  • daryl herzmann <akrherz@iastate.edu>

    daryl herzmann <akrherz@iastate.edu> b8de086c5e8376b83d59c1e605dcd4a0cfcd65fa

    Merge pull request #1727 from guusdk/OF-2095_PEP-notifications-to-woner
    PEP notification fixes

  • daryl herzmann <akrherz@iastate.edu>

    daryl herzmann <akrherz@iastate.edu> e9bed6bb9e1c5e0cc35e0c97318f92b2dd959fd9

    Merge pull request #1728 from guusdk/OF-2097_admin-console-show-caps
    OF-2097: Allow CAPS info to be shown on the admin console

  • daryl herzmann <akrherz@iastate.edu>

    daryl herzmann <akrherz@iastate.edu> 531f919197c13a5f4bd160a444d0dcd2758ab730

    Merge pull request #1729 from guusdk/OF-2098_admin-console-show-pubsub-node-config
    OF-2098: Admin console should show Pubsub Node config

  • dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 57eb7b0c2d93edf0178df59d1e1eaaf1d5d70768

    Bump junit from 4.12 to 4.13.1 in /xmppserver
    Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
    - [Release notes](https://github.com/junit-team/junit4/releases)
    - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
    - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

    Signed-off-by: dependabot[bot] <support@github.com>

    • xmppserver/pom.xml (version 57eb7b0c2d93edf0178df59d1e1eaaf1d5d70768)
  • Guus der Kinderen <guus.der.kinderen@gmail.com>

    Guus der Kinderen <guus.der.kinderen@gmail.com> 869af46d0c6009c8a03987c7a73a4abb90853f16 m

    OF-2098: Admin console should show Pubsub Node config

    • i18n/src/main/resources/openfire_i18n.properties (version 869af46d0c6009c8a03987c7a73a4abb90853f16)
    • xmppserver/src/main/resources/admin-sidebar.xml (version 869af46d0c6009c8a03987c7a73a4abb90853f16)
    • xmppserver/src/main/webapp/pubsub-node-configuration.jsp (version 869af46d0c6009c8a03987c7a73a4abb90853f16)
    • xmppserver/src/main/webapp/pubsub-node-summary.jsp (version 869af46d0c6009c8a03987c7a73a4abb90853f16)
  • Guus der Kinderen <guus.der.kinderen@gmail.com>

    Guus der Kinderen <guus.der.kinderen@gmail.com> cbb9224718fe47a0ec3dcc21f555398f60525291 m

    OF-2097: Allow CAPS info to be shown on the admin console
    This adds Entity Capabilities (as announced by the client) to the session details page. As this information is not very useful for the average user, I've hidden it behind a 'show more details' button.

    • i18n/src/main/resources/openfire_i18n.properties (version cbb9224718fe47a0ec3dcc21f555398f60525291)
    • i18n/src/main/resources/openfire_i18n_nl.properties (version cbb9224718fe47a0ec3dcc21f555398f60525291)
    • xmppserver/src/main/webapp/session-details.jsp (version cbb9224718fe47a0ec3dcc21f555398f60525291)
  • Guus der Kinderen <guus.der.kinderen@gmail.com>

    Guus der Kinderen <guus.der.kinderen@gmail.com> 6ad1faa67c0471148bfc7339e9d4b72860c5eb77 m

    OF-2096: PEP - do not bypass logic for certain recipients
    The existing code would break out of the processing when the intended recipient could not be looked up. This prevented access control to be applied, as well as enrichment of the PEP notification message.

    • xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPService.java (version 6ad1faa67c0471148bfc7339e9d4b72860c5eb77)
  • Guus der Kinderen <guus.der.kinderen@gmail.com>

    Guus der Kinderen <guus.der.kinderen@gmail.com> 3790dbca7ddb8e6badaf3d454c41d065001871bf m

    OF-2095: Account for intended recipient to be the service owner
    ... as opposed to a subscriber.

    This prevents a bypass of certain logic - that probably should not be bypassed in any case (see OF-2096).

    • xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPService.java (version 3790dbca7ddb8e6badaf3d454c41d065001871bf)