Merge pull request #580 from aguibert/db2-invalid-db2-name

Add handling for ACCSEC error path

Author: aguibert

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/InitialHandshakeCommandCodec.java

@@ -23,6 +23,8 @@
 import io.vertx.db2client.impl.drda.DRDAConnectResponse;
 import io.vertx.db2client.impl.drda.DRDAConnectResponse.RDBAccessData;
 import io.vertx.db2client.impl.drda.DRDAConstants;
+import io.vertx.db2client.impl.drda.SQLState;
+import io.vertx.db2client.impl.drda.SqlCode;
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.command.CommandResponse;
 
@@ -54,7 +56,8 @@ void encode(DB2Encoder encoder) {
             //Sometimes DB2 closes the connection when sending an invalid Database name.
             //-4499 = A fatal error occurred that resulted in a disconnect from the data source.
             //08001 = "The connection was unable to be established"
-            cmd.fail(new DB2Exception("Socket closed during connection", -4499,"08001"));           
+            cmd.fail(new DB2Exception("The connection was closed by the database server.", 
+            		SqlCode.CONNECTION_REFUSED, SQLState.AUTH_DATABASE_CONNECTION_REFUSED));           
           }
         });
         sendInitialHandshake();

vertx-db2-client/src/main/java/io/vertx/db2client/impl/drda/DRDAConnectResponse.java

@@ -21,6 +21,7 @@
 import java.util.List;
 
 import io.netty.buffer.ByteBuf;
