Build: #925 was successful Scheduled with changes by daryl herzmann <akrherz@iastate.edu> and Guus der Kinderen
Code commits
Openfire (master)
-
daryl herzmann <akrherz@iastate.edu> a0976cefddfc03e54230ddd933478aa226d8e16b
Merge pull request #1774 from guusdk/OF-2170_UserDN-negative-lookup-cache
OF-2170: LDAP userDN cache should contain negative lookups -
daryl herzmann <akrherz@iastate.edu> 3e22998457fcb4d0657c342e647efae55f0889a9
Merge pull request #1773 from guusdk/OF-2169_LDAP-vcard-NPE
OF-2169: Prevent exception for missing LDAP attribute -
daryl herzmann <akrherz@iastate.edu> b7620321a78d80a1cbe912a2323e8c585b2a7eff
Merge pull request #1772 from guusdk/OF-2168_MUC-broadcast-role
OF-2168: MUC presence broadcast supression based on role -
Guus der Kinderen 69736a161c2622bbf4c676030e062577b7e61878
OF-2170: Prevent NullPointer
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 69736a161c2622bbf4c676030e062577b7e61878)
-
Guus der Kinderen 4834bf79fd4a8289b60947d90916f52c2352e5ef
OF-2170: Use CacheableOptional
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 4834bf79fd4a8289b60947d90916f52c2352e5ef)
-
Guus der Kinderen ebb551b00968df13ef034c9ca8f359f1f665dfb7
OF-2170: LDAP userDN cache should contain negative lookups
By caching lookup failures, subsequent lookups are prevented, which will increase performance.- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version ebb551b00968df13ef034c9ca8f359f1f665dfb7)
-
Guus der Kinderen b07147f87a9828d93ed9668d6f7d52d9864c8cc4
OF-2169: Prevent exception for missing LDAP attribute
When a VCard template refers to an attribute that a user does not have, the resulting value should be empty. This commit prevents a NullPointerException to be thrown.- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java (version b07147f87a9828d93ed9668d6f7d52d9864c8cc4)
- xmppserver/src/test/java/org/jivesoftware/openfire/ldap/VCardTest.java (version b07147f87a9828d93ed9668d6f7d52d9864c8cc4)
-
Guus der Kinderen 214e9463f9661b68eeb1aba215aa6ecc1f6d75b5
OF-2168: MUC presence broadcast supression based on role
Openfire offers functionality to suppress the broadcast of occupants that have a certain role. The old implementation is based on the definition of that role that should be present in the presence stanza to be broadcast.
When the presence stanza that is being processed does, for some reason, not include this role, the implementation fails. NullPointerExceptions have been observed in relation to this.
It should be a lot safer to base the broadcast/do not broadcast decision based on the role that is assigned to the user, as this prevents the need to parse a stanza. This commit applies this new strategy.
Additionally, this commit replaces the string-based represention of a role with a type-safe variant.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 214e9463f9661b68eeb1aba215aa6ecc1f6d75b5)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java (version 214e9463f9661b68eeb1aba215aa6ecc1f6d75b5)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 214e9463f9661b68eeb1aba215aa6ecc1f6d75b5)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version 214e9463f9661b68eeb1aba215aa6ecc1f6d75b5)
- xmppserver/src/main/webapp/muc-room-edit-form.jsp (version 214e9463f9661b68eeb1aba215aa6ecc1f6d75b5)