Code commits

Openfire (master)

  • Dave Cridland <dave@cridland.net>

    Dave Cridland <dave@cridland.net> 55ceda569e447ba896eaaf1b282e61a91d6583cf

    Merge pull request #1140 from GregDThomas/OF-1589
    OF-1589: Ensure Cache entries are non-null and serializable

  • Dave Cridland <dave@cridland.net>

    Dave Cridland <dave@cridland.net> 622d5e54f5d87ba4e1a26afa2786034480e357ec

    Merge branch 'master' into OF-1589

  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 1464e08267c215efaea6df3030d5ba22b1cf2fde

    Merge pull request #1166 from GregDThomas/genericize-cluster-task
    Genericize the calling of cluster tasks revisited

  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> f28c14ac6ec80ca3320c9c90e307592738a48031

    Genericize the calling of cluster tasks revisited

    • src/plugins/monitoring/src/java/org/jivesoftware/openfire/archive/ConversationManager.java (version f28c14ac6ec80ca3320c9c90e307592738a48031)
    • src/plugins/monitoring/src/java/org/jivesoftware/openfire/reporting/stats/StatsEngine.java (version f28c14ac6ec80ca3320c9c90e307592738a48031)
  • Dave Cridland <dave@cridland.net>

    Dave Cridland <dave@cridland.net> c182ab5813ca5990846d7e72643e2be22134c8a1

    Merge pull request #1165 from GregDThomas/OF-1616
    OF-1616: Provide paging of users on the group membership edit page

  • Dave Cridland <dave@cridland.net>

    Dave Cridland <dave@cridland.net> 986b4d6fc8bf6d4385e5667fbc065f560e43e9a3

    Merge pull request #1146 from GregDThomas/genericize-cluster-task
    Genericize the calling of cluster tasks.

  • Dave Cridland <dave@cridland.net>

    Dave Cridland <dave@cridland.net> 73cf7dd4faedf7f2c86cf4f912ee3609eb426c63

    Merge pull request #1157 from guusdk/OF-1599_Not-both-RSA-and-DSA-certs
    OF-1599 / OF-1603 / OF-1604 / OF-1605

  • Dave Cridland <dave@cridland.net>

    Dave Cridland <dave@cridland.net> 4f277703e161ad7af514a6fc6303547738f74475

    Merge pull request #1159 from guusdk/OF-1607_certman-plugin_chain-lenght
    Various Certificate Manager plugin changes

  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 5a6651c10b05772486599fa9f742762eb3a8fb6e

    OF-1616: Provide paging of users on the group membership edit page [Also fix a bug in the list pager which prevented the last page from being shown]

    • i18n/src/main/resources/openfire_i18n_en.properties (version 5a6651c10b05772486599fa9f742762eb3a8fb6e)
    • src/java/org/jivesoftware/util/ListPager.java (version 5a6651c10b05772486599fa9f742762eb3a8fb6e)
    • src/test/java/org/jivesoftware/util/ListPagerTest.java (version 5a6651c10b05772486599fa9f742762eb3a8fb6e)
    • src/web/group-edit.jsp (version 5a6651c10b05772486599fa9f742762eb3a8fb6e)
  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> f1cdfefc471d1bacc07990e6f9161151b0b853da m

    OF-1589: Ensure Cache entries are non-null and serializable

    • src/java/org/jivesoftware/openfire/SessionManager.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/java/org/jivesoftware/openfire/StreamID.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/java/org/jivesoftware/openfire/crowd/CrowdGroupProvider.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/java/org/jivesoftware/openfire/group/GroupManager.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/java/org/jivesoftware/openfire/vcard/VCardManager.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/java/org/jivesoftware/util/cache/Cache.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/java/org/jivesoftware/util/cache/CacheWrapper.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/java/org/jivesoftware/util/cache/ComponentCacheWrapper.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/java/org/jivesoftware/util/cache/DefaultCache.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
    • src/plugins/hazelcast/src/java/org/jivesoftware/openfire/plugin/util/cache/ClusterListener.java (version f1cdfefc471d1bacc07990e6f9161151b0b853da)
  • Guus der Kinderen

    Guus der Kinderen 914a3f94e5ad24b6a0bbe24e471a1e9ecb836dd0 m

    OF-1607: Certificate Manager plugin: certificate chain detection: should contain more than one certificate.

    • src/plugins/certificateManager/src/java/org/igniterealtime/openfire/plugins/certificatemanager/DirectoryWatcher.java (version 914a3f94e5ad24b6a0bbe24e471a1e9ecb836dd0)
  • Guus der Kinderen

    Guus der Kinderen f8596e771d7baab2f9b4055848f5576d8d5af6ed m

    OF-1528: Use Java 8 when compiling JSP.

    • webadmin/pom.xml (version f8596e771d7baab2f9b4055848f5576d8d5af6ed)
  • Guus der Kinderen

    Guus der Kinderen 087921cfa2d1ac9eecc475f368af3bb697ed7354 m

    Certificate Manager plugin: improve logging.

    • src/plugins/certificateManager/src/java/org/igniterealtime/openfire/plugins/certificatemanager/DirectoryWatcher.java (version 087921cfa2d1ac9eecc475f368af3bb697ed7354)
  • Guus der Kinderen

    Guus der Kinderen 55457df2f7a33e6348f2f2b9152ce89cc0bcd226 m

    Certificate Manager plugin: Add Dutch translation.

    • src/plugins/certificateManager/changelog.html (version 55457df2f7a33e6348f2f2b9152ce89cc0bcd226)
    • src/plugins/certificateManager/src/i18n/certificatemanager_i18n_nl.properties (version 55457df2f7a33e6348f2f2b9152ce89cc0bcd226)
  • Guus der Kinderen

    Guus der Kinderen 65f1cb02ec8cae608d32b611979a728648adaea3 m

    OF-1607: Certificate Manager plugin: Set minimum size for certificate chain.
    When detecting cerificate chain files, look for (by default) files that at least have _more_ than one certificate in them.

    • src/plugins/certificateManager/changelog.html (version 65f1cb02ec8cae608d32b611979a728648adaea3)
    • src/plugins/certificateManager/pom.xml (version 65f1cb02ec8cae608d32b611979a728648adaea3)
    • src/plugins/certificateManager/src/i18n/certificatemanager_i18n.properties (version 65f1cb02ec8cae608d32b611979a728648adaea3)
    • src/plugins/certificateManager/src/java/org/igniterealtime/openfire/plugins/certificatemanager/DirectoryWatcher.java (version 65f1cb02ec8cae608d32b611979a728648adaea3)
    • src/plugins/certificateManager/src/web/certificate-management.jsp (version 65f1cb02ec8cae608d32b611979a728648adaea3)
  • Guus der Kinderen

    Guus der Kinderen 0bc0d9438158d7e69033c781c52fb4175fb944d3 m

    OF-1610: Certificate Manager plugin: use optional passphrase for to-be-imported private key.

    • src/plugins/certificateManager/changelog.html (version 0bc0d9438158d7e69033c781c52fb4175fb944d3)
    • src/plugins/certificateManager/src/i18n/certificatemanager_i18n.properties (version 0bc0d9438158d7e69033c781c52fb4175fb944d3)
    • src/plugins/certificateManager/src/i18n/certificatemanager_i18n_nl.properties (version 0bc0d9438158d7e69033c781c52fb4175fb944d3)
    • src/plugins/certificateManager/src/java/org/igniterealtime/openfire/plugins/certificatemanager/DirectoryWatcher.java (version 0bc0d9438158d7e69033c781c52fb4175fb944d3)
    • src/plugins/certificateManager/src/web/certificate-management.jsp (version 0bc0d9438158d7e69033c781c52fb4175fb944d3)
  • Guus der Kinderen

    Guus der Kinderen b81be5e7327204d21b00168a6f6883424b3624af m

    OF-1608: Certificate Manager plugin: create backup before applying changes.

    • src/plugins/certificateManager/changelog.html (version b81be5e7327204d21b00168a6f6883424b3624af)
    • src/plugins/certificateManager/plugin.xml (version b81be5e7327204d21b00168a6f6883424b3624af)
    • src/plugins/certificateManager/pom.xml (version b81be5e7327204d21b00168a6f6883424b3624af)
    • src/plugins/certificateManager/src/java/org/igniterealtime/openfire/plugins/certificatemanager/DirectoryWatcher.java (version b81be5e7327204d21b00168a6f6883424b3624af)
  • Guus der Kinderen

    Guus der Kinderen 5d80ae885b5c3f3eaee21535e949a6c686911887 m

    OF-1609: Certificate Manager plugin: grace period for file system changes should be respected.

    • src/plugins/certificateManager/changelog.html (version 5d80ae885b5c3f3eaee21535e949a6c686911887)
    • src/plugins/certificateManager/src/java/org/igniterealtime/openfire/plugins/certificatemanager/DirectoryWatcher.java (version 5d80ae885b5c3f3eaee21535e949a6c686911887)
  • Guus der Kinderen

    Guus der Kinderen 98d6d61be0562ba6e74291e1d28dbc1ea5ea0b92 m

    OF-1608: Facilitate backup of certificate stores.

    • i18n/src/main/resources/openfire_i18n_en.properties (version 98d6d61be0562ba6e74291e1d28dbc1ea5ea0b92)
    • i18n/src/main/resources/openfire_i18n_nl.properties (version 98d6d61be0562ba6e74291e1d28dbc1ea5ea0b92)
    • src/java/org/jivesoftware/openfire/keystore/CertificateStore.java (version 98d6d61be0562ba6e74291e1d28dbc1ea5ea0b92)
    • src/java/org/jivesoftware/openfire/keystore/CertificateStoreConfiguration.java (version 98d6d61be0562ba6e74291e1d28dbc1ea5ea0b92)
    • src/java/org/jivesoftware/openfire/keystore/CertificateStoreManager.java (version 98d6d61be0562ba6e74291e1d28dbc1ea5ea0b92)
    • src/java/org/jivesoftware/util/CollectionUtils.java (version 98d6d61be0562ba6e74291e1d28dbc1ea5ea0b92)
    • src/resources/jar/admin-sidebar.xml (version 98d6d61be0562ba6e74291e1d28dbc1ea5ea0b92)
    • src/security/archive/readme.txt (version 98d6d61be0562ba6e74291e1d28dbc1ea5ea0b92)
    • src/web/security-certificate-store-backup.jsp (version 98d6d61be0562ba6e74291e1d28dbc1ea5ea0b92)
    • src/web/security-certificate-store-management.jsp (version 98d6d61be0562ba6e74291e1d28dbc1ea5ea0b92)
  • Guus der Kinderen

    Guus der Kinderen 87688b5c7cab6a3a9c41647a27be0925920e6aee m

    OF-1611: Certificate Manager plugin: should not import more than once per iteration.

    • src/java/org/jivesoftware/openfire/keystore/CertificateStoreManager.java (version 87688b5c7cab6a3a9c41647a27be0925920e6aee)
    • src/plugins/certificateManager/changelog.html (version 87688b5c7cab6a3a9c41647a27be0925920e6aee)
    • src/plugins/certificateManager/src/java/org/igniterealtime/openfire/plugins/certificatemanager/DirectoryWatcher.java (version 87688b5c7cab6a3a9c41647a27be0925920e6aee)
  • Guus der Kinderen

    Guus der Kinderen a85f5098cb242787f67d7fca519e0aaca7c6fbbb m

    OF-1605: Add support for wildcard in self-signed certificates.
    When generating a self-signed certificate, a wildcard SAN will be generated, unless the
    property cert.wildcard is set to false (it defaults to true).

    Using a wildcard makes it more likely that future changes / additions will be covered
    by the pre-existing certificate.

    • src/java/org/jivesoftware/openfire/keystore/IdentityStore.java (version a85f5098cb242787f67d7fca519e0aaca7c6fbbb)
  • Guus der Kinderen

    Guus der Kinderen 3759d573071f3522cd525e0d58709b85a3e87770 m

    OF-1604: Fix SAN pattern matching

    • src/java/org/jivesoftware/openfire/keystore/IdentityStore.java (version 3759d573071f3522cd525e0d58709b85a3e87770)
  • Guus der Kinderen

    Guus der Kinderen b5e9fba64cbf39286896f3725f4b588378a3cb34 m

    OF-1603: Persist and log only if something changed.

    • src/web/security-keystore.jsp (version b5e9fba64cbf39286896f3725f4b588378a3cb34)
  • Guus der Kinderen

    Guus der Kinderen e3e249698711d6e77595b87a64eb7b4e3d8f5f56 m

    Removed unused error condition definition.

    • i18n/src/main/resources/openfire_i18n_cs_CZ.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • i18n/src/main/resources/openfire_i18n_de.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • i18n/src/main/resources/openfire_i18n_en.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • i18n/src/main/resources/openfire_i18n_es.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • i18n/src/main/resources/openfire_i18n_fr.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • i18n/src/main/resources/openfire_i18n_ja_JP.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • i18n/src/main/resources/openfire_i18n_nl.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • i18n/src/main/resources/openfire_i18n_pl_PL.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • i18n/src/main/resources/openfire_i18n_pt_BR.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • i18n/src/main/resources/openfire_i18n_ru_RU.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • i18n/src/main/resources/openfire_i18n_sk.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • i18n/src/main/resources/openfire_i18n_zh_CN.properties (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
    • src/web/security-keystore.jsp (version e3e249698711d6e77595b87a64eb7b4e3d8f5f56)
  • Guus der Kinderen

    Guus der Kinderen 0cb36a689762403b26f23dff1d5634cd05ba6c16 m

    OF-1603: Self-signed certs should be regenerated when the existing one does not match all server identities.
    The self-signed certificate that's installed in Openfire should be replaced (when the user instructs to do so)
    when the existing certificate does not include all server identities as subject alternate names (of the DNS type).

    The existing code checked only if the primary identity was present in the certificate, and ignored the request
    to replace the certificate if it was.

    • src/test/java/org/jivesoftware/util/CertificateManagerTest.java (version 0cb36a689762403b26f23dff1d5634cd05ba6c16)
    • src/web/security-keystore.jsp (version 0cb36a689762403b26f23dff1d5634cd05ba6c16)
  • Guus der Kinderen

    Guus der Kinderen b53820933b38cc319fe85b7300d6b4a7bc73a85f m

    OF-1599: Stop insisting on having certificates with two different algorithms
    This commit will allow Openfire to operate with just one certificate, instead of two,
    without showing warnings.

    The commit also replaces some hard-coded values with properties that have the original
    hard-coded value as a default.

    • i18n/src/main/resources/openfire_i18n_cs_CZ.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_de.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_en.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_es.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_fr.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_ja_JP.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_nl.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_pl_PL.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_pt_BR.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_pt_PT.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_ru_RU.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_sk.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • i18n/src/main/resources/openfire_i18n_zh_CN.properties (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • src/java/org/jivesoftware/openfire/XMPPServer.java (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • src/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • src/java/org/jivesoftware/openfire/http/HttpBindManager.java (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • src/java/org/jivesoftware/openfire/keystore/IdentityStore.java (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • src/web/index.jsp (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
    • src/web/security-keystore.jsp (version b53820933b38cc319fe85b7300d6b4a7bc73a85f)
  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 7c3a43fec3f5813c4bf58e9cb3868880eb052d5f m

    Genericize the calling of cluster tasks.

    • src/java/org/jivesoftware/openfire/SessionManager.java (version 7c3a43fec3f5813c4bf58e9cb3868880eb052d5f)
    • src/java/org/jivesoftware/openfire/container/PluginCacheRegistry.java (version 7c3a43fec3f5813c4bf58e9cb3868880eb052d5f)
    • src/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 7c3a43fec3f5813c4bf58e9cb3868880eb052d5f)
    • src/java/org/jivesoftware/util/cache/CacheFactory.java (version 7c3a43fec3f5813c4bf58e9cb3868880eb052d5f)
    • src/java/org/jivesoftware/util/cache/CacheFactoryStrategy.java (version 7c3a43fec3f5813c4bf58e9cb3868880eb052d5f)
    • src/plugins/hazelcast/src/java/org/jivesoftware/openfire/plugin/util/cache/ClusteredCacheFactory.java (version 7c3a43fec3f5813c4bf58e9cb3868880eb052d5f)
    • src/plugins/hazelcast/src/java/org/jivesoftware/openfire/plugin/util/cluster/NodeRuntimeStats.java (version 7c3a43fec3f5813c4bf58e9cb3868880eb052d5f)
    • src/web/system-clustering.jsp (version 7c3a43fec3f5813c4bf58e9cb3868880eb052d5f)