Build: #8 was successful Manual run by daryl herzmann
Code commits
Openfire (master)
-
akrherz <akrherz@iastate.edu> 4235b9eebdc5ae28713707106c97b922145d0e67
Denote Openfire 4.5.0 Beta Release
- distribution/pom.xml (version 4235b9eebdc5ae28713707106c97b922145d0e67)
- i18n/pom.xml (version 4235b9eebdc5ae28713707106c97b922145d0e67)
- plugins/openfire-plugin-assembly-descriptor/pom.xml (version 4235b9eebdc5ae28713707106c97b922145d0e67)
- plugins/pom.xml (version 4235b9eebdc5ae28713707106c97b922145d0e67)
- pom.xml (version 4235b9eebdc5ae28713707106c97b922145d0e67)
- starter/pom.xml (version 4235b9eebdc5ae28713707106c97b922145d0e67)
- xmppserver/changelog.html (version 4235b9eebdc5ae28713707106c97b922145d0e67)
- xmppserver/pom.xml (version 4235b9eebdc5ae28713707106c97b922145d0e67)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java (version 4235b9eebdc5ae28713707106c97b922145d0e67)
-
Guus der Kinderen 14fa9a58346e7ecfa4691f0788ec69d8d5778268
OF-1806: Tweaks to make LGTM happy.
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 14fa9a58346e7ecfa4691f0788ec69d8d5778268)
-
Greg Thomas <greg.d.thomas@gmail.com> 04c9ad5bc12d0f098e2ee1a38eadce81a215dcb6
OF-1951: Allow plugins to use i18n with their SystemProperty descriptions.
- xmppserver/src/main/java/org/jivesoftware/util/LocaleUtils.java (version 04c9ad5bc12d0f098e2ee1a38eadce81a215dcb6)
- xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java (version 04c9ad5bc12d0f098e2ee1a38eadce81a215dcb6)
- xmppserver/src/test/java/org/jivesoftware/util/SystemPropertyTest.java (version 04c9ad5bc12d0f098e2ee1a38eadce81a215dcb6)
-
Guus der Kinderen 4caf10af27de6d1a4aa20543f914f85eadbf0b9c
Merge pull request #1427 from cpetzka/npe_in_server_session_row_jsp
OF-1953: fix an npe in the server sessions view on the admin console -
Guus der Kinderen fcf074836dd655229b5e9f6ac977570950776aa8
Merge pull request #1406 from mnsuccess/xep-0232
OF-1806 -- Add support for XEP-0232 -
Guus der Kinderen 2a3e80aebbe3c11b7284b8a7d284b4972f9a255e
Merge branch 'master' into xep-0232
-
GregDThomas <greg.d.thomas@gmail.com> e5b91b3c709b5362b0483d662246424cb288c0d7
OF-1889: Add standardised CSRF protection support for plugins (#1500)
* OF-1889: Add standardised CSRF protection for plugins
* OF-1889: Document standardised CSRF protection for plugins
* Use existing i18n CSRF text
* (rebase against master)- documentation/plugin-dev-guide.html (version e5b91b3c709b5362b0483d662246424cb288c0d7)
- xmppserver/src/main/java/org/jivesoftware/admin/FlashMessageTag.java (version e5b91b3c709b5362b0483d662246424cb288c0d7)
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadata.java (version e5b91b3c709b5362b0483d662246424cb288c0d7)
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadataHelper.java (version e5b91b3c709b5362b0483d662246424cb288c0d7)
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServlet.java (version e5b91b3c709b5362b0483d662246424cb288c0d7)
- xmppserver/src/main/java/org/jivesoftware/openfire/update/AvailablePlugin.java (version e5b91b3c709b5362b0483d662246424cb288c0d7)
- xmppserver/src/main/resources/META-INF/admin.tld (version e5b91b3c709b5362b0483d662246424cb288c0d7)
- xmppserver/src/main/webapp/META-INF/admin.tld (version e5b91b3c709b5362b0483d662246424cb288c0d7)
- xmppserver/src/main/webapp/WEB-INF/admin.tld (version e5b91b3c709b5362b0483d662246424cb288c0d7)
-
Greg Thomas <greg.d.thomas@gmail.com> 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 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 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 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)
-
Guus der Kinderen 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 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 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)
-
daryl herzmann <akrherz@iastate.edu> 332374e7cf723e5d58abe4befe4166b1f01dac81
Merge pull request #1549 from guusdk/OF-1938_Bouncy-castle-1_64
OF-1938: Update Bouncy Castle to v1.64 -
Guus der Kinderen 8952aecf92104a0017d6dda133ce6a714d52c306
OF-1938: Update Bouncy Castle to v1.64
- pom.xml (version 8952aecf92104a0017d6dda133ce6a714d52c306)
-
mnsuccess <ngudiamanasse@gmail.com> 390d6a128d9fd1635c23257dadcdc1ec93f1b22f
OF-1823 add meta data for responsive page html5
- xmppserver/src/main/webapp/decorators/main.jsp (version 390d6a128d9fd1635c23257dadcdc1ec93f1b22f)
- xmppserver/src/main/webapp/decorators/setup.jsp (version 390d6a128d9fd1635c23257dadcdc1ec93f1b22f)
-
mnsuccess <ngudiamanasse@gmail.com> 9e5ec632822c0a658713ca693c02f6e4eb88b3b1
OF-1823 modify href style link
- xmppserver/src/main/webapp/decorators/main.jsp (version 9e5ec632822c0a658713ca693c02f6e4eb88b3b1)
-
mnsuccess <ngudiamanasse@gmail.com> 52cf1e244c55d23b58130b33d8647bbfdbb661cf
OF-1823 indent code
- xmppserver/src/main/webapp/decorators/main.jsp (version 52cf1e244c55d23b58130b33d8647bbfdbb661cf)
- xmppserver/src/main/webapp/decorators/setup.jsp (version 52cf1e244c55d23b58130b33d8647bbfdbb661cf)
-
mnsuccess <ngudiamanasse@gmail.com> 44678f02b0afd94f6ef0933f0416c630f92f00a0
OF-1823 : remove jquery
- xmppserver/src/main/webapp/decorators/main.jsp (version 44678f02b0afd94f6ef0933f0416c630f92f00a0)
- xmppserver/src/main/webapp/decorators/setup.jsp (version 44678f02b0afd94f6ef0933f0416c630f92f00a0)
- xmppserver/src/main/webapp/js/framework/bootstrap.min.js (version 44678f02b0afd94f6ef0933f0416c630f92f00a0)
- xmppserver/src/main/webapp/js/framework/jquery.min.js (version 44678f02b0afd94f6ef0933f0416c630f92f00a0)
- xmppserver/src/main/webapp/js/framework/popper.min.js (version 44678f02b0afd94f6ef0933f0416c630f92f00a0)
-
mnsuccess <ngudiamanasse@gmail.com> bb134041ca2048adcaa2360783134381aec516f2
OF-1823 add css framework to excludes decorator jsp
- xmppserver/src/main/webapp/login.jsp (version bb134041ca2048adcaa2360783134381aec516f2)
- xmppserver/src/main/webapp/loginToken.jsp (version bb134041ca2048adcaa2360783134381aec516f2)
- xmppserver/src/main/webapp/setup/setup-completed.jsp (version bb134041ca2048adcaa2360783134381aec516f2)
-
mnsuccess <ngudiamanasse@gmail.com> ac282a82f82958a69c474ac409ea2f5e3225e07f
OF-1823 reset css and font
- xmppserver/src/main/webapp/style/global.css (version ac282a82f82958a69c474ac409ea2f5e3225e07f)
-
mnsuccess <ngudiamanasse@gmail.com> 283c5eac30c572ea2997ff74b3bb54a5f25f0996
OF-1823 add css framework on setup jsp decorator
- xmppserver/src/main/webapp/decorators/setup.jsp (version 283c5eac30c572ea2997ff74b3bb54a5f25f0996)
-
mnsuccess <ngudiamanasse@gmail.com> 40875b529a7e5449d8c83351b346c608b09b7871
OF-1823 Init style fremework
- xmppserver/src/main/webapp/js/framework/bootstrap.min.js (version 40875b529a7e5449d8c83351b346c608b09b7871)
- xmppserver/src/main/webapp/js/framework/jquery.min.js (version 40875b529a7e5449d8c83351b346c608b09b7871)
- xmppserver/src/main/webapp/js/framework/popper.min.js (version 40875b529a7e5449d8c83351b346c608b09b7871)
- xmppserver/src/main/webapp/style/fonts/fontawesome-webfont3e6e.eot (version 40875b529a7e5449d8c83351b346c608b09b7871)
- xmppserver/src/main/webapp/style/fonts/fontawesome-webfont3e6e.svg (version 40875b529a7e5449d8c83351b346c608b09b7871)
- xmppserver/src/main/webapp/style/fonts/fontawesome-webfont3e6e.ttf (version 40875b529a7e5449d8c83351b346c608b09b7871)
- xmppserver/src/main/webapp/style/fonts/fontawesome-webfont3e6e.woff (version 40875b529a7e5449d8c83351b346c608b09b7871)
- xmppserver/src/main/webapp/style/fonts/fontawesome-webfont3e6e.woff2 (version 40875b529a7e5449d8c83351b346c608b09b7871)
- xmppserver/src/main/webapp/style/fonts/fontawesome-webfontd41d.eot (version 40875b529a7e5449d8c83351b346c608b09b7871)
- xmppserver/src/main/webapp/style/framework/bootstrap.min.css (version 40875b529a7e5449d8c83351b346c608b09b7871)
- xmppserver/src/main/webapp/style/framework/font-awesome.min.css (version 40875b529a7e5449d8c83351b346c608b09b7871)
-
mnsuccess <ngudiamanasse@gmail.com> 406c696fdec4f77d6bc15571ada6f58bbca3ec84
OF-1823 Improve design login jsp form
- xmppserver/src/main/webapp/login.jsp (version 406c696fdec4f77d6bc15571ada6f58bbca3ec84)
- xmppserver/src/main/webapp/style/login.css (version 406c696fdec4f77d6bc15571ada6f58bbca3ec84)
-
mnsuccess <ngudiamanasse@gmail.com> c00891935d0b8c7be5a8594d70d023764fffd6a1
OF-1823 css framework improve structuer folder
- xmppserver/src/main/webapp/decorators/setup.jsp (version c00891935d0b8c7be5a8594d70d023764fffd6a1)
- xmppserver/src/main/webapp/style/framework/css/bootstrap.min.css (version c00891935d0b8c7be5a8594d70d023764fffd6a1)
- xmppserver/src/main/webapp/style/framework/css/font-awesome.min.css (version c00891935d0b8c7be5a8594d70d023764fffd6a1)
- xmppserver/src/main/webapp/style/framework/fonts/fontawesome-webfont3e6e.eot (version c00891935d0b8c7be5a8594d70d023764fffd6a1)
- xmppserver/src/main/webapp/style/framework/fonts/fontawesome-webfont3e6e.svg (version c00891935d0b8c7be5a8594d70d023764fffd6a1)
- xmppserver/src/main/webapp/style/framework/fonts/fontawesome-webfont3e6e.ttf (version c00891935d0b8c7be5a8594d70d023764fffd6a1)
- xmppserver/src/main/webapp/style/framework/fonts/fontawesome-webfont3e6e.woff (version c00891935d0b8c7be5a8594d70d023764fffd6a1)
- xmppserver/src/main/webapp/style/framework/fonts/fontawesome-webfont3e6e.woff2 (version c00891935d0b8c7be5a8594d70d023764fffd6a1)
- xmppserver/src/main/webapp/style/framework/fonts/fontawesome-webfontd41d.eot (version c00891935d0b8c7be5a8594d70d023764fffd6a1)
-
mnsuccess <ngudiamanasse@gmail.com> cb7562d0dafc026b47708926ca349d08a6f17874
OF-1823 remove google font
- xmppserver/src/main/webapp/style/global.css (version cb7562d0dafc026b47708926ca349d08a6f17874)
-
mnsuccess <ngudiamanasse@gmail.com> 996bcc6084d8fdff5669f6aa751e9bb44ff0b1b6
OF-1823 add css framework on main jsp decorator
- xmppserver/src/main/webapp/decorators/main.jsp (version 996bcc6084d8fdff5669f6aa751e9bb44ff0b1b6)
-
Guus der Kinderen 14f0e3b732557ab9f56a67824b458fdd7916ba4e
OF-1937: Reduce connection timeout for LDAP.
We've found that with a connection timeout of larger than 4 seconds, Spark fails to authenticate against LDAP, when LDAP integration is making use of more than one LDAP server with the first of the two unavailable.
This commit reduces the connection timeout to a value that allows Spark to authenticate. It does not, however, prevent that Openfire operates with degraded performance.- documentation/ldap-guide.html (version 14f0e3b732557ab9f56a67824b458fdd7916ba4e)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 14f0e3b732557ab9f56a67824b458fdd7916ba4e)
-
Guus der Kinderen 8a15ed8c71451c85c42ebe0f4d284d31ac022ecb
OF-1943: Refer to GroupBasedAdminProvider by reference, not name.
- xmppserver/src/main/webapp/setup/setup-admin-settings.jsp (version 8a15ed8c71451c85c42ebe0f4d284d31ac022ecb)
-
Guus der Kinderen 7e77f42ba73567efdc43dda0570f7ce0311be268
OF-1251: Reduce overzealous CSRF protection.
As this page is embedded on another, resetting the CSRF value causes an error to pop up whenever the CSRF value is used on the page on which this popup is embedded in. The popup should not reset the value.- xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp (version 7e77f42ba73567efdc43dda0570f7ce0311be268)
-
Guus der Kinderen f2956cd5c275796681b876fe687e82307c473c77
OF-1943: LDAP group as admin
This commit allows Openfire to be set up to use an LDAP group to provide all administrators.- i18n/src/main/resources/openfire_i18n.properties (version f2956cd5c275796681b876fe687e82307c473c77)
- i18n/src/main/resources/openfire_i18n_nl.properties (version f2956cd5c275796681b876fe687e82307c473c77)
- xmppserver/src/main/webapp/setup/setup-admin-settings.jsp (version f2956cd5c275796681b876fe687e82307c473c77)
-
Dan Caseley <dan@caseley.me.uk> 6ee34e555d68b88dec801349ed3a776629f9c8b8
Fix help text
- runIntegrationTests (version 6ee34e555d68b88dec801349ed3a776629f9c8b8)
-
akrherz <akrherz@iastate.edu> b9f166a91de10275dbee0c39ec5ae95d7987c48c
remove demoboot.xml from RPM distribution
- build/rpm/openfire.spec (version b9f166a91de10275dbee0c39ec5ae95d7987c48c)
-
Dan Caseley <dan@caseley.me.uk> 6c735b787937b2f4c88d934971f6aac25789e14a
Better cross-platform integration tests (#1539)
* Add script launch structure with getopts, add hosts file editing
* Stop openfire when tests end
* Add alternate host/credential options
* Add usage and error handling to test runner script
* Improve hosts file editing (and prevent it in Travis)
* Swap Smack clone for Smack from maven, tidy all the things
* Move openfire-demoboot.xml to Openfire repo
Solves a TODO. Could now run without internet connectivity
* Add logic to deal with differing versions of Smack
* Fix for Java11
* Re-enable unbroken tests
* Re-disable tests that fail in Travis- .gitignore (version 6c735b787937b2f4c88d934971f6aac25789e14a)
- .travis.yml (version 6c735b787937b2f4c88d934971f6aac25789e14a)
- distribution/src/conf/openfire-demoboot.xml (version 6c735b787937b2f4c88d934971f6aac25789e14a)
- runIntegrationTests (version 6c735b787937b2f4c88d934971f6aac25789e14a)
- test.gradle (version 6c735b787937b2f4c88d934971f6aac25789e14a)
-
Greg Thomas <greg.d.thomas@bt.com> 95fa27b05f9e43e0e5708b8fc48df96193cc504c
Swap the dates if "from" date is after "to" date
- xmppserver/src/main/java/org/jivesoftware/admin/servlet/SecurityAuditViewerServlet.java (version 95fa27b05f9e43e0e5708b8fc48df96193cc504c)
-
Greg Thomas <greg.d.thomas@bt.com> 927f3b1a26ecb653824aedb75764b42af97cb42a
Tidy up page layout
- xmppserver/src/main/webapp/security-audit-viewer-jsp.jsp (version 927f3b1a26ecb653824aedb75764b42af97cb42a)
-
Greg Thomas <greg.d.thomas@bt.com> a0853e7ba95a887cbcca03b92e0834e288f0594d
OF-1936 - hopefully fix OOM with Oracle JDBC driver
- xmppserver/src/main/java/org/jivesoftware/admin/servlet/SecurityAuditViewerServlet.java (version a0853e7ba95a887cbcca03b92e0834e288f0594d)
- xmppserver/src/main/java/org/jivesoftware/openfire/security/DefaultSecurityAuditProvider.java (version a0853e7ba95a887cbcca03b92e0834e288f0594d)
-
mightymop <totzkotz@gmail.com> 8d65030a0140ff33d8264a604aec015423d8e419
-Added Option to change service.unload.empty_days in admin console -if service.unload.empty_days is 0 or lower the service will keep MUCRooms in memory
format code and cleanup- i18n/src/main/resources/openfire_i18n.properties (version 8d65030a0140ff33d8264a604aec015423d8e419)
- i18n/src/main/resources/openfire_i18n_de.properties (version 8d65030a0140ff33d8264a604aec015423d8e419)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 8d65030a0140ff33d8264a604aec015423d8e419)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version 8d65030a0140ff33d8264a604aec015423d8e419)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 8d65030a0140ff33d8264a604aec015423d8e419)
- xmppserver/src/main/webapp/muc-service-edit-form.jsp (version 8d65030a0140ff33d8264a604aec015423d8e419)
-
mightymop <totzkotz@gmail.com> 006dc78ef569d58cc2a67cf296c568956c1e7326
Changed javadoc param emptyDate to cleanupDate
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version 006dc78ef569d58cc2a67cf296c568956c1e7326)
-
admin <root@poldom.local> 73a2f5f9da01e2d5e142be1d62d78a4fd77eb59b
formated code
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version 73a2f5f9da01e2d5e142be1d62d78a4fd77eb59b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 73a2f5f9da01e2d5e142be1d62d78a4fd77eb59b)
-
mightymop <mightymop@mopsdom.de> 242e3407ea5886ccaf4f9bc7266f2bec1ec102b8
removed comments
- xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionInfo.java (version 242e3407ea5886ccaf4f9bc7266f2bec1ec102b8)
-
mightymop <totzkotz@gmail.com> f3d3d82dff09c1e229ceb082f500519633130a12
Add data to cache to cluster it later...
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalClientSession.java (version f3d3d82dff09c1e229ceb082f500519633130a12)
-
mightymop <totzkotz@gmail.com> 2dc5f027b149f2855fd186d7e28e187c7fc5471d
format code
- xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionInfo.java (version 2dc5f027b149f2855fd186d7e28e187c7fc5471d)
-
mightymop <totzkotz@gmail.com> 389a96cef7b24ae90897078b349eb6a40aad3c41
Update ClientSessionInfo.java
- xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionInfo.java (version 389a96cef7b24ae90897078b349eb6a40aad3c41)
-
mightymop <totzkotz@gmail.com> 0d02dc79ed61b094a3c15638b59e394eb35e51e0
Fix SQL Statement in Pubsub
Fixes Statement for SQL SERVER purge function- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubPersistenceManager.java (version 0d02dc79ed61b094a3c15638b59e394eb35e51e0)
-
Greg Thomas <greg.d.thomas@bt.com> 3351bd29f56625f51de37606c5a8146569705ded
(and update the README))
- README.md (version 3351bd29f56625f51de37606c5a8146569705ded)
-
Greg Thomas <greg.d.thomas@bt.com> ac8b42bd8406d35bb84850ece48691f1565145eb
Add a Maven wrapper (mvnw.cmd / mvnw) to save installing Maven
- .mvn/wrapper/MavenWrapperDownloader.java (version ac8b42bd8406d35bb84850ece48691f1565145eb)
- .mvn/wrapper/maven-wrapper.jar (version ac8b42bd8406d35bb84850ece48691f1565145eb)
- .mvn/wrapper/maven-wrapper.properties (version ac8b42bd8406d35bb84850ece48691f1565145eb)
- mvnw (version ac8b42bd8406d35bb84850ece48691f1565145eb)
- mvnw.cmd (version ac8b42bd8406d35bb84850ece48691f1565145eb)
-
Greg Thomas <greg.d.thomas@bt.com> e7740847e0270836e4f2901469ad93ef1a1dc502
OF-1932: Ensure we use the correct password when running tests
- xmppserver/src/main/webapp/setup/setup-ldap-group_test.jsp (version e7740847e0270836e4f2901469ad93ef1a1dc502)
- xmppserver/src/main/webapp/setup/setup-ldap-user_test.jsp (version e7740847e0270836e4f2901469ad93ef1a1dc502)
-
Marcel Heckel <marcel.heckel@ivi.fraunhofer.de> 864ae177ee47f258d60fa694dcda97b3df35345d
Added support for flatting nested groups.
Nested / complex / hierarchic groups are flattened. This means: if
group A is member of group B, the members of group A will also be
members of group B.
Cyclic paths are detected and followed only once.
The features is disable by default.
Set property "ldap.flattenNestedGroups" to "true" to enable it.- xmppserver/pom.xml (version 864ae177ee47f258d60fa694dcda97b3df35345d)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version 864ae177ee47f258d60fa694dcda97b3df35345d)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 864ae177ee47f258d60fa694dcda97b3df35345d)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/UserManager.java (version 864ae177ee47f258d60fa694dcda97b3df35345d)
- xmppserver/src/test/java/org/jivesoftware/openfire/ldap/FlattenNestedGroupsTest.java (version 864ae177ee47f258d60fa694dcda97b3df35345d)
- xmppserver/src/test/resources/org/jivesoftware/openfire/ldap/flattenNestedGroups.ldif (version 864ae177ee47f258d60fa694dcda97b3df35345d)
-
Greg Thomas <greg.d.thomas@bt.com> 8c7c663ef314c838cb64c2d6bd16dfc4a51e5639
OF-1219: Fix class cast exception
- xmppserver/src/main/webapp/setup/ldap-user.jspf (version 8c7c663ef314c838cb64c2d6bd16dfc4a51e5639)
-
Greg Thomas <greg.d.thomas@bt.com> 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559
OF-1929: Make LDAPS the default protocol, and bring out encryption settings from "Advanced"
- i18n/src/main/resources/openfire_i18n.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_cs_CZ.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_de.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_es.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_fr.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_ja_JP.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_pl_PL.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_pt_BR.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_pt_PT.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_ru_RU.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_sk.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- i18n/src/main/resources/openfire_i18n_zh_CN.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- xmppserver/src/main/java/org/jivesoftware/util/StringUtils.java (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
- xmppserver/src/main/webapp/setup/ldap-server.jspf (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
-
Greg Thomas <greg.d.thomas@bt.com> 3287a23551c5d8035da2921020c1931c56624f45
OF-1929: Correct the LDAP URL, update test cases, fix bug(!)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 3287a23551c5d8035da2921020c1931c56624f45)
- xmppserver/src/test/java/org/jivesoftware/openfire/ldap/LdapManagerTest.java (version 3287a23551c5d8035da2921020c1931c56624f45)
-
Guus der Kinderen c47ed3437daee079a11bf210b6ad3ed6db79b03c
OF-1928: Properly escape displayed data.
- xmppserver/src/main/webapp/muc-room-affiliations.jsp (version c47ed3437daee079a11bf210b6ad3ed6db79b03c)
-
Guus der Kinderen bda2fc1c473ebf40d0dd5540201a718c87167850
Smack Integration Tests: use later version of Smack and Gradle. (#1529)
* Smack Integration Tests: use later version of Smack and Gradle.
Recently, the integration tests have been failing a lot. Flow suggested improving the version of Gradle that's used to run them. While at it, I'm also bumping the version of Smack that we use to the latest release (4.3.4).- runIntegrationTests (version bda2fc1c473ebf40d0dd5540201a718c87167850)
-
Guus der Kinderen b490741342c2e113e682bdbaca109999be8062ad
Merge pull request #1429 from cpetzka/resolve_multi_threading_issues_in_LocalMUCRoom
OF-1930: Make LocalMUCRoom more thread safe -
Greg Thomas <greg.d.thomas@bt.com> 32ae6223d145c04a0e6eff8d1041ff217f5d04eb
OF-1902: Restrict retrieve of favicon to connected servers
- xmppserver/src/main/java/org/jivesoftware/util/FaviconServlet.java (version 32ae6223d145c04a0e6eff8d1041ff217f5d04eb)
-
Greg Thomas <greg.d.thomas@bt.com> a2c82ee4a125c7ae69217ddb877a04ed3df31ca9
OF-1902: Review comments
- xmppserver/src/main/java/org/jivesoftware/util/FaviconServlet.java (version a2c82ee4a125c7ae69217ddb877a04ed3df31ca9)
-
Guus der Kinderen 3c4ed38cb3bc6961a32d7ac3824b34a7e2d2c585
OF-1925: Hint clients to do resumes at the same cluster node.
- i18n/src/main/resources/openfire_i18n.properties (version 3c4ed38cb3bc6961a32d7ac3824b34a7e2d2c585)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 3c4ed38cb3bc6961a32d7ac3824b34a7e2d2c585)
- xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java (version 3c4ed38cb3bc6961a32d7ac3824b34a7e2d2c585)
-
Guus der Kinderen 3355293f3832329ecbe1bfde07ce34aee659c613
OF-1923: When replacing a session, make sure it's not removed by SM cleanup task.
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBindHandler.java (version 3355293f3832329ecbe1bfde07ce34aee659c613)
-
Guus der Kinderen cf9d891c429f488fe2fe0fa42241d574c056b52f
OF-1923: Only close the session if it has not been replaced by another session (safeguard).
- xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version cf9d891c429f488fe2fe0fa42241d574c056b52f)
-
Guus der Kinderen 3f78907b3e2a68d542371ac06b16307b0cc79274
OF-1926: Tell clients how long they can be detached.
- i18n/src/main/resources/openfire_i18n.properties (version 3f78907b3e2a68d542371ac06b16307b0cc79274)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 3f78907b3e2a68d542371ac06b16307b0cc79274)
- xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java (version 3f78907b3e2a68d542371ac06b16307b0cc79274)
-
Guus der Kinderen b64ec7a4ffb2cb3f5e6eeb48dfc0fc9c26ab3cbb
Fix log statement
- xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version b64ec7a4ffb2cb3f5e6eeb48dfc0fc9c26ab3cbb)
-
Guus der Kinderen e8c782af9cf274e93781ee8168d1091dbc287a1a
OF-1924: Make Stream Management clean task run relative to TTL
- xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version e8c782af9cf274e93781ee8168d1091dbc287a1a)
-
cpetzka <31418387+cpetzka@users.noreply.github.com> 9bc81544b69a1b44a237a684062c8de4f212a1fe
fix compilation error in CaffeineCache
- xmppserver/src/main/java/org/jivesoftware/util/cache/CaffeineCache.java (version 9bc81544b69a1b44a237a684062c8de4f212a1fe)
-
cpetzka <31418387+cpetzka@users.noreply.github.com> f4fea2a5e7702664f73b3d4aa0bed7ae0d3cde3f
change the api to provide backward compatibility and add new methods
The api change from previous commits is reverted and effected methods
are declared as deprecated. This commit adds new methods for the new api
with default behavior.- xmppserver/src/main/java/org/jivesoftware/openfire/auth/POP3AuthProvider.java (version f4fea2a5e7702664f73b3d4aa0bed7ae0d3cde3f)
- xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdGroupProvider.java (version f4fea2a5e7702664f73b3d4aa0bed7ae0d3cde3f)
- xmppserver/src/main/java/org/jivesoftware/util/cache/Cache.java (version f4fea2a5e7702664f73b3d4aa0bed7ae0d3cde3f)
- xmppserver/src/main/java/org/jivesoftware/util/cache/CacheWrapper.java (version f4fea2a5e7702664f73b3d4aa0bed7ae0d3cde3f)
- xmppserver/src/main/java/org/jivesoftware/util/cache/CaffeineCache.java (version f4fea2a5e7702664f73b3d4aa0bed7ae0d3cde3f)
- xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultCache.java (version f4fea2a5e7702664f73b3d4aa0bed7ae0d3cde3f)
-
cpetzka <31418387+cpetzka@users.noreply.github.com> 8b3a5b3a79d2596eb3cfa561cc993a3dbc6ec1c4
make the max cache size consistent to long
- xmppserver/src/main/java/org/jivesoftware/util/cache/Cache.java (version 8b3a5b3a79d2596eb3cfa561cc993a3dbc6ec1c4)
- xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactory.java (version 8b3a5b3a79d2596eb3cfa561cc993a3dbc6ec1c4)
- xmppserver/src/main/java/org/jivesoftware/util/cache/CacheWrapper.java (version 8b3a5b3a79d2596eb3cfa561cc993a3dbc6ec1c4)
- xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultCache.java (version 8b3a5b3a79d2596eb3cfa561cc993a3dbc6ec1c4)
- xmppserver/src/main/webapp/system-cache.jsp (version 8b3a5b3a79d2596eb3cfa561cc993a3dbc6ec1c4)
-
GregDThomas <greg.d.thomas@gmail.com> 01fcb835063313babbca73606a0283dc037a44a9
Merge pull request #1526 from GregDThomas/OF-1865-bis
OF-1865 revisited: Correct the name of the property in the resource -
Guus der Kinderen c018cd4e3cba2ca1f25bd799e57bcebbed7541d1
OF-353: Add optional escaping of RDN.
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version c018cd4e3cba2ca1f25bd799e57bcebbed7541d1)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version c018cd4e3cba2ca1f25bd799e57bcebbed7541d1)
-
Guus der Kinderen 046a8a419ecb5d8a315de82e57c0d0970a38aa8a
OF-353: Refactor parseAsLdapName to keep Enumeration out
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 046a8a419ecb5d8a315de82e57c0d0970a38aa8a)
-
Guus der Kinderen f732dec6de8d7fd4eef1931b910cde24580f7160
OF-353: Removed redundant if (debug) checks, tweaked logging.
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version f732dec6de8d7fd4eef1931b910cde24580f7160)
-
Guus der Kinderen f326a1566376391169736642db13087ba1e426b5
Javadoc typo fix
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version f326a1566376391169736642db13087ba1e426b5)
-
Guus der Kinderen 777cffcf2a7c888dd29d33bf8cd9eda14f1b1102
OF-353: Prevent redundant initialization of arrays.
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 777cffcf2a7c888dd29d33bf8cd9eda14f1b1102)
-
Guus der Kinderen 90364691e771c6f3f39edc636f7a29049c2aaef9
OF-353: Remove redundant catch
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 90364691e771c6f3f39edc636f7a29049c2aaef9)
-
Guus der Kinderen 8988aefd569bf25d14e8aeac424ebca7daf7f306
OF-353: Prevent redundant boxing.
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 8988aefd569bf25d14e8aeac424ebca7daf7f306)
-
Guus der Kinderen ed1269b6851c4c2d12f4127603e7442720ff07c7
OF-353: Remove redundant initializers and cast.
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version ed1269b6851c4c2d12f4127603e7442720ff07c7)
-
Guus der Kinderen 098ab6cc10f6a2a653e5fac145c60792ff2c30bf
OF-353: Remove deprecated methods
The OF-353 implementation changes the API considerably. There's no value in keeping some old, unused methods around, as there'll be API incompatibilities anyway.- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 098ab6cc10f6a2a653e5fac145c60792ff2c30bf)
-
Guus der Kinderen ba53868ae63a700cf54f3caf187d62bf614e9c98
OF-353: Improve exception message logging.
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version ba53868ae63a700cf54f3caf187d62bf614e9c98)
-
Guus der Kinderen ad4962b24700844a2aecfd3a64f585ba0cf1389c
OF-353: Improve escaping for JNDI
As LDAP is being accessed through JNDI, data needs to be handled in a way that is aware of JNDI specifics.
For input parameters, this was already taken into account. A similar handling however, failed for processing search results. This commit adds that.
Additionally, the implementation responsible for this is no longer custom code. Instead, the LdapName class (provided by Java) is now used for this purpose.- xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java (version ad4962b24700844a2aecfd3a64f585ba0cf1389c)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version ad4962b24700844a2aecfd3a64f585ba0cf1389c)
- xmppserver/src/test/java/org/jivesoftware/util/LDAPTest.java (version ad4962b24700844a2aecfd3a64f585ba0cf1389c)
-
Guus der Kinderen 9275cdb6df54f6a9c0d9fe52a556e5c3dcce97d4
OF-353: Properly concat RDN values.
As found by lgtm.com: https://lgtm.com/projects/g/igniterealtime/Openfire/rev/pr-39a7f695da8e9cbf775306367871905c327b97ac- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version 9275cdb6df54f6a9c0d9fe52a556e5c3dcce97d4)
-
Guus der Kinderen e168b8f391e46008e338ab83c05cdd9cc22b47a6
OF-353: LDAP: improve character escaping
This adds additional escaping of LDAP strings, including those defined in RFC-4514.- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version e168b8f391e46008e338ab83c05cdd9cc22b47a6)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version e168b8f391e46008e338ab83c05cdd9cc22b47a6)
- xmppserver/src/test/java/org/jivesoftware/util/LDAPTest.java (version e168b8f391e46008e338ab83c05cdd9cc22b47a6)
-
Guus der Kinderen 5b9d6ecccc5223f82877770480517157d9170924
OF-353: Remove unused property
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 5b9d6ecccc5223f82877770480517157d9170924)
-
Guus der Kinderen 99161e841941dbdbcb060da320c6f0d8bd02b6ea
OF-353: Use RDN instead of LdapName, escape for JNDI.
In a recent commit, string-based representations of LDAP distinguished names were replaced with instances of LdapName.
User and Groups are referred to in Openfire code by relative references, RDNs. Java has a more specific implementation for that: Rdn. In this commit, Rdn replaces LdapName when group or user references are being represented.
Additionally, RDN values are properly escaped when their string representation is used in a JNDI-based lookup, which is a Java-specific requirement to working with LDAP via JNDI. This effectively solves issues with users or groups that contain the forward-slash character.- xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java (version 99161e841941dbdbcb060da320c6f0d8bd02b6ea)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthProvider.java (version 99161e841941dbdbcb060da320c6f0d8bd02b6ea)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationPolicy.java (version 99161e841941dbdbcb060da320c6f0d8bd02b6ea)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version 99161e841941dbdbcb060da320c6f0d8bd02b6ea)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 99161e841941dbdbcb060da320c6f0d8bd02b6ea)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapUserProvider.java (version 99161e841941dbdbcb060da320c6f0d8bd02b6ea)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java (version 99161e841941dbdbcb060da320c6f0d8bd02b6ea)
- xmppserver/src/main/webapp/setup/setup-admin-settings.jsp (version 99161e841941dbdbcb060da320c6f0d8bd02b6ea)
- xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp (version 99161e841941dbdbcb060da320c6f0d8bd02b6ea)
- xmppserver/src/test/java/org/jivesoftware/util/LDAPTest.java (version 99161e841941dbdbcb060da320c6f0d8bd02b6ea)
-
Guus der Kinderen 8c1df6ac4abe3022ce618ea7122835b1218d7e65
OF-353: LDAP - use javax.naming.* types instead of Strings
To represent LDAP DNs, Strings have been used. Java provides a more specific, and more suitable set of types for this purpose.
By using the types in the javax.naming package, additional functionality becomes available, and type-safety is improved throughout the code.- xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java (version 8c1df6ac4abe3022ce618ea7122835b1218d7e65)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthProvider.java (version 8c1df6ac4abe3022ce618ea7122835b1218d7e65)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationPolicy.java (version 8c1df6ac4abe3022ce618ea7122835b1218d7e65)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version 8c1df6ac4abe3022ce618ea7122835b1218d7e65)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 8c1df6ac4abe3022ce618ea7122835b1218d7e65)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapUserProvider.java (version 8c1df6ac4abe3022ce618ea7122835b1218d7e65)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java (version 8c1df6ac4abe3022ce618ea7122835b1218d7e65)
- xmppserver/src/main/webapp/profile-settings.jsp (version 8c1df6ac4abe3022ce618ea7122835b1218d7e65)
- xmppserver/src/main/webapp/setup/ldap-server.jspf (version 8c1df6ac4abe3022ce618ea7122835b1218d7e65)
- xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp (version 8c1df6ac4abe3022ce618ea7122835b1218d7e65)
- xmppserver/src/test/java/org/jivesoftware/util/LDAPTest.java (version 8c1df6ac4abe3022ce618ea7122835b1218d7e65)
-
Guus der Kinderen e131ff4578d2835b97cf051834c74ac7941e1ae0
OF-353: Allow for RDNs with more than one component.
When searching for 'mtucker' in the basedn 'o=jivesoftware, o=com', the code should be able to handle a response that consists of more than one RDN value, like 'uid=mtucker,ou=People'.
Shamelessly stolen the commit from @Fishbowler's https://github.com/Fishbowler/Openfire/commit/fb12dfc48b53dfadd1f94ee713a1194fb3e50455- xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java (version e131ff4578d2835b97cf051834c74ac7941e1ae0)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthProvider.java (version e131ff4578d2835b97cf051834c74ac7941e1ae0)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationMapping.java (version e131ff4578d2835b97cf051834c74ac7941e1ae0)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationPolicy.java (version e131ff4578d2835b97cf051834c74ac7941e1ae0)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version e131ff4578d2835b97cf051834c74ac7941e1ae0)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version e131ff4578d2835b97cf051834c74ac7941e1ae0)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapUserProvider.java (version e131ff4578d2835b97cf051834c74ac7941e1ae0)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java (version e131ff4578d2835b97cf051834c74ac7941e1ae0)
- xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp (version e131ff4578d2835b97cf051834c74ac7941e1ae0)
- xmppserver/src/test/java/org/jivesoftware/util/LDAPTest.java (version e131ff4578d2835b97cf051834c74ac7941e1ae0)
-
Guus der Kinderen 5b721eea9d5f3b8853f397db4d28f7b36c02bb58
OF-353: Revert from LdapName to String for adminDN
Earlier commits introduces the usage of LdapName to represent DNs. This had an unexpected side effect: the LDAP admin DN now strictly requires the full DN.
In the past, the userprincipalname format (user.name@domain.com) could be used, but not anymore. This will likely break some installs.
This commit reverts back to String to represent the adminDN.- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 5b721eea9d5f3b8853f397db4d28f7b36c02bb58)
- xmppserver/src/main/webapp/profile-settings.jsp (version 5b721eea9d5f3b8853f397db4d28f7b36c02bb58)
- xmppserver/src/main/webapp/setup/ldap-server.jspf (version 5b721eea9d5f3b8853f397db4d28f7b36c02bb58)
-
Guus der Kinderen a14a783528aab9438f29bf5f7e6245de3282b450
OF-353: LDAP Remove support for 'enclosed' DNs.
As a resolution for JM-1327, the concept of 'enclosing' DNs with double-quote (") characters was introduced.
The previous commit adds more elaborate escaping of reserved characters, which makes this 'enclosing' redundant. As the code now uses javax.naming.* types, instead of Strings, to represent DNs, it'll be more challenging to restorte the 'enclosing' functionality.
To reduce code complexity, the 'enclosing' functionality (that no longer serves any purpose) is removed in this commit.- i18n/src/main/resources/openfire_i18n.properties (version a14a783528aab9438f29bf5f7e6245de3282b450)
- i18n/src/main/resources/openfire_i18n_de.properties (version a14a783528aab9438f29bf5f7e6245de3282b450)
- i18n/src/main/resources/openfire_i18n_es.properties (version a14a783528aab9438f29bf5f7e6245de3282b450)
- i18n/src/main/resources/openfire_i18n_pt_PT.properties (version a14a783528aab9438f29bf5f7e6245de3282b450)
- i18n/src/main/resources/openfire_i18n_ru_RU.properties (version a14a783528aab9438f29bf5f7e6245de3282b450)
- i18n/src/main/resources/openfire_i18n_zh_CN.properties (version a14a783528aab9438f29bf5f7e6245de3282b450)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version a14a783528aab9438f29bf5f7e6245de3282b450)
- xmppserver/src/main/webapp/setup/ldap-server.jspf (version a14a783528aab9438f29bf5f7e6245de3282b450)
-
Guus der Kinderen 80d3ff37cf28e578cc8909ebea06269c30456c91
OF-353: Allow baseDN to have spaces
The baseDN value is used to compose the connect host(s) URL. This value is a space-separated string of URLs. When a baseDN contains a space character, this character must be escaped, to prevent it from being interpreted as a second connect host.
This commit adds URL encoding to the baseDN when it's used to create the connect host URL.- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 80d3ff37cf28e578cc8909ebea06269c30456c91)
- xmppserver/src/test/java/org/jivesoftware/openfire/ldap/LdapManagerTest.java (version 80d3ff37cf28e578cc8909ebea06269c30456c91)
-
Guus der Kinderen 62eaa8a67c2745361e1a7129d62f0d9a505e04ac
OF-353: Fixing up log messages.
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 62eaa8a67c2745361e1a7129d62f0d9a505e04ac)
-
Greg Thomas <greg.d.thomas@bt.com> 419dd5d603067d65b45db179d46a4f349946a0d2
OF-1865: Correct the name of the property in the resource
- i18n/src/main/resources/openfire_i18n.properties (version 419dd5d603067d65b45db179d46a4f349946a0d2)
-
Dele Olajide <dele@4ng.net> 7088c7e7ea8eda41ef8c97fd7bed9b2004ef79f7
Merge pull request #1520 from guusdk/OF-1917_Cyclic-shared-groups
OF-1917: Work with cyclic dependencies in shared groups. -
cpetzka <31418387+cpetzka@users.noreply.github.com> 38d20885cb6da904a9664361db30a4887e011f99 m
fix a concurrent modification bug in LocalMUCRoom
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 38d20885cb6da904a9664361db30a4887e011f99)
-
Guus der Kinderen ef93ad5bb3ae25d9c82698fc240d8dfa056746cf
OF-1917: Fix javadoc.
- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupManager.java (version ef93ad5bb3ae25d9c82698fc240d8dfa056746cf)
-
Guus der Kinderen eca195c241486ba791ab3fd3e20ef55a7c361cb9
OF-1917: Work with cyclic dependencies in shared groups.
In order to avoid a stack overflow, this code first 'flattens' the set of dependent shared groups, before processing them.- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupManager.java (version eca195c241486ba791ab3fd3e20ef55a7c361cb9)
-
daryl herzmann <akrherz@iastate.edu> 2564dd8679de95777c313c1581cecc5bd2ec7cea
Merge pull request #1517 from guusdk/OF-1912_Remove-sun-package-usage
OF-1912: Stop using proprietary sun.security.x509.GeneralNameInterface -
Guus der Kinderen c647fa197e30fa6a9c0bc73c0fa23df51542405d
OF-1912: Stop using proprietary sun.security.x509.GeneralNameInterface
The implementation is used only for one constant definition. We can copy the constant value in our code, instead of depending on proprietary code.- xmppserver/src/test/java/org/jivesoftware/util/CertificateManagerTest.java (version c647fa197e30fa6a9c0bc73c0fa23df51542405d)
-
daryl herzmann <akrherz@iastate.edu> cb900749d4e836b32cc6e2cc41cda17f252b977d
Merge pull request #1498 from guusdk/OF-1886_plugin-servlet-local-file-access
OF-1886: Plugin Servlet shouldn't provide access to any file on the host -
Guus der Kinderen 5af6e03c25b121d01e752927c401124a4da569f7
OF-1886: Plugin Servlet shouldn't provide access to any file on the host
- i18n/src/main/resources/openfire_i18n.properties (version 5af6e03c25b121d01e752927c401124a4da569f7)
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServlet.java (version 5af6e03c25b121d01e752927c401124a4da569f7)
-
Greg Thomas <greg.d.thomas@gmail.com> 5b52694b7359b18bfa1625613b2bce90b8b87f68
OF-1894: Allow the contents of Cache's to be kept private
- xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemCacheDetailsServlet.java (version 5b52694b7359b18bfa1625613b2bce90b8b87f68)
- xmppserver/src/main/java/org/jivesoftware/util/cache/Cache.java (version 5b52694b7359b18bfa1625613b2bce90b8b87f68)
-
Guus der Kinderen d592fcb2632aca3797fe159ea5f062b830a91d45
OF-1909: Allow CertificateStoreWatcher to be disabled by config.
- i18n/src/main/resources/openfire_i18n.properties (version d592fcb2632aca3797fe159ea5f062b830a91d45)
- xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreWatcher.java (version d592fcb2632aca3797fe159ea5f062b830a91d45)