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 @@ -4,6 +4,7 @@
import com.epam.aidial.core.config.Upstream;
import com.epam.aidial.core.server.Proxy;
import com.epam.aidial.core.server.ProxyContext;
import com.epam.aidial.core.server.data.ApiKeyData;
import com.epam.aidial.core.server.upstream.UpstreamRoute;
import com.epam.aidial.core.server.util.ProxyUtil;
import com.epam.aidial.core.server.vertx.stream.BufferingReadStream;
Expand Down Expand Up @@ -43,10 +44,20 @@ Future<Void> handle() {
.onSuccess(body -> proxy.getTaskExecutor().submit(() -> {
handleRequestBody(body);
return null;
}));
}).onFailure(this::handleError));
return Future.succeededFuture();
}

private void handleError(Throwable error) {
if (error instanceof HttpException httpException) {
controller.respond(httpException);
} else {
String errorMsg = "Error occurred on processing route request: %s".formatted(context.getRequest().path());
controller.respond(HttpStatus.INTERNAL_SERVER_ERROR, errorMsg);
log.error(errorMsg, error);
}
}

private void handleRequestBody(Buffer requestBody) {
Deployment deployment = context.getDeployment();
log.info("Received body from client. Deployment: {}. Length: {}",
Expand All @@ -55,7 +66,7 @@ private void handleRequestBody(Buffer requestBody) {
context.setRequestBodyTimestamp(System.currentTimeMillis());
context.setRequestBody(requestBody);

controller.setupProxyApiKeyData();
ApiKeyData apiKeyData = controller.setupProxyApiKeyData();

controller.setupEnhancementFunctions();

Expand All @@ -81,8 +92,9 @@ private void handleRequestBody(Buffer requestBody) {
return;
}
}

proxy.getApiKeyStore().assignPerRequestApiKey(context.getProxyApiKeyData());
if (apiKeyData != null) {
proxy.getApiKeyStore().assignPerRequestApiKey(apiKeyData);
}
sendRequest();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ private static List<Arguments> datasource() {
Arguments.of(HttpMethod.GET, "/v1/forbidden", "vstore_admin_key", 403, "Forbidden route"),
Arguments.of(HttpMethod.GET, "/unexpected", "vstore_user_key", 404, "Route is not found"),
Arguments.of(HttpMethod.POST, "/v1/rate", "vstore_user_key", 200, "OK"),
Arguments.of(HttpMethod.POST, "/v1/rate?k1=v1&k2=v2", "vstore_user_key", 200, "OK")
Arguments.of(HttpMethod.POST, "/v1/rate?k1=v1&k2=v2", "vstore_user_key", 200, "OK"),
Arguments.of(HttpMethod.POST, "/tasks/task1", "vstore_user_key", 200, "/tasks/task1")
);
}
}
25 changes: 25 additions & 0 deletions server/src/test/resources/aidial.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,31 @@
"body": "OK"
}
},
"tasks": {
"rewritePath": true,
"paths": [
"/tasks(/[^/]+)*$"
],
"methods": [
"DELETE",
"POST",
"GET"
],
"upstreams": [
{
"endpoint": "http://localhost:9876",
"key": "123456789",
"weight": 1,
"tier": 0
}
],
"maxRetryAttempts": 1,
"permissions": [],
"attachmentPaths": {
"requestBody": [],
"responseBody": []
}
},
"forbidden" : {
"paths": ["/v1/forbidden"],
"methods": ["GET"],
Expand Down
Loading