Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Signature alg fix #58

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Signature alg fix #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
359bddd
changes to allow signature algorithm for STS to be overridden
DamienJDev Mar 26, 2020
97b5d59
signature algorithm set correctly
DamienJDev Mar 26, 2020
f9fddaa
signature algorithm api fix, will now translate to constructed message
DamienJDev Mar 26, 2020
89affa8
signature algorithm api fix, will now translate to constructed message
DamienJDev Mar 26, 2020
12c5e9c
Merge branch 'signatureAlgFix' of https://github.com/DamienJDev/metro…
DamienJDev Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...i/src/main/java/com/sun/xml/ws/api/security/trust/client/STSIssuedTokenConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public abstract class STSIssuedTokenConfiguration implements IssuedTokenConfigur
public static final String STS_SERVICE_NAME ="sts-service-name";
public static final String STS_PORT_NAME ="sts-port-name";
public static final String STS_NAMESPACE ="sts-namespace";
public static final String STS_SIGNATURE_ALGORITHM ="sts-signature-algorithm";
public static final String LIFE_TIME = "LifeTime";
public static final String MAX_CLOCK_SKEW = "MaxClockSkew";

Expand Down
4 changes: 3 additions & 1 deletion wsit/ws-sx/wssx-impl/src/main/java/com/sun/xml/ws/security/trust/impl/TrustPluginImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,9 @@ private BaseSTSResponse invokeRST(final RequestSecurityToken request, STSIssuedT
}
dispatch.getRequestContext().put(WSTrustConstants.IS_TRUST_MESSAGE, "true");
dispatch.getRequestContext().put(WSTrustConstants.TRUST_ACTION, getAction(wstVer, request.getRequestType().toString()));


dispatch.getRequestContext().put(STSIssuedTokenConfiguration.STS_SIGNATURE_ALGORITHM, stsConfig.getSignatureAlgorithm());

// Pass the keys and/or username, password to the message context
// String userName = (String) stsConfig.getOtherOptions().get(com.sun.xml.wss.XWSSConstants.USERNAME_PROPERTY);
// String password = (String) stsConfig.getOtherOptions().get(com.sun.xml.wss.XWSSConstants.PASSWORD_PROPERTY);
Expand Down
4 changes: 4 additions & 0 deletions wsit/ws-sx/wssx-impl/src/main/java/com/sun/xml/wss/jaxws/impl/SecurityClientTube.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,10 @@ public Packet processClientRequestPacket(Packet packet) {
ProcessingContext ctx = initializeOutgoingProcessingContext(packet, isSCMessage);
((ProcessingContextImpl) ctx).setIssuedTokenContextMap(issuedTokenContextMap);
((ProcessingContextImpl) ctx).setSCPolicyIDtoSctIdMap(scPolicyIDtoSctIdMap);
String sigAlg = (String)(packet.invocationProperties.get(STSIssuedTokenConfiguration.STS_SIGNATURE_ALGORITHM));
if(sigAlg!=null && (!sigAlg.equals(""))) {
((ProcessingContextImpl) ctx).getAlgorithmSuite().setSignatureAlgorithm(sigAlg);
}
ctx.isClient(true);
try {
if (hasKerberosTokenPolicy()) {
Expand Down