Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,11 @@
public class TypedApiImplementation implements TypedApiInterface {
private final HttpClient httpClient;
private final String baseUrl;
private final ConfigApi configApi;
Map<String, String> headers;

private final AnalysesCoreApi analysisCoreApi;
private final AuthenticationUsersApi authenticationUsersApi;
private final AnalysesResultsMetadataApi analysesResultsMetadataApi;
private final ConfigApi configApi;
private final SearchApi searchApi;
private final FunctionsCoreApi functionsCoreApi;
private final FunctionsRenamingHistoryApi functionsRenamingHistoryApi;
Expand Down Expand Up @@ -98,7 +97,6 @@ public TypedApiImplementation(String baseUrl, String apiKey) {
APIKey.setApiKey(apiKey);

this.analysisCoreApi = new AnalysesCoreApi(apiClient);
this.authenticationUsersApi = new AuthenticationUsersApi(apiClient);
this.analysesResultsMetadataApi = new AnalysesResultsMetadataApi(apiClient);
this.searchApi = new SearchApi(apiClient);
this.functionsCoreApi = new FunctionsCoreApi(apiClient);
Expand Down Expand Up @@ -443,15 +441,6 @@ public Optional<FunctionDataTypeStatus> getFunctionDataTypes(AnalysisID analysis
}
}

@Override
public void authenticate() throws InvalidAPIInfoException {
try {
this.authenticationUsersApi.getRequesterUserInfo();
} catch (ApiException e) {
throw new InvalidAPIInfoException("Invalid API key", e);
}
}

@Override
public boolean triggerAIDecompilationForFunctionID(FunctionID functionID) {
JSONObject params = new JSONObject().put("function_id", functionID.value());
Expand Down Expand Up @@ -681,4 +670,3 @@ public ConfigResponse getConfig() {
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ default List<AnalysisID> searchBinaries(

String getAnalysisLogs(AnalysisID analysisID);

void authenticate() throws InvalidAPIInfoException;

default DataTypeList generateFunctionDataTypes(AnalysisID analysisID, List<FunctionID> functionIDS) {
throw new UnsupportedOperationException("generateFunctionDataTypes not implemented yet");
}
Expand Down Expand Up @@ -230,4 +228,3 @@ default ConfigResponse getConfig() throws ApiException {
throw new UnsupportedOperationException("getConfig not implemented yet");
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,9 @@ public String getAnalysisLogs(AnalysisID analysisID) {
return "";
}

@Override
public void authenticate() throws APIAuthenticationException {
}

@Override
public void renameFunction(FunctionID id, String newName, String newNameMangled) {

}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ public String getAnalysisLogs(AnalysisID analysisID) {
return "ANALYSIS LOGS";
}

@Override
public void authenticate() {

}

@Override
public void renameFunction(FunctionID id, String newName, String newNameMangled) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ static CredentialValidator defaultValidator() {
throw new InvalidAPIInfoException("hostURI and apiKey must not be null");
}
var api = new TypedApiImplementation(apiInfo);
api.authenticate();
try {
// Validate the credentials by making a simple API call that requires authentication.
api.getConfig();
} catch (Exception e) {
throw new InvalidAPIInfoException("Failed to validate API credentials: " + e.getMessage(), e);
}
};
}
}
Loading