safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 00:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-197: Clean up logic for retrieving radius state.

Browse Source
This commit is contained in:
Nick Couchman
2017-04-11 09:15:39 -04:00
committed by Nick Couchman
parent 6402cecd53
commit 564b9687a2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/AuthenticationProviderService.java
View File

@@ -109,7 +109,6 @@ public class AuthenticationProviderService {
// Try to get parameters to see if this is a post-challenge attempt // Try to get parameters to see if this is a post-challenge attempt
String challengeResponse = request.getParameter(RadiusChallengeResponseField.PARAMETER_NAME); String challengeResponse = request.getParameter(RadiusChallengeResponseField.PARAMETER_NAME);
String radiusState = request.getParameter(RadiusStateField.PARAMETER_NAME);
// We do not have a challenge response, so we proceed normally // We do not have a challenge response, so we proceed normally
if (challengeResponse == null || challengeResponse.isEmpty()) { if (challengeResponse == null || challengeResponse.isEmpty()) {
@@ -159,7 +158,7 @@ public class AuthenticationProviderService {
// We have the required attributes - convert to strings and then generate the additional login box/field // We have the required attributes - convert to strings and then generate the additional login box/field
String replyMsg = replyAttr.toString(); String replyMsg = replyAttr.toString();
radiusState = new String(stateAttr.getValue().getBytes()); String radiusState = new String(stateAttr.getValue().getBytes());
Field radiusResponseField = new RadiusChallengeResponseField(replyMsg); Field radiusResponseField = new RadiusChallengeResponseField(replyMsg);
Field radiusStateField = new RadiusStateField(radiusState); Field radiusStateField = new RadiusStateField(radiusState);
CredentialsInfo expectedCredentials = new CredentialsInfo(Arrays.asList(radiusResponseField,radiusStateField)); CredentialsInfo expectedCredentials = new CredentialsInfo(Arrays.asList(radiusResponseField,radiusStateField));
@@ -193,7 +192,7 @@ public class AuthenticationProviderService {
// Initialize Radius Packet and try to authenticate // Initialize Radius Packet and try to authenticate
try { try {
radPack = radiusService.authenticate(credentials.getUsername(), radPack = radiusService.authenticate(credentials.getUsername(),
radiusState, request.getParameter(RadiusStateField.PARAMETER_NAME),
challengeResponse); challengeResponse);
} }
catch (GuacamoleException e) { catch (GuacamoleException e) {