fixed NPE on RequestPropsInjecterTransformer for property userName on…

… not authenticated requests
SoftInstigate · May 15, 2018 · 1422bc3 · 1422bc3
1 parent 5bb0ef2
commit 1422bc3
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/main/java/org/restheart/metadata/transformers/RequestPropsInjecterTransformer.java b/src/main/java/org/restheart/metadata/transformers/RequestPropsInjecterTransformer.java
@@ -174,11 +174,17 @@ HashMap<String, BsonValue> getPropsValues(
             final RequestContext context) {
         HashMap<String, BsonValue> properties = new HashMap<>();
 
-        // remote user
-        properties.put("userName", new BsonString(
-                ExchangeAttributes
+
+        String _userName = ExchangeAttributes
                         .remoteUser()
-                        .readAttribute(exchange)));
+                        .readAttribute(exchange);
+
+        BsonValue userName = _userName != null 
+                ? new BsonString(_userName)
+                : BsonNull.VALUE;
+
+        // remote user
+        properties.put("userName", userName);
 
         // user roles
         if (Objects.nonNull(exchange.getSecurityContext())