eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-16 10:48:47 +00:00
Code Activity

Merge branch 'main' into bug6178

Browse Source
This commit is contained in:
Axel Uhl
2025-11-04 23:47:40 +01:00
parent 80a48393b7 265fbb0f6e
commit c2566206a5
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.aiagent/src/com/sap/sailing/aiagent/impl/AIAgentImpl.java
+4
View File
@@ -138,6 +138,10 @@ public class AIAgentImpl implements AIAgent {
chatSession = createChatSession();
} catch (UnsupportedOperationException | URISyntaxException | IOException | ParseException e) {
throw new RuntimeException(e);
} catch (SecurityException e) {
aiCore.setCredentials(null);
logger.warning("Invalid credentials; clearing (setting to null).");
throw e;
}
} else {
chatSession = null;
java/com.sap.sse.aicore.test/src/com/sap/sse/aicore/impl/ReadCredentialsTest.java
+2 -2
View File
@@ -22,8 +22,8 @@ public class ReadCredentialsTest {
try {
((CredentialsImpl) c).fetchToken();
fail("Expected an unauthorized (401) error code");
} catch (IOException e) {
assertTrue(e.getMessage().contains("401")); // expected
} catch (SecurityException e) {
assertTrue(e.getMessage().contains("Authentication failed: Unauthorized")); // expected
}
}
}
java/com.sap.sse.aicore/src/com/sap/sse/aicore/impl/AICoreImpl.java
+9 -2
View File
@@ -4,6 +4,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URISyntaxException;
import java.net.URL;
import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -123,8 +124,14 @@ public class AICoreImpl implements AICore {
public JSONObject getJSONResponse(HttpUriRequest request) throws UnsupportedOperationException, ClientProtocolException, URISyntaxException, IOException, ParseException {
final CloseableHttpClient client = getHttpClient();
final HttpResponse response = client.execute(request);
if (response.getStatusLine().getStatusCode() >= 400) {
throw new IOException("Error fetching "+request.getRequestLine()+": ("+response.getStatusLine().getStatusCode()+") "+response.getStatusLine().getReasonPhrase());
final int statusCode = response.getStatusLine().getStatusCode();
if (statusCode == 401) {
throw new SecurityException("Authentication failed: "+response.getStatusLine().getReasonPhrase());
} else if (statusCode == 403) {
throw new AccessControlException("Authorization failed: " + response.getStatusLine().getReasonPhrase());
}
if (statusCode >= 400) {
throw new IOException("Error fetching "+request.getRequestLine()+": ("+statusCode+") "+response.getStatusLine().getReasonPhrase());
}
final JSONObject configurationsJson = (JSONObject) new JSONParser().parse(new InputStreamReader(response.getEntity().getContent()));
return configurationsJson;
java/com.sap.sse.aicore/src/com/sap/sse/aicore/impl/CredentialsImpl.java
+9 -2
View File
@@ -6,6 +6,7 @@ import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.List;
@@ -119,8 +120,14 @@ public class CredentialsImpl implements Credentials {
.build();
final JSONParser jsonParser = new JSONParser();
final HttpResponse response = client.execute(postRequest);
if (response.getStatusLine().getStatusCode() >= 400) {
throw new IOException("Error obtaining client token: "+response.getStatusLine().getReasonPhrase()+" ("+response.getStatusLine().getStatusCode()+")");
final int statusCode = response.getStatusLine().getStatusCode();
if (statusCode == 401) {
throw new SecurityException("Authentication failed: "+response.getStatusLine().getReasonPhrase());
} else if (statusCode == 403) {
throw new AccessControlException("Authorization failed: " + response.getStatusLine().getReasonPhrase());
}
if (statusCode >= 400) {
throw new IOException("Error obtaining client token: "+response.getStatusLine().getReasonPhrase()+" ("+statusCode+")");
}
final JSONObject tokenJson = (JSONObject) jsonParser.parse(new InputStreamReader(response.getEntity().getContent()));
return (String) tokenJson.get(ACCESS_TOKEN);