Fixed usage of empty database in HTTP layer

Fixed issue #581
ArcadeData · Oct 27, 2022 · 1574f38 · 1574f38
1 parent b5b06b9
commit 1574f38
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/server/src/main/java/com/arcadedb/server/ArcadeDBServer.java b/server/src/main/java/com/arcadedb/server/ArcadeDBServer.java
@@ -347,6 +347,9 @@ public String toString() {
   }
 
   public synchronized Database getDatabase(final String databaseName, final boolean createIfNotExists, final boolean allowLoad) {
+    if (databaseName == null || databaseName.trim().isEmpty())
+      throw new IllegalArgumentException("Invalid database name " + databaseName);
+
     DatabaseInternal db = databases.get(databaseName);
 
     if (db == null || !db.isOpen()) {

diff --git a/server/src/main/java/com/arcadedb/server/http/handler/PostCreateDatabaseHandler.java b/server/src/main/java/com/arcadedb/server/http/handler/PostCreateDatabaseHandler.java
@@ -38,16 +38,20 @@ protected boolean requiresDatabase() {
 
   @Override
   public void execute(final HttpServerExchange exchange, ServerSecurityUser user, final Database database) {
-    final Deque<String> databaseName = exchange.getQueryParameters().get("database");
-    if (databaseName.isEmpty()) {
+    final Deque<String> databaseNamePar = exchange.getQueryParameters().get("database");
+    String databaseName = databaseNamePar.isEmpty() ? null : databaseNamePar.getFirst().trim();
+    if (databaseName.isEmpty())
+      databaseName = null;
+
+    if (databaseName == null) {
       exchange.setStatusCode(400);
       exchange.getResponseSender().send("{ \"error\" : \"Database parameter is null\"}");
       return;
     }
 
     httpServer.getServer().getServerMetrics().meter("http.create-database").mark();
 
-    httpServer.getServer().createDatabase(databaseName.getFirst(), PaginatedFile.MODE.READ_WRITE);
+    httpServer.getServer().createDatabase(databaseName, PaginatedFile.MODE.READ_WRITE);
 
     exchange.setStatusCode(200);
     exchange.getResponseSender().send("{ \"result\" : \"ok\"}");

diff --git a/server/src/test/java/com/arcadedb/server/HTTPGraphIT.java b/server/src/test/java/com/arcadedb/server/HTTPGraphIT.java
@@ -582,4 +582,26 @@ public void closeAndReopenDatabase() throws Exception {
       }
     });
   }
+
+  @Test
+  public void testEmptyDatabaseName() throws Exception {
+    testEachServer((serverIndex) -> {
+      // CREATE THE DATABASE ''
+      HttpURLConnection connection = (HttpURLConnection) new URL("http://127.0.0.1:248" + serverIndex + "/api/v1/create/").openConnection();
+      connection.setRequestMethod("POST");
+      connection.setRequestProperty("Authorization",
+          "Basic " + Base64.getEncoder().encodeToString(("root:" + BaseGraphServerTest.DEFAULT_PASSWORD_FOR_TESTS).getBytes()));
+      connection.connect();
+
+      try {
+        readResponse(connection);
+        Assertions.fail("Empty database should be an error");
+      } catch (Exception e) {
+        Assertions.assertEquals(400, connection.getResponseCode());
+
+      } finally {
+        connection.disconnect();
+      }
+    });
+  }
 }