Author: ctubbsii
Date: Tue Jan 29 20:49:34 2013
New Revision: 1440118
URL: http://svn.apache.org/viewvc?rev=1440118&view=rev
Log:
ACCUMULO-918 Added user iterator for visibilities. TODO: add a test.
Added:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java?rev=1440118&r1=1440117&r2=1440118&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
Tue Jan 29 20:49:34 2013
@@ -32,10 +32,10 @@ import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
public class VisibilityFilter extends Filter {
- private VisibilityEvaluator ve;
- private Text defaultVisibility;
- private LRUMap cache;
- private Text tmpVis;
+ protected VisibilityEvaluator ve;
+ protected Text defaultVisibility;
+ protected LRUMap cache;
+ protected Text tmpVis;
private static final Logger log = Logger.getLogger(VisibilityFilter.class);
Added:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java?rev=1440118&view=auto
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
(added)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
Tue Jan 29 20:49:34 2013
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.iterators.user;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.iterators.IteratorEnvironment;
+import org.apache.accumulo.core.iterators.OptionDescriber;
+import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.accumulo.core.security.VisibilityEvaluator;
+import org.apache.accumulo.core.util.BadArgumentException;
+import org.apache.commons.collections.map.LRUMap;
+import org.apache.hadoop.io.Text;
+
+/**
+ *
+ */
+public class VisibilityFilter extends
org.apache.accumulo.core.iterators.system.VisibilityFilter implements
OptionDescriber {
+
+ public static final String AUTHS = "auths";
+ public static final String FILTER_INVALID_ONLY = "filterInvalid";
+
+ private boolean filterInvalid;
+
+ /**
+ *
+ */
+ public VisibilityFilter() {
+ super();
+ }
+
+ @Override
+ public void init(SortedKeyValueIterator<Key,Value> source,
Map<String,String> options, IteratorEnvironment env) throws IOException {
+ super.init(source, options, env);
+ validateOptions(options);
+ this.filterInvalid =
Boolean.parseBoolean(options.get(FILTER_INVALID_ONLY));
+
+ if (!filterInvalid) {
+ this.ve = new VisibilityEvaluator(new
Authorizations(options.get(AUTHS).getBytes(Constants.UTF8)));
+ this.defaultVisibility = new Text();
+ this.cache = new LRUMap(1000);
+ this.tmpVis = new Text();
+ }
+ }
+
+ @Override
+ public boolean accept(Key k, Value v) {
+ if (filterInvalid) {
+ Text testVis = k.getColumnVisibility(tmpVis);
+ try {
+ new ColumnVisibility(testVis);
+ cache.put(new Text(testVis), true);
+ return true;
+ } catch (BadArgumentException e) {
+ cache.put(new Text(testVis), false);
+ return false;
+ }
+ } else {
+ return super.accept(k, v);
+ }
+ }
+
+ @Override
+ public IteratorOptions describeOptions() {
+ IteratorOptions io = super.describeOptions();
+ io.setName("visibilityFilter");
+ io.setDescription("The VisibilityFilter allows you to filter for key/value
pairs by a set of authorizations or filter invalid labels from corrupt files.");
+ io.addNamedOption(FILTER_INVALID_ONLY,
+ "if 'true', the iterator is instructed to ignore the authorizations
and only filter invalid visibility labels (default: false)");
+ io.addNamedOption(AUTHS, "the serialized set of authorizations to filter
against (default: empty string, accepts only entries visible by all)");
+ return io;
+ }
+
+ @Override
+ public boolean validateOptions(Map<String,String> options) {
+ // All local options are valid; only check super options
+ return super.validateOptions(options);
+ }
+
+ public static void setAuthorizations(IteratorSetting setting, Authorizations
auths) {
+ setting.addOption(AUTHS, auths.serialize());
+ }
+
+ public static void filterInvalidLabelsOnly(IteratorSetting setting, boolean
featureEnabled) {
+ setting.addOption(FILTER_INVALID_ONLY, Boolean.toString(featureEnabled));
+ }
+
+}
