Skip to content

Commit

Permalink
fix(oxtrust-server): handle for invalid sector uri #2354
Browse files Browse the repository at this point in the history
  • Loading branch information
shekhar16 committed Jul 25, 2023
1 parent c46c624 commit 489abfa
Showing 1 changed file with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import java.io.IOException;
import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -2042,13 +2044,14 @@ public List<SelectableEntity<CustomScript>> getAvailableSpontaneousScripts() {
}

private boolean loadSector(String sectorIdentifierUri) throws ClientProtocolException, IOException {
try {
String sectoruriContent = downloadSectorIdentifierUri(sectorIdentifierUri);

if (sectoruriContent == null) {
return false;
}

try {

JSONArray uris = new JSONArray(sectoruriContent);
this.loginUris.clear();
for (int i = 0; i < uris.length(); i++) {
Expand All @@ -2058,7 +2061,7 @@ private boolean loadSector(String sectorIdentifierUri) throws ClientProtocolExce
}
return true;
} catch (Exception e) {
log.error("", e.getMessage());
log.error("exception in parsing the uri", e.getMessage());
return false;
}
}
Expand All @@ -2082,8 +2085,10 @@ private String getResponseContent(HttpResponse httpResponse) throws IOException
return new String(responseBytes, StandardCharsets.UTF_8);
}

private String downloadSectorIdentifierUri(String sectorIdentifierUri) throws IOException, ClientProtocolException {
HttpGet httpGet = new HttpGet();
private String downloadSectorIdentifierUri(String sectorIdentifierUri) throws IOException, ClientProtocolException, URISyntaxException {

HttpGet httpGet = new HttpGet();
httpGet.setURI(new URI(sectorIdentifierUri));
httpGet.setHeader("Accept", "application/json");

String fileContent = null;
Expand Down

0 comments on commit 489abfa

Please sign in to comment.