From jboss-cvs-commits at lists.jboss.org Fri May 9 17:49:41 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 9 May 2014 17:49:41 -0400 Subject: [jboss-cvs] JBossAS SVN: r114809 - branches. Message-ID: <201405092149.s49Lnfjg007667@svn01.web.mwc.hst.phx2.redhat.com> Author: klape Date: 2014-05-09 17:49:41 -0400 (Fri, 09 May 2014) New Revision: 114809 Added: branches/JBPAPP_5_1_2_GA_JBPAPP-11150/ Log: [JBPAPP-11150] Creating one off branch From jboss-cvs-commits at lists.jboss.org Fri May 9 17:50:45 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 9 May 2014 17:50:45 -0400 Subject: [jboss-cvs] JBossAS SVN: r114810 - branches/JBPAPP_5_1_2_GA_JBPAPP-11150/webservices/src/main/org/jboss/wsf/container/jboss50/invocation. Message-ID: <201405092150.s49LojFV007751@svn01.web.mwc.hst.phx2.redhat.com> Author: klape Date: 2014-05-09 17:50:45 -0400 (Fri, 09 May 2014) New Revision: 114810 Modified: branches/JBPAPP_5_1_2_GA_JBPAPP-11150/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java Log: [JBPAPP-11150] Try using ws impl's CL to load param types Modified: branches/JBPAPP_5_1_2_GA_JBPAPP-11150/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java =================================================================== --- branches/JBPAPP_5_1_2_GA_JBPAPP-11150/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2014-05-09 21:49:41 UTC (rev 114809) +++ branches/JBPAPP_5_1_2_GA_JBPAPP-11150/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2014-05-09 21:50:45 UTC (rev 114810) @@ -137,7 +137,15 @@ if (JavaUtils.isPrimitive(paramType) == false) { String paramTypeName = paramType.getName(); - paramType = JavaUtils.loadJavaType(paramTypeName); + try + { + paramType = JavaUtils.loadJavaType(paramTypeName); + } + catch(Exception e) + { + //TCCL might not have the class for some reason... + paramType = JavaUtils.loadJavaType(paramTypeName, implClass.getClassLoader()); + } paramTypes[i] = paramType; } } From jboss-cvs-commits at lists.jboss.org Thu May 15 20:45:08 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 15 May 2014 20:45:08 -0400 Subject: [jboss-cvs] JBossAS SVN: r114811 - projects/security/security-negotiation/branches. Message-ID: <201405160045.s4G0j8YJ022929@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-05-15 20:45:07 -0400 (Thu, 15 May 2014) New Revision: 114811 Added: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/ Log: Creating a branch for a one-off patch [bz-1098360] From jboss-cvs-commits at lists.jboss.org Thu May 15 20:50:51 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 15 May 2014 20:50:51 -0400 Subject: [jboss-cvs] JBossAS SVN: r114812 - projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation. Message-ID: <201405160050.s4G0opYx023414@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-05-15 20:50:51 -0400 (Thu, 15 May 2014) New Revision: 114812 Modified: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java Log: Backport SECURITY-640 Modified: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java =================================================================== --- projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java 2014-05-16 00:45:07 UTC (rev 114811) +++ projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java 2014-05-16 00:50:51 UTC (rev 114812) @@ -224,7 +224,9 @@ if (principal == null) { - response.sendError(Response.SC_UNAUTHORIZED); + // Instead of returning a 401 here...attempt to fallback to form, otherwise return a 401 + log.debug("SPNEGO based authentication failed...initiating negotiation"); + initiateNegotiation(request, response, config); } else { From jboss-cvs-commits at lists.jboss.org Thu May 15 20:51:26 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 15 May 2014 20:51:26 -0400 Subject: [jboss-cvs] JBossAS SVN: r114813 - projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation. Message-ID: <201405160051.s4G0pQCh023824@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-05-15 20:51:26 -0400 (Thu, 15 May 2014) New Revision: 114813 Modified: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java Log: Backport SECURITY-722 Modified: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java =================================================================== --- projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java 2014-05-16 00:50:51 UTC (rev 114812) +++ projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java 2014-05-16 00:51:26 UTC (rev 114813) @@ -272,6 +272,7 @@ disp.include(request.getRequest(), response); response.setHeader("WWW-Authenticate", getNegotiateScheme()); response.setStatus(Response.SC_UNAUTHORIZED); + response.setContentType("text/html"); } catch (ServletException e) { From jboss-cvs-commits at lists.jboss.org Thu May 15 20:52:57 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 15 May 2014 20:52:57 -0400 Subject: [jboss-cvs] JBossAS SVN: r114814 - in projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360: jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common and 1 other directories. Message-ID: <201405160052.s4G0qvbf023865@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-05-15 20:52:57 -0400 (Thu, 15 May 2014) New Revision: 114814 Modified: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/NegotiationContext.java projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java Log: Backport SECURITY-826 Modified: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java =================================================================== --- projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java 2014-05-16 00:51:26 UTC (rev 114813) +++ projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/NegotiationAuthenticator.java 2014-05-16 00:52:57 UTC (rev 114814) @@ -153,6 +153,7 @@ throw new IOException("Invalid 'Authorization' header."); } + boolean isContinuationRequired = false; String authTokenBase64 = authHeader.substring(negotiateScheme.length() + 1); byte[] authToken = Base64.decode(authTokenBase64); ByteArrayInputStream authTokenIS = new ByteArrayInputStream(authToken); @@ -218,15 +219,24 @@ } finally { + isContinuationRequired = negotiationContext.isContinuationRequired(); + // Clear the headers and remove the ThreadLocal association. negotiationContext.clear(); } if (principal == null) { - // Instead of returning a 401 here...attempt to fallback to form, otherwise return a 401 - log.debug("SPNEGO based authentication failed...initiating negotiation"); - initiateNegotiation(request, response, config); + if( isContinuationRequired ) { + log.debug("Continuation required...sendError(SC_UNAUTHORIZED)"); + response.sendError(Response.SC_UNAUTHORIZED); + } + else { + // Instead of returning a 401 here...attempt to fallback to form, otherwise return a 401 + log.debug("SPNEGO based authentication failed...initiating negotiation"); + initiateNegotiation(request, response, config); + } + } else { Modified: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/NegotiationContext.java =================================================================== --- projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/NegotiationContext.java 2014-05-16 00:51:26 UTC (rev 114813) +++ projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/common/NegotiationContext.java 2014-05-16 00:52:57 UTC (rev 114814) @@ -52,6 +52,8 @@ private Object schemeContext = null; + private boolean continuationRequired = false; + public static NegotiationContext getCurrentNegotiationContext() { return negotiationContext.get(); @@ -73,6 +75,7 @@ log.trace("clear " + this.hashCode()); requestMessage = null; responseMessage = null; + continuationRequired = false; negotiationContext.remove(); } @@ -136,4 +139,13 @@ this.schemeContext = schemeContext; } + public boolean isContinuationRequired() + { + return continuationRequired; + } + + public void setContinuationRequired(boolean continuationRequired) + { + this.continuationRequired = continuationRequired; + } } Modified: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java =================================================================== --- projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java 2014-05-16 00:51:26 UTC (rev 114813) +++ projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1098360/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/SPNEGOLoginModule.java 2014-05-16 00:52:57 UTC (rev 114814) @@ -178,6 +178,12 @@ } else { + NegotiationContext negotiationContext = NegotiationContext.getCurrentNegotiationContext(); + if (negotiationContext != null) { + log.debug("NegotiationContext.setContinuationRequired(true)"); + negotiationContext.setContinuationRequired(true); + } + throw new LoginException("Continuation Required."); }