Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into Co…

…nnectionResiliency # Conflicts: # src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
microsoft · Mar 13, 2017 · b1474ab · b1474ab
2 parents 6561dd9 + e24866c
commit b1474ab
Show file tree

Hide file tree

Showing 52 changed files with 4,936 additions and 239 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,24 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 
+## [6.1.5]
+### Added
+- Added socket timeout exception as cause[#180](https://github.com/Microsoft/mssql-jdbc/pull/180)
+- Added Constrained delegation support[#178](https://github.com/Microsoft/mssql-jdbc/pull/178)
+- Added junit test for Statement test[#174](https://github.com/Microsoft/mssql-jdbc/pull/174)
+- Added test for statement.cancel() when MultiSubnetFailover is set to true[#173](https://github.com/Microsoft/mssql-jdbc/pull/173)
+- Added tests for lobs [#168](https://github.com/Microsoft/mssql-jdbc/pull/168)
+- Added badges for License, Maven Central, JavaDocs & gitter chat room [#184](https://github.com/Microsoft/mssql-jdbc/pull/184)
+
+### Changed
+- Enabled update counts for SELECT INTO statements[#175](https://github.com/Microsoft/mssql-jdbc/pull/175)
+- Use Executor service instead of thread[#162](https://github.com/Microsoft/mssql-jdbc/pull/162)
+- Convert socket adaptor to socket[#160](https://github.com/Microsoft/mssql-jdbc/pull/160)
+
+### Fixed Issues
+- Fixed local test failures [#179](https://github.com/Microsoft/mssql-jdbc/pull/179) 
+- Fixed random failure in BulkCopyColumnMapping test[#165](https://github.com/Microsoft/mssql-jdbc/pull/165)
+
 ## [6.1.4]
 ### Added
 - Added isWrapperFor methods for MetaData classes[#94](https://github.com/Microsoft/mssql-jdbc/pull/94)
@@ -19,7 +37,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 
 ### Fixed Issues
 - Fixed getBinaryStream issue [#133](https://github.com/Microsoft/mssql-jdbc/pull/133) 
- - Fixed an issue of Bulk Copy when AlwaysEncrypted is enabled on connection and destination table is not encrypted [#151](https://github.com/Microsoft/mssql-jdbc/pull/151)
+- Fixed an issue of Bulk Copy when AlwaysEncrypted is enabled on connection and destination table is not encrypted [#151](https://github.com/Microsoft/mssql-jdbc/pull/151)
 
 
 ## [6.1.3]

diff --git a/README.md b/README.md
@@ -1,3 +1,8 @@
+[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/Microsoft/mssql-jdbc/master/LICENSE)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.microsoft.sqlserver/mssql-jdbc/badge.svg)](http://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc)
+[![Javadocs](http://javadoc.io/badge/com.microsoft.sqlserver/mssql-jdbc.svg)](http://javadoc.io/doc/com.microsoft.sqlserver/mssql-jdbc)
+[![Gitter](https://img.shields.io/gitter/room/badges/shields.svg)](https://gitter.im/Microsoft/mssql-developers)
+</br>
 # Microsoft JDBC Driver for SQL Server
 
 Welcome to the Microsoft JDBC Driver for SQL Server project!
@@ -30,20 +35,13 @@ What's coming next?  We will look into adding a more comprehensive set of tests,
 ## Build
 ### Prerequisites
 * Java 8
-* [Ant](http://ant.apache.org/manual/install.html) (with [Ivy](https://ant.apache.org/ivy/download.cgi)), [Maven](http://maven.apache.org/download.cgi) or [Gradle](https://gradle.org/gradle-download/)
+* [Maven](http://maven.apache.org/download.cgi) or [Gradle](https://gradle.org/gradle-download/)
 * An instance of SQL Server or Azure SQL Database that you can connect to. 
 
 ### Build the JAR files
 Maven and Gradle builds automatically trigger a set of verification tests to run.  For these tests to pass, you will first need to add an environment variable in your system called `mssql_jdbc_test_connection_properties` to provide the [correct connection properties](https://msdn.microsoft.com/en-us/library/ms378428(v=sql.110).aspx) for your SQL Server or Azure SQL Database instance.
 
-To build the jar files, you must use Java 8 with either Ant (with Ivy), Maven or Gradle.  You can choose to build a JDBC 4.1 compliant jar file (for use with JRE 7) and/or a JDBC 4.2 compliant jar file (for use with JRE 8).
-
-* Ant:
-	1. If you have not already done so, add the environment variable `mssql_jdbc_test_connection_properties` in your system with the connection properties for your SQL Server or SQL DB instance.
-	2. Run one of the commands below to build a JDBC 4.1 compliant jar, JDBC 4.2 compliant jar, or both in the \build directory. 
-		* Run `ant`. This creates both JDBC 4.1 compliant jar and JDBC 4.2 compliant jar in \build directory
-    	* Run `ant build41`. This creates JDBC 4.1 compliant jar in \build directory
-    	* Run `ant build42`. This creates JDBC 4.2 compliant jar in \build directory
+To build the jar files, you must use Java 8 with either Maven or Gradle.  You can choose to build a JDBC 4.1 compliant jar file (for use with JRE 7) and/or a JDBC 4.2 compliant jar file (for use with JRE 8).
 
 * Maven:
 	1. If you have not already done so, add the environment variable `mssql_jdbc_test_connection_properties` in your system with the connection properties for your SQL Server or SQL DB instance.
@@ -148,3 +146,4 @@ The Microsoft JDBC Driver for SQL Server is licensed under the MIT license. See
 
 ## Code of conduct
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 archivesBaseName = 'mssql-jdbc'
-version = '6.1.4'
+version = '6.1.5'
 
 allprojects {
     tasks.withType(JavaCompile) {

diff --git a/build.xml b/build.xml
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.1.4</version>
+	<version>6.1.5</version>
 
 	<packaging>jar</packaging>
 
@@ -114,15 +114,27 @@
 			<artifactId>junit-jupiter-engine</artifactId>
 			<version>5.0.0-M3</version>
 			<scope>test</scope>
-		</dependency>	
+		</dependency>
+		<dependency>
+			<groupId>com.zaxxer</groupId>
+			<artifactId>HikariCP</artifactId>
+			<version>2.6.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-dbcp2 </artifactId>
+			<version>2.1.1</version>
+			<scope>test</scope>
+		</dependency>
   	<!-- 
 	<dependency>
   		<groupId>org.junit.vintage</groupId>
 		<artifactId>junit-vintage-engine</artifactId>	
   		<version>4.12.0-M3</version>
   		<scope>test</scope>
   	</dependency>	
-  	 -->	
+  	 -->
 	</dependencies>
 
 	<profiles>

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
@@ -57,7 +57,11 @@
 import java.util.Set;
 import java.util.SimpleTimeZone;
 import java.util.TimeZone;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -2092,7 +2096,7 @@ final int read(byte[] data,
                 logger.fine(toString() + " read failed:" + e.getMessage());
 
             if (e instanceof SocketTimeoutException) {
-                con.terminate(SQLServerException.ERROR_SOCKET_TIMEOUT, e.getMessage());
+                con.terminate(SQLServerException.ERROR_SOCKET_TIMEOUT, e.getMessage(), e);
             }
             else {
                 con.terminate(SQLServerException.DRIVER_ERROR_IO_FAILED, e.getMessage());
@@ -7047,9 +7051,23 @@ final void TryProcessFeatureExtAck(boolean featureExtAckReceived) throws SQLServ
  * a reason like "timed out".
  */
 final class TimeoutTimer implements Runnable {
+    private static final String threadGroupName = "mssql-jdbc-TimeoutTimer";
     private final int timeoutSeconds;
     private final TDSCommand command;
-    private Thread timerThread;
+    private volatile Future<?> task;
+
+    private static final ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactory() {
+        private final ThreadGroup tg = new ThreadGroup(threadGroupName);
+        private final String threadNamePrefix = tg.getName() + "-";
+        private final AtomicInteger threadNumber = new AtomicInteger(0);
+        @Override
+        public Thread newThread(Runnable r) {
+            Thread t = new Thread(tg, r, threadNamePrefix + threadNumber.incrementAndGet());
+            t.setDaemon(true);
+            return t;
+        }
+    });
+
     private volatile boolean canceled = false;
 
     TimeoutTimer(int timeoutSeconds,
@@ -7062,17 +7080,15 @@ final class TimeoutTimer implements Runnable {
     }
 
     final void start() {
-        timerThread = new Thread(this);
-        timerThread.setDaemon(true);
-        timerThread.start();
+        task = executor.submit(this);
     }
 
     final void stop() {
+        task.cancel(true);
         canceled = true;
-        timerThread.interrupt();
     }
 
-    public void run() {
+    public void run() { 
         int secondsRemaining = timeoutSeconds;
         try {
             // Poll every second while time is left on the timer.

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/KerbAuthentication.java b/src/main/java/com/microsoft/sqlserver/jdbc/KerbAuthentication.java
@@ -141,37 +141,47 @@ private void intAuthInit() throws SQLServerException {
             // If we need to support NTLM as well, we can use null
             // Kerberos OID
             Oid kerberos = new Oid("1.2.840.113554.1.2.2");
-            Subject currentSubject = null;
-            try {
-                AccessControlContext context = AccessController.getContext();
-                currentSubject = Subject.getSubject(context);
-                if (null == currentSubject) {
-                    lc = new LoginContext(CONFIGNAME);
-                    lc.login();
-                    // per documentation LoginContext will instantiate a new subject.
-                    currentSubject = lc.getSubject();
-                }
-            }
-            catch (LoginException le) {
-                con.terminate(SQLServerException.DRIVER_ERROR_NONE, SQLServerException.getErrString("R_integratedAuthenticationFailed"), le);
-            }
-
             // http://blogs.sun.com/harcey/entry/of_java_kerberos_and_access
-            // We pass null to indicate that the system should interpret the SPN as it is.
+            // We pass null to indicate that the system should interpret the SPN
+            // as it is.
             GSSName remotePeerName = manager.createName(spn, null);
-            if (authLogger.isLoggable(Level.FINER)) {
-                authLogger.finer(toString() + " Getting client credentials");
-            }
-            peerCredentials = getClientCredential(currentSubject, manager, kerberos);
-            if (authLogger.isLoggable(Level.FINER)) {
-                authLogger.finer(toString() + " creating security context");
+
+            if (null != peerCredentials) {
+                peerContext = manager.createContext(remotePeerName, kerberos, peerCredentials, GSSContext.DEFAULT_LIFETIME);
+                peerContext.requestCredDeleg(false);
+                peerContext.requestMutualAuth(true);
+                peerContext.requestInteg(true);
             }
+            else {
+                Subject currentSubject = null;
+                try {
+                    AccessControlContext context = AccessController.getContext();
+                    currentSubject = Subject.getSubject(context);
+                    if (null == currentSubject) {
+                        lc = new LoginContext(CONFIGNAME);
+                        lc.login();
+                        // per documentation LoginContext will instantiate a new subject.
+                        currentSubject = lc.getSubject();
+                    }
+                }
+                catch (LoginException le) {
+                    con.terminate(SQLServerException.DRIVER_ERROR_NONE, SQLServerException.getErrString("R_integratedAuthenticationFailed"), le);
+                }
 
-            peerContext = manager.createContext(remotePeerName, kerberos, peerCredentials, GSSContext.DEFAULT_LIFETIME);
-            // The following flags should be inline with our native implementation.
-            peerContext.requestCredDeleg(true);
-            peerContext.requestMutualAuth(true);
-            peerContext.requestInteg(true);
+                if (authLogger.isLoggable(Level.FINER)) {
+                    authLogger.finer(toString() + " Getting client credentials");
+                }
+                peerCredentials = getClientCredential(currentSubject, manager, kerberos);
+                if (authLogger.isLoggable(Level.FINER)) {
+                    authLogger.finer(toString() + " creating security context");
+                }
+
+                peerContext = manager.createContext(remotePeerName, kerberos, peerCredentials, GSSContext.DEFAULT_LIFETIME);
+                // The following flags should be inline with our native implementation.
+                peerContext.requestCredDeleg(true);
+                peerContext.requestMutualAuth(true);
+                peerContext.requestInteg(true);
+            }
         }
 
         catch (GSSException ge) {
@@ -196,7 +206,7 @@ public GSSCredential run() throws GSSException {
             }
         };
         // TO support java 5, 6 we have to do this
-        // The signature for Java 5 returns an object 6 returns GSSCredential, immediate casting throws
+        // The signature for Java 5 returns an object 6 returns GSSCredential, immediate casting throws 
         // warning in Java 6.
         Object credential = Subject.doAs(subject, action);
         return (GSSCredential) credential;
@@ -283,6 +293,22 @@ private String makeSpn(String server,
         this.reconnecting = reconnecting;
     }
 
+    /**
+     * 
+     * @param con
+     * @param address
+     * @param port
+     * @param ImpersonatedUserCred
+     * @throws SQLServerException
+     */
+    KerbAuthentication(SQLServerConnection con,
+            String address,
+            int port,
+            GSSCredential ImpersonatedUserCred) throws SQLServerException {
+        this(con, address, port);
+        peerCredentials = ImpersonatedUserCred;
+    }
+
     byte[] GenerateClientContext(byte[] pin,
             boolean[] done) throws SQLServerException {
         byte[] clientContext = null;