Skip to content

throw original exception to keep compatibility with common RestTemplate #18272

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

Open
morokosi wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −2
Open

throw original exception to keep compatibility with common RestTemplate #18272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ...ient/src/main/java/org/springframework/security/kerberos/client/KerberosRestTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ public T run() {
});

}
catch (RestClientException ex) {
throw ex;
}
catch (Exception ex) {
throw new RestClientException("Error running rest call", ex);
}
Expand Down
17 changes: 15 additions & 2 deletions ...src/test/java/org/springframework/security/kerberos/client/KerberosRestTemplateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
Expand All @@ -33,8 +35,10 @@
import org.springframework.http.MediaType;
import org.springframework.security.kerberos.test.KerberosSecurityTestcase;
import org.springframework.security.kerberos.test.MiniKdc;
import org.springframework.web.client.HttpClientErrorException;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

class KerberosRestTemplateTests extends KerberosSecurityTestcase {

Expand Down Expand Up @@ -72,6 +76,8 @@ void setUp() throws Exception {
String serverPrincipal = "HTTP/localhost";
File serverKeytab = new File(workDir, "server.keytab");
kdc.createPrincipal(serverKeytab, serverPrincipal);

setUpClient();
}

@AfterEach
Expand All @@ -81,13 +87,20 @@ void tearDown() throws Exception {

@Test
void sendsNegotiateHeader() {
setUpClient();
String s = this.restTemplate.getForObject(this.baseUrl + "/get", String.class);
assertThat(s).isEqualTo(helloWorld);
}

@Test
void throwsOriginalException() {
assertThatThrownBy(() -> restTemplate.getForObject(this.baseUrl + "/notfound", String.class))
.isInstanceOf(HttpClientErrorException.NotFound.class);
}

private void setUpClient() {
this.restTemplate = new KerberosRestTemplate(this.clientKeytab.getAbsolutePath(), this.clientPrincipal);
Map<String, Object> loginOptions = new HashMap<>();
loginOptions.put("refreshKrb5Config", "true");
this.restTemplate = new KerberosRestTemplate(this.clientKeytab.getAbsolutePath(), this.clientPrincipal, loginOptions);
}

private MockResponse getRequest(RecordedRequest request, byte[] body, String contentType) {
Expand Down