From 66dcc667ba71e3703492936dff49117f73f28fe7 Mon Sep 17 00:00:00 2001 From: Andrea Di Cesare Date: Tue, 15 May 2018 17:24:02 +0200 Subject: [PATCH] fixed NPE on RequestPropsInjecterTransformer for property userName on not authenticated requests --- .../RequestPropsInjecterTransformer.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/restheart/metadata/transformers/RequestPropsInjecterTransformer.java b/src/main/java/org/restheart/metadata/transformers/RequestPropsInjecterTransformer.java index 69855b95fa..c025e41da4 100644 --- a/src/main/java/org/restheart/metadata/transformers/RequestPropsInjecterTransformer.java +++ b/src/main/java/org/restheart/metadata/transformers/RequestPropsInjecterTransformer.java @@ -168,11 +168,17 @@ HashMap getPropsValues( final RequestContext context) { HashMap properties = new HashMap<>(); + + String _userName = ExchangeAttributes + .remoteUser() + .readAttribute(exchange); + + BsonValue userName = _userName != null + ? new BsonString(_userName) + : BsonNull.VALUE; + // remote user - properties.put("userName", new BsonString( - ExchangeAttributes - .remoteUser() - .readAttribute(exchange))); + properties.put("userName", userName); // user roles if (Objects.nonNull(exchange.getSecurityContext())