Build #2,325

Plan branch:

Build: #2325 was successful

Job: RPM Workflow was successful

Stages & jobs

  1. Build and Package

Code commits

Openfire (master)

  • Guus der Kinderen

    Guus der Kinderen 30b4a1766da5b88ffacb88bc076f4b8595ed8020

    OF-2786: Openfire to use system-defined preferences for IPv6 over IPv4
    When establishing an outbound connection, Openfire now prefers the IP family as defined by the order in which the operating system returns addresses.

    • distribution/src/bin/openfire.sh (version 30b4a1766da5b88ffacb88bc076f4b8595ed8020)
  • Guus der Kinderen

    Guus der Kinderen 2950d055cb1dc84406c4017f91117282fe66fdf1

    Improve javadoc

    • xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java (version 2950d055cb1dc84406c4017f91117282fe66fdf1)
  • Guus der Kinderen

    Guus der Kinderen 2bf076e6544f1e09f69ce843ebf93d0da6e26c22

    OF-2786: Set up multiple, concurrent, outbound connections when establishing S2S
    Following the "Happy Eyeballs" directive, have outbound S2S connections to a race to find the fastest connection.

    • xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java (version 2bf076e6544f1e09f69ce843ebf93d0da6e26c22)
    • xmppserver/src/main/java/org/jivesoftware/openfire/net/HappyEyeballsResolver.java (version 2bf076e6544f1e09f69ce843ebf93d0da6e26c22)
    • xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketUtil.java (version 2bf076e6544f1e09f69ce843ebf93d0da6e26c22)
    • xmppserver/src/main/java/org/jivesoftware/util/ScheduledExecutorCompletionService.java (version 2bf076e6544f1e09f69ce843ebf93d0da6e26c22)
  • Guus der Kinderen

    Guus der Kinderen 2e0f316124b3b02359d1600a47329401b6c32ab7

    OF-2786: Add new IP resolved based on Happy Eyeballs
    This introduces a new utility class that resolves hostnames into IP addresses, as defined by the Happy Eyeballs algorithm.

    • xmppserver/src/main/java/org/jivesoftware/openfire/net/HappyEyeballsResolver.java (version 2e0f316124b3b02359d1600a47329401b6c32ab7)
    • xmppserver/src/test/java/org/jivesoftware/openfire/net/HappyEyeballsResolverTest.java (version 2e0f316124b3b02359d1600a47329401b6c32ab7)
  • Guus der Kinderen

    Guus der Kinderen 8a58b79431099cd747d10cd906f57fff83b8d8e1

    OF-2786: Refactoring of DNS resolution utility classes
    The implementation that is responsible for resolving an XMPP domain name in a set of socket addresses used a set of purpose-built utility classes. Over time, more and more were added, that each significantly overlapped.

    This commit refactors these classes into two basic classes:
    - `SrvRecord` - a (partial) representation of a DNS SRV lookup result that represents an _unresolved_ hostname for an XMPP service
    - `ResolvedServiceAddress` - a representation of a result of resolving a SrvRecord into an IP address and port.

    These replace most other classes, leaving most of them in deprecated state for backwards compatibility.

    No major functional changes are intended to be introduced by this commit.

    • xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/main/java/org/jivesoftware/openfire/net/HappyEyeballsResolver.java (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/main/java/org/jivesoftware/openfire/net/IndexedResolvedServiceAddress.java (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/main/java/org/jivesoftware/openfire/net/ResolvedServiceAddress.java (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketUtil.java (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/main/java/org/jivesoftware/openfire/net/SrvRecord.java (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/main/webapp/dns-check-resulttable.jspf (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/main/webapp/dns-check.jsp (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/main/webapp/index.jsp (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/test/java/org/jivesoftware/openfire/net/DNSUtilTest.java (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/test/java/org/jivesoftware/openfire/net/HappyEyeballsResolverTest.java (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/test/java/org/jivesoftware/openfire/net/SrvRecordTest.java (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/test/java/org/jivesoftware/openfire/session/LocalIncomingServerSessionTest.java (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
    • xmppserver/src/test/java/org/jivesoftware/openfire/session/LocalOutgoingServerSessionTest.java (version 8a58b79431099cd747d10cd906f57fff83b8d8e1)
  • Guus der Kinderen

    Guus der Kinderen 72f42357d7100bb5369ab10bf6b2e1a7611393ca

    Introduce @VisibleForTesting
    This replaces a few comments in code that indicate that a method has a broader-than-intended access modifier to facilitate unit testing with an annotation that defines the same thing.

    • xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServlet.java (version 72f42357d7100bb5369ab10bf6b2e1a7611393ca)
    • xmppserver/src/main/java/org/jivesoftware/openfire/net/HappyEyeballsResolver.java (version 72f42357d7100bb5369ab10bf6b2e1a7611393ca)
    • xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java (version 72f42357d7100bb5369ab10bf6b2e1a7611393ca)
    • xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java (version 72f42357d7100bb5369ab10bf6b2e1a7611393ca)
  • Guus der Kinderen

    Guus der Kinderen d29389f1454572909e1dbc36aeb31e4c2bcc9193

    OF-2786: Ensure deprecated method has original signature
    This rolls back some changes in previous commits.

    • xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java (version d29389f1454572909e1dbc36aeb31e4c2bcc9193)
    • xmppserver/src/test/java/org/jivesoftware/openfire/net/DNSUtilTest.java (version d29389f1454572909e1dbc36aeb31e4c2bcc9193)
  • Guus der Kinderen

    Guus der Kinderen 00e027fd7d5fcb0c26afe314305ad9f7bd5f27d5

    OF-2786: Group DNS SRV results by priority
    In preparation of having concurrent TCP connection attempts, the targets to connect to are to be grouped by priority. This allows code to exhaust one group of addresses, before moving to the next group.

    • xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java (version 00e027fd7d5fcb0c26afe314305ad9f7bd5f27d5)
    • xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketUtil.java (version 00e027fd7d5fcb0c26afe314305ad9f7bd5f27d5)
    • xmppserver/src/test/java/org/jivesoftware/openfire/net/DNSUtilTest.java (version 00e027fd7d5fcb0c26afe314305ad9f7bd5f27d5)
  • Guus der Kinderen

    Guus der Kinderen 67f55c1214625b7772a7aa7c1ceb039503fcb198

    OF-2785: Happy Eyeballs: Have concurrent outbound connection attempts
    When establishing an outbound S2S connection, Happy Eyeballs defines that concurrent connection attempts should be made, when the target domain advertises multiple server sockets (throught DNS SRV etc).

    This change implements such concurrency. The first connection that is established will be returned, cancelling other scheduled attempts and aborting attempts that are inflight.

    Note that this commit does _not_ address the issue where, when establishing an outbound connection, resolving the address to be used from the XMPP domain name results in a socket connection, that's then immediately closed only to be replaced by a new connection to the same address (OF-2721).

    • xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketUtil.java (version 67f55c1214625b7772a7aa7c1ceb039503fcb198)
  • Guus der Kinderen

    Guus der Kinderen a8816f83cabf772820984427867137b965221fb8

    OF-2785: Replace dulicate functionality with IpUtils
    This uses the newly introduced IP utility class (from the previous commit) to phase out duplicated functionality in other classes.

    • xmppserver/src/main/java/org/jivesoftware/admin/AuthCheckFilter.java (version a8816f83cabf772820984427867137b965221fb8)
    • xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalClientSession.java (version a8816f83cabf772820984427867137b965221fb8)
    • xmppserver/src/test/java/org/jivesoftware/openfire/session/LocalClientSessionTest.java (version a8816f83cabf772820984427867137b965221fb8)
  • Guus der Kinderen

    Guus der Kinderen b80f75956fa9503e7cb791096d2be3e208815842

    OF-2785: Introduce IpUtils
    A new utility class in which IP-related helper methods are centralized. Includes unit tests.

    • xmppserver/src/main/java/org/jivesoftware/util/IpUtils.java (version b80f75956fa9503e7cb791096d2be3e208815842)
    • xmppserver/src/test/java/org/jivesoftware/util/IpUtilsTest.java (version b80f75956fa9503e7cb791096d2be3e208815842)
  • Guus der Kinderen

    Guus der Kinderen d84f35b3bd58e81b61f9a17cf3c07e7c8ec36556

    OF-2785: Add IPv6 to org.jivesoftware.openfire.session.LocalClientSession#isAddressInRange
    The check used to see if a particular IP address is in a set of addresses or addres ranges should also be able to operate on IPv6 addresses (not just IPv4).

    • xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalClientSession.java (version d84f35b3bd58e81b61f9a17cf3c07e7c8ec36556)
    • xmppserver/src/test/java/org/jivesoftware/openfire/session/LocalClientSessionTest.java (version d84f35b3bd58e81b61f9a17cf3c07e7c8ec36556)
  • Guus der Kinderen

    Guus der Kinderen 6fa95dab99cfb79a492cbe9891759931080db066

    OF-2784: Admin Console's DNS check improvements
    Now checks for the presence of A (IPv4) and AAAA (IPv6) records, allowing users to assert if their DNS configuration is correct.

    The index page (which pops up a warning to look at the analytics-page if needed) now operates based on a timeout. This prevents slow DNS resolution from keeping the index-page to load in a timely manner. This functionality depends on the new feature introduced by OF-2885.

    • i18n/src/main/resources/openfire_i18n.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_cs_CZ.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_de.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_es.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_fa_IR.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_fr.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_he.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_ja_JP.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_nl.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_pl_PL.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_pt_BR.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_pt_PT.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_ru_RU.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_sk.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_uk_UA.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • i18n/src/main/resources/openfire_i18n_zh_CN.properties (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • xmppserver/src/main/webapp/dns-check-resulttable.jspf (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • xmppserver/src/main/webapp/dns-check.jsp (version 6fa95dab99cfb79a492cbe9891759931080db066)
    • xmppserver/src/main/webapp/index.jsp (version 6fa95dab99cfb79a492cbe9891759931080db066)
  • Guus der Kinderen

    Guus der Kinderen 4d9c92b2c1f5bae1c7af173700dd677f25236236

    OF-2784: Admin Console Registration & Login settings to include IPv6
    This reworks the login restrictions that can be configured on the Registration & Login page. The text area that was used to fill out _all_ IP addresses / ranges is now replaced with a table and form that takes individual IP addresses and ranges. Support for IPv6 addresses (and ranges) has been added.

    All pre-existing notation forms remain functional. The wildcard-based annotation form to denote an IPv4-range (eg `198.41.100.*`) now gets translated in a CIDR variant (`198.51.100.0/24`) when saved. The wildcard notation is _not_ supported for IPv6.

    • xmppserver/src/main/webapp/reg-settings.jsp (version 4d9c92b2c1f5bae1c7af173700dd677f25236236)
  • Guus der Kinderen

    Guus der Kinderen 37ed569161461b3067d7f69838730feaf8a25827

    OF-2784: Admin Console Access settings to include IPv6
    This reworks the restrictions that can be configured on the Admin Console Access page. The text area that was used to fill out _all_ IP addresses / ranges is now replaced with a table and form that takes individual IP addresses and ranges. Support for IPv6 addresses (and ranges) has been added.

    • xmppserver/src/main/webapp/system-admin-console-access.jsp (version 37ed569161461b3067d7f69838730feaf8a25827)
  • Guus der Kinderen

    Guus der Kinderen 2634d4a83a86ed9a3d64f62f23ba9e0f84be2397

    Passthrough unrecognized openfire.sh arguments
    openfire.sh can be invoked with a number of arguments (eg `-demoboot`, `-debug`). Prior to this commit, unrecognized arguments were ignored.

    With this commit, unrecognized argumetns are passed through to the java command that starts Openfire. This allows anyone to add arguments, like system properties, by doing something like `./bin/openfire.sh -Dfoo=bar`

    • distribution/src/bin/openfire.sh (version 2634d4a83a86ed9a3d64f62f23ba9e0f84be2397)
  • daryl herzmann

    daryl herzmann 0422a157fba89f6cf807629b26e5f419b65bd559

    Merge pull request #2553 from guusdk/OF-2890_Setup-directoryservice-admin-test
    OF-2890: Fix CSRF error on admin setup (directory services)

  • daryl herzmann

    daryl herzmann 0ec4a8fd207081f630274274fe66aa571721ce8c

    Merge pull request #2554 from guusdk/OF-2891_Setup-directoryservice-admin-layout
    OF-2891: Alignment on admin setup (directory services)

  • Guus der Kinderen

    Guus der Kinderen 6f8e8bdb0d23a21a711d5ba35f5bc8fdf5b337f4 m

    OF-2891: Alignment on admin setup (directory services)
    A small HTML-fix for the page on which admin passwords are tested.

    • xmppserver/src/main/webapp/setup/setup-admin-settings.jsp (version 6f8e8bdb0d23a21a711d5ba35f5bc8fdf5b337f4)
  • Guus der Kinderen

    Guus der Kinderen 7faedf031f6e9e04753cfbb242916e92e65db31f m

    OF-2890: Fix CSRF error on admin setup (directory services)
    This fixes a bug that prevented the successful password-check of a newly configured admin.

    The page that performs the test is embedded as a dialog in another page. To prevent collisions with the 'csrf' parameter, the parameter on the embedded page is renamed to 'embeddedcsrf'. CSRF processing on the parent page is not performed if the page reload related to the embedded page (CSRF checking is performed there).

    • xmppserver/src/main/webapp/setup/setup-admin-settings.jsp (version 7faedf031f6e9e04753cfbb242916e92e65db31f)
    • xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp (version 7faedf031f6e9e04753cfbb242916e92e65db31f)