CB-4617 NPE fix (#2349)

Co-authored-by: Evgenia Bezborodova <[email protected]>
dbeaver · Feb 5, 2024 · f8e74f9 · f8e74f9
1 parent b7ab8b1
commit f8e74f9
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/...er.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java b/...er.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
@@ -1410,10 +1410,12 @@ private String createNewAuthAttempt(
         String authAttemptId = UUID.randomUUID().toString();
         try (Connection dbCon = database.openConnection()) {
             try (JDBCTransaction txn = new JDBCTransaction(dbCon)) {
-                if (smConfig.isCheckBruteforce()
-                    && this.getAuthProvider(authProviderId).getInstance() instanceof SMBruteForceProtected bruteforceProtected) {
-                    BruteForceUtils.checkBruteforce(smConfig,
-                        getLatestUserLogins(dbCon, authProviderId, bruteforceProtected.getInputUsername(authData).toString()));
+                if (smConfig.isCheckBruteforce() && this.getAuthProvider(authProviderId).getInstance() instanceof SMBruteForceProtected bruteforceProtected) {
+                    Object inputUsername = bruteforceProtected.getInputUsername(authData);
+                    if (inputUsername != null) {
+                        BruteForceUtils.checkBruteforce(smConfig,
+                            getLatestUserLogins(dbCon, authProviderId, inputUsername.toString()));
+                    }
                 }
                 try (PreparedStatement dbStat = dbCon.prepareStatement(
                     database.normalizeTableNames(
@@ -1435,7 +1437,12 @@ private String createNewAuthAttempt(
                     }
                     dbStat.setString(7, isMainSession ? CHAR_BOOL_TRUE : CHAR_BOOL_FALSE);
                     if (this.getAuthProvider(authProviderId).getInstance() instanceof SMBruteForceProtected bruteforceProtected) {
-                        dbStat.setString(8, bruteforceProtected.getInputUsername(authData).toString());
+                        Object inputUsername = bruteforceProtected.getInputUsername(authData);
+                        if (inputUsername != null) {
+                            dbStat.setString(8, inputUsername.toString());
+                        } else {
+                            dbStat.setString(8, null);
+                        }
                     } else {
                         dbStat.setString(8, null);
                     }