forked from alibaba/Sentinel
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Separate checking logic from AuthorityRule and add test cases
Signed-off-by: Eric Zhao <sczyh16@gmail.com>
- Loading branch information
Showing
9 changed files
with
402 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
...re/src/main/java/com/alibaba/csp/sentinel/slots/block/authority/AuthorityRuleChecker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright 1999-2018 Alibaba Group Holding Ltd. | ||
| * | ||
| * Licensed 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 com.alibaba.csp.sentinel.slots.block.authority; | ||
|
|
||
| import com.alibaba.csp.sentinel.context.Context; | ||
| import com.alibaba.csp.sentinel.slots.block.RuleConstant; | ||
| import com.alibaba.csp.sentinel.util.StringUtil; | ||
|
|
||
| /** | ||
| * Rule checker for white/black list authority. | ||
| * | ||
| * @author Eric Zhao | ||
| * @since 0.2.0 | ||
| */ | ||
| final class AuthorityRuleChecker { | ||
|
|
||
| static boolean passCheck(AuthorityRule rule, Context context) { | ||
| String requester = context.getOrigin(); | ||
|
|
||
| // Empty origin or empty limitApp will pass. | ||
| if (StringUtil.isEmpty(requester) || StringUtil.isEmpty(rule.getLimitApp())) { | ||
| return true; | ||
| } | ||
|
|
||
| // Do exact match with origin name. | ||
| int pos = rule.getLimitApp().indexOf(requester); | ||
| boolean contain = pos > -1; | ||
|
|
||
| if (contain) { | ||
| boolean exactlyMatch = false; | ||
| String[] appArray = rule.getLimitApp().split(","); | ||
| for (String app : appArray) { | ||
| if (requester.equals(app)) { | ||
| exactlyMatch = true; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| contain = exactlyMatch; | ||
| } | ||
|
|
||
| int strategy = rule.getStrategy(); | ||
| if (strategy == RuleConstant.AUTHORITY_BLACK && contain) { | ||
| return false; | ||
| } | ||
|
|
||
| if (strategy == RuleConstant.AUTHORITY_WHITE && !contain) { | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| private AuthorityRuleChecker() {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
sentinel-core/src/test/java/com/alibaba/csp/sentinel/TestUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Copyright 1999-2018 Alibaba Group Holding Ltd. | ||
| * | ||
| * Licensed 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 com.alibaba.csp.sentinel; | ||
|
|
||
| import com.alibaba.csp.sentinel.context.Context; | ||
| import com.alibaba.csp.sentinel.context.ContextUtil; | ||
|
|
||
| /** | ||
| * @author Eric Zhao | ||
| */ | ||
| public final class TestUtil { | ||
|
|
||
| public static void cleanUpContext() { | ||
| Context context = ContextUtil.getContext(); | ||
| if (context != null) { | ||
| context.setCurEntry(null); | ||
| ContextUtil.exit(); | ||
| } | ||
| } | ||
|
|
||
| private TestUtil() {} | ||
| } |
59 changes: 59 additions & 0 deletions
59
...rc/test/java/com/alibaba/csp/sentinel/slots/block/authority/AuthorityRuleCheckerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package com.alibaba.csp.sentinel.slots.block.authority; | ||
|
|
||
| import com.alibaba.csp.sentinel.TestUtil; | ||
| import com.alibaba.csp.sentinel.context.ContextUtil; | ||
| import com.alibaba.csp.sentinel.slots.block.RuleConstant; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.junit.Assert.*; | ||
|
|
||
| /** | ||
| * Test cases for {@link AuthorityRuleChecker}. | ||
| * | ||
| * @author Eric Zhao | ||
| */ | ||
| public class AuthorityRuleCheckerTest { | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| TestUtil.cleanUpContext(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPassCheck() { | ||
| String origin = "appA"; | ||
| ContextUtil.enter("entrance", origin); | ||
| try { | ||
| String resourceName = "testPassCheck"; | ||
| AuthorityRule ruleA = new AuthorityRule() | ||
| .setResource(resourceName) | ||
| .setLimitApp(origin + ",appB") | ||
| .as(AuthorityRule.class) | ||
| .setStrategy(RuleConstant.AUTHORITY_WHITE); | ||
| AuthorityRule ruleB = new AuthorityRule() | ||
| .setResource(resourceName) | ||
| .setLimitApp("appB") | ||
| .as(AuthorityRule.class) | ||
| .setStrategy(RuleConstant.AUTHORITY_WHITE); | ||
| AuthorityRule ruleC = new AuthorityRule() | ||
| .setResource(resourceName) | ||
| .setLimitApp(origin) | ||
| .as(AuthorityRule.class) | ||
| .setStrategy(RuleConstant.AUTHORITY_BLACK); | ||
| AuthorityRule ruleD = new AuthorityRule() | ||
| .setResource(resourceName) | ||
| .setLimitApp("appC") | ||
| .as(AuthorityRule.class) | ||
| .setStrategy(RuleConstant.AUTHORITY_BLACK); | ||
|
|
||
| assertTrue(AuthorityRuleChecker.passCheck(ruleA, ContextUtil.getContext())); | ||
| assertFalse(AuthorityRuleChecker.passCheck(ruleB, ContextUtil.getContext())); | ||
| assertFalse(AuthorityRuleChecker.passCheck(ruleC, ContextUtil.getContext())); | ||
| assertTrue(AuthorityRuleChecker.passCheck(ruleD, ContextUtil.getContext())); | ||
| } finally { | ||
| ContextUtil.exit(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.