-
Notifications
You must be signed in to change notification settings - Fork 8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dashboard: Improve the ACL checking mechanism (#1042)
* Add `@AuthAction` annotation support
- Loading branch information
Showing
13 changed files
with
196 additions
and
166 deletions.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthAction.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,34 @@ | ||
| /* | ||
| * 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.dashboard.auth; | ||
|
|
||
| import java.lang.annotation.Documented; | ||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| @Retention(RetentionPolicy.RUNTIME) | ||
| @Documented | ||
| @Target({ElementType.METHOD}) | ||
| public @interface AuthAction { | ||
|
|
||
| AuthService.PrivilegeType value(); | ||
|
|
||
| String targetName() default "app"; | ||
|
|
||
| String message() default "No privilege"; | ||
| } |
66 changes: 66 additions & 0 deletions
66
...inel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthInterceptor.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,66 @@ | ||
| /* | ||
| * 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.dashboard.auth; | ||
|
|
||
| import com.alibaba.csp.sentinel.dashboard.domain.Result; | ||
| import com.alibaba.fastjson.JSON; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.web.method.HandlerMethod; | ||
| import org.springframework.web.servlet.HandlerInterceptor; | ||
|
|
||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import java.io.IOException; | ||
| import java.lang.reflect.Method; | ||
|
|
||
| @Component | ||
| public class AuthInterceptor implements HandlerInterceptor { | ||
|
|
||
| @Autowired | ||
| private AuthService<HttpServletRequest> authService; | ||
|
|
||
| @Override | ||
| public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) | ||
| throws Exception { | ||
| if (handler.getClass().isAssignableFrom(HandlerMethod.class)) { | ||
| Method method = ((HandlerMethod) handler).getMethod(); | ||
|
|
||
| AuthAction authAction = method.getAnnotation(AuthAction.class); | ||
| if (authAction != null) { | ||
| AuthService.AuthUser authUser = authService.getAuthUser(request); | ||
| if (authUser == null) { | ||
| responseNoPrivilegeMsg(response, authAction.message()); | ||
| return false; | ||
| } | ||
| String target = request.getParameter(authAction.targetName()); | ||
|
|
||
| if (!authUser.authTarget(target, authAction.value())) { | ||
| responseNoPrivilegeMsg(response, authAction.message()); | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| private void responseNoPrivilegeMsg(HttpServletResponse response, String message) throws IOException { | ||
| Result result = Result.ofFail(-1, message); | ||
| response.addHeader("Content-Type", "application/json;charset=UTF-8"); | ||
| response.getOutputStream().write(JSON.toJSONBytes(result)); | ||
| } | ||
| } |
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
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
Oops, something went wrong.