From 43bfbcf4f2953280a119729cd9d211de3f22cd1f Mon Sep 17 00:00:00 2001 From: Gil Portenseigne Date: Fri, 7 Feb 2020 17:54:52 +0100 Subject: [PATCH] Fixed: Error in user impersonation with sub permission (OFBIZ-11342) Add unit tests for permission control feature. Add new method to manage multilevel permission control. This allowing an user with PARTYMGR_ADMIN permission to impersonate another user with PARTYMGR_PCM_CREATE permission. --- .../apache/ofbiz/security/SecurityUtil.java | 19 +++++++- .../ofbiz/security/SecurityUtilTest.java | 47 +++++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 framework/security/src/test/java/org/apache/ofbiz/security/SecurityUtilTest.java diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java index 95dc868386..37aa15fd65 100644 --- a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java +++ b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java @@ -119,10 +119,25 @@ public final class SecurityUtil { return toUserLoginPermissionIds.stream() .filter(perm -> !userLoginPermissionIds.contains(perm) - && !adminPermissions.contains(perm.substring(0, perm.lastIndexOf("_")))) + && !checkMultiLevelAdminPermissionValidity(adminPermissions, perm)) .collect(Collectors.toList()); } + /** + * Return if an admin permission is valid for the given list of permissions. + * + * @param permissionIds List of admin permission value without "_ADMIN" suffix + * @param permission permission to be checked with its suffix + * + */ + public static boolean checkMultiLevelAdminPermissionValidity(List permissionIds, String permission) { + while (permission.lastIndexOf("_") != -1) { + permission = permission.substring(0, permission.lastIndexOf("_")); + if (permissionIds.contains(permission)) return true; + } + return false; + } + /** * Return a JWToken for authenticate a userLogin with salt the token by userLoginId and currentPassword */ @@ -150,4 +165,4 @@ public final class SecurityUtil { } return false; } -} \ No newline at end of file +} diff --git a/framework/security/src/test/java/org/apache/ofbiz/security/SecurityUtilTest.java b/framework/security/src/test/java/org/apache/ofbiz/security/SecurityUtilTest.java new file mode 100644 index 0000000000..5f9b339ffc --- /dev/null +++ b/framework/security/src/test/java/org/apache/ofbiz/security/SecurityUtilTest.java @@ -0,0 +1,47 @@ +/* + * 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.ofbiz.security; + +import java.util.Arrays; +import java.util.List; + +import org.junit.Test; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; + +public class SecurityUtilTest { + @Test + public void basicAdminPermissionTesting() { + List adminPermissions = Arrays.asList("PARTYMGR", "EXAMPLE", "ACCTG_PREF"); + assertTrue(SecurityUtil.checkMultiLevelAdminPermissionValidity(adminPermissions, "PARTYMGR_CREATE")); + assertTrue(SecurityUtil.checkMultiLevelAdminPermissionValidity(adminPermissions, "EXAMPLE_CREATE ")); + assertTrue(SecurityUtil.checkMultiLevelAdminPermissionValidity(adminPermissions, "EXAMPLE_ADMIN")); + assertFalse(SecurityUtil.checkMultiLevelAdminPermissionValidity(adminPermissions, "ACCTG_ADMIN")); + } + + @Test + public void multiLevelAdminPermissionTesting() { + List adminPermissions = Arrays.asList("PARTYMGR", "EXAMPLE", "ACCTG_PREF"); + assertTrue(SecurityUtil.checkMultiLevelAdminPermissionValidity(adminPermissions, "PARTYMGR_CME_CREATE")); + assertTrue(SecurityUtil.checkMultiLevelAdminPermissionValidity( + adminPermissions, "EXAMPLE_WITH_MULTI_LEVEL_ADMIN")); + assertFalse(SecurityUtil.checkMultiLevelAdminPermissionValidity(adminPermissions, "ACCTG_ADMIN")); + } +}