Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package org.maurodata.controller

import groovy.transform.CompileStatic
import io.micronaut.core.async.publisher.Publishers
import io.micronaut.core.order.Ordered
import io.micronaut.http.HttpRequest
import io.micronaut.http.HttpStatus
import io.micronaut.http.MutableHttpResponse
import io.micronaut.http.annotation.Filter
import io.micronaut.http.filter.HttpServerFilter
import io.micronaut.http.filter.ServerFilterChain
import io.micronaut.http.hateoas.JsonError
import io.micronaut.http.hateoas.Resource
import org.reactivestreams.Publisher

@CompileStatic
@Filter("/**")
class ErrorSanitisingFilter implements HttpServerFilter {

@Override
int getOrder() {
return Ordered.LOWEST_PRECEDENCE
}

@Override
Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request,
ServerFilterChain chain) {

return Publishers.map(chain.proceed(request)) {response ->

if (response.status == HttpStatus.INTERNAL_SERVER_ERROR) {
response.body.ifPresent {body ->

if (body instanceof JsonError) {
sanitiseJsonError(body as JsonError, "Internal Server Error")
}
}
}

return response
} as Publisher<MutableHttpResponse<?>>
}

private static void sanitiseJsonError(JsonError error, String message) {
if (error.getMessage() && HttpStatusExceptionHandler.toTrap(error.getMessage())) {
error.setMessage(message)
}

error.getEmbedded().values().forEach {List<Resource> resources ->
resources.each {resource ->
if (resource instanceof JsonError) {
sanitiseJsonError(resource as JsonError, 'No details')
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,20 @@ import io.micronaut.http.HttpResponse
import jakarta.inject.Singleton
import io.micronaut.http.HttpStatus
import io.micronaut.http.exceptions.HttpStatusException
import java.util.regex.Pattern

@CompileStatic
@Replaces(HttpStatusHandler.class)
@Singleton
class HttpStatusExceptionHandler implements ExceptionHandler<HttpStatusException, HttpResponse<Map<String, Object>>> {

static String[] trap = ['select', 'insert', 'update', 'delete', 'sql', 'query', 'jdbc', 'table']
static Pattern trapPattern = ~/(?i)\b(${trap.join('|')})\b/

static boolean toTrap(final String message) {
message && (message =~ trapPattern)
}

@Override
HttpResponse<Map<String, Object>> handle(HttpRequest request, HttpStatusException exception) {
HttpStatus status = exception.getStatus()
Expand All @@ -31,6 +39,11 @@ class HttpStatusExceptionHandler implements ExceptionHandler<HttpStatusException
exception.printStackTrace()
}

if (toTrap(message)) {
System.err.println(message)
message = 'No details'
}

Map<String, String> errorMessage = Collections.singletonMap("message", message)

Map<String, Object> embedded = new HashMap<>()
Expand Down
Loading