Build: #208 was successful Scheduled with changes by Joel Njanga <joel@armortext.co> and GregDThomas <greg.d.thomas@gmail.com>

Code commits

Openfire (master)

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

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

    OF-1726: Merge pull request #1309 from promiselaoliu/encryption
    The encrypted properties cannot be decrypted correctly if your run multiple setups

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

    GregDThomas <greg.d.thomas@gmail.com> 979fdf03f9aef2f4a7cab4e44899d2de1cd61f3e

    OF-1725: Merge pull request #1323 from promiselaoliu/adminpassword
    The old password always fails validation if the admin password is not the default one "admin"

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

    GregDThomas <greg.d.thomas@gmail.com> 74b619de1b2a6b638a2b09e9e6f6b9fa21751caf

    Merge pull request #1326 from barbarello/master
    propagate saveToDb state change to other nodes in the cluster

  • Joel Njanga <joel@armortext.co>

    Joel Njanga <joel@armortext.co> b3b4bad7b32cd573f3037f8e47b91a85908f7a01

    propagate saveToDb state change to other nodes in the cluster

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version b3b4bad7b32cd573f3037f8e47b91a85908f7a01)
  • Liu, Yong-Liang <yong-liang.liu@microfocus.com>

    Liu, Yong-Liang <yong-liang.liu@microfocus.com> b6b5f0376ad0963553fd4d00c1e3d8d3d453eafe m

    set encryption key as early as possible; get database related properties from the autosetup section

    • xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java (version b6b5f0376ad0963553fd4d00c1e3d8d3d453eafe)
  • Liu, Yong-Liang <yong-liang.liu@microfocus.com>

    Liu, Yong-Liang <yong-liang.liu@microfocus.com> c17036ad3df02e5272a4953e619e4cca25716666 m

    use real password to authenticate

    • xmppserver/src/main/webapp/setup/setup-admin-settings.jsp (version c17036ad3df02e5272a4953e619e4cca25716666)
  • Liu, Yong-Liang <yong-liang.liu@microfocus.com>

    Liu, Yong-Liang <yong-liang.liu@microfocus.com> e6987f4ac6ad6ef9efbfd70cac362864937bc1bf m

    add another condition for updating encryption: the old encryptor is not null

    • xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java (version e6987f4ac6ad6ef9efbfd70cac362864937bc1bf)
  • Liu, Yong-Liang <yong-liang.liu@microfocus.com>

    Liu, Yong-Liang <yong-liang.liu@microfocus.com> 2ba712c8fa4282459dc62174a6af421d90b576dc m

    still need null check for the old key

    • xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java (version 2ba712c8fa4282459dc62174a6af421d90b576dc)
  • Liu, Yong-Liang <yong-liang.liu@microfocus.com>

    Liu, Yong-Liang <yong-liang.liu@microfocus.com> 4dcf3844ce01463c577557f6efc6391a157517ec m

    add null check for the new key in setupPropertyEncryptionKey

    • xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java (version 4dcf3844ce01463c577557f6efc6391a157517ec)
  • Liu, Yong-Liang <yong-liang.liu@microfocus.com>

    Liu, Yong-Liang <yong-liang.liu@microfocus.com> 589ef8b39c6ec93e18054088e763ff142b50851d m

    when changing the encryption key, should keep both the old key and the new key

    • xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java (version 589ef8b39c6ec93e18054088e763ff142b50851d)
    • xmppserver/src/main/java/org/jivesoftware/util/JiveProperties.java (version 589ef8b39c6ec93e18054088e763ff142b50851d)
    • xmppserver/src/main/java/org/jivesoftware/util/XMLProperties.java (version 589ef8b39c6ec93e18054088e763ff142b50851d)
  • Liu, Yong-Liang <yong-liang.liu@microfocus.com>

    Liu, Yong-Liang <yong-liang.liu@microfocus.com> df4a3a6b75fbeb384f0f5d848bcfeac66fccc1c4 m

    refacotring of the logic

    • xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java (version df4a3a6b75fbeb384f0f5d848bcfeac66fccc1c4)
  • Liu, Yong-Liang <yong-liang.liu@microfocus.com>

    Liu, Yong-Liang <yong-liang.liu@microfocus.com> 3f2cf9a96d7bd2494373355739fc1516598e2b27 m

    update current key only if not empty

    • xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java (version 3f2cf9a96d7bd2494373355739fc1516598e2b27)
  • Liu, Yong-Liang <yong-liang.liu@microfocus.com>

    Liu, Yong-Liang <yong-liang.liu@microfocus.com> 4c4527aadd5756e4df71f5e631b4a64692e5e467 m

    fix encryption issues

    • xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java (version 4c4527aadd5756e4df71f5e631b4a64692e5e467)