Skip to content

Commit 1ee071a

Browse files
committed
Update opensaml dependency (elastic#44972)
Add a mirror of the maven repository of the shibboleth project and upgrade opensaml and related dependencies to the latest version available version Resolves: elastic#44947
1 parent 777f6d5 commit 1ee071a

40 files changed

+321
-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: 282 additions & 119 deletions
Large diffs are not rendered by default.

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

x-pack/plugin/security/src/main/plugin-metadata/plugin-security.policy

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ grant {
77
// needed because of SAML (cf. o.e.x.s.s.RestorableContextClassLoader)
88
permission java.lang.RuntimePermission "getClassLoader";
99
permission java.lang.RuntimePermission "setContextClassLoader";
10+
// needed during initialization of OpenSAML library where xml security algorithms are registered
11+
// see https://github.com/apache/santuario-java/blob/e79f1fe4192de73a975bc7246aee58ed0703343d/src/main/java/org/apache/xml/security/utils/JavaUtils.java#L205-L220
12+
// and https://git.shibboleth.net/view/?p=java-opensaml.git;a=blob;f=opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureMarshaller.java;hb=db0eaa64210f0e32d359cd6c57bedd57902bf811#l52
13+
// which uses it in the opensaml-xmlsec-impl
14+
permission java.security.SecurityPermission "org.apache.xml.security.register";
1015

1116
// needed for multiple server implementations used in tests
1217
permission java.net.SocketPermission "*", "accept,connect";
@@ -31,14 +36,6 @@ grant {
3136
permission java.lang.RuntimePermission "getFileStoreAttributes";
3237
};
3338

34-
grant codeBase "${codebase.xmlsec-2.0.8.jar}" {
35-
// needed during initialization of OpenSAML library where xml security algorithms are registered
36-
// see https://github.com/apache/santuario-java/blob/e79f1fe4192de73a975bc7246aee58ed0703343d/src/main/java/org/apache/xml/security/utils/JavaUtils.java#L205-L220
37-
// and https://git.shibboleth.net/view/?p=java-opensaml.git;a=blob;f=opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureMarshaller.java;hb=db0eaa64210f0e32d359cd6c57bedd57902bf811#l52
38-
// which uses it in the opensaml-xmlsec-impl
39-
permission java.security.SecurityPermission "org.apache.xml.security.register";
40-
};
41-
4239
grant codeBase "${codebase.netty-common}" {
4340
// for reading the system-wide configuration for the backlog of established sockets
4441
permission java.io.FilePermission "/proc/sys/net/core/somaxconn", "read";

0 commit comments

Comments
 (0)