Skip to content

Commit

Permalink
RAD-780: SAExecute request error masked by useless exception
Browse files Browse the repository at this point in the history
  • Loading branch information
glacuesta-sa committed Jan 12, 2024
1 parent 2f2a248 commit 453e060
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
currentVersion=1.1.0.11
currentVersion=9.9.9.9
3 changes: 1 addition & 2 deletions src/main/java/org/secureauth/sarestapi/ISAAccess.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.secureauth.sarestapi;

import jakarta.ws.rs.core.Cookie;
import org.secureauth.sarestapi.data.DFP.DFP;
import org.secureauth.sarestapi.data.IPEval;
import org.secureauth.sarestapi.data.PushAcceptStatus;
Expand All @@ -11,8 +12,6 @@
import org.secureauth.sarestapi.data.UserProfile.UsersToGroup;
import org.secureauth.sarestapi.exception.SARestAPIException;

import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.NewCookie;
import java.util.Hashtable;

public interface ISAAccess {
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/org/secureauth/sarestapi/SAAccess.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
import java.util.Map;
import java.util.stream.Collectors;

import javax.ws.rs.core.Cookie;

import jakarta.ws.rs.core.Cookie;
import org.secureauth.sarestapi.data.IPEval;
import org.secureauth.sarestapi.data.PushAcceptStatus;
import org.secureauth.sarestapi.data.SAAuth;
Expand Down Expand Up @@ -232,7 +231,7 @@ public IPEval iPEvaluation(String userId, String ipAddress) {
saBaseURL.getApplianceURL() + IPEvalQuery.queryIPEval(saAuth.getRealm()), ipEvalRequest, ts);

} catch (Exception e) {
logger.error(new StringBuilder().append("Exception occurred executing REST query::\n")
logger.error(new StringBuilder().append("Exception occurred executing REST query::\n")
.append(e.getMessage()).append("\n").toString(), e);
}

Expand Down Expand Up @@ -2076,8 +2075,8 @@ public BaseResponse UpdatePhoneNumberProfile(String userId, String phoneNumber,

/**
* Validate the yubico OTP token from userId.
* @param userId
* @param token
* @param userId UserId to validate
* @param token Token to validate
* @return ResponseObject with status and message. Where "status" is "valid" or "invalid" according the case.
*/
public ResponseObject validateUserYubicoOTPToken(String userId, String token) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.secureauth.sarestapi.data.Response;

import javax.ws.rs.core.NewCookie;
import jakarta.ws.rs.core.NewCookie;

public class StatefulResponseObject extends ResponseObject {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.secureauth.sarestapi.filters;

import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.client.ClientRequestContext;
import jakarta.ws.rs.client.ClientRequestFilter;
import jakarta.ws.rs.core.Response;

import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package org.secureauth.sarestapi.guid;

import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import jakarta.ws.rs.client.ClientRequestContext;
import jakarta.ws.rs.client.ClientRequestFilter;

import java.io.IOException;

public class XRequestIDFilter implements ClientRequestFilter {

Expand All @@ -12,7 +14,7 @@ public XRequestIDFilter(String transactionId) {
}

@Override
public void filter(ClientRequestContext requestContext) {
public void filter(ClientRequestContext requestContext) throws IOException {
requestContext.getHeaders().putSingle( "X-Request-ID", this.transactionId );
}
}
13 changes: 7 additions & 6 deletions src/main/java/org/secureauth/sarestapi/resources/SAExecuter.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
import java.util.Optional;

import javax.net.ssl.*;
import javax.ws.rs.client.*;
import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.MediaType;

import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import jakarta.ws.rs.client.*;
import jakarta.ws.rs.core.*;
import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.jackson.JacksonFeature;
import org.secureauth.sarestapi.data.*;
import org.secureauth.sarestapi.data.BehavioralBio.BehaveBioRequest;
import org.secureauth.sarestapi.data.Requests.BehaveBioResetRequest;
Expand All @@ -39,9 +41,6 @@
//Jersey 2 Libs
import org.glassfish.jersey.client.ClientConfig;

import javax.ws.rs.core.NewCookie;
import javax.ws.rs.core.Response;


/**
* @author [email protected]
Expand Down Expand Up @@ -129,6 +128,8 @@ private void createConnection() throws SARestAPIException {
ctx.init(null, SATrustManagerFactory.createTrustsManagersFor( this.saBaseURL ) , new SecureRandom());
config.register(SACheckRequestFilter.class);
config.register( this.xRequestIDFilter );
config.register(JacksonFeature.class);

client = ClientBuilder.newBuilder()
.withConfig(config)
.sslContext(ctx)
Expand Down

0 comments on commit 453e060

Please sign in to comment.