Openfire (master)

• 

  Greg Thomas <greg.d.thomas@gmail.com> 17 Dec 2019 4b1b155dd4a997c00f4e670081daf8aafb9ca501

  OF-1895: Unload properties that belong to a plugin

  • xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java (version 4b1b155dd4a997c00f4e670081daf8aafb9ca501)
• 

  Guus der Kinderen 17 Dec 2019 c0e81a77cf4e5d7e489bfd78fb4cc7be56129494

  There's no need to add a duplicate character to split on.

  • xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java (version c0e81a77cf4e5d7e489bfd78fb4cc7be56129494)
• 

  Guus der Kinderen 17 Dec 2019 22c7a95e873d23db4f923fa1a9f618851e27b83c

  OF-1106: Allow for multiple namefields.
  This commit allows one to configure more than one LDAP attribute to be used for the Name field, where the first non-empty attribute is used (note that this is different from combining multiple attribute values, which was already supported).
  
  The new functionality is used by defining the mapping value as follows:
  
      (|({givenName})({displayName})({cn}))
  
  In the example above, the attribute used will be the first non-empty attribute value from the list:
  
  - givenName
  - displayName
  - cn
  
  Obviously, other attribute names can be used. It's also possible to use fewer or more fields.
  
  This particular format (which mimics LDAP filter syntax) was used to avoid clashes with mappings where it is desirable to join multiple fields (which is also supported in Openfire), for example:
  
      {familyName}, {givenName}

  • i18n/src/main/resources/openfire_i18n.properties (version 22c7a95e873d23db4f923fa1a9f618851e27b83c)
  • i18n/src/main/resources/openfire_i18n_nl.properties (version 22c7a95e873d23db4f923fa1a9f618851e27b83c)
  • xmppserver/src/main/java/org/jivesoftware/admin/LdapUserProfile.java (version 22c7a95e873d23db4f923fa1a9f618851e27b83c)
  • xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java (version 22c7a95e873d23db4f923fa1a9f618851e27b83c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 22c7a95e873d23db4f923fa1a9f618851e27b83c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapUserProvider.java (version 22c7a95e873d23db4f923fa1a9f618851e27b83c)
  • xmppserver/src/main/webapp/setup/ldap-user.jspf (version 22c7a95e873d23db4f923fa1a9f618851e27b83c)
  • xmppserver/src/test/java/org/jivesoftware/openfire/ldap/LdapManagerTest.java (version 22c7a95e873d23db4f923fa1a9f618851e27b83c)
• 

  Guus der Kinderen 17 Dec 2019 a64480ed827019cfe2c76d02ae39945ec73d63b0

  OF-1106: Apply new 'priority' filter to VCard mapping.

  • xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java (version a64480ed827019cfe2c76d02ae39945ec73d63b0)
  • xmppserver/src/test/java/org/jivesoftware/openfire/ldap/VCardTemplateTest.java (version a64480ed827019cfe2c76d02ae39945ec73d63b0)
  • xmppserver/src/test/java/org/jivesoftware/openfire/ldap/VCardTest.java (version a64480ed827019cfe2c76d02ae39945ec73d63b0)
• 

  Guus der Kinderen 17 Dec 2019 955061fc09a1e6b6fc34ac794037be0486927621

  OF-1949: Should combine LDAP values in User's "name" field.

  • xmppserver/src/main/java/org/jivesoftware/admin/LdapUserProfile.java (version 955061fc09a1e6b6fc34ac794037be0486927621)
  • xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java (version 955061fc09a1e6b6fc34ac794037be0486927621)
  • xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 955061fc09a1e6b6fc34ac794037be0486927621)
  • xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapUserProvider.java (version 955061fc09a1e6b6fc34ac794037be0486927621)
• 

  Guus der Kinderen 17 Dec 2019 37068fd8c10ab2219db516a72ae7a733f5fd8c5a

  OF-1944: Clear caches after changing LDAP settings.
  When LDAP profile settings are changed (for example, to change the VCard mapping), then old data can still linger in the caches. To the unexpected user, it'll appear as if changes have not been applied.
  
  To help changes be effectuated immediately, relevant caches should be cleared after updating the LDAP profile settings.

  • xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactory.java (version 37068fd8c10ab2219db516a72ae7a733f5fd8c5a)
  • xmppserver/src/main/webapp/setup/ldap-group.jspf (version 37068fd8c10ab2219db516a72ae7a733f5fd8c5a)
  • xmppserver/src/main/webapp/setup/ldap-server.jspf (version 37068fd8c10ab2219db516a72ae7a733f5fd8c5a)
  • xmppserver/src/main/webapp/setup/ldap-user.jspf (version 37068fd8c10ab2219db516a72ae7a733f5fd8c5a)
• 

  Guus der Kinderen 17 Dec 2019 a441e7eb7e49de1e64eb508f917fa6fe4564bd70

  OF-1947: LDAP - don't replace non-placeholder values.
  This commit adds some unit tests for the VCard Template processing code in Openfire.
  
  Additionally, it fixes a small bug where, conditionally, vcard values that are not placeholders were replaced.

  • xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java (version a441e7eb7e49de1e64eb508f917fa6fe4564bd70)
  • xmppserver/src/test/java/org/jivesoftware/openfire/ldap/VCardTemplateTest.java (version a441e7eb7e49de1e64eb508f917fa6fe4564bd70)
  • xmppserver/src/test/java/org/jivesoftware/openfire/ldap/VCardTest.java (version a441e7eb7e49de1e64eb508f917fa6fe4564bd70)
  • xmppserver/src/test/resources/org/jivesoftware/openfire/ldap/vcardmapping-combined.xml (version a441e7eb7e49de1e64eb508f917fa6fe4564bd70)
  • xmppserver/src/test/resources/org/jivesoftware/openfire/ldap/vcardmapping-default.xml (version a441e7eb7e49de1e64eb508f917fa6fe4564bd70)
  • xmppserver/src/test/resources/org/jivesoftware/openfire/ldap/vcardmapping-prioritized.xml (version a441e7eb7e49de1e64eb508f917fa6fe4564bd70)
• 

  daryl herzmann <akrherz@iastate.edu> 17 Dec 2019 332374e7cf723e5d58abe4befe4166b1f01dac81

  Merge pull request #1549 from guusdk/OF-1938_Bouncy-castle-1_64
  OF-1938: Update Bouncy Castle to v1.64
• 

  Guus der Kinderen 17 Dec 2019 8952aecf92104a0017d6dda133ce6a714d52c306

  OF-1938: Update Bouncy Castle to v1.64

  • pom.xml (version 8952aecf92104a0017d6dda133ce6a714d52c306)