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

Release/1.12.19 #129

Merged
merged 7 commits into from
May 24, 2024
Merged

Release/1.12.19 #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ccec7d1
URL Validation
obalandi May 23, 2024
3811164
Codestyle customizations
obalandi May 23, 2024
69ccf40
Codestyle adjustments
obalandi May 23, 2024
7dbae37
Codestyle Adjustments
obalandi May 23, 2024
e9af61b
Bugfix
obalandi May 23, 2024
8e9c1b0
Bugfix
obalandi May 23, 2024
72f2b66
Bugfix
obalandi May 23, 2024
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
61 changes: 45 additions & 16 deletions matchmaking/src/main/java/org/eclipse/tractusx/agents/http/DelegationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URI;
import java.nio.charset.Charset;
import java.util.List;
import java.util.Map;
Expand All @@ -50,6 +51,7 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;


/**
* A service that may delegate an incoming
* agent http request ot another agent in the
Expand Down Expand Up @@ -129,6 +131,22 @@ public DelegationResponse executeQueryRemote(String remoteUrl, String skill, Str

}

/**
* URL Validation
*
* @param url URL string for validation
* @return Returns true if the URL is valid, false otherwise.
*/
public static boolean isValid(String url) {
// Try creating a valid URL
try {
new URI(url).toURL();
return true;
} catch (Exception e) { // If there was an Exception while creating URL object
return false;
}
}

/**
* route a get request
*
Expand All @@ -142,16 +160,21 @@ public DelegationResponse sendGetRequest(EndpointDataReference dataReference, St

monitor.debug(String.format("About to delegate GET %s", url));

var requestBuilder = new okhttp3.Request.Builder()
.url(url);
if (isValid(url.toString())) {

if (dataReference.getAuthKey() != null) {
requestBuilder = requestBuilder.addHeader(dataReference.getAuthKey(), Objects.requireNonNull(dataReference.getAuthCode()));
}
var requestBuilder = new okhttp3.Request.Builder()
.url(url);

if (dataReference.getAuthKey() != null) {
requestBuilder = requestBuilder.addHeader(dataReference.getAuthKey(), Objects.requireNonNull(dataReference.getAuthCode()));
}

var newRequest = requestBuilder.build();
var newRequest = requestBuilder.build();

return new DelegationResponse(sendRequest(newRequest, response), Response.status(response.getStatus()).build());
return new DelegationResponse(sendRequest(newRequest, response), Response.status(response.getStatus()).build());
} else {
return null;
}
}

/**
Expand All @@ -170,19 +193,25 @@ public DelegationResponse sendPostRequest(EndpointDataReference dataReference, S

monitor.debug(String.format("About to delegate POST %s with content type %s", url, contentType));

var requestBuilder = new okhttp3.Request.Builder()
.url(url)
.addHeader("Content-Type", contentType);
if (isValid(url.toString())) {

if (dataReference.getAuthKey() != null) {
requestBuilder = requestBuilder.addHeader(dataReference.getAuthKey(), Objects.requireNonNull(dataReference.getAuthCode()));
}
var requestBuilder = new okhttp3.Request.Builder()
.url(url)
.addHeader("Content-Type", contentType);

requestBuilder.post(okhttp3.RequestBody.create(request.getInputStream().readAllBytes(), parsedContentType));
if (dataReference.getAuthKey() != null) {
requestBuilder = requestBuilder.addHeader(dataReference.getAuthKey(), Objects.requireNonNull(dataReference.getAuthCode()));
}

var newRequest = requestBuilder.build();
requestBuilder.post(okhttp3.RequestBody.create(request.getInputStream().readAllBytes(), parsedContentType));

return new DelegationResponse(sendRequest(newRequest, response), Response.status(response.getStatus()).build());
var newRequest = requestBuilder.build();

return new DelegationResponse(sendRequest(newRequest, response), Response.status(response.getStatus()).build());

} else {
return null;
}
}

protected static final Pattern PARAMETER_KEY_ALLOW = Pattern.compile("^(?<param>(?!asset$)[^&?=]+)$");
Expand Down
47 changes: 35 additions & 12 deletions matchmaking/src/main/java/org/eclipse/tractusx/agents/service/DataManagement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.eclipse.tractusx.agents.utils.TypeManager;

import java.io.IOException;
import java.net.URI;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
Expand Down Expand Up @@ -425,6 +426,22 @@ public IdResponse createOrUpdateGraph(String assetId, String name, String descri
return createOrUpdateAsset(assetId, assetSpec);
}

/**
* URL Validation
*
* @param url URL string for validation
* @return Returns true if the URL is valid, false otherwise.
*/
public static boolean isValid(String url) {
// Try creating a valid URL
try {
new URI(url).toURL();
return true;
} catch (Exception e) { // If there was an Exception while creating URL object
return false;
}
}

/**
* deletes an existing aseet
*
Expand All @@ -435,19 +452,25 @@ public IdResponse createOrUpdateGraph(String assetId, String name, String descri
public IdResponse deleteAsset(String assetId) throws IOException {
String version = "/v3";
var url = String.format(ASSET_UPDATE_CALL, config.getControlPlaneManagementProviderUrl(), version, assetId);
var request = new Request.Builder().url(url).delete();
config.getControlPlaneManagementHeaders().forEach(request::addHeader);
try (var response = httpClient.newCall(request.build()).execute()) {
ResponseBody body = response.body();
if (response.isSuccessful() && body != null) {
return JsonLd.processIdResponse(body.string());
} else {
monitor.warning(format("Failure in calling the control plane at %s. Ignoring", url));
return null;

if (isValid(url)) {
var request = new Request.Builder().url(url).delete();
config.getControlPlaneManagementHeaders().forEach(request::addHeader);
try (var response = httpClient.newCall(request.build()).execute()) {
ResponseBody body = response.body();
if (response.isSuccessful() && body != null) {
return JsonLd.processIdResponse(body.string());
} else {
monitor.warning(format("Failure in calling the control plane at %s. Ignoring", url));
return null;
}
} catch (Exception e) {
monitor.severe(format("Error in calling the control plane at %s", url), e);
throw e;
}
} catch (Exception e) {
monitor.severe(format("Error in calling the control plane at %s", url), e);
throw e;
} else {
monitor.warning(format("Invalid URL", url));
return null;
}
}

Expand Down
Loading