+import io.vertx.db2client.DB2Exception;
 
 public class DRDAConnectResponse extends DRDAResponse {
 
@@ -1141,8 +1142,7 @@ private void parseSECCHKRM() {
     private void parseACCSECreply(int securityMechanism) {
         int peekCP = peekCodePoint();
         if (peekCP != CodePoint.ACCSECRD) {
-            throw new IllegalStateException(String.format("Expecting ACCSECRD codepoint (0x14AC) but got %04x", peekCP));
-            //parseAccessSecurityError(netConnection);
+            parseAccessSecurityError();
         }
         parseACCSECRD(securityMechanism);
 
@@ -1154,6 +1154,191 @@ private void parseACCSECreply(int securityMechanism) {
 //        }
     }
 
+    private void parseAccessSecurityError() {
+        int peekCP = peekCodePoint();
+        switch (peekCP) {
+        case CodePoint.CMDCHKRM:
+            parseCMDCHKRM();
+            break;
+        case CodePoint.RDBNFNRM:
+            parseRDBNFNRM();
+            break;
+        case CodePoint.RDBAFLRM:
+            parseRdbAccessFailed();
+            break;
+        default:
+            parseCommonError(peekCP);
+        }
+    }
+    
+    // RDB Not Found Reply Message indicates that the target
+    // server cannot find the specified relational database.
+    // PROTOCOL architects an SQLSTATE of 08004.
+    //
+    // Messages
+    // SQLSTATE : 8004
+    //     The application server rejected establishment of the connection.
+    //     SQLCODE : -30061
+    //     The database alias or database name <name> was not found at the remote node.
+    //     The statement cannot be processed.
+    //
+    //
+    // Returned from Server:
+    // SVRCOD - required  (8 - ERROR)
+    // RDBNAM - required
+    private void parseRDBNFNRM() {
+        boolean svrcodReceived = false;
+        int svrcod = CodePoint.SVRCOD_INFO;
+        boolean rdbnamReceived = false;
+        String rdbnam = null;
+
+        parseLengthAndMatchCodePoint(CodePoint.RDBNFNRM);
+        pushLengthOnCollectionStack();
+        int peekCP = peekCodePoint();
+
+        while (peekCP != END_OF_COLLECTION) {
+
+            boolean foundInPass = false;
+
+            if (peekCP == CodePoint.SVRCOD) {
+                foundInPass = true;
+                svrcodReceived = checkAndGetReceivedFlag(svrcodReceived);
+                svrcod = parseSVRCOD(CodePoint.SVRCOD_ERROR, CodePoint.SVRCOD_ERROR);
+                peekCP = peekCodePoint();
+            }
+
+            if (peekCP == CodePoint.RDBNAM) {
+                foundInPass = true;
+                rdbnamReceived = checkAndGetReceivedFlag(rdbnamReceived);
+                rdbnam = parseRDBNAM(true);
+                peekCP = peekCodePoint();
+            }
+            
+            if (peekCP == CodePoint.SRVDGN) {
+            	foundInPass = true;
+            	String serverDiagnostics = parseSRVDGN();
+            	// TODO: @AGG Log the server diagnostics here
+            	peekCP = peekCodePoint();
+            }
+
+            if (!foundInPass) {
+            	throwUnknownCodepoint(peekCP);
+            }
+
+        }
+        popCollectionStack();
+        if (!svrcodReceived)
+        	throwMissingRequiredCodepoint("SVRCOD", CodePoint.SVRCOD);
+        if (!rdbnamReceived)
+        	throwMissingRequiredCodepoint("RDBNAM", CodePoint.RDBNAM);
+
+//        netAgent_.setSvrcod(svrcod);
+        throw new DB2Exception("The requested database was not found: " + metadata.databaseName,
+        		SqlCode.RDB_NOT_FOUND, SQLState.NET_DATABASE_NOT_FOUND);
+//        agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//            new ClientMessageId(SQLState.NET_DATABASE_NOT_FOUND),
+//            netConnection.databaseName_));
+    }
+    
+    private void parseRdbAccessFailed() {
+        parseRDBAFLRM();
+
+        // an SQLCARD is returned if an RDBALFRM is returned.
+        // this SQLCARD always follows the RDBALFRM.
+        // TYPDEFNAM and TYPDEFOVR are MTLINC
+
+        if (peekCodePoint() == CodePoint.TYPDEFNAM) {
+            parseTYPDEFNAM();
+            parseTYPDEFOVR();
+        } else {
+            parseTYPDEFOVR();
+            parseTYPDEFNAM();
+        }
+
+        NetSqlca netSqlca = parseSQLCARD(null);
+        
+        //Check if the SQLCARD has null SQLException
+        if(netSqlca.getSqlErrmc() == null) {
+        	// netConnection.setConnectionNull(true); 
+        } else {
+        	NetSqlca.complete(netSqlca);
+        }
+    }
+    
+    // RDB Access Failed Reply Message specifies that the relational
+    // database failed the attempted connection.
+    // An SQLCARD object must also be returned, following the
+    // RDBAFLRM, to explain why the RDB failed the connection.
+    // In addition, the target SQLAM instance is destroyed.
+    // The SQLSTATE is returned in the SQLCARD.
+    //
+    // Messages
+    // SQLSTATE : 58009
+    //     Execution failed due to a distribution protocol error that caused deallocation of the conversation.
+    //     SQLCODE : -30020
+    //     Execution failed because of a Distributed Protocol
+    //         Error that will affect the successful execution of subsequent
+    //         commands and SQL statements: Reason Code <reason-code>.
+    //      Some possible reason codes include:
+    //      121C Indicates that the user is not authorized to perform the requested command.
+    //      1232 The command could not be completed because of a permanent error.
+    //          In most cases, the server will be in the process of an abend.
+    //      220A The target server has received an invalid data description.
+    //          If a user SQLDA is specified, ensure that the fields are
+    //          initialized correctly. Also, ensure that the length does not
+    //          exceed the maximum allowed length for the data type being used.
+    //
+    //      The command or statement cannot be processed.  The current
+    //      transaction is rolled back and the application is disconnected
+    //      from the remote database.
+    //
+    //
+    // Returned from Server:
+    // SVRCOD - required  (8 - ERROR)
+    // RDBNAM - required
+    //
+    private void parseRDBAFLRM() {
+        boolean svrcodReceived = false;
+        int svrcod = CodePoint.SVRCOD_INFO;
+        boolean rdbnamReceived = false;
+        String rdbnam = null;
+
+        parseLengthAndMatchCodePoint(CodePoint.RDBAFLRM);
+        pushLengthOnCollectionStack();
+        int peekCP = peekCodePoint();
+
+        while (peekCP != END_OF_COLLECTION) {
+
+            boolean foundInPass = false;
+
+            if (peekCP == CodePoint.SVRCOD) {
+                foundInPass = true;
+                svrcodReceived = checkAndGetReceivedFlag(svrcodReceived);
+                svrcod = parseSVRCOD(CodePoint.SVRCOD_ERROR, CodePoint.SVRCOD_ERROR);
+                peekCP = peekCodePoint();
+            }
+
+            if (peekCP == CodePoint.RDBNAM) {
+                foundInPass = true;
+                rdbnamReceived = checkAndGetReceivedFlag(rdbnamReceived);
+                rdbnam = parseRDBNAM(true);
+                peekCP = peekCodePoint();
+            }
+
+            if (!foundInPass) {
+            	throwUnknownCodepoint(peekCP);
+            }
+
+        }
+        popCollectionStack();
+        if (!svrcodReceived)
+        	throwMissingRequiredCodepoint("SVRCOD", CodePoint.SVRCOD);
+        if (!rdbnamReceived)
+        	throwMissingRequiredCodepoint("RDBNAM", CodePoint.RDBNAM);
+
+//        netAgent_.setSvrcod(svrcod);
+    }
+    
     // The Access Security Reply Data (ACSECRD) Collection Object contains
     // the security information from a target server's security manager.
     // this method returns the security check code received from the server

vertx-db2-client/src/main/java/io/vertx/db2client/impl/drda/NetSqlca.java

@@ -25,6 +25,8 @@
  * If the code is == 0, nothing is wrong
  */
 public class NetSqlca {
+	
+	private static final String SQLERRMC_MESSAGE_DELIMITER = new String(new char[] {(char)20,(char)20,(char)20,(char)20});
 
     // Indexes into sqlErrd_
     private  static  final   int HIGH_ORDER_ROW_COUNT = 0;
@@ -171,46 +173,46 @@ synchronized public int getSqlCode() {
 //        return errorCode;
 //    }
 
-//    synchronized public String getSqlErrmc() {
-//        if (sqlErrmc_ != null) {
-//            return sqlErrmc_;
-//        }
-//
-//        // sqlErrmc string is dependent on sqlErrmcMessages_ array having
-//        // been built
-//        initSqlErrmcMessages();
-//
-//        // sqlErrmc will be built only if sqlErrmcMessages_ has been built.
-//        // Otherwise, a null string will be returned.
-//        if (sqlErrmcMessages_ == null) {
-//            return null;
-//        }
-//
-//        // create 0-length String if no tokens
-//        if (sqlErrmcMessages_.length == 0) {
-//            sqlErrmc_ = "";
-//            return sqlErrmc_;
-//        }
-//
-//        // concatenate tokens with sqlErrmcDelimiter delimiters into one String
-//        StringBuffer buffer = new StringBuffer();
-//        int indx;
-//        for (indx = 0; indx < sqlErrmcMessages_.length - 1; indx++) {
-//            buffer.append(sqlErrmcMessages_[indx]);
-//            buffer.append(MessageUtils.SQLERRMC_MESSAGE_DELIMITER);
-//            // all but the first message should be preceded by the SQL state
-//            // and a colon (see DRDAConnThread.buildTokenizedSqlerrmc() on the
-//            // server)
-//            buffer.append(sqlStates_[indx+1]);
-//            buffer.append(":");
-//        }
-//        // add the last token
-//        buffer.append(sqlErrmcMessages_[indx]);
-//
-//        // save as a string
-//        sqlErrmc_ = buffer.toString();
-//        return sqlErrmc_;
-//    }
+    synchronized public String getSqlErrmc() {
+        if (sqlErrmc_ != null) {
+            return sqlErrmc_;
+        }
+
+        // sqlErrmc string is dependent on sqlErrmcMessages_ array having
+        // been built
+        initSqlErrmcMessages();
+
+        // sqlErrmc will be built only if sqlErrmcMessages_ has been built.
+        // Otherwise, a null string will be returned.
+        if (sqlErrmcMessages_ == null) {
+            return null;
+        }
+
+        // create 0-length String if no tokens
+        if (sqlErrmcMessages_.length == 0) {
+            sqlErrmc_ = "";
+            return sqlErrmc_;
+        }
+
+        // concatenate tokens with sqlErrmcDelimiter delimiters into one String
+        StringBuffer buffer = new StringBuffer();
+        int indx;
+        for (indx = 0; indx < sqlErrmcMessages_.length - 1; indx++) {
+            buffer.append(sqlErrmcMessages_[indx]);
+            buffer.append(SQLERRMC_MESSAGE_DELIMITER);
+            // all but the first message should be preceded by the SQL state
+            // and a colon (see DRDAConnThread.buildTokenizedSqlerrmc() on the
+            // server)
+            buffer.append(sqlStates_[indx+1]);
+            buffer.append(":");
+        }
+        // add the last token
+        buffer.append(sqlErrmcMessages_[indx]);
+
+        // save as a string
+        sqlErrmc_ = buffer.toString();
+        return sqlErrmc_;
+    }
 
     /**
      * Initialize and build the arrays <code>sqlErrmcMessages_</code> and
@@ -539,7 +541,7 @@ public String toString() {
                 "  sqlCode=" + sqlCode_ +
                 "  sqlState=" + sqlState_ + 
                 "  sqlErrd=" + Arrays.toString(sqlErrd_) + 
-                "  sqlErrmc="  + bytes2String(sqlErrmcBytes_) + 
+                "  sqlErrmc="  + getSqlErrmc() + 
                 "  sqlErrp=" + bytes2String(sqlErrpBytes_) + 
                 "  sqlStates=" + Arrays.deepToString(sqlStates_) +
                 "  sqlWarn=" + bytes2String(sqlWarnBytes_);

vertx-db2-client/src/main/java/io/vertx/db2client/impl/drda/SqlCode.java

@@ -21,6 +21,12 @@
  * DB2 SQL Codes</a>
  */
 public class SqlCode {
+	
+	// TODO: @AGG Convert this class to an interface with constants
+	
+	public static final int CONNECTION_REFUSED = -4499;
+	public static final int RDB_NOT_FOUND = -30061;
+	
     private int code_;
 
     SqlCode(int code) {
@@ -38,7 +44,7 @@ public final int getCode() {
 
     public final static SqlCode queuedXAError = new SqlCode(-4203);
 
-    final static SqlCode disconnectError = new SqlCode(40000);
+    public final static SqlCode disconnectError = new SqlCode(40000);
 
     /** SQL code for SQL state 02000 (end of data). DRDA does not
      * specify the SQL code for this SQL state, but Derby/DB2 uses 100. */