diff --git a/README_zh.md b/README_zh.md index 96dafb8d8..86f043f88 100644 --- a/README_zh.md +++ b/README_zh.md @@ -24,7 +24,7 @@ # 概述 -MaxKey单点登录认证系统，谐音马克思的钥匙寓意是最大钥匙,是业界领先的IAM身份管理和认证产品,支持OAuth 2.x/OpenID Connect、SAML 2.0、JWT、CAS、SCIM等标准协议，提供 标准、安全和开放的用户身份管理(IDM)、身份认证(AM)、单点登录(SSO)、RBAC权限管理和资源管理等。 +MaxKey单点登录认证系统，谐音马克思的钥匙寓意是最大钥匙,是业界领先的IAM身份管理和认证产品,支持OAuth 2.x/OpenID Connect、SAML 2.0、JWT、CAS、SCIM等标准协议，提供标准、安全和开放的用户身份管理(IDM)、身份认证(AM)、单点登录(SSO)、RBAC权限管理和资源管理等。 官方网站 官网 | 官网二线 diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/InstitutionEndpoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/InstitutionEndpoint.java new file mode 100644 index 000000000..b6d91f683 --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/InstitutionEndpoint.java @@ -0,0 +1,86 @@ +/* + * Copyright [2022] [MaxKey of copyright http://www.maxkey.top] + * + * 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 org.maxkey.authn.web; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang3.StringUtils; +import org.maxkey.configuration.ApplicationConfig; +import org.maxkey.entity.Institutions; +import org.maxkey.entity.Message; +import org.maxkey.persistence.repository.InstitutionsRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping(value = "/inst") +public class InstitutionEndpoint { + private static final Logger _logger = LoggerFactory.getLogger(InstitutionEndpoint.class); + + public final static String HEADER_HOST = "host"; + + public final static String HEADER_HOSTNAME = "hostname"; + + @Autowired + InstitutionsRepository institutionsRepository; + + @Autowired + ApplicationConfig applicationConfig; + + @RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE}) + public ResponseEntity get( + HttpServletRequest request, + @RequestHeader("Origin") String originURL, + @RequestHeader(HEADER_HOSTNAME) String headerHostName, + @RequestHeader(HEADER_HOST) String headerHost) { + _logger.debug("get Institution" ); + + String host = headerHostName; + _logger.trace("hostname {}",host); + if(StringUtils.isEmpty(host)) { + host = headerHost; + _logger.trace("host {}",host); + } + + if(StringUtils.isEmpty(host)) { + host = applicationConfig.getDomainName(); + _logger.trace("config domain {}",host); + } + + if(host.indexOf(":")> -1 ) { + host = host.split(":")[0]; + _logger.trace("domain split {}",host); + } + + Institutions inst = institutionsRepository.get(host); + if(inst != null) { + _logger.debug("inst {}",inst); + return new Message(inst).buildResponse(); + }else { + Institutions defaultInst = institutionsRepository.get("1"); + _logger.debug("default inst {}",inst); + return new Message(defaultInst).buildResponse(); + } + } +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebConstants.java b/maxkey-core/src/main/java/org/maxkey/web/WebConstants.java index a589508d0..e72387b5d 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebConstants.java +++ b/maxkey-core/src/main/java/org/maxkey/web/WebConstants.java @@ -33,8 +33,6 @@ public class WebConstants { public static final String CURRENT_INST = "current_inst"; public final static String INST_COOKIE_NAME = "mxk_inst"; - - public final static String FRONTEND_BASE_URI = "mxk_frontend_base_uri"; // SPRING_SECURITY_SAVED_REQUEST public static final String FIRST_SAVED_REQUEST_PARAMETER diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java b/maxkey-core/src/main/java/org/maxkey/web/WebContext.java index e47aeac6e..e72949115 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java +++ b/maxkey-core/src/main/java/org/maxkey/web/WebContext.java @@ -307,12 +307,7 @@ public final class WebContext { public static Institutions getInst() { return (Institutions)getAttribute(WebConstants.CURRENT_INST); - } - - public static String getBaseUri() { - return (String)getAttribute(WebConstants.FRONTEND_BASE_URI); - } - + } /** * encoding encodingString by ApplicationConfig. diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebInstRequestFilter.java b/maxkey-core/src/main/java/org/maxkey/web/WebInstRequestFilter.java index 3c8c86769..6379a631d 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebInstRequestFilter.java +++ b/maxkey-core/src/main/java/org/maxkey/web/WebInstRequestFilter.java @@ -37,7 +37,9 @@ public class WebInstRequestFilter extends GenericFilterBean { final static Logger _logger = LoggerFactory.getLogger(GenericFilterBean.class); public final static String HEADER_HOST = "host"; + public final static String HEADER_HOSTNAME = "hostname"; + public final static String HEADER_ORIGIN = "Origin"; InstitutionsRepository institutionsRepository; @@ -74,7 +76,6 @@ public class WebInstRequestFilter extends GenericFilterBean { if(StringUtils.isEmpty(origin)) { origin = applicationConfig.getFrontendUri(); } - request.getSession().setAttribute(WebConstants.FRONTEND_BASE_URI, origin); } chain.doFilter(servletRequest, servletResponse); } diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/layout/basic/basic.component.ts b/maxkey-web-frontend/maxkey-web-app/src/app/layout/basic/basic.component.ts index a3abf9ce6..642d78554 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/layout/basic/basic.component.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/layout/basic/basic.component.ts @@ -22,6 +22,7 @@ import { environment } from '@env/environment'; import { CONSTS } from 'src/app/shared/consts'; import { AuthnService } from '../../service/authn.service'; +import { knowHost } from '../../shared/utils/knowhost'; import { LayoutDefaultOptions } from '../../theme/layout-default'; @Component({ @@ -109,8 +110,9 @@ import { LayoutDefaultOptions } from '../../theme/layout-default'; ` }) -export class LayoutBasicComponent { +export class LayoutBasicComponent implements OnInit { version = CONSTS.VERSION; + inst: any; options: LayoutDefaultOptions = { logoExpanded: `./assets/logo-full.svg`, logoCollapsed: `./assets/logo.svg`, @@ -129,5 +131,15 @@ export class LayoutBasicComponent { changePassword(): void { this.router.navigateByUrl('/config/password'); } - constructor(private settingsService: SettingsService, private router: Router) { } + + ngOnInit(): void { + this.inst = this.authnService.getInst(); + if (this.inst == null) { + this.authnService.initInst().subscribe(res => { + this.authnService.setInst(res.data, !knowHost()); + this.inst = this.authnService.getInst(); + }); + } + } + constructor(private authnService: AuthnService, private settingsService: SettingsService, private router: Router) { } } diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/layout/passport/passport.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/layout/passport/passport.component.html index 3184f6cd7..29b698813 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/layout/passport/passport.component.html +++ b/maxkey-web-frontend/maxkey-web-app/src/app/layout/passport/passport.component.html @@ -1,30 +1,38 @@
-
+
+ + +
-
{{ 'mxk.login.title' | i18n }}{{ 'mxk.title' | i18n }}
+
MaxKey{{ 'mxk.title' | i18n }}
+
{{ inst.title }}
-
+
+ +
-
{{ 'mxk.login.title.sub' | i18n }}
+
+ {{ 'mxk.login.title.sub' | i18n }} +
MaxKey {{ version }}
Copyright - 2022 http://www.maxkey.top
+ + 2022 + http://www.maxkey.top
Licensed under the Apache License, Version 2.0
- + \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/layout/passport/passport.component.ts b/maxkey-web-frontend/maxkey-web-app/src/app/layout/passport/passport.component.ts index ae0b2dc22..5c4a15356 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/layout/passport/passport.component.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/layout/passport/passport.component.ts @@ -19,6 +19,9 @@ import { ActivatedRoute } from '@angular/router'; import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth'; import { CONSTS } from 'src/app/shared/consts'; +import { AuthnService } from '../../service/authn.service'; +import { knowHost } from '../../shared/utils/knowhost'; + @Component({ selector: 'layout-passport', templateUrl: './passport.component.html', @@ -26,6 +29,8 @@ import { CONSTS } from 'src/app/shared/consts'; }) export class LayoutPassportComponent implements OnInit { version = CONSTS.VERSION; + inst: any; + links = [ { title: '帮助', @@ -37,7 +42,19 @@ export class LayoutPassportComponent implements OnInit { } ]; - constructor(@Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService, private route: ActivatedRoute) { } + constructor( + private authnService: AuthnService, + @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService, + private route: ActivatedRoute + ) { } - ngOnInit(): void { } + ngOnInit(): void { + this.inst = this.authnService.getInst(); + if (this.inst == null) { + this.authnService.initInst().subscribe(res => { + this.authnService.setInst(res.data, !knowHost()); + this.inst = this.authnService.getInst(); + }); + } + } } diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/service/authn.service.ts b/maxkey-web-frontend/maxkey-web-app/src/app/service/authn.service.ts index 7b6a16ce3..4f27eceab 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/service/authn.service.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/service/authn.service.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import { HttpClient } from '@angular/common/http'; import { Injectable, Inject } from '@angular/core'; import { Router } from '@angular/router'; import { StartupService } from '@core'; @@ -37,6 +38,7 @@ export class AuthnService { private settingsService: SettingsService, private cookieService: CookieService, private startupService: StartupService, + private client: HttpClient, @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService, private http: _HttpClient ) { } @@ -103,13 +105,24 @@ export class AuthnService { jwtAuth(authParam: any) { return this.http.get(`/login/jwt/trust?_allow_anonymous=true`, authParam); } - - setInst(inst: any) { - localStorage.setItem(CONSTS.INST, JSON.stringify({ id: inst.id, name: inst.name, title: inst.frontTitle, logo: inst.logo })); + setInst(inst: any, custom: boolean) { + localStorage.setItem( + CONSTS.INST, + JSON.stringify({ custom: custom, id: inst.id, name: inst.name, title: inst.frontTitle, logo: inst.logo }) + ); } getInst() { - return JSON.parse(`${localStorage.getItem(CONSTS.INST)}`); + let strInst = `${localStorage.getItem(CONSTS.INST)}`; + if (strInst == null || strInst === '') { + return null; + } else { + return JSON.parse(strInst); + } + } + + initInst() { + return this.http.get(`/inst/get?_allow_anonymous=true`); } setRoles(aclService: ACLService | null): string[] { diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/shared/utils/knowhost.ts b/maxkey-web-frontend/maxkey-web-app/src/app/shared/utils/knowhost.ts new file mode 100644 index 000000000..b39a1d6b2 --- /dev/null +++ b/maxkey-web-frontend/maxkey-web-app/src/app/shared/utils/knowhost.ts @@ -0,0 +1,9 @@ +export function knowHost() { + let hostArray: string[] = new Array('localhost', 'sso.maxkey.top', 'mgt.maxkey.top', 'sso.maxsso.net', 'mgt.maxsso.net'); + for (var i = 0; i < hostArray.length; i++) { + if (hostArray[i] == location.hostname) { + return true; + } + } + return false; +} diff --git a/maxkey-web-frontend/maxkey-web-app/src/index.html b/maxkey-web-frontend/maxkey-web-app/src/index.html index fe44175cd..554f5248d 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/index.html +++ b/maxkey-web-frontend/maxkey-web-app/src/index.html @@ -13,7 +13,101 @@ - + @@ -56,28 +150,28 @@ } --> - - - + \ No newline at end of file