handling issues when authenticator not set

h2/src/main/org/h2/api/ErrorCode.java

@@ -1990,7 +1990,20 @@ public class ErrorCode {
      */
     public static final int ROW_NOT_FOUND_IN_PRIMARY_INDEX = 90143;
 
-    // next are 90122, 90144
+    /**
+     * The error with code <code>90144</code> is thrown when
+     * user trying to login into a database with AUTHREALM set and
+     * the target database doesn't have an authenticator defined
+     * <p>Authenticator experimental feature can be enabled by 
+     * </p> 
+     * <pre>
+     * SET AUTHENTICATOR TRUE
+     * </pre>
+     */
+    public static final int AUTHENTICATOR_NOT_AVAILABLE = 90144;
+    
+    
+    // next are 90122, 90145
 
     private ErrorCode() {
         // utility class

h2/src/main/org/h2/engine/Engine.java

@@ -93,7 +93,6 @@ public class Engine implements SessionFactory {
         }
         if (user == null) {
             if (database.validateFilePasswordHash(cipher, ci.getFilePasswordHash())) {
-                
                 if (ci.getProperty("AUTHREALM")== null) {
                     user = database.findUser(ci.getUserName());
                     if (user != null) {
@@ -102,21 +101,18 @@ public class Engine implements SessionFactory {
                         }
                     }
                 } else {
-                    try {
-                        Authenticator authenticator = database.getAuthenticator();
-                        if (authenticator==null) {
-                            DbException er = DbException.get(ErrorCode.WRONG_USER_OR_PASSWORD);
-                            database.getTrace(Trace.DATABASE).error(er,"no authenticator for database users");
-                        }else {
+                    Authenticator authenticator = database.getAuthenticator();
+                    if (authenticator==null) {
+                        throw DbException.get(ErrorCode.AUTHENTICATOR_NOT_AVAILABLE, name);
+                    } else {
+                        try {
                             AuthenticationInfo authenticationInfo=new AuthenticationInfo(ci);
                             user = database.getAuthenticator().authenticate(authenticationInfo, database);
+                        } catch (AuthenticationException authenticationError) {
+                            database.getTrace(Trace.DATABASE).error(authenticationError,
+                                "an error occurred during authentication; user: \"" +
+                                ci.getUserName() + "\"");
                         }
-                    } catch (AuthenticationException authenticationError) {
-                        database.getTrace(Trace.DATABASE).error(authenticationError,
-                            "an error occurred during authentication; user: \"" +
-                            ci.getUserName() + "\"");
-                    }finally {
-                        ci.cleanAuthenticationInfo();
                     }
                 }
             }
@@ -133,6 +129,8 @@ public class Engine implements SessionFactory {
             database.removeSession(null);
             throw er;
         }
+        //Prevent to set _PASSWORD
+        ci.cleanAuthenticationInfo();
         checkClustering(ci, database);
         Session session = database.createSession(user);
         if (session == null) {

h2/src/main/org/h2/res/_messages_en.prop

@@ -174,6 +174,7 @@
 90141=Serializer cannot be changed because there is a data table: {0}
 90142=Step size must not be zero
 90143=Row {1} not found in primary index {0}
+90144=Athenticator not enabled on database {0}
 HY000=General error: {0}
 HY004=Unknown data type: {0}
 HYC00=Feature not supported: {0}