You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by sp...@apache.org on 2018/10/25 18:26:26 UTC
sentry git commit: SENTRY-2431: Update Solr permission mapping to
include Metric history reading permission (Mano Kovacs,
reviewed by Sergio Pena)
Repository: sentry
Updated Branches:
refs/heads/master a7550a0b6 -> 6734686ac
SENTRY-2431: Update Solr permission mapping to include Metric history reading permission (Mano Kovacs, reviewed by Sergio Pena)
Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/6734686a
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/6734686a
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/6734686a
Branch: refs/heads/master
Commit: 6734686acf9345c7adb5604bd48b1561fc71194b
Parents: a7550a0
Author: Sergio Pena <se...@cloudera.com>
Authored: Thu Oct 25 13:25:36 2018 -0500
Committer: Sergio Pena <se...@cloudera.com>
Committed: Thu Oct 25 13:25:36 2018 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
sentry-binding/sentry-binding-solr/pom.xml | 20 ++++++++++++++++++++
.../solr/authz/SentrySolrPluginImpl.java | 1 +
sentry-tests/sentry-tests-solr/pom.xml | 2 +-
4 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sentry/blob/6734686a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b4002b4..acbdcc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@ limitations under the License.
<pig.version>0.12.0</pig.version>
<shiro.version>1.4.0</shiro.version>
<slf4j.version>1.7.25</slf4j.version>
- <solr.version>7.1.0</solr.version>
+ <solr.version>7.4.0</solr.version>
<sqoop.version>1.99.7</sqoop.version>
<surefire.version>2.20.1</surefire.version>
<test.sentry.hadoop.classpath>${maven.test.classpath}</test.sentry.hadoop.classpath>
http://git-wip-us.apache.org/repos/asf/sentry/blob/6734686a/sentry-binding/sentry-binding-solr/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-solr/pom.xml b/sentry-binding/sentry-binding-solr/pom.xml
index 2884d1f..f2a5fca 100644
--- a/sentry-binding/sentry-binding-solr/pom.xml
+++ b/sentry-binding/sentry-binding-solr/pom.xml
@@ -38,6 +38,26 @@ limitations under the License.
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/sentry/blob/6734686a/sentry-binding/sentry-binding-solr/src/main/java/org/apache/sentry/binding/solr/authz/SentrySolrPluginImpl.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-solr/src/main/java/org/apache/sentry/binding/solr/authz/SentrySolrPluginImpl.java b/sentry-binding/sentry-binding-solr/src/main/java/org/apache/sentry/binding/solr/authz/SentrySolrPluginImpl.java
index 4092fe4..a065220 100644
--- a/sentry-binding/sentry-binding-solr/src/main/java/org/apache/sentry/binding/solr/authz/SentrySolrPluginImpl.java
+++ b/sentry-binding/sentry-binding-solr/src/main/java/org/apache/sentry/binding/solr/authz/SentrySolrPluginImpl.java
@@ -240,6 +240,7 @@ public class SentrySolrPluginImpl implements AuthorizationPlugin {
case SCHEMA_READ_PERM: {
return binding.authorize(userName, SolrAuthzUtil.getSchemaAuthorizables(authCtx), QUERY);
}
+ case METRICS_HISTORY_READ_PERM:
case METRICS_READ_PERM: {
return binding.authorize(userName, Collections.singleton(AdminOperation.METRICS), QUERY);
}
http://git-wip-us.apache.org/repos/asf/sentry/blob/6734686a/sentry-tests/sentry-tests-solr/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-solr/pom.xml b/sentry-tests/sentry-tests-solr/pom.xml
index e19c944..7c28bda 100644
--- a/sentry-tests/sentry-tests-solr/pom.xml
+++ b/sentry-tests/sentry-tests-solr/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
<description>end to end tests for sentry-solr integration</description>
<properties>
<!-- Harmonize the jetty version with the SOLR version -->
- <jettyVersion>9.3.20.v20170531</jettyVersion>
+ <jettyVersion>9.4.11.v20180605</jettyVersion>
</properties>
<dependencies>