Merge branch 'develop' into 'master'

Release 0.33.1-SNAPSHOT See merge request hercules/hercules!197
vostok · Jan 9, 2020 · ad9bf19 · ad9bf19
2 parents 649cda3 + 8c36794
commit ad9bf19
Show file tree

Hide file tree

Showing 43 changed files with 104 additions and 43 deletions.
diff --git a/hercules-application/pom.xml b/hercules-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-auth/pom.xml b/hercules-auth/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-auth/src/main/java/ru/kontur/vostok/hercules/auth/AuthProvider.java b/hercules-auth/src/main/java/ru/kontur/vostok/hercules/auth/AuthProvider.java
@@ -135,4 +135,43 @@ public AuthResult authWrite(HttpServerRequest request, String name) {
                 return AuthResult.unknown();
         }
     }
+
+    /**
+     * Authorize any access from {@code rights} using authentication context of the http request.
+     * If at least one of right from {@code rights} is authorize success, then return {@link AuthResult#ok()}.
+     *
+     * @param request the http request
+     * @param name    the resource name
+     * @param rights  access rights
+     * @return authorization result
+     */
+    public AuthResult authAny(HttpServerRequest request, String name, Right... rights) {
+        if (rights.length == 0) {
+            return AuthResult.unknown();
+        }
+        AuthResult result;
+        for (Right right : rights) {
+            if (right == Right.READ) {
+                result = authRead(request, name);
+                if (result.isSuccess()) {
+                    return result;
+                }
+                continue;
+            }
+            if (right == Right.WRITE) {
+                result = authWrite(request, name);
+                if (result.isSuccess()) {
+                    return result;
+                }
+                continue;
+            }
+            if (right == Right.MANAGE) {
+                result = authManage(request, name);
+                if (result.isSuccess()) {
+                    return result;
+                }
+            }
+        }
+        return AuthResult.unknown();
+    }
 }
diff --git a/hercules-auth/src/main/java/ru/kontur/vostok/hercules/auth/Right.java b/hercules-auth/src/main/java/ru/kontur/vostok/hercules/auth/Right.java
@@ -0,0 +1,12 @@
+package ru.kontur.vostok.hercules.auth;
+
+/**
+ * The type of right.
+ *
+ * @author Vladimir Tsypaev
+ */
+public enum Right {
+    READ,
+    WRITE,
+    MANAGE;
+}
diff --git a/hercules-cassandra-sink/pom.xml b/hercules-cassandra-sink/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-cassandra-util/pom.xml b/hercules-cassandra-util/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-client/pom.xml b/hercules-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-configuration/pom.xml b/hercules-configuration/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-curator/pom.xml b/hercules-curator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-elastic-sink/pom.xml b/hercules-elastic-sink/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...lastic-sink/src/main/java/ru/kontur/vostok/hercules/elastic/sink/index/IndexResolver.java b/...lastic-sink/src/main/java/ru/kontur/vostok/hercules/elastic/sink/index/IndexResolver.java
@@ -90,8 +90,16 @@ private static String getFormattedDate(Event event) {
         return DATE_FORMATTER.format(TimeUtil.unixTicksToInstant(event.getTimestamp()));
     }
 
-    private static final Pattern ILLEGAL_CHARS = Pattern.compile("[^-a-zA-Z0-9_]");
-
+    private static final Pattern ILLEGAL_CHARS = Pattern.compile("[^-a-zA-Z0-9_.]");
+
+    /**
+     * Replace illegal characters with underscore {@code _}.
+     * <p>
+     * Illegal character is any character which is not alphanumeric, minus sign {@code -}, underscore {@code _} or dot {@code .}.
+     *
+     * @param s the string
+     * @return the sanitized string
+     */
     private static String sanitize(String s) {
         return ILLEGAL_CHARS.matcher(s).replaceAll("_").
                 toLowerCase();

diff --git a/...ic-sink/src/test/java/ru/kontur/vostok/hercules/elastic/sink/index/IndexResolverTest.java b/...ic-sink/src/test/java/ru/kontur/vostok/hercules/elastic/sink/index/IndexResolverTest.java
@@ -93,13 +93,13 @@ public void shouldSanitizeIndexName() {
                 tag("properties", Variant.ofContainer(
                         Container.builder().
                                 tag("project", Variant.ofString("Project<To,Test>")).
-                                tag("environment", Variant.ofString("DEV")).
+                                tag("environment", Variant.ofString("D.E.V")).
                                 tag("subproject", Variant.ofString(">Ю")).
                                 build())).
                 build();
 
         Optional<String> index = indexResolver.resolve(event);
         Assert.assertTrue(index.isPresent());
-        Assert.assertEquals("project_to_test_-dev-__-2019.12.01", index.get());
+        Assert.assertEquals("project_to_test_-d.e.v-__-2019.12.01", index.get());
     }
 }
diff --git a/hercules-gate-client/pom.xml b/hercules-gate-client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-gate/pom.xml b/hercules-gate/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-graphite-sink/pom.xml b/hercules-graphite-sink/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-health/pom.xml b/hercules-health/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-http/pom.xml b/hercules-http/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-init/pom.xml b/hercules-init/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-json/pom.xml b/hercules-json/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-kafka-util/pom.xml b/hercules-kafka-util/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-management-api/pom.xml b/hercules-management-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...-api/src/main/java/ru/kontur/vostok/hercules/management/api/stream/InfoStreamHandler.java b/...-api/src/main/java/ru/kontur/vostok/hercules/management/api/stream/InfoStreamHandler.java
@@ -4,6 +4,7 @@
 import org.slf4j.LoggerFactory;
 import ru.kontur.vostok.hercules.auth.AuthProvider;
 import ru.kontur.vostok.hercules.auth.AuthResult;
+import ru.kontur.vostok.hercules.auth.Right;
 import ru.kontur.vostok.hercules.curator.exception.CuratorException;
 import ru.kontur.vostok.hercules.http.HttpServerRequest;
 import ru.kontur.vostok.hercules.http.HttpStatusCodes;
@@ -44,7 +45,7 @@ public void handle(HttpServerRequest request) {
             return;
         }
 
-        AuthResult authResult = authProvider.authManage(request, streamName.get());
+        AuthResult authResult = authProvider.authAny(request, streamName.get(), Right.READ, Right.MANAGE);
         if (!authResult.isSuccess()) {
             if (authResult.isUnknown()) {
                 request.complete(HttpStatusCodes.UNAUTHORIZED);

diff --git a/hercules-meta/pom.xml b/hercules-meta/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-partitioner/pom.xml b/hercules-partitioner/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-protocol/pom.xml b/hercules-protocol/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-sd/pom.xml b/hercules-sd/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-sentry-sink/pom.xml b/hercules-sentry-sink/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-sink/pom.xml b/hercules-sink/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-stream-api/pom.xml b/hercules-stream-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-stream-manager/pom.xml b/hercules-stream-manager/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-stream-sink/pom.xml b/hercules-stream-sink/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-tags/pom.xml b/hercules-tags/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-throttling/pom.xml b/hercules-throttling/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-timeline-api/pom.xml b/hercules-timeline-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-timeline-manager/pom.xml b/hercules-timeline-manager/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-timeline-sink/pom.xml b/hercules-timeline-sink/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hercules-tracing-api/pom.xml b/hercules-tracing-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hercules</artifactId>
         <groupId>ru.kontur.vostok.hercules</groupId>
-        <version>0.33.0-SNAPSHOT</version>
+        <version>0.33.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>