Skip to content

Commit ba0c848

Browse files
authored
[7.x] Update opensaml dependency (#44972) (#49512)
Add a mirror of the maven repository of the shibboleth project and upgrade opensaml and related dependencies to the latest version available version Resolves: #44947
1 parent 1425e30 commit ba0c848

40 files changed

+157
-146
lines changed

buildSrc/version.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ joda = 2.10.4
2929
# - distribution/tools/plugin-cli
3030
# - x-pack/plugin/security
3131
bouncycastle = 1.61
32-
3332
# test dependencies
3433
randomizedrunner = 2.7.1
3534
junit = 4.12

x-pack/build.gradle

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@ import org.elasticsearch.gradle.precommit.LicenseHeadersTask
44
Project xpackRootProject = project
55

66
subprojects {
7+
8+
// We define a specific repository for opensaml since the shibboleth project doesn't publish to maven central and the
9+
// artifacts that are located there are not curated/updated by the project
10+
// see: https://wiki.shibboleth.net/confluence/display/DEV/Use+of+Maven+Central
11+
repositories {
12+
maven {
13+
name "opensaml"
14+
url "https://artifactory.elstc.co/artifactory/shibboleth-releases/"
15+
content {
16+
includeGroup "org.opensaml"
17+
includeGroup "net.shibboleth.utilities"
18+
includeGroup "net.shibboleth"
19+
}
20+
}
21+
}
22+
723
group = 'org.elasticsearch.plugin'
824
ext.xpackRootProject = xpackRootProject
925
ext.xpackProject = { String projectName -> xpackRootProject.project(projectName) }

x-pack/plugin/security/build.gradle

Lines changed: 118 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@ dependencies {
2929
compileOnly 'org.bouncycastle:bcpkix-jdk15on:1.59'
3030

3131
// the following are all SAML dependencies - might as well download the whole internet
32-
compile "org.opensaml:opensaml-core:3.3.0"
33-
compile "org.opensaml:opensaml-saml-api:3.3.0"
34-
compile "org.opensaml:opensaml-saml-impl:3.3.0"
35-
compile "org.opensaml:opensaml-messaging-api:3.3.0"
36-
compile "org.opensaml:opensaml-messaging-impl:3.3.0"
37-
compile "org.opensaml:opensaml-security-api:3.3.0"
38-
compile "org.opensaml:opensaml-security-impl:3.3.0"
39-
compile "org.opensaml:opensaml-profile-api:3.3.0"
40-
compile "org.opensaml:opensaml-profile-impl:3.3.0"
41-
compile "org.opensaml:opensaml-xmlsec-api:3.3.0"
42-
compile "org.opensaml:opensaml-xmlsec-impl:3.3.0"
43-
compile "org.opensaml:opensaml-soap-api:3.3.0"
44-
compile "org.opensaml:opensaml-soap-impl:3.3.0"
45-
compile "org.opensaml:opensaml-storage-api:3.3.0"
46-
compile "org.opensaml:opensaml-storage-impl:3.3.0"
47-
compile "net.shibboleth.utilities:java-support:7.3.0"
48-
compile "org.apache.santuario:xmlsec:2.0.8"
32+
compile "org.opensaml:opensaml-core:3.4.5"
33+
compile "org.opensaml:opensaml-saml-api:3.4.5"
34+
compile "org.opensaml:opensaml-saml-impl:3.4.5"
35+
compile "org.opensaml:opensaml-messaging-api:3.4.5"
36+
compile "org.opensaml:opensaml-messaging-impl:3.4.5"
37+
compile "org.opensaml:opensaml-security-api:3.4.5"
38+
compile "org.opensaml:opensaml-security-impl:3.4.5"
39+
compile "org.opensaml:opensaml-profile-api:3.4.5"
40+
compile "org.opensaml:opensaml-profile-impl:3.4.5"
41+
compile "org.opensaml:opensaml-xmlsec-api:3.4.5"
42+
compile "org.opensaml:opensaml-xmlsec-impl:3.4.5"
43+
compile "org.opensaml:opensaml-soap-api:3.4.5"
44+
compile "org.opensaml:opensaml-soap-impl:3.4.5"
45+
compile "org.opensaml:opensaml-storage-api:3.4.5"
46+
compile "org.opensaml:opensaml-storage-impl:3.4.5"
47+
compile "net.shibboleth.utilities:java-support:7.5.1"
48+
compile "org.apache.santuario:xmlsec:2.1.4"
4949
compile "io.dropwizard.metrics:metrics-core:3.2.2"
50-
compile "org.cryptacular:cryptacular:1.2.0"
50+
compile "org.cryptacular:cryptacular:1.2.3"
5151
compile "org.slf4j:slf4j-api:${versions.slf4j}"
5252
compile "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
5353
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
@@ -178,107 +178,106 @@ forbiddenApisMain {
178178

179179
// classes are missing, e.g. com.ibm.icu.lang.UCharacter
180180
thirdPartyAudit {
181-
ignoreMissingClasses(
182-
// SAML dependencies
183-
// [missing classes] Some cli utilities that we don't use depend on these missing JCommander classes
184-
'com.beust.jcommander.JCommander',
185-
'com.beust.jcommander.converters.BaseConverter',
186-
// [missing classes] Shibboleth + OpenSAML have servlet support that we don't use
187-
'javax.servlet.AsyncContext',
188-
'javax.servlet.DispatcherType',
189-
'javax.servlet.Filter',
190-
'javax.servlet.FilterChain',
191-
'javax.servlet.FilterConfig',
192-
'javax.servlet.RequestDispatcher',
193-
'javax.servlet.ServletContext',
194-
'javax.servlet.ServletException',
195-
'javax.servlet.ServletInputStream',
196-
'javax.servlet.ServletOutputStream',
197-
'javax.servlet.ServletRequest',
198-
'javax.servlet.ServletResponse',
199-
'javax.servlet.http.Cookie',
200-
'javax.servlet.http.HttpServletRequest',
201-
'javax.servlet.http.HttpServletResponse',
202-
'javax.servlet.http.HttpServletResponseWrapper',
203-
'javax.servlet.http.HttpSession',
204-
'javax.servlet.http.Part',
205-
// [missing classes] Shibboleth + OpenSAML have velocity support that we don't use
206-
'org.apache.velocity.VelocityContext',
207-
'org.apache.velocity.app.VelocityEngine',
208-
'org.apache.velocity.context.Context',
209-
'org.apache.velocity.exception.VelocityException',
210-
'org.apache.velocity.runtime.RuntimeServices',
211-
'org.apache.velocity.runtime.log.LogChute',
212-
'org.apache.velocity.runtime.resource.loader.StringResourceLoader',
213-
'org.apache.velocity.runtime.resource.util.StringResourceRepository',
214-
// [missing classes] OpenSAML depends on Apache XML security which depends on Xalan, but only for functionality that OpenSAML doesn't use
215-
'org.apache.xml.dtm.DTM',
216-
'org.apache.xml.utils.PrefixResolver',
217-
'org.apache.xml.utils.PrefixResolverDefault',
218-
'org.apache.xpath.Expression',
219-
'org.apache.xpath.NodeSetDTM',
220-
'org.apache.xpath.XPath',
221-
'org.apache.xpath.XPathContext',
222-
'org.apache.xpath.compiler.FunctionTable',
223-
'org.apache.xpath.functions.Function',
224-
'org.apache.xpath.objects.XNodeSet',
225-
'org.apache.xpath.objects.XObject',
226-
// [missing classes] OpenSAML storage has an optional LDAP storage impl
227-
'org.ldaptive.AttributeModification',
228-
'org.ldaptive.AttributeModificationType',
229-
'org.ldaptive.Connection',
230-
'org.ldaptive.DeleteOperation',
231-
'org.ldaptive.DeleteRequest',
232-
'org.ldaptive.LdapAttribute',
233-
'org.ldaptive.LdapEntry',
234-
'org.ldaptive.LdapException',
235-
'org.ldaptive.ModifyOperation',
236-
'org.ldaptive.ModifyRequest',
237-
'org.ldaptive.Response',
238-
'org.ldaptive.ResultCode',
239-
'org.ldaptive.SearchOperation',
240-
'org.ldaptive.SearchRequest',
241-
'org.ldaptive.SearchResult',
242-
'org.ldaptive.ext.MergeOperation',
243-
'org.ldaptive.ext.MergeRequest',
244-
'org.ldaptive.pool.ConnectionPool',
245-
'org.ldaptive.pool.PooledConnectionFactory',
246-
// [missing classes] OpenSAML storage has an optional JSON-backed storage impl
247-
'javax.json.Json',
248-
'javax.json.JsonException',
249-
'javax.json.JsonNumber',
250-
'javax.json.JsonObject',
251-
'javax.json.JsonReader',
252-
'javax.json.JsonValue$ValueType',
253-
'javax.json.JsonValue',
254-
'javax.json.stream.JsonGenerator',
255-
// [missing classes] OpenSAML storage has an optional JPA storage impl
256-
'javax.persistence.EntityManager',
257-
'javax.persistence.EntityManagerFactory',
258-
'javax.persistence.EntityTransaction',
259-
'javax.persistence.LockModeType',
260-
'javax.persistence.Query',
261-
// [missing classes] OpenSAML storage and HttpClient cache have optional memcache support
262-
'net.spy.memcached.CASResponse',
263-
'net.spy.memcached.CASValue',
264-
'net.spy.memcached.MemcachedClient',
265-
'net.spy.memcached.MemcachedClientIF',
266-
'net.spy.memcached.CachedData',
267-
'net.spy.memcached.internal.OperationFuture',
268-
'net.spy.memcached.transcoders.Transcoder',
269-
// [missing classes] Http Client cache has optional ehcache support
270-
'net.sf.ehcache.Ehcache',
271-
'net.sf.ehcache.Element',
272-
// [missing classes] SLF4j includes an optional class that depends on an extension class (!)
273-
'org.slf4j.ext.EventData',
274-
// Optional dependency of oauth2-oidc-sdk that we don't need since we do not support AES-SIV for JWE
275-
'org.cryptomator.siv.SivMode',
276-
// Optional dependency of nimbus-jose-jwt for handling Ed25519 signatures and ECDH with X25519 (RFC 8037)
277-
'com.google.crypto.tink.subtle.Ed25519Sign',
278-
'com.google.crypto.tink.subtle.Ed25519Sign$KeyPair',
279-
'com.google.crypto.tink.subtle.Ed25519Verify',
280-
'com.google.crypto.tink.subtle.X25519'
281-
181+
ignoreMissingClasses (
182+
// SAML dependencies
183+
// [missing classes] Some cli utilities that we don't use depend on these missing JCommander classes
184+
'com.beust.jcommander.JCommander',
185+
'com.beust.jcommander.converters.BaseConverter',
186+
// [missing classes] Shibboleth + OpenSAML have servlet support that we don't use
187+
'javax.servlet.AsyncContext',
188+
'javax.servlet.DispatcherType',
189+
'javax.servlet.Filter',
190+
'javax.servlet.FilterChain',
191+
'javax.servlet.FilterConfig',
192+
'javax.servlet.RequestDispatcher',
193+
'javax.servlet.ServletContext',
194+
'javax.servlet.ServletException',
195+
'javax.servlet.ServletInputStream',
196+
'javax.servlet.ServletOutputStream',
197+
'javax.servlet.ServletRequest',
198+
'javax.servlet.ServletResponse',
199+
'javax.servlet.http.Cookie',
200+
'javax.servlet.http.HttpServletRequest',
201+
'javax.servlet.http.HttpServletResponse',
202+
'javax.servlet.http.HttpServletResponseWrapper',
203+
'javax.servlet.http.HttpSession',
204+
'javax.servlet.http.Part',
205+
// [missing classes] Shibboleth + OpenSAML have velocity support that we don't use
206+
'org.apache.velocity.VelocityContext',
207+
'org.apache.velocity.app.VelocityEngine',
208+
'org.apache.velocity.context.Context',
209+
'org.apache.velocity.exception.VelocityException',
210+
'org.apache.velocity.runtime.RuntimeServices',
211+
'org.apache.velocity.runtime.log.LogChute',
212+
'org.apache.velocity.runtime.resource.loader.StringResourceLoader',
213+
'org.apache.velocity.runtime.resource.util.StringResourceRepository',
214+
// [missing classes] OpenSAML depends on Apache XML security which depends on Xalan, but only for functionality that OpenSAML doesn't use
215+
'org.apache.xml.dtm.DTM',
216+
'org.apache.xml.utils.PrefixResolver',
217+
'org.apache.xml.utils.PrefixResolverDefault',
218+
'org.apache.xpath.Expression',
219+
'org.apache.xpath.NodeSetDTM',
220+
'org.apache.xpath.XPath',
221+
'org.apache.xpath.XPathContext',
222+
'org.apache.xpath.compiler.FunctionTable',
223+
'org.apache.xpath.functions.Function',
224+
'org.apache.xpath.objects.XNodeSet',
225+
'org.apache.xpath.objects.XObject',
226+
// [missing classes] OpenSAML storage has an optional LDAP storage impl
227+
'org.ldaptive.AttributeModification',
228+
'org.ldaptive.AttributeModificationType',
229+
'org.ldaptive.Connection',
230+
'org.ldaptive.DeleteOperation',
231+
'org.ldaptive.DeleteRequest',
232+
'org.ldaptive.LdapAttribute',
233+
'org.ldaptive.LdapEntry',
234+
'org.ldaptive.LdapException',
235+
'org.ldaptive.ModifyOperation',
236+
'org.ldaptive.ModifyRequest',
237+
'org.ldaptive.Response',
238+
'org.ldaptive.ResultCode',
239+
'org.ldaptive.SearchOperation',
240+
'org.ldaptive.SearchRequest',
241+
'org.ldaptive.SearchResult',
242+
'org.ldaptive.ext.MergeOperation',
243+
'org.ldaptive.ext.MergeRequest',
244+
'org.ldaptive.pool.ConnectionPool',
245+
'org.ldaptive.pool.PooledConnectionFactory',
246+
// [missing classes] OpenSAML storage has an optional JSON-backed storage impl
247+
'javax.json.Json',
248+
'javax.json.JsonException',
249+
'javax.json.JsonNumber',
250+
'javax.json.JsonObject',
251+
'javax.json.JsonReader',
252+
'javax.json.JsonValue$ValueType',
253+
'javax.json.JsonValue',
254+
'javax.json.stream.JsonGenerator',
255+
// [missing classes] OpenSAML storage has an optional JPA storage impl
256+
'javax.persistence.EntityManager',
257+
'javax.persistence.EntityManagerFactory',
258+
'javax.persistence.EntityTransaction',
259+
'javax.persistence.LockModeType',
260+
'javax.persistence.Query',
261+
// [missing classes] OpenSAML storage and HttpClient cache have optional memcache support
262+
'net.spy.memcached.CASResponse',
263+
'net.spy.memcached.CASValue',
264+
'net.spy.memcached.MemcachedClient',
265+
'net.spy.memcached.MemcachedClientIF',
266+
'net.spy.memcached.CachedData',
267+
'net.spy.memcached.internal.OperationFuture',
268+
'net.spy.memcached.transcoders.Transcoder',
269+
// [missing classes] Http Client cache has optional ehcache support
270+
'net.sf.ehcache.Ehcache',
271+
'net.sf.ehcache.Element',
272+
// [missing classes] SLF4j includes an optional class that depends on an extension class (!)
273+
'org.slf4j.ext.EventData',
274+
// Optional dependency of oauth2-oidc-sdk that we don't need since we do not support AES-SIV for JWE
275+
'org.cryptomator.siv.SivMode',
276+
// Optional dependency of nimbus-jose-jwt for handling Ed25519 signatures and ECDH with X25519 (RFC 8037)
277+
'com.google.crypto.tink.subtle.Ed25519Sign',
278+
'com.google.crypto.tink.subtle.Ed25519Sign$KeyPair',
279+
'com.google.crypto.tink.subtle.Ed25519Verify',
280+
'com.google.crypto.tink.subtle.X25519'
282281
)
283282

284283
ignoreViolations(

x-pack/plugin/security/licenses/cryptacular-1.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+
7b0398d04a68ff7f58657938b3bdc5f2799b4b49

x-pack/plugin/security/licenses/java-support-7.3.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+
c3fecaa141e8f0fff8a14e6800aefa8155c9b3e8

x-pack/plugin/security/licenses/opensaml-core-3.3.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+
0958fae127de9e8b0296e6f089c7451b6d5f0846

x-pack/plugin/security/licenses/opensaml-messaging-api-3.3.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+
e3ec93dfbf90c451e9f7fb34a3e33a6ac60edd31

x-pack/plugin/security/licenses/opensaml-messaging-impl-3.3.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+
beaca9bd69ad861dbb55f1694853a02cb6988ae7

x-pack/plugin/security/licenses/opensaml-profile-api-3.3.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+
bb0a1f97d38342a5715bad628ee24000b08e821e

x-pack/plugin/security/licenses/opensaml-profile-impl-3.3.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+
6cb4595c7a988d964f6a2d55dcac754b0c68904e

x-pack/plugin/security/licenses/opensaml-saml-api-3.3.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+
bef43d21b2d878baceae291af4a0ad3449c7d7ec

x-pack/plugin/security/licenses/opensaml-saml-impl-3.3.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+
ecf4a9552575d38cffd4dc56d95e7564b7dccfc1

x-pack/plugin/security/licenses/opensaml-security-api-3.3.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+
15cbb232ae6665edc5df5f260e551e69fdb362e5

x-pack/plugin/security/licenses/opensaml-security-impl-3.3.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+
b2bc1aa5b0f400aa50499f3783b10e9f7c216a47

x-pack/plugin/security/licenses/opensaml-soap-api-3.3.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+
c497df002980c6e482ce7b828924bb24f60f99f7

x-pack/plugin/security/licenses/opensaml-soap-impl-3.3.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+
30ed8d37259e840df5b3fd8daf7b654129a9190c

x-pack/plugin/security/licenses/opensaml-storage-api-3.3.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+
a984671fd04e50da03f68003d2b062578e63ec86

x-pack/plugin/security/licenses/opensaml-storage-impl-3.3.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+
a4b828fe1a9d64953ecdd8a9e00ff31b63ad6ef0

x-pack/plugin/security/licenses/opensaml-xmlsec-api-3.3.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+
a1b10f97deca1e3405f95db5b39697c0d46f5e0d

x-pack/plugin/security/licenses/opensaml-xmlsec-impl-3.3.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+
d46cb9854a1ff85bea34ece7077bc32dbc2f10da

x-pack/plugin/security/licenses/xmlsec-2.0.8.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+
cb43326f02e3e77526c24269c8b5d3cc3f7f6653

0 commit comments

Comments
 (0)