Fixed bad token generation when username is empty. (arangodb#6971)

Lars Maier · jsteemann · commit da996017bf43 · 2018-10-19T17:45:56.000+02:00
diff --git a/arangod/GeneralServer/RestHandler.cpp b/arangod/GeneralServer/RestHandler.cpp
@@ -160,14 +160,21 @@ bool RestHandler::forwardRequest() {
   }
   auto auth = AuthenticationFeature::instance();
   if (auth != nullptr && auth->isActive()) {
-    VPackBuilder builder;
-    {
-      VPackObjectBuilder payload{&builder};
-      payload->add("preferred_username", VPackValue(_request->user()));
+
+    // when in superuser mode, username is empty
+    //  in this case ClusterComm will add the default superuser token
+    std::string const& username = _request->user();
+    if (!username.empty()) {
+
+      VPackBuilder builder;
+      {
+        VPackObjectBuilder payload{&builder};
+        payload->add("preferred_username", VPackValue(username));
+      }
+      VPackSlice slice = builder.slice();
+      headers.emplace(StaticStrings::Authorization,
+                      "bearer " + auth->tokenCache()->generateJwt(slice));
     }
-    VPackSlice slice = builder.slice();
-    headers.emplace(StaticStrings::Authorization,
-                    "bearer " + auth->tokenCache()->generateJwt(slice));
   }
 
   auto& values = _request->values();
