pzampino commented on a change in pull request #537:
URL: https://github.com/apache/knox/pull/537#discussion_r813186144
##########
File path:
gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java
##########
@@ -17,12 +17,34 @@
*/
package org.apache.knox.gateway;
+import java.util.Set;
+
import org.apache.knox.gateway.i18n.messages.Message;
import org.apache.knox.gateway.i18n.messages.MessageLevel;
import org.apache.knox.gateway.i18n.messages.Messages;
+import org.apache.knox.gateway.plang.Ast;
+import org.apache.knox.gateway.plang.SyntaxException;
@Messages(logger="org.apache.knox.gateway")
public interface IdentityAsserterMessages {
@Message( level = MessageLevel.ERROR, text = "Required subject/identity not
available. Check authentication/federation provider for proper configuration."
)
void subjectNotAvailable();
+
+ @Message( level = MessageLevel.WARN, text = "Invalid mapping parameter name:
Missing required group name.")
+ void missingVirtualGroupName();
+
+ @Message( level = MessageLevel.WARN, text = "Invalid mapping, parse error:
{2}. At {0}={1}")
+ void parseError(String key, String script, SyntaxException e);
+
+ @Message( level = MessageLevel.WARN, text = "Invalid result: {2}. Expected
boolean when evaluating: {1}. For virtualGroup: {0}")
+ void invalidResult(String virtualGroupName, Ast ast, Object result);
+
+ @Message( level = MessageLevel.DEBUG, text = "Adding user: {0} to virtual
group: {1} using predicate: {2}")
+ void addingUserToVirtualGroup(String username, String virtualGroupName, Ast
ast);
+
+ @Message( level = MessageLevel.DEBUG, text = "Checking user: {0} (with
groups: {1}) whether to add virtualGroup: {2} using predicate: {3}")
Review comment:
Suggestion: "Checking whether user {0} (with group(s) {1}) should be
added to group {2} based on predicate {3}"
##########
File path:
gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java
##########
@@ -17,12 +17,34 @@
*/
package org.apache.knox.gateway;
+import java.util.Set;
+
import org.apache.knox.gateway.i18n.messages.Message;
import org.apache.knox.gateway.i18n.messages.MessageLevel;
import org.apache.knox.gateway.i18n.messages.Messages;
+import org.apache.knox.gateway.plang.Ast;
+import org.apache.knox.gateway.plang.SyntaxException;
@Messages(logger="org.apache.knox.gateway")
public interface IdentityAsserterMessages {
@Message( level = MessageLevel.ERROR, text = "Required subject/identity not
available. Check authentication/federation provider for proper configuration."
)
void subjectNotAvailable();
+
+ @Message( level = MessageLevel.WARN, text = "Invalid mapping parameter name:
Missing required group name.")
+ void missingVirtualGroupName();
+
+ @Message( level = MessageLevel.WARN, text = "Invalid mapping, parse error:
{2}. At {0}={1}")
+ void parseError(String key, String script, SyntaxException e);
+
+ @Message( level = MessageLevel.WARN, text = "Invalid result: {2}. Expected
boolean when evaluating: {1}. For virtualGroup: {0}")
Review comment:
Suggestion: "Invalid result: {2}. Expected boolean when evaluating group
{0} mapping value {1}."
##########
File path:
gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java
##########
@@ -17,12 +17,34 @@
*/
package org.apache.knox.gateway;
+import java.util.Set;
+
import org.apache.knox.gateway.i18n.messages.Message;
import org.apache.knox.gateway.i18n.messages.MessageLevel;
import org.apache.knox.gateway.i18n.messages.Messages;
+import org.apache.knox.gateway.plang.Ast;
+import org.apache.knox.gateway.plang.SyntaxException;
@Messages(logger="org.apache.knox.gateway")
public interface IdentityAsserterMessages {
@Message( level = MessageLevel.ERROR, text = "Required subject/identity not
available. Check authentication/federation provider for proper configuration."
)
void subjectNotAvailable();
+
+ @Message( level = MessageLevel.WARN, text = "Invalid mapping parameter name:
Missing required group name.")
+ void missingVirtualGroupName();
+
+ @Message( level = MessageLevel.WARN, text = "Invalid mapping, parse error:
{2}. At {0}={1}")
+ void parseError(String key, String script, SyntaxException e);
+
+ @Message( level = MessageLevel.WARN, text = "Invalid result: {2}. Expected
boolean when evaluating: {1}. For virtualGroup: {0}")
+ void invalidResult(String virtualGroupName, Ast ast, Object result);
+
+ @Message( level = MessageLevel.DEBUG, text = "Adding user: {0} to virtual
group: {1} using predicate: {2}")
Review comment:
Suggestion: "Adding user {0} to group {1} based on predicate {2}"
##########
File path:
gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java
##########
@@ -17,12 +17,34 @@
*/
package org.apache.knox.gateway;
+import java.util.Set;
+
import org.apache.knox.gateway.i18n.messages.Message;
import org.apache.knox.gateway.i18n.messages.MessageLevel;
import org.apache.knox.gateway.i18n.messages.Messages;
+import org.apache.knox.gateway.plang.Ast;
+import org.apache.knox.gateway.plang.SyntaxException;
@Messages(logger="org.apache.knox.gateway")
public interface IdentityAsserterMessages {
@Message( level = MessageLevel.ERROR, text = "Required subject/identity not
available. Check authentication/federation provider for proper configuration."
)
void subjectNotAvailable();
+
+ @Message( level = MessageLevel.WARN, text = "Invalid mapping parameter name:
Missing required group name.")
+ void missingVirtualGroupName();
+
+ @Message( level = MessageLevel.WARN, text = "Invalid mapping, parse error:
{2}. At {0}={1}")
Review comment:
Suggestion: "Invalid mapping {0}={1}, Parse error: {2}"
##########
File path:
gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java
##########
@@ -17,12 +17,34 @@
*/
package org.apache.knox.gateway;
+import java.util.Set;
+
import org.apache.knox.gateway.i18n.messages.Message;
import org.apache.knox.gateway.i18n.messages.MessageLevel;
import org.apache.knox.gateway.i18n.messages.Messages;
+import org.apache.knox.gateway.plang.Ast;
+import org.apache.knox.gateway.plang.SyntaxException;
@Messages(logger="org.apache.knox.gateway")
public interface IdentityAsserterMessages {
@Message( level = MessageLevel.ERROR, text = "Required subject/identity not
available. Check authentication/federation provider for proper configuration."
)
void subjectNotAvailable();
+
+ @Message( level = MessageLevel.WARN, text = "Invalid mapping parameter name:
Missing required group name.")
+ void missingVirtualGroupName();
+
+ @Message( level = MessageLevel.WARN, text = "Invalid mapping, parse error:
{2}. At {0}={1}")
+ void parseError(String key, String script, SyntaxException e);
+
+ @Message( level = MessageLevel.WARN, text = "Invalid result: {2}. Expected
boolean when evaluating: {1}. For virtualGroup: {0}")
+ void invalidResult(String virtualGroupName, Ast ast, Object result);
+
+ @Message( level = MessageLevel.DEBUG, text = "Adding user: {0} to virtual
group: {1} using predicate: {2}")
+ void addingUserToVirtualGroup(String username, String virtualGroupName, Ast
ast);
+
+ @Message( level = MessageLevel.DEBUG, text = "Checking user: {0} (with
groups: {1}) whether to add virtualGroup: {2} using predicate: {3}")
+ void checkingVirtualGroup(String userName, Set<String> userGroups, String
virtualGroupName, Ast ast);
+
+ @Message( level = MessageLevel.DEBUG, text = "User: {0} (with groups: {1})
added to virtual groups: {2}")
Review comment:
Suggestion: "User {0} (with group(s) {1}) added to group(s) {2}"
##########
File path:
gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
##########
@@ -17,30 +17,45 @@
*/
package org.apache.knox.gateway.identityasserter.common.filter;
+import java.io.IOException;
+import java.security.AccessController;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
import javax.security.auth.Subject;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.knox.gateway.IdentityAsserterMessages;
import org.apache.knox.gateway.i18n.messages.MessagesFactory;
+import org.apache.knox.gateway.plang.Ast;
+import org.apache.knox.gateway.plang.Parser;
+import org.apache.knox.gateway.plang.SyntaxException;
+import org.apache.knox.gateway.security.GroupPrincipal;
import org.apache.knox.gateway.security.principal.PrincipalMappingException;
import org.apache.knox.gateway.security.principal.SimplePrincipalMapper;
-import java.io.IOException;
-import java.security.AccessController;
-
public class CommonIdentityAssertionFilter extends
AbstractIdentityAssertionFilter {
+ public static final String VIRTUAL_GROUP_MAPPING_PREFIX =
"virtual.group.mapping.";
Review comment:
I thought we agreed to remove the "virtual" language from the
configuration. Did we revert that agreement?
I think it's fine in the code, but from a configuration-perspective, is
there anything preventing mapping a user to a "real" group with this mechanism?
##########
File path:
gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/common/filter/VirtualGroupMapperTest.java
##########
@@ -0,0 +1,120 @@
+/*
+ * 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.knox.gateway.identityasserter.common.filter;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.knox.gateway.plang.Ast;
+import org.apache.knox.gateway.plang.Parser;
+import org.junit.Test;
+
+@SuppressWarnings("PMD.NonStaticInitializer")
+public class VirtualGroupMapperTest {
Review comment:
Would some negative test cases add value here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@knox.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
