From a8072e7452fd0f496530426e9ae7ce1670d7c591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 22 Nov 2018 16:01:18 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80security=E5=BC=82=E5=B8=B8=E5=AF=BC=E8=87=B4remotetoke?= =?UTF-8?q?nservice=20=E6=97=A0=E6=B3=95=E8=A7=A3=E6=9E=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/AuthorizationServerConfig.java | 2 +- .../auth/config/WebSecurityConfigurer.java | 6 +- .../pigx/auth/endpoint/PigxTokenEndpoint.java | 4 +- .../main/resources/templates/ftl/login.ftl | 2 +- .../PigxResourceServerAutoConfiguration.java | 15 +- .../PigxWebResponseExceptionTranslator.java | 15 +- .../admin/api/feign/RemoteTokenService.java | 4 +- .../RemoteTokenServiceFallbackImpl.java | 9 +- .../admin/controller/TokenController.java | 8 +- .../ui/assets/css/chunk-vendors.b14d72af.css | 1 + .../ui/assets/css/sba-core.1d30acdf.css | 399 ++++++++++++++++++ .../assets/fonts/element-icons.2fad952a.woff | Bin 0 -> 6164 bytes .../assets/fonts/element-icons.6f0a7632.ttf | Bin 0 -> 11040 bytes .../ui/assets/js/chunk-vendors.3f3d7607.js | 74 ++++ .../assets/js/chunk-vendors.3f3d7607.js.map | 1 + .../ui/assets/js/sba-core.f44ce28e.js | 2 + .../ui/assets/js/sba-core.f44ce28e.js.map | 1 + 17 files changed, 518 insertions(+), 25 deletions(-) create mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/css/chunk-vendors.b14d72af.css create mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/css/sba-core.1d30acdf.css create mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/fonts/element-icons.2fad952a.woff create mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/fonts/element-icons.6f0a7632.ttf create mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/js/chunk-vendors.3f3d7607.js create mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/js/chunk-vendors.3f3d7607.js.map create mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/js/sba-core.f44ce28e.js create mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/js/sba-core.f44ce28e.js.map diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java index 01fa8afbc..a068928c0 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java @@ -69,7 +69,7 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap public void configure(AuthorizationServerSecurityConfigurer oauthServer) { oauthServer .allowFormAuthenticationForClients() - .checkTokenAccess("permitAll()"); + .checkTokenAccess("isAuthenticated()"); } @Override diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/WebSecurityConfigurer.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/WebSecurityConfigurer.java index 603a19705..6781dd508 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/WebSecurityConfigurer.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/WebSecurityConfigurer.java @@ -62,13 +62,13 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { protected void configure(HttpSecurity http) throws Exception { http .formLogin() - .loginPage("/oauth/login") - .loginProcessingUrl("/oauth/form") + .loginPage("/token/login") + .loginProcessingUrl("/token/form") .and() .authorizeRequests() .antMatchers( + "/token/**", "/actuator/**", - "/oauth/**", "/mobile/**").permitAll() .anyRequest().authenticated() .and().csrf().disable() diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java index 3fd9cd984..564955d57 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java @@ -55,7 +55,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/oauth") +@RequestMapping("/token") public class PigxTokenEndpoint { private static final String PIGX_OAUTH_ACCESS = SecurityConstants.PIGX_PREFIX + SecurityConstants.OAUTH_PREFIX + "access:"; private final TokenStore tokenStore; @@ -103,7 +103,7 @@ public class PigxTokenEndpoint { * @param from 内部调用标志 * @return */ - @DeleteMapping("/token/{token}") + @DeleteMapping("/{token}") public R delToken(@PathVariable("token") String token, @RequestHeader(required = false) String from) { if (StrUtil.isBlank(from)) { return null; diff --git a/pigx-auth/src/main/resources/templates/ftl/login.ftl b/pigx-auth/src/main/resources/templates/ftl/login.ftl index 835506495..becb0c495 100755 --- a/pigx-auth/src/main/resources/templates/ftl/login.ftl +++ b/pigx-auth/src/main/resources/templates/ftl/login.ftl @@ -16,7 +16,7 @@
-