Skip to content

Commit 18b2267

Browse files
jaymodekcm
authored andcommitted
Security: upgrade unboundid ldapsdk to 4.0.8 (#34247)
This commit upgrades the unboundid ldapsdk to version 4.0.8. The primary driver for upgrading is a fix that prevents this library from rewrapping Error instances that would normally bubble up to the UncaughtExceptionHandler and terminate the JVM. Other notable changes include some fixes related to connection handling in the library's connection pool implementation. Closes #33175
1 parent e5eed99 commit 18b2267

File tree

6 files changed

+43
-41
lines changed

6 files changed

+43
-41
lines changed

x-pack/plugin/core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
compile "commons-codec:commons-codec:${versions.commonscodec}"
3636

3737
// security deps
38-
compile 'com.unboundid:unboundid-ldapsdk:3.2.0'
38+
compile 'com.unboundid:unboundid-ldapsdk:4.0.8'
3939
compile project(path: ':modules:transport-netty4', configuration: 'runtime')
4040
compile(project(path: ':plugins:transport-nio', configuration: 'runtime')) {
4141
// TODO: core exclusion should not be necessary, since it is a transitive dep of all plugins

x-pack/plugin/core/licenses/unboundid-ldapsdk-3.2.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bf1a0d3790f8f7bd28f1172323c26fed2e3bbaa5

x-pack/plugin/core/licenses/unboundid-ldapsdk-LICENSE.txt

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,77 @@
11
UnboundID LDAP SDK Free Use License
22

3-
THIS IS AN AGREEMENT BETWEEN YOU ("YOU") AND UNBOUNDID CORP. ("UNBOUNDID")
4-
REGARDING YOUR USE OF UNBOUNDID LDAP SDK FOR JAVA AND ANY ASSOCIATED
5-
DOCUMENTATION, OBJECT CODE, COMPILED LIBRARIES, SOURCE CODE AND SOURCE FILES OR
6-
OTHER MATERIALS MADE AVAILABLE BY UNBOUNDID (COLLECTIVELY REFERRED TO IN THIS
7-
AGREEMENT AS THE ("SDK").
3+
THIS IS AN AGREEMENT BETWEEN YOU ("YOU") AND PING IDENTITY CORPORATION
4+
("PING IDENTITY") REGARDING YOUR USE OF UNBOUNDID LDAP SDK FOR JAVA AND ANY
5+
ASSOCIATED DOCUMENTATION, OBJECT CODE, COMPILED LIBRARIES, SOURCE CODE AND
6+
SOURCE FILES OR OTHER MATERIALS MADE AVAILABLE BY PING IDENTITY (COLLECTIVELY
7+
REFERRED TO IN THIS AGREEMENT AS THE ("SDK").
88

99
BY INSTALLING, ACCESSING OR OTHERWISE USING THE SDK, YOU ACCEPT THE TERMS OF
1010
THIS AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, DO NOT
1111
INSTALL, ACCESS OR USE THE SDK.
1212

13-
USE OF THE SDK. Subject to your compliance with this Agreement, UnboundID
14-
grants to You a non-exclusive, royalty-free license, under UnboundID's
13+
USE OF THE SDK. Subject to your compliance with this Agreement, Ping Identity
14+
grants to You a non-exclusive, royalty-free license, under Ping Identity's
1515
intellectual property rights in the SDK, to use, reproduce, modify and
1616
distribute this release of the SDK; provided that no license is granted herein
1717
under any patents that may be infringed by your modifications, derivative works
1818
or by other works in which the SDK may be incorporated (collectively, your
1919
"Applications"). You may reproduce and redistribute the SDK with your
2020
Applications provided that you (i) include this license file and an
21-
unmodified copy of the unboundid-ldapsdk-se.jar file; and (ii) such
21+
unmodified copy of the unboundid-ldapsdk.jar file; and (ii) such
2222
redistribution is subject to a license whose terms do not conflict with or
2323
contradict the terms of this Agreement. You may also reproduce and redistribute
2424
the SDK without your Applications provided that you redistribute the SDK
2525
complete and unmodified (i.e., with all "read me" files, copyright notices, and
26-
other legal notices and terms that UnboundID has included in the SDK).
26+
other legal notices and terms that Ping Identity has included in the SDK).
2727

28-
SCOPE OF LICENSES. This Agreement does not grant You the right to use any
29-
UnboundID intellectual property which is not included as part of the SDK. The
28+
SCOPE OF LICENSES. This Agreement does not grant You the right to use any Ping
29+
Identity intellectual property which is not included as part of the SDK. The
3030
SDK is licensed, not sold. This Agreement only gives You some rights to use
31-
the SDK. UnboundID reserves all other rights. Unless applicable law gives You
32-
more rights despite this limitation, You may use the SDK only as expressly
31+
the SDK. Ping Identity reserves all other rights. Unless applicable law gives
32+
You more rights despite this limitation, You may use the SDK only as expressly
3333
permitted in this Agreement.
3434

35-
SUPPORT. UnboundID is not obligated to provide any technical or other support
36-
("Support Services") for the SDK to You under this Agreement. However, if
37-
UnboundID chooses to provide any Support Services to You, Your use of such
38-
Support Services will be governed by then-current UnboundID support policies.
35+
SUPPORT. Ping Identity is not obligated to provide any technical or other
36+
support ("Support Services") for the SDK to You under this Agreement. However,
37+
if Ping Identity chooses to provide any Support Services to You, Your use of
38+
such Support Services will be governed by then-current Ping Identity support
39+
policies.
3940

40-
TERMINATION. UnboundID reserves the right to discontinue offering the SDK and
41-
to modify the SDK at any time in its sole discretion. Notwithstanding anything
42-
contained in this Agreement to the contrary, UnboundID may also, in its sole
43-
discretion, terminate or suspend access to the SDK to You or any end user at
44-
any time. In addition, if you fail to comply with the terms of this Agreement,
45-
then any rights granted herein will be automatically terminated if such failure
46-
is not corrected within 30 days of the initial notification of such failure.
47-
You acknowledge that termination and/or monetary damages may not be a
48-
sufficient remedy if You breach this Agreement and that UnboundID will be
49-
entitled, without waiving any other rights or remedies, to injunctive or
41+
TERMINATION. Ping Identity reserves the right to discontinue offering the SDK
42+
and to modify the SDK at any time in its sole discretion. Notwithstanding
43+
anything contained in this Agreement to the contrary, Ping Identity may also,
44+
in its sole discretion, terminate or suspend access to the SDK to You or any
45+
end user at any time. In addition, if you fail to comply with the terms of
46+
this Agreement, then any rights granted herein will be automatically terminated
47+
if such failure is not corrected within 30 days of the initial notification of
48+
such failure. You acknowledge that termination and/or monetary damages may not
49+
be a sufficient remedy if You breach this Agreement and that Ping Identity will
50+
be entitled, without waiving any other rights or remedies, to injunctive or
5051
equitable relief as may be deemed proper by a court of competent jurisdiction
51-
in the event of a breach. UnboundID may also terminate this Agreement if the
52-
SDK becomes, or in UnboundID?s reasonable opinion is likely to become, the
53-
subject of a claim of intellectual property infringement or trade secret
52+
in the event of a breach. Ping Identity may also terminate this Agreement if
53+
the SDK becomes, or in Ping Identity's reasonable opinion is likely to become,
54+
the subject of a claim of intellectual property infringement or trade secret
5455
misappropriation. All rights and licenses granted herein will simultaneously
5556
and automatically terminate upon termination of this Agreement for any reason.
5657

57-
DISCLAIMER OF WARRANTY. THE SDK IS PROVIDED "AS IS" AND UNBOUNDID DOES NOT
58+
DISCLAIMER OF WARRANTY. THE SDK IS PROVIDED "AS IS" AND PING IDENTITY DOES NOT
5859
WARRANT THAT THE SDK WILL BE ERROR-FREE, VIRUS-FREE, WILL PERFORM IN AN
5960
UNINTERRUPTED, SECURE OR TIMELY MANNER, OR WILL INTEROPERATE WITH OTHER
6061
HARDWARE, SOFTWARE, SYSTEMS OR DATA. TO THE MAXIMUM EXTENT ALLOWED BY LAW, ALL
6162
CONDITIONS, REPRESENTATIONS AND WARRANTIES, WHETHER EXPRESS, IMPLIED, STATUTORY
6263
OR OTHERWISE INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF
63-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE (EVEN IF UNBOUNDID HAD BEEN
64-
INFORMED OF SUCH PURPOSE), OR NON-INFRINGEMENT OF THIRD PARTY RIGHTS ARE HEREBY
65-
DISCLAIMED.
64+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE (EVEN IF PING IDENTITY HAD
65+
BEEN INFORMED OF SUCH PURPOSE), OR NON-INFRINGEMENT OF THIRD PARTY RIGHTS ARE
66+
HEREBY DISCLAIMED.
6667

67-
LIMITATION OF LIABILITY. IN NO EVENT WILL UNBOUNDID OR ITS SUPPLIERS BE LIABLE
68-
FOR ANY DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, LOST PROFITS,
68+
LIMITATION OF LIABILITY. IN NO EVENT WILL PING IDENTITY OR ITS SUPPLIERS BE
69+
LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, LOST PROFITS,
6970
REVENUE, DATA OR DATA USE, BUSINESS INTERRUPTION, COST OF COVER, DIRECT,
7071
INDIRECT, SPECIAL, PUNITIVE, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND)
7172
ARISING OUT OF THE USE OF OR INABILITY TO USE THE SDK OR IN ANY WAY RELATED TO
72-
THIS AGREEMENT, EVEN IF UNBOUNDID HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
73-
DAMAGES.
73+
THIS AGREEMENT, EVEN IF PING IDENTITY HAS BEEN ADVISED OF THE POSSIBILITY OF
74+
SUCH DAMAGES.
7475

7576
ADDITIONAL RIGHTS. Certain states do not allow the exclusion of implied
7677
warranties or limitation of liability for certain kinds of damages, so the

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ public class XPackPlugin extends XPackClientPlugin implements ScriptPlugin, Exte
102102
public Void run() {
103103
try {
104104
Class.forName("com.unboundid.util.Debug");
105+
Class.forName("com.unboundid.ldap.sdk.LDAPConnectionOptions");
105106
} catch (ClassNotFoundException e) {
106107
throw new RuntimeException(e);
107108
}

x-pack/plugin/security/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323

2424
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
2525

26-
compile 'com.unboundid:unboundid-ldapsdk:3.2.0'
26+
compile 'com.unboundid:unboundid-ldapsdk:4.0.8'
2727
compileOnly 'org.bouncycastle:bcprov-jdk15on:1.59'
2828
compileOnly 'org.bouncycastle:bcpkix-jdk15on:1.59'
2929

0 commit comments

Comments
 (0)