You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2012/08/01 21:21:11 UTC
svn commit: r1368203 - in /zookeeper/trunk: CHANGES.txt
src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java
src/java/test/org/apache/zookeeper/test/SaslAuthTest.java
Author: phunt
Date: Wed Aug 1 19:21:11 2012
New Revision: 1368203
URL: http://svn.apache.org/viewvc?rev=1368203&view=rev
Log:
ZOOKEEPER-1503. remove redundant JAAS configuration code in SaslAuthTest and SaslAuthFailTest ((Eugene Koontz via phunt)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthTest.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1368203&r1=1368202&r2=1368203&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Aug 1 19:21:11 2012
@@ -338,6 +338,9 @@ IMPROVEMENTS:
ZOOKEEPER-1454. Document how to run autoreconf if cppunit is
installed in a non-standard directory (Michi Mutsuzaki via phunt)
+ ZOOKEEPER-1503. remove redundant JAAS configuration code in SaslAuthTest and
+ SaslAuthFailTest ((Eugene Koontz via phunt)
+
Release 3.4.0 -
Non-backward compatible changes:
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java?rev=1368203&r1=1368202&r2=1368203&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java Wed Aug 1 19:21:11 2012
@@ -66,22 +66,6 @@ public class SaslAuthFailTest extends Cl
protected TestableZooKeeper createClient(String hp)
throws IOException, InterruptedException
{
- File tmpDir = ClientBase.createTmpDir();
- File saslConfFile = new File(tmpDir, "jaas_bad_password.conf");
- FileWriter fwriter = new FileWriter(saslConfFile);
-
- fwriter.write("" +
- "Server {\n" +
- " org.apache.zookeeper.server.auth.DigestLoginModule required\n" +
- " user_super=\"test\";\n" +
- "};\n" +
- "Client {\n" +
- " org.apache.zookeeper.server.auth.DigestLoginModule required\n" +
- " username=\"super\"\n" +
- " password=\"test1\";\n" + // NOTE: wrong password to cause authentication failure : 'test' != 'test1'.
- "};" + "\n");
- fwriter.close();
- System.setProperty("java.security.auth.login.config",saslConfFile.getAbsolutePath());
MyWatcher watcher = new MyWatcher();
return createClient(watcher, hp);
}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthTest.java?rev=1368203&r1=1368202&r2=1368203&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthTest.java Wed Aug 1 19:21:11 2012
@@ -70,22 +70,6 @@ public class SaslAuthTest extends Client
protected TestableZooKeeper createClient(String hp)
throws IOException, InterruptedException
{
- File tmpDir = ClientBase.createTmpDir();
- File saslConfFile = new File(tmpDir, "jaas.conf");
- FileWriter fwriter = new FileWriter(saslConfFile);
-
- fwriter.write("" +
- "Server {\n" +
- " org.apache.zookeeper.server.auth.DigestLoginModule required\n" +
- " user_super=\"test\";\n" +
- "};\n" +
- "Client {\n" +
- " org.apache.zookeeper.server.auth.DigestLoginModule required\n" +
- " username=\"super\"\n" +
- " password=\"test\";\n" +
- "};" + "\n");
- fwriter.close();
- System.setProperty("java.security.auth.login.config",saslConfFile.getAbsolutePath());
MyWatcher watcher = new MyWatcher();
return createClient(watcher, hp);
}