mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2024-11-21 01:21:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: catch errors in image proxy

Browse Source
This commit is contained in:
MiniDigger | Martin 2023-04-15 12:59:29 +02:00
parent 002522d5d6
commit 4d6986ca7c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/main/java/io/papermc/hangar/components/images/controller/ImageProxyController.java
View File

@ -11,6 +11,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
@RestController
@ -24,12 +25,16 @@ public class ImageProxyController {
}
@GetMapping("/**")
public ResponseEntity<byte[]> proxy(final HttpServletRequest request) {
public ResponseEntity<?> proxy(final HttpServletRequest request) {
final String url = this.cleanUrl(request.getRequestURI());
if (this.validTarget(url)) {
final ResponseEntity<byte[]> response = this.restTemplate.getForEntity(url, byte[].class);
if (this.validContentType(response)) {
return response;
try {
final ResponseEntity<byte[]> response = this.restTemplate.getForEntity(url, byte[].class);
if (this.validContentType(response)) {
return response;
}
} catch (final RestClientException ex) {
return ResponseEntity.internalServerError().body("Encountered " + ex.getClass().getSimpleName() + " while trying to load " + url);
}
}
return ResponseEntity.badRequest().build();