File tree Expand file tree Collapse file tree
oidc/src/main/java/oidc/web Expand file tree Collapse file tree Original file line number Diff line number Diff line change 4141
4242import static oidc .saml .AuthnRequestContextConsumer .REDIRECT_URI_VALID ;
4343import static org .springframework .http .HttpStatus .BAD_REQUEST ;
44+ import static org .springframework .http .HttpStatus .NOT_FOUND ;
4445
4546@ RestController
4647public class CustomErrorController implements org .springframework .boot .web .servlet .error .ErrorController {
@@ -77,6 +78,13 @@ public Object error(HttpServletRequest request) {
7778 if (error != null && error .getCause () != null ) {
7879 error = error .getCause ();
7980 }
81+ // Short-circuit for non-existent resource requests (e.g. security scans)
82+ if (error instanceof NoResourceFoundException ) {
83+ LOG .debug ("No resource found: " + error .getMessage ());
84+ boolean hasStatus = result .containsKey ("status" ) && !result .get ("status" ).equals (999 );
85+ HttpStatus code = hasStatus ? HttpStatus .resolve ((Integer ) result .get ("status" )) : NOT_FOUND ;
86+ return ResponseEntity .status (code != null ? code : NOT_FOUND ).build ();
87+ }
8088 boolean status = result .containsKey ("status" ) && !result .get ("status" ).equals (999 ) && !result .get ("status" ).equals (500 );
8189 HttpStatus statusCode = status ? HttpStatus .resolve ((Integer ) result .get ("status" )) : BAD_REQUEST ;
8290 if (error != null ) {
You can’t perform that action at this time.
0 commit comments