Skip to content

Commit

Permalink
Merge branch 'develop' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@glacuesta-sa
glacuesta-sa authored Sep 28, 2023
2 parents 3bc760f + 9b76c09 commit 6a02e0f
Show file tree
Hide file tree
Showing 10 changed files with 1,775 additions and 1,212 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
currentVersion=1.1.0.6
currentVersion=1.1.0.8
555 changes: 345 additions & 210 deletions src/main/java/org/secureauth/sarestapi/ISAAccess.java
View file

Large diffs are not rendered by default.

1,629 changes: 982 additions & 647 deletions src/main/java/org/secureauth/sarestapi/SAAccess.java
View file

Large diffs are not rendered by default.

24 changes: 23 additions & 1 deletion src/main/java/org/secureauth/sarestapi/data/PreferredMFA.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@

import org.secureauth.sarestapi.util.JSONUtil;

public class PreferredMFA {

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;

@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class PreferredMFA {

private String factorId;
private String capability;
private String type;
private String mode;
private String available_choosen_mode;
Expand All @@ -26,6 +34,20 @@ public String getAvailable_choosen_mode() {
public void setAvailable_choosen_mode(String available_choosen_mode) {
this.available_choosen_mode = available_choosen_mode;
}

public String getFactorId() {
return factorId;
}
public void setFactorId(String factorId) {
this.factorId = factorId;
}
public String getCapability() {
return capability;
}
public void setCapability(String capability) {
this.capability = capability;
}

@Override
public String toString(){
return JSONUtil.convertObjectToJSON(this);
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/secureauth/sarestapi/data/Response/BaseResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package org.secureauth.sarestapi.data.Response;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;

import org.secureauth.sarestapi.util.JSONUtil;

import javax.xml.bind.annotation.XmlRootElement;
Expand All @@ -10,9 +13,16 @@
*/
@XmlRootElement
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class BaseResponse {

@JsonProperty("status")
private String status;

@JsonProperty("message")
private String message;

@JsonProperty("user_id")
private String user_id;

public String getStatus() {
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/org/secureauth/sarestapi/data/Response/FactorsResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package org.secureauth.sarestapi.data.Response;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
/**
* @author [email protected]
*
*/
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;

import org.secureauth.sarestapi.data.Factors;
import org.secureauth.sarestapi.data.PreferredMFA;
import org.secureauth.sarestapi.util.JSONUtil;
Expand All @@ -17,10 +20,15 @@
@XmlRootElement
@XmlSeeAlso(Factors.class)
@JsonInclude(JsonInclude.Include.NON_NULL)
public class FactorsResponse extends BaseResponse{
@JsonIgnoreProperties(ignoreUnknown = true)
public class FactorsResponse extends BaseResponse {

@JsonProperty("factors")
private ArrayList<Factors> factors = new ArrayList<Factors>();

@JsonProperty("preferred_mfa")
public PreferredMFA preferred_mfa = new PreferredMFA();

public ArrayList<Factors> getFactors() {
return factors;
}
Expand Down
141 changes: 82 additions & 59 deletions src/main/java/org/secureauth/sarestapi/resources/Resource.java
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,42 @@
package org.secureauth.sarestapi.resources;

/**
/**
* /**
*
* @author [email protected]
*
Copyright (c) 2015, SecureAuth
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Copyright (c) 2015, SecureAuth
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/


public class Resource {

public static final String API_VERSION = "v1";
Expand All @@ -29,64 +45,71 @@ public class Resource {
public static final String HTTP = "http://";
public static final String COLON = ":";
public static final String SLASH = "/";
public static final String APPLIANCE_AUTH="/api/"+ API_VERSION +"/auth";
public static final String APPLIANCE_AUTH_LINK="/api/"+ API_VERSION +"/auth/link/";
public static final String APPLIANCE_AAUTH="/api/"+ API_VERSION +"/adaptauth";
public static final String APPLIANCE_USERS="/api/"+ API_VERSION + "/users/";
public static final String APPLIANCE_AUTH = "/api/" + API_VERSION + "/auth";
public static final String APPLIANCE_AUTH_LINK = "/api/" + API_VERSION + "/auth/link/";
public static final String APPLIANCE_AAUTH = "/api/" + API_VERSION + "/adaptauth";
public static final String APPLIANCE_USERS = "/api/" + API_VERSION + "/users/";
public static final String APPLIANCE_AUTHENTICATED = "/api/" + API_VERSION_2 + "/authenticated";
public static final String APPLIANCE_IDM_USERS="/users/";
public static final String APPLIANCE_IDM_USERS_PASSWD_RESET="/resetpwd";
public static final String APPLIANCE_IDM_USERS_PASSWD_CHANGE="/changepwd";
public static final String APPLIANCE_IDM_USERS_GROUPS="/groups/";
public static final String APPLIANCE_IDM_GROUPS="/api/" + API_VERSION + "/groups/";
public static final String APPLIANCE_FACTORS="/factors";
public static final String APPLIANCE_IPEVAL="/api/"+ API_VERSION + "/ipeval";
public static final String APPLIANCE_DFP="/api/" + API_VERSION + "/dfp";
public static final String APPLIANCE_DFP_JS=APPLIANCE_DFP + "/js";
public static final String APPLIANCE_DFP_VALIDATE=APPLIANCE_DFP + "/validate";
public static final String APPLIANCE_DFP_CONFIRM=APPLIANCE_DFP + "/confirm";
public static final String APPLIANCE_IDM_USERS = "/users/";
public static final String APPLIANCE_IDM_USERS_PASSWD_RESET = "/resetpwd";
public static final String APPLIANCE_IDM_USERS_PASSWD_CHANGE = "/changepwd";
public static final String APPLIANCE_IDM_USERS_GROUPS = "/groups/";
public static final String APPLIANCE_IDM_GROUPS = "/api/" + API_VERSION + "/groups/";
public static final String APPLIANCE_FACTORS = "/factors";
public static final String APPLIANCE_IPEVAL = "/api/" + API_VERSION + "/ipeval";
public static final String APPLIANCE_DFP = "/api/" + API_VERSION + "/dfp";
public static final String APPLIANCE_DFP_JS = APPLIANCE_DFP + "/js";
public static final String APPLIANCE_DFP_VALIDATE = APPLIANCE_DFP + "/validate";
public static final String APPLIANCE_DFP_CONFIRM = APPLIANCE_DFP + "/confirm";
public static final String APPLIANCE_DFP_SCORE = APPLIANCE_DFP + "/score";
public static final String APPLIANCE_DFP_SAVE = APPLIANCE_DFP + "/save";
public static final String APPLIANCE_ACCESSHISTORY="/api/" + API_VERSION + "/accesshistory";
public static final String APPLIANCE_BEHAVEBIO="/api/" + API_VERSION + "/behavebio";
public static final String APPLIANCE_BEHAVEBIO_JS=APPLIANCE_BEHAVEBIO + "/js";
public static final String APPLIANCE_NUMBERPROFILE="/api/" + API_VERSION + "/numberprofile";
public static final String APPLIANCE_OTP="/api/" + API_VERSION + "/otp";
public static final String APPLIANCE_OTP_VALIDATE=APPLIANCE_OTP + "/validate";
public static final String APPLIANCE_ACCESSHISTORY = "/api/" + API_VERSION + "/accesshistory";
public static final String APPLIANCE_BEHAVEBIO = "/api/" + API_VERSION + "/behavebio";
public static final String APPLIANCE_BEHAVEBIO_JS = APPLIANCE_BEHAVEBIO + "/js";
public static final String APPLIANCE_NUMBERPROFILE = "/api/" + API_VERSION + "/numberprofile";
public static final String APPLIANCE_OTP = "/api/" + API_VERSION + "/otp";
public static final String APPLIANCE_OTP_VALIDATE = APPLIANCE_OTP + "/validate";
public static final String APPLIANCE_THROTTLE = "/throttle";
public static final String APPLIANCE_STATUS = "/status";


public static final String STATUS_INVALID="invalid";
public static final String STATUS_SERVER_ERROR="server_error";
public static final String STATUS_VALID="valid";
public static final String STATUS_FOUND="found";
public static final String STATUS_VERIFIED="verified";
public static final String STATUS_NOT_FOUND="not_found";
public static final String STATUS_FAILED="failed";
public static final String STATUS_ERROR="error";
public static final String STATUS_INVALID = "invalid";
public static final String STATUS_SERVER_ERROR = "server_error";
public static final String STATUS_VALID = "valid";
public static final String STATUS_FOUND = "found";
public static final String STATUS_VERIFIED = "verified";
public static final String STATUS_NOT_FOUND = "not_found";
public static final String STATUS_FAILED = "failed";
public static final String STATUS_ERROR = "error";

public static final String METHOD_GET = "GET";
public static final String METHOD_POST = "POST";
public static final String METHOD_PUT = "PUT";
public static final String METHOD_DELETE = "DELETE";

public static final String PHONES="Phones";
public static final String PHONE="Phone";
public static final String KBQS="KBQS";
public static final String KBQ="KBQ";
public static final String HELPDESKS="HelpDesks";
public static final String HELPDESK="HelpDesk";
public static final String OATHS="Oaths";
public static final String OATH="Oath";
public static final String PUSHS="Pushs";
public static final String PUSH="Push";
public static final String FACTORS="factors";
public static final String FACTOR="factor";
public static final String GEOLOC="GeoLoc";
public static final String PHONES = "Phones";
public static final String PHONE = "Phone";
public static final String KBQS = "KBQS";
public static final String KBQ = "KBQ";
public static final String HELPDESKS = "HelpDesks";
public static final String HELPDESK = "HelpDesk";
public static final String OATHS = "Oaths";
public static final String OATH = "Oath";
public static final String PUSHS = "Pushs";
public static final String PUSH = "Push";
public static final String FACTORS = "factors";
public static final String FACTOR = "factor";
public static final String GEOLOC = "GeoLoc";
public static final String EMAIL = "email";
public static final String SMS = "sms";
public static final String EMAIL_LINK = "email_link";
public static final String SMS_LINK = "sms_link";
public static final String YUBIKEY = "yubikey";
public static final String PASSWORD = "password";
public static final String RISK = "risk";
public static final String USER_ID = "user_id";
public static final String PIN = "pin";
public static final String KBA = "kba";
public static final String CALL = "call";
public static final String HELP_DESK = "help_desk";

}
Loading

0 comments on commit 6a02e0f

Please sign in to comment.