map output to groups, add test, cleanup

Author: adwk67

pom.xml

@@ -12,13 +12,16 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hadoop.version>3.3.6</hadoop.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
-            <version>3.3.6</version>
+            <version>${hadoop.version}</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -42,7 +45,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -64,10 +67,6 @@
                                     <pattern>com.fasterxml</pattern>
                                     <shadedPattern>org.shaded.fasterxml</shadedPattern>
                                 </relocation>
-                              <relocation>
-                                    <pattern>io.fabric8</pattern>
-                                    <shadedPattern>org.shaded.fabric8</shadedPattern>
-                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>

src/main/java/tech/stackable/hadoop/OpaQuery.java

@@ -0,0 +1,16 @@
+package tech.stackable.hadoop;
+
+public class OpaQuery {
+    public final OpaQueryInput input;
+
+    public OpaQuery(OpaQueryInput input) {
+        this.input = input;
+    }
+
+    public static class OpaQueryInput {
+        public final String username;
+        public OpaQueryInput(String user) {
+            this.username = user;
+        }
+    }
+}

src/main/java/tech/stackable/hadoop/OpaQueryResult.java

@@ -0,0 +1,35 @@
+package tech.stackable.hadoop;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.hadoop.util.Lists;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.UnaryOperator;
+
+public class OpaQueryResult {
+    public Map<String, Map<String, Object>> result;
+    public List<String> groups;
+
+    @SuppressWarnings("unchecked")
+    @JsonProperty("result")
+    private void unpackNested(Map<String, Map<String, Object>> result) {
+        this.result = result;
+        List<String> rawGroups = Lists.newArrayList();
+        for (String group :  (List<String>) result.get("groups").get("groups")) {
+            rawGroups.add(removeSlashes.apply(group));
+        }
+
+        this.groups = rawGroups;
+    }
+
+    private final static UnaryOperator<String> removeSlashes = s -> {
+        if (s.startsWith("/")) {
+            s = s.substring(1);
+        }
+        if (s.endsWith("/")) {
+            s = s.substring(0, s.length() - 1);
+        }
+        return s;
+    };
+}

src/main/java/tech/stackable/hadoop/StackableGroupMapper.java

@@ -5,7 +5,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.GroupMappingServiceProvider;
-import org.apache.hadoop.util.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,21 +33,6 @@ public StackableGroupMapper() {
                 .setSerializationInclusion(JsonInclude.Include.NON_NULL);
     }
 
-    private static class OpaQuery {
-        public OpaQueryInput input;
-
-        public OpaQuery(OpaQueryInput input) {
-            this.input = input;
-        }
-    }
-
-    public class OpaQueryInput {
-        public final String username;
-        public OpaQueryInput(String user) {
-            this.username = user;
-        }
-    }
-
     /**
      * Returns list of groups for a user.
      *
@@ -68,7 +52,7 @@ public List<String> getGroups(String user) throws IOException {
         URI opaUri = URI.create(opaMappingUrl);
         HttpResponse<String> response = null;
 
-        OpaQuery query = new OpaQuery(new OpaQueryInput(user));
+        OpaQuery query = new OpaQuery(new OpaQuery.OpaQueryInput(user));
         String body = json.writeValueAsString(query);
 
         LOG.info("Request body [{}]", body);
@@ -82,16 +66,16 @@ public List<String> getGroups(String user) throws IOException {
             LOG.error(e.getMessage());
         }
 
-        switch (response.statusCode()) {
-            case 200:
-                break;
-            default:
-                throw new IOException(opaUri.toString());
+        if (response == null || response.statusCode() != 200) {
+            throw new IOException(opaUri.toString());
         }
         String responseBody = response.body();
         LOG.info("Response body [{}]", responseBody);
 
-        return Lists.newArrayList("me", "myself", "I");
+        OpaQueryResult result = json.readValue(responseBody, OpaQueryResult.class);
+        LOG.info("Groups for [{}]: [{}]", user, result.groups);
+
+        return result.groups;
     }
 
     /**

src/test/java/tech/stackable/hadoop/StackableGroupMapperTest.java

@@ -0,0 +1,59 @@
+package tech.stackable.hadoop;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class StackableGroupMapperTest {
+
+    @Test
+    public void testJsonMapper() throws JsonProcessingException {
+        String input = "{\n" +
+                "    \"result\": {\n" +
+                "        \"groups\": {\n" +
+                "            \"groups\": [\n" +
+                "                \"/admin\",\n" +
+                "                \"/superuser\"\n" +
+                "            ]\n" +
+                "        },\n" +
+                "        \"users_by_name\": {\n" +
+                "            \"alice\": {\n" +
+                "                \"customAttributes\": {},\n" +
+                "                \"groups\": [\n" +
+                "                    \"/superset-admin\"\n" +
+                "                ],\n" +
+                "                \"id\": \"af07f12c-1234-40a7-93e0-874537bdf3f5\",\n" +
+                "                \"username\": \"alice\"\n" +
+                "            },\n" +
+                "            \"bob\": {\n" +
+                "                \"customAttributes\": {},\n" +
+                "                \"groups\": [\n" +
+                "                    \"/admin\"\n" +
+                "                ],\n" +
+                "                \"id\": \"af07f12c-2345-40a7-93e0-874537bdf3f5\",\n" +
+                "                \"username\": \"bob\"\n" +
+                "            },\n" +
+                "            \"stackable\": {\n" +
+                "                \"customAttributes\": {},\n" +
+                "                \"groups\": [\n" +
+                "                    \"/admin\",\n" +
+                "                    \"/superuser\"\n" +
+                "                ],\n" +
+                "                \"id\": \"af07f12c-3456-40a7-93e0-874537bdf3f5\",\n" +
+                "                \"username\": \"stackable\"\n" +
+                "            }\n" +
+                "        }\n" +
+                "    }\n" +
+                "}";
+
+        ObjectMapper json = new ObjectMapper()
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+                .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        OpaQueryResult result = json.readValue(input, OpaQueryResult.class);
+        Assert.assertEquals("admin", result.groups.get(0));
+        Assert.assertEquals("superuser", result.groups.get(1));
+    }
+}

test/stack/10-hdfs.yaml

@@ -36,8 +36,6 @@ spec:
       default:
         envOverrides:
           HADOOP_CLASSPATH: "/stackable/hadoop/share/hadoop/tools/lib/*.jar"
-          USERS_MAPPING_SUFFIX: "v1/data/hdfs"
-          USERS_MAPPING_TARGET: "users"
         configOverrides:
           core-site.xml:
             hadoop.security.group.mapping: "tech.stackable.hadoop.StackableGroupMapper"