You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/07/20 14:05:01 UTC
[cxf] branch 3.1.x-fixes updated (0a446ba -> f609b04)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 0a446ba Recording .gitmergeinfo Changes
new af9de72 Fixed potential NPE in SAML OAuth 2.0 code
new f609b04 Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 3 +++
.../cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
[cxf] 01/02: Fixed potential NPE in SAML OAuth 2.0 code
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit af9de729e3745214be191a732bef41d28c5ac7e9
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jul 20 12:30:21 2018 +0100
Fixed potential NPE in SAML OAuth 2.0 code
(cherry picked from commit dd2ad753ca0980a3f83347016adff97aee5c09c2)
(cherry picked from commit 963b17be320f5206280c18075cfe7ebd1b41e9df)
# Conflicts:
# rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
---
.../cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
index 9fecf1c..6fbd3c1 100644
--- a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
+++ b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
@@ -138,7 +138,7 @@ public class Saml2BearerGrantHandler extends AbstractGrantHandler {
SAMLSecurityContext jaxrsSc = (SAMLSecurityContext)sc;
Set<Principal> rolesP = jaxrsSc.getUserRoles();
List<String> roles = new ArrayList<String>();
- if (roles != null) {
+ if (rolesP != null) {
for (Principal p : rolesP) {
roles.add(p.getName());
}
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f609b043fbec2df68a7b2cbfa84f4e64f331e6e8
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jul 20 15:04:53 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 46000c3..dab5aef 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -83,6 +83,7 @@ B 12e767a2e34ba8eabe7a16afbdb221245857b680
B 1304bc2ffbe6b4c3bfdc4e4f47e5e224e52fd808
B 1329e2c2b2f83a7b6e80ad2f15a2602161343749
B 137485de37b3bf81e305e616a5af81741620f547
+B 13875caf7adb708343d8a3d9670852dad4a9b1bb
B 1387abab66da34304d3773d5b8cccc5e5a81303b
B 13bcc2362509c6d893ed21fff9461d576fda1ccc
B 13e8d4ee88d4fea53ff9363054104c4f42c384fd
@@ -203,6 +204,7 @@ B 31e536485d6639a72b875e8619424c2cab60d20c
B 31e60f11f546e790510a16eb8c6a7f6a329dee7c
B 32d044afbe9c6bf4fd4ef829a71af3d1d949315e
B 332cd6e96b04d6d2ae077e2074b10b6b4163f235
+B 332db08ca95c7da951043ae8e2b18833a33fe1bb
B 333632ee013b26b6ed15d05818971d83927bd43d
B 337742ff1215b34643c8c35d8a1a9c4d5238d743
B 343d06d94838cd26f682f7afbcea0e422aa1597d
@@ -1253,6 +1255,7 @@ M 94060fc026b3b7214337c9fcfce71c06f0fb4444
M 94bbc35372b41e5e887fc52cdd6502fb149de32c
M 955fd4b7fee79642934a828b7758ce14f783364a
M 959a067ef27ff94b38aea5670418998a1add9999
+M 963b17be320f5206280c18075cfe7ebd1b41e9df
M 974c9d346ca9229d60a4d176b892f5920b994668
M 97b20f61bbf7054076c8cdf609beb8a7047105b8
M 97d813c04981a03ce878720c7dd94b17abdfbd0d