db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1392819 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java
Date Tue, 02 Oct 2012 09:52:59 GMT
Author: kristwaa
Date: Tue Oct  2 09:52:59 2012
New Revision: 1392819

URL: http://svn.apache.org/viewvc?rev=1392819&view=rev
Log:
DERBY-5940: Disable securityMechanism=8 in NSSecurityMechanismTest on ARM platforms

Disabled strong password substitution tests on ARM platforms. The check is
simply based on the value of "os.arch", which must be "ARM" for the tests
to be disabled.

Patch file: derby-5940-1a-disable_secMec8_on_ARM.diff

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java?rev=1392819&r1=1392818&r2=1392819&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java
Tue Oct  2 09:52:59 2012
@@ -22,12 +22,9 @@
 
 package org.apache.derbyTesting.functionTests.tests.derbynet;
 
-import java.lang.reflect.*;
-import java.net.InetAddress;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import java.security.AccessController;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.CallableStatement;
@@ -38,9 +35,6 @@ import javax.sql.DataSource;
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.PooledConnection;
 
-import org.apache.derby.drda.NetworkServerControl;
-import org.apache.derby.jdbc.ClientConnectionPoolDataSource40;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
 import org.apache.derbyTesting.junit.J2EEDataSource;
@@ -280,6 +274,13 @@ public class NSSecurityMechanismTest ext
             // as it's the first in the array, it should use default setting
             if (derby_drda_securityMechanism != null)
             {
+                if (derby_drda_securityMechanism.equals(
+                        "STRONG_PASSWORD_SUBSTITUTE_SECURITY") &&
+                        !hasSufficientEntropy()) {
+                    println("skipping USRSSBPWD secmec due to " +
+                            "assumed lack of entropy");
+                    continue;
+                }
                 // with "" or "INVALID_VALUE", or with other mechanisms with
                 // certain jvms, some settings are not supported. Flag the loop
                 // to not try connections
@@ -478,6 +479,10 @@ public class NSSecurityMechanismTest ext
     private void assertSecurityMechanismOK(String user, String password,
         Short secmec, String msg, String expectedValue)
     {
+        // Skip this USRSSBPWD on platforms that are short on entropy.
+        if (secmec.shortValue() == SECMEC_USRSSBPWD && !hasSufficientEntropy()){
+            return;
+        }
         Connection conn;
 
         DataSource ds = getDS(user,password);
@@ -530,6 +535,10 @@ public class NSSecurityMechanismTest ext
     private void assertConnectionUsingDriverManager(
         String dbUrl, String msg, String expectedValue)
     {
+        if (!hasSufficientEntropy() &&
+                dbUrl.indexOf("securityMechanism=8") != -1) {
+            return;
+        }
         try
         {
             TestConfiguration.getCurrent();
@@ -1047,6 +1056,11 @@ public class NSSecurityMechanismTest ext
      */
     private void assertUSRSSBPWD_with_BUILTIN(String[] expectedValues)
             throws Exception {
+        // Skip this security mechanism on platforms that are short on entropy,
+        // otherwise this test will take a very long time to complete.
+        if (!hasSufficientEntropy()) {
+            return;
+        }
         // Turn on Derby BUILTIN authentication and attempt connecting with
         // USRSSBPWD security mechanism.
         println("Turning ON Derby BUILTIN authentication");
@@ -1229,4 +1243,15 @@ public class NSSecurityMechanismTest ext
         if (expectedValue.equals("08001.C.8"))
             assertEquals("Password can not be null.", sqle.getMessage());
     }
+
+    /**
+     * Tells if the current platform is assumed to have sufficient entropy for
+     * the strong password substitution security mechanism to run reasonably
+     * fast.
+     */
+    private boolean hasSufficientEntropy() {
+        // The ARM platform is known to suffer from too little entropy
+        // (unless there is significant disk activity).
+        return !getSystemProperty("os.arch").equalsIgnoreCase("arm");
+    }
 }



Mime
View raw message