You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/04/30 19:27:02 UTC
svn commit: r1477732 - in /accumulo/branches/1.5/core/src:
main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
Author: ecn
Date: Tue Apr 30 17:26:57 2013
New Revision: 1477732
URL: http://svn.apache.org/r1477732
Log:
ACCUMULO-1361 committing Corey Nolet's for zero-length ColumnVisibility
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java?rev=1477732&r1=1477731&r2=1477732&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java Tue Apr 30 17:26:57 2013
@@ -79,6 +79,8 @@ public class VisibilityEvaluator {
}
private final boolean evaluate(final byte[] expression, final Node root) throws VisibilityParseException {
+ if(expression.length == 0)
+ return true;
switch (root.type) {
case TERM:
return auths.contains(root.getTerm(expression));
Modified: accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java?rev=1477732&r1=1477731&r2=1477732&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java (original)
+++ accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java Tue Apr 30 17:26:57 2013
@@ -35,6 +35,9 @@ public class VisibilityEvaluatorTest {
public void testVisibilityEvaluator() throws VisibilityParseException {
VisibilityEvaluator ct = new VisibilityEvaluator(ByteArraySet.fromStrings("one", "two", "three", "four"));
+ // test for empty vis
+ assertTrue(ct.evaluate(new ColumnVisibility(new byte[0])));
+
// test for and
assertTrue("'and' test", ct.evaluate(new ColumnVisibility("one&two")));