From c9870a81465e186e7146e8a0483a5670d5122e7c Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sun, 9 Jan 2022 21:38:43 +0800 Subject: [PATCH] v3.2.1 --- gradle.properties | 2 +- .../service/SocialSignOnProviderService.java | 73 +++-- .../SocialSignOnAutoConfiguration.java | 4 +- .../ApplicationAutoConfiguration.java | 11 +- .../autoconfigure/MvcAutoConfiguration.java | 38 ++- .../java/org/maxkey/entity/Institutions.java | 269 ++++++++++++++++++ .../org/maxkey/entity/SocialsProvider.java | 110 +++---- .../maxkey/entity/SocialsProviderLogin.java | 88 ++++++ .../persistence/db/InstitutionService.java | 81 ++++++ .../java/org/maxkey/web/WebConstants.java | 8 +- .../main/java/org/maxkey/web/WebContext.java | 39 +++ .../org/maxkey/web/WebInstRequestFilter.java | 78 +++++ .../maxkey/web/tag/LocaleTagDirective.java | 15 + .../src/main/resources/application.yml | 2 +- .../mapper/InstitutionsMapper.java | 28 ++ .../service/InstitutionsService.java | 45 +++ .../TokenEndpointAuthenticationFilter.java | 43 +-- .../src/main/resources/application.properties | 2 +- .../SocialSignOnListController.java | 6 +- .../maxkey/web/endpoint/LoginEndpoint.java | 13 +- .../maxkey/web/endpoint/LogoutEndpoint.java | 4 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/log4j2.xml | 1 - .../templates/views/layout/nologintop.ftl | 2 +- .../resources/templates/views/layout/top.ftl | 2 +- .../main/resources/templates/views/login.ftl | 12 +- ...ogindingtalk.ftl => loginscandingtalk.ftl} | 8 +- ...workweixin.ftl => loginscanworkweixin.ftl} | 5 + .../java/org/maxkey/MaxKeyMgtMvcConfig.java | 1 + .../contorller/InstitutionsController.java | 73 +++++ .../src/main/resources/application.properties | 2 +- .../resources/messages/message.properties | 21 ++ .../resources/messages/message_en.properties | 20 ++ .../messages/message_zh_CN.properties | 22 ++ .../views/institutions/updateInstitutions.ftl | 225 +++++++++++++++ .../templates/views/layout/sidenav.ftl | 6 + .../socialsprovider/socialsProviderAdd.ftl | 10 + .../socialsprovider/socialsProviderUpdate.ftl | 10 + 38 files changed, 1240 insertions(+), 141 deletions(-) create mode 100644 maxkey-core/src/main/java/org/maxkey/entity/Institutions.java create mode 100644 maxkey-core/src/main/java/org/maxkey/entity/SocialsProviderLogin.java create mode 100644 maxkey-core/src/main/java/org/maxkey/persistence/db/InstitutionService.java create mode 100644 maxkey-core/src/main/java/org/maxkey/web/WebInstRequestFilter.java create mode 100644 maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/InstitutionsMapper.java create mode 100644 maxkey-persistence/src/main/java/org/maxkey/persistence/service/InstitutionsService.java rename maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/{logindingtalk.ftl => loginscandingtalk.ftl} (91%) rename maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/{loginworkweixin.ftl => loginscanworkweixin.ftl} (82%) create mode 100644 maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/InstitutionsController.java create mode 100644 maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/institutions/updateInstitutions.ftl diff --git a/gradle.properties b/gradle.properties index 00fbbfcc..528bff6e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #maxkey properties group =maxkey.top -version =3.2.0 +version =3.2.1 vendor =https://www.maxkey.top author =MaxKeyTop diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java index 2d35f496..bbaa0fdd 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java @@ -22,15 +22,21 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.concurrent.TimeUnit; import org.maxkey.configuration.ApplicationConfig; +import org.maxkey.constants.ConstantsTimeInterval; import org.maxkey.crypto.password.PasswordReciprocal; import org.maxkey.entity.SocialsProvider; +import org.maxkey.entity.SocialsProviderLogin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; + import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthUser; @@ -39,10 +45,12 @@ import me.zhyd.oauth.request.*; public class SocialSignOnProviderService{ private static Logger _logger = LoggerFactory.getLogger(SocialSignOnProviderService.class); - private static final String DEFAULT_SELECT_STATEMENT = "select * from mxk_socials_provider where status = 1 order by sortindex"; - - - List socialSignOnProviders = new ArrayList(); + private static final String DEFAULT_SELECT_STATEMENT = "select * from mxk_socials_provider where instid = ? and status = 1 order by sortindex"; + + protected static final Cache socialSignOnProvidersStore = + Caffeine.newBuilder() + .expireAfterWrite(ConstantsTimeInterval.ONE_HOUR, TimeUnit.MINUTES) + .build(); HashMapsocialSignOnProviderMaps=new HashMap(); @@ -52,7 +60,6 @@ public class SocialSignOnProviderService{ this.jdbcTemplate=jdbcTemplate; } - public SocialsProvider get(String provider){ return socialSignOnProviderMaps.get(provider); } @@ -162,26 +169,43 @@ public class SocialSignOnProviderService{ } return null; } - public List getSocialSignOnProviders() { - return socialSignOnProviders; - } - public void loadSocialsProviders() { - List listSocialsProvider=jdbcTemplate.query( - DEFAULT_SELECT_STATEMENT, - new SocialsProviderRowMapper()); - _logger.trace("query SocialsProvider " + listSocialsProvider); - - for(SocialsProvider socialsProvider : listSocialsProvider){ - socialSignOnProviderMaps.put(socialsProvider.getProvider(), socialsProvider); - _logger.debug("Social Provider " + socialsProvider.getProvider() - + "(" + socialsProvider.getProviderName()+")"); - if(!socialsProvider.getHidden().equals("true")) { - this.socialSignOnProviders.add(socialsProvider); - } - } - - _logger.debug("social SignOn Providers {}" , this.socialSignOnProviders); + public SocialsProviderLogin loadSocialsProviders(String instId) { + SocialsProviderLogin ssl = socialSignOnProvidersStore.getIfPresent(instId); + if(ssl == null) { + List listSocialsProvider=jdbcTemplate.query( + DEFAULT_SELECT_STATEMENT, + new SocialsProviderRowMapper(),instId); + _logger.trace("query SocialsProvider " + listSocialsProvider); + + + List socialSignOnProviders = new ArrayList(); + ssl = new SocialsProviderLogin(socialSignOnProviders); + + for(SocialsProvider socialsProvider : listSocialsProvider){ + socialSignOnProviderMaps.put(socialsProvider.getProvider(), socialsProvider); + _logger.debug("Social Provider " + socialsProvider.getProvider() + + "(" + socialsProvider.getProviderName()+")"); + if(!socialsProvider.getHidden().equals("true")) { + socialSignOnProviders.add(socialsProvider); + } + + if(socialsProvider.getProvider().equalsIgnoreCase("workweixin")) { + ssl.setWorkWeixinLogin(socialsProvider.getScanCode()); + }else if(socialsProvider.getProvider().equalsIgnoreCase("dingtalk")) { + ssl.setDingTalkLogin(socialsProvider.getScanCode()); + }else if(socialsProvider.getProvider().equalsIgnoreCase("feishu")) { + ssl.setFeiShuLogin(socialsProvider.getScanCode()); + }else if(socialsProvider.getProvider().equalsIgnoreCase("welink")) { + ssl.setWeLinkLogin(socialsProvider.getScanCode()); + } + } + + _logger.debug("social SignOn Providers Login {}" , ssl); + + socialSignOnProvidersStore.put(instId, ssl); + } + return ssl; } @@ -201,6 +225,7 @@ public class SocialSignOnProviderService{ socialsProvider.setAgentId(rs.getString("agentId")); socialsProvider.setHidden(rs.getString("hidden")); socialsProvider.setSortIndex(rs.getInt("sortindex")); + socialsProvider.setScanCode(rs.getString("scancode")); socialsProvider.setStatus(rs.getInt("status")); return socialsProvider; } diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java index 6d1f0073..afc1eb02 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java @@ -42,8 +42,8 @@ public class SocialSignOnAutoConfiguration implements InitializingBean { public SocialSignOnProviderService socialSignOnProviderService( JdbcTemplate jdbcTemplate) throws IOException { SocialSignOnProviderService socialSignOnProviderService = new SocialSignOnProviderService(jdbcTemplate); - //load Socials Providers from database - socialSignOnProviderService.loadSocialsProviders(); + //load default Social Providers from database + socialSignOnProviderService.loadSocialsProviders("1"); _logger.debug("SocialSignOnProviderService inited."); return socialSignOnProviderService; } diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java index 8a903c5e..2fdd1053 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java @@ -29,6 +29,7 @@ import org.maxkey.crypto.password.MessageDigestPasswordEncoder; import org.maxkey.crypto.password.PasswordReciprocal; import org.maxkey.crypto.password.SM3PasswordEncoder; import org.maxkey.crypto.password.StandardPasswordEncoder; +import org.maxkey.persistence.db.InstitutionService; import org.maxkey.util.IdGenerator; import org.maxkey.util.SnowFlakeId; import org.maxkey.web.WebContext; @@ -39,6 +40,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.Resource; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.DelegatingPasswordEncoder; @@ -62,6 +64,11 @@ public class ApplicationAutoConfiguration implements InitializingBean { return new DataSourceTransactionManager(dataSource); } + @Bean(name = "institutionService") + public InstitutionService institutionService(JdbcTemplate jdbcTemplate) { + return new InstitutionService(jdbcTemplate); + } + /** * Authentication Password Encoder . * @return @@ -94,10 +101,10 @@ public class ApplicationAutoConfiguration implements InitializingBean { if(_logger.isDebugEnabled()) { _logger.debug("Password Encoders :"); for (String key : encoders.keySet()) { - _logger.debug(key + "=" + encoders.get(key).getClass().getName()); + _logger.debug("{}= {}" ,String.format("%-10s", key), encoders.get(key).getClass().getName()); } } - _logger.debug("default encoder " + idForEncode); + _logger.debug("{} is default encoder" , idForEncode); return passwordEncoder; } diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java index 2b5367b8..575cff82 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java @@ -22,11 +22,14 @@ import java.util.List; import javax.servlet.Filter; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsTimeInterval; +import org.maxkey.persistence.db.InstitutionService; import org.maxkey.persistence.db.LoginHistoryService; import org.maxkey.persistence.db.LoginService; import org.maxkey.web.SessionListenerAdapter; import org.maxkey.web.WebXssRequestFilter; +import org.maxkey.web.WebInstRequestFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -255,17 +258,6 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer return new SecurityContextHolderAwareRequestFilter(); } - - @Bean - public FilterRegistrationBean webXssRequestFilter() { - _logger.debug("delegatingFilterProxy init for /* "); - FilterRegistrationBean registrationBean = new FilterRegistrationBean(new WebXssRequestFilter()); - registrationBean.addUrlPatterns("/*"); - registrationBean.setName("webXssRequestFilter"); - registrationBean.setOrder(2); - return registrationBean; - } - @Bean public FilterRegistrationBean delegatingFilterProxy() { _logger.debug("delegatingFilterProxy init for /* "); @@ -279,6 +271,30 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer return registrationBean; } + @Bean + public FilterRegistrationBean webXssRequestFilter() { + _logger.debug("webXssRequestFilter init for /* "); + FilterRegistrationBean registrationBean = new FilterRegistrationBean(new WebXssRequestFilter()); + registrationBean.addUrlPatterns("/*"); + registrationBean.setName("webXssRequestFilter"); + registrationBean.setOrder(2); + return registrationBean; + } + + + @Bean + public FilterRegistrationBean WebInstRequestFilter( + InstitutionService institutionService, + ApplicationConfig applicationConfig) { + _logger.debug("WebInstRequestFilter init for /* "); + FilterRegistrationBean registrationBean = + new FilterRegistrationBean(new WebInstRequestFilter(institutionService,applicationConfig)); + registrationBean.addUrlPatterns("/*"); + registrationBean.setName("webInstRequestFilter"); + registrationBean.setOrder(3); + return registrationBean; + } + @Bean(name = "sessionListenerAdapter") public SessionListenerAdapter sessionListenerAdapter( LoginService loginService, diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java b/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java new file mode 100644 index 00000000..f95724e0 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java @@ -0,0 +1,269 @@ +/* + * 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.entity; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.apache.mybatis.jpa.persistence.JpaBaseEntity; + +@Entity +@Table(name = "MXK_INSTITUTIONS") +public class Institutions extends JpaBaseEntity implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -2375872012431214098L; + + @Id + @Column + @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + private String id; + @Column + private String name; + @Column + private String fullName; + @Column + private String logo; + @Column + private String domain; + @Column + private String division; + @Column + private String country; + @Column + private String region; + @Column + private String locality; + @Column + private String street; + @Column + private String address; + @Column + private String contact; + @Column + private String postalCode; + @Column + private String phone; + @Column + private String fax; + @Column + private String email; + + @Column + private String description; + @Column + private int status; + @Column + String createdBy; + @Column + String createdDate; + @Column + String modifiedBy; + @Column + String modifiedDate; + + public Institutions() { + super(); + } + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getFullName() { + return fullName; + } + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public String getLogo() { + return logo; + } + public void setLogo(String logo) { + this.logo = logo; + } + public String getDomain() { + return domain; + } + public void setDomain(String domain) { + this.domain = domain; + } + public String getDivision() { + return division; + } + public void setDivision(String division) { + this.division = division; + } + public String getCountry() { + return country; + } + public void setCountry(String country) { + this.country = country; + } + public String getRegion() { + return region; + } + public void setRegion(String region) { + this.region = region; + } + public String getLocality() { + return locality; + } + public void setLocality(String locality) { + this.locality = locality; + } + public String getStreet() { + return street; + } + public void setStreet(String street) { + this.street = street; + } + public String getAddress() { + return address; + } + public void setAddress(String address) { + this.address = address; + } + public String getContact() { + return contact; + } + public void setContact(String contact) { + this.contact = contact; + } + public String getPostalCode() { + return postalCode; + } + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + public String getPhone() { + return phone; + } + public void setPhone(String phone) { + this.phone = phone; + } + public String getFax() { + return fax; + } + public void setFax(String fax) { + this.fax = fax; + } + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public int getStatus() { + return status; + } + public void setStatus(int status) { + this.status = status; + } + public String getCreatedBy() { + return createdBy; + } + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + public String getCreatedDate() { + return createdDate; + } + public void setCreatedDate(String createdDate) { + this.createdDate = createdDate; + } + public String getModifiedBy() { + return modifiedBy; + } + public void setModifiedBy(String modifiedBy) { + this.modifiedBy = modifiedBy; + } + public String getModifiedDate() { + return modifiedDate; + } + public void setModifiedDate(String modifiedDate) { + this.modifiedDate = modifiedDate; + } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("Institutions [id="); + builder.append(id); + builder.append(", name="); + builder.append(name); + builder.append(", fullName="); + builder.append(fullName); + builder.append(", division="); + builder.append(division); + builder.append(", country="); + builder.append(country); + builder.append(", region="); + builder.append(region); + builder.append(", locality="); + builder.append(locality); + builder.append(", street="); + builder.append(street); + builder.append(", address="); + builder.append(address); + builder.append(", contact="); + builder.append(contact); + builder.append(", postalCode="); + builder.append(postalCode); + builder.append(", phone="); + builder.append(phone); + builder.append(", fax="); + builder.append(fax); + builder.append(", email="); + builder.append(email); + builder.append(", description="); + builder.append(description); + builder.append(", status="); + builder.append(status); + builder.append(", createdBy="); + builder.append(createdBy); + builder.append(", createdDate="); + builder.append(createdDate); + builder.append(", modifiedBy="); + builder.append(modifiedBy); + builder.append(", modifiedDate="); + builder.append(modifiedDate); + builder.append("]"); + return builder.toString(); + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/entity/SocialsProvider.java b/maxkey-core/src/main/java/org/maxkey/entity/SocialsProvider.java index 638d6465..d0ce7e4f 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/SocialsProvider.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/SocialsProvider.java @@ -60,6 +60,8 @@ public class SocialsProvider extends JpaBaseEntity implements Serializable { @Column private long sortIndex; @Column + private String scanCode; + @Column private int status; @Column private String instId; @@ -261,7 +263,15 @@ public class SocialsProvider extends JpaBaseEntity implements Serializable { this.sortIndex = sortIndex; } - public String getInstId() { + public String getScanCode() { + return scanCode; + } + + public void setScanCode(String scanCode) { + this.scanCode = scanCode; + } + + public String getInstId() { return instId; } @@ -270,53 +280,57 @@ public class SocialsProvider extends JpaBaseEntity implements Serializable { } @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("SocialsProvider [id="); - builder.append(id); - builder.append(", provider="); - builder.append(provider); - builder.append(", providerName="); - builder.append(providerName); - builder.append(", icon="); - builder.append(icon); - builder.append(", clientId="); - builder.append(clientId); - builder.append(", clientSecret="); - builder.append(clientSecret); - builder.append(", agentId="); - builder.append(agentId); - builder.append(", sortOrder="); - builder.append(sortOrder); - builder.append(", hidden="); - builder.append(hidden); - builder.append(", status="); - builder.append(status); - builder.append(", createdBy="); - builder.append(createdBy); - builder.append(", createdDate="); - builder.append(createdDate); - builder.append(", modifiedBy="); - builder.append(modifiedBy); - builder.append(", modifiedDate="); - builder.append(modifiedDate); - builder.append(", redirectUri="); - builder.append(redirectUri); - builder.append(", accountId="); - builder.append(accountId); - builder.append(", bindTime="); - builder.append(bindTime); - builder.append(", unBindTime="); - builder.append(unBindTime); - builder.append(", lastLoginTime="); - builder.append(lastLoginTime); - builder.append(", state="); - builder.append(state); - builder.append(", userBind="); - builder.append(userBind); - builder.append("]"); - return builder.toString(); - } + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("SocialsProvider [id="); + builder.append(id); + builder.append(", provider="); + builder.append(provider); + builder.append(", providerName="); + builder.append(providerName); + builder.append(", icon="); + builder.append(icon); + builder.append(", clientId="); + builder.append(clientId); + builder.append(", clientSecret="); + builder.append(clientSecret); + builder.append(", agentId="); + builder.append(agentId); + builder.append(", hidden="); + builder.append(hidden); + builder.append(", sortIndex="); + builder.append(sortIndex); + builder.append(", scanCode="); + builder.append(scanCode); + builder.append(", status="); + builder.append(status); + builder.append(", instId="); + builder.append(instId); + builder.append(", createdBy="); + builder.append(createdBy); + builder.append(", createdDate="); + builder.append(createdDate); + builder.append(", modifiedBy="); + builder.append(modifiedBy); + builder.append(", modifiedDate="); + builder.append(modifiedDate); + builder.append(", redirectUri="); + builder.append(redirectUri); + builder.append(", accountId="); + builder.append(accountId); + builder.append(", bindTime="); + builder.append(bindTime); + builder.append(", unBindTime="); + builder.append(unBindTime); + builder.append(", lastLoginTime="); + builder.append(lastLoginTime); + builder.append(", state="); + builder.append(state); + builder.append(", userBind="); + builder.append(userBind); + builder.append("]"); + return builder.toString(); + } diff --git a/maxkey-core/src/main/java/org/maxkey/entity/SocialsProviderLogin.java b/maxkey-core/src/main/java/org/maxkey/entity/SocialsProviderLogin.java new file mode 100644 index 00000000..dd08dbae --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/entity/SocialsProviderLogin.java @@ -0,0 +1,88 @@ +/* + * 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.entity; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Crystal.Sea + * + */ + +public class SocialsProviderLogin implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -2672107566766342357L; + + List socialSignOnProviders = new ArrayList(); + + String dingTalkLogin = "none"; + + String workWeixinLogin = "none"; + + String feiShuLogin = "none"; + + String weLinkLogin = "none"; + + public SocialsProviderLogin(List socialSignOnProviders) { + super(); + this.socialSignOnProviders = socialSignOnProviders; + } + + public String getDingTalkLogin() { + return dingTalkLogin; + } + + public void setDingTalkLogin(String dingTalkLogin) { + this.dingTalkLogin = dingTalkLogin; + } + + public String getWorkWeixinLogin() { + return workWeixinLogin; + } + + public void setWorkWeixinLogin(String workWeixinLogin) { + this.workWeixinLogin = workWeixinLogin; + } + + public String getFeiShuLogin() { + return feiShuLogin; + } + + public void setFeiShuLogin(String feiShuLogin) { + this.feiShuLogin = feiShuLogin; + } + + public String getWeLinkLogin() { + return weLinkLogin; + } + + public void setWeLinkLogin(String weLinkLogin) { + this.weLinkLogin = weLinkLogin; + } + + public List getSocialSignOnProviders() { + return socialSignOnProviders; + } + + +} diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/db/InstitutionService.java b/maxkey-core/src/main/java/org/maxkey/persistence/db/InstitutionService.java new file mode 100644 index 00000000..b6de42e2 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/persistence/db/InstitutionService.java @@ -0,0 +1,81 @@ +/* + * 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.persistence.db; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import org.maxkey.constants.ConstantsStatus; +import org.maxkey.constants.ConstantsTimeInterval; +import org.maxkey.entity.Institutions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; + +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; + +public class InstitutionService { + private static Logger _logger = LoggerFactory.getLogger(InstitutionService.class); + + private static final String SELECT_STATEMENT = "select * from mxk_institutions where domain = ? and status = " + ConstantsStatus.ACTIVE; + + protected static final Cache institutionsStore = + Caffeine.newBuilder() + .expireAfterWrite(ConstantsTimeInterval.ONE_HOUR, TimeUnit.MINUTES) + .build(); + + protected JdbcTemplate jdbcTemplate; + + public InstitutionService(JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; + } + + public Institutions findByDomain(String domain) { + _logger.trace(" domain {}" , domain); + Institutions inst = institutionsStore.getIfPresent(domain); + if(inst == null) { + List institutions = + jdbcTemplate.query(SELECT_STATEMENT,new InstitutionsRowMapper(),domain); + + if (institutions != null && institutions.size() > 0) { + inst = institutions.get(0); + } + + institutionsStore.put(domain, inst); + } + + return inst; + } + + public class InstitutionsRowMapper implements RowMapper { + @Override + public Institutions mapRow(ResultSet rs, int rowNum) throws SQLException { + Institutions institution = new Institutions(); + institution.setId(rs.getString("id")); + institution.setName(rs.getString("name")); + institution.setFullName(rs.getString("fullname")); + institution.setLogo(rs.getString("logo")); + institution.setDomain(rs.getString("domain")); + return institution; + } + } +} 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 bfc11899..f6510d03 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebConstants.java +++ b/maxkey-core/src/main/java/org/maxkey/web/WebConstants.java @@ -47,6 +47,8 @@ public class WebConstants { = "current_user_password_set_type"; public static final String CURRENT_MESSAGE = "current_message"; + + public static final String CURRENT_INST = "current_inst"; // SPRING_SECURITY_SAVED_REQUEST public static final String FIRST_SAVED_REQUEST_PARAMETER @@ -92,11 +94,7 @@ public class WebConstants { public static final String PASSWORD_ERROE = "password error"; public static final String USER_NOT_EXIST = "user not exist"; public static final String USER_LOCKED = "locked"; - public static final String USER_INACTIVE = "inactive"; - - - - + public static final String USER_INACTIVE = "inactive"; } } 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 c2d0a88f..10d4f705 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java +++ b/maxkey-core/src/main/java/org/maxkey/web/WebContext.java @@ -20,6 +20,7 @@ package org.maxkey.web; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.Enumeration; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -64,6 +65,8 @@ public final class WebContext { public static ArrayList sessionAttributeNameList = new ArrayList(); + public static ArrayList logoutAttributeNameList = new ArrayList(); + public static IdGenerator idGenerator; static { @@ -76,9 +79,27 @@ public final class WebContext { sessionAttributeNameList.add(WebConstants.CURRENT_USER_PASSWORD_SET_TYPE); sessionAttributeNameList.add(WebConstants.CURRENT_USER_SESSION_ID); + sessionAttributeNameList.add(WebConstants.CURRENT_INST); + sessionAttributeNameList.add(WebConstants.FIRST_SAVED_REQUEST_PARAMETER); sessionAttributeNameList.add(WebConstants.REMEBER_ME_SESSION); + + //logout + logoutAttributeNameList.add(WebConstants.AUTHENTICATION); + + logoutAttributeNameList.add(WebConstants.AUTHORIZE_SIGN_ON_APP); + logoutAttributeNameList.add(WebConstants.AUTHORIZE_SIGN_ON_APP_SAMLV20_ADAPTER); + + logoutAttributeNameList.add(WebConstants.CURRENT_USER); + logoutAttributeNameList.add(WebConstants.CURRENT_USER_PASSWORD_SET_TYPE); + logoutAttributeNameList.add(WebConstants.CURRENT_USER_SESSION_ID); + + + logoutAttributeNameList.add(WebConstants.FIRST_SAVED_REQUEST_PARAMETER); + + logoutAttributeNameList.add(WebConstants.REMEBER_ME_SESSION); + } /** @@ -238,6 +259,24 @@ public final class WebContext { return httpContextPath; } + + public static void printRequest(final HttpServletRequest request) { + _logger.trace("getRequestURL : "+request.getRequestURL()); + _logger.trace("getMethod : "+request.getMethod()); + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()) { + String key = (String) headerNames.nextElement(); + String value = request.getHeader(key); + _logger.trace("Header key "+key +" , value " + value); + } + + Enumeration parameterNames = request.getParameterNames(); + while (parameterNames.hasMoreElements()) { + String key = (String) parameterNames.nextElement(); + String value = request.getParameter(key); + _logger.trace("Parameter "+key +" , value " + value); + } + } /** * get current Session. diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebInstRequestFilter.java b/maxkey-core/src/main/java/org/maxkey/web/WebInstRequestFilter.java new file mode 100644 index 00000000..84e46425 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/WebInstRequestFilter.java @@ -0,0 +1,78 @@ +/* + * 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.web; + +import java.io.IOException; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; +import org.maxkey.configuration.ApplicationConfig; +import org.maxkey.entity.Institutions; +import org.maxkey.persistence.db.InstitutionService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.filter.GenericFilterBean; + +public class WebInstRequestFilter extends GenericFilterBean { + final static Logger _logger = LoggerFactory.getLogger(GenericFilterBean.class); + + public final static String HEADER_HOST = "host"; + + public final static String LOGO_COOKIE_NAME = "mxk_logo"; + + InstitutionService institutionService; + + ApplicationConfig applicationConfig; + + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) + throws IOException, ServletException { + _logger.trace("WebInstRequestFilter"); + HttpServletRequest request= ((HttpServletRequest)servletRequest); + + if(request.getSession().getAttribute(WebConstants.CURRENT_INST) == null) { + WebContext.printRequest(request); + String host = request.getHeader(HEADER_HOST); + if(StringUtils.isEmpty(host)) { + host = applicationConfig.getDomainName(); + } + if(host.indexOf(":")> -1 ) { + host = host.split(":")[0]; + } + Institutions institution =institutionService.findByDomain(host); + _logger.trace("{}" ,institution); + request.getSession().setAttribute(WebConstants.CURRENT_INST, institution); + WebContext.setCookie((HttpServletResponse)servletResponse, host, LOGO_COOKIE_NAME, institution.getLogo()); + } + chain.doFilter(servletRequest, servletResponse); + } + + public WebInstRequestFilter(InstitutionService institutionService,ApplicationConfig applicationConfig) { + super(); + this.institutionService = institutionService; + this.applicationConfig = applicationConfig; + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java index 8ed993b8..356e5c63 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java @@ -25,7 +25,11 @@ import freemarker.template.TemplateModel; import java.io.IOException; import java.util.Map; import javax.servlet.http.HttpServletRequest; + +import org.maxkey.entity.Institutions; +import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; +import org.maxkey.web.WebInstRequestFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +48,7 @@ import org.springframework.web.servlet.support.RequestContextUtils; @FreemarkerTag("locale") public class LocaleTagDirective implements TemplateDirectiveModel { private static final Logger _logger = LoggerFactory.getLogger(LocaleTagDirective.class); + @Autowired private HttpServletRequest request; @@ -60,6 +65,16 @@ public class LocaleTagDirective implements TemplateDirectiveModel { } else if (params.get("code").toString().equals("global.application.version") || params.get("code").toString().equals("application.version")) { message = WebContext.properties.getProperty("application.formatted-version"); + } else if (params.get("code").toString().equals("global.logo")) { + if(request.getSession().getAttribute(WebConstants.CURRENT_INST)!=null) { + message = ((Institutions)request.getSession().getAttribute(WebConstants.CURRENT_INST)).getLogo(); + }else { + message = WebContext.readCookieByName(request, WebInstRequestFilter.LOGO_COOKIE_NAME).getValue(); + } + + if(!message.startsWith("http")) { + message = request.getContextPath() + message; + } } else { _logger.trace("message code " + params.get("code")); try { diff --git a/maxkey-gataway/src/main/resources/application.yml b/maxkey-gataway/src/main/resources/application.yml index 338accbd..69a09030 100644 --- a/maxkey-gataway/src/main/resources/application.yml +++ b/maxkey-gataway/src/main/resources/application.yml @@ -1,7 +1,7 @@ #端口号 application: name: maxkey-gateway-server - formatted-version: v3.2.0 GA + formatted-version: v3.2.1 GA server: port: 9000 spring: diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/InstitutionsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/InstitutionsMapper.java new file mode 100644 index 00000000..ecd90d47 --- /dev/null +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/InstitutionsMapper.java @@ -0,0 +1,28 @@ +/* + * Copyright [2020] [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.persistence.mapper; +import org.apache.ibatis.annotations.Select; +import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; +import org.maxkey.constants.ConstantsStatus; +import org.maxkey.entity.Institutions; + +public interface InstitutionsMapper extends IJpaBaseMapper { + + @Select("select * from mxk_institutions where domain = #{value} and status = " + ConstantsStatus.ACTIVE) + public Institutions findByDomain(String domain); +} diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/InstitutionsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/InstitutionsService.java new file mode 100644 index 00000000..03688d14 --- /dev/null +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/InstitutionsService.java @@ -0,0 +1,45 @@ +/* + * Copyright [2020] [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.persistence.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.entity.Institutions; +import org.maxkey.persistence.mapper.InstitutionsMapper; +import org.springframework.stereotype.Repository; + + +@Repository +public class InstitutionsService extends JpaBaseService{ + + public InstitutionsService() { + super(InstitutionsMapper.class); + } + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public InstitutionsMapper getMapper() { + return (InstitutionsMapper)super.getMapper(); + } + + public Institutions findByDomain(String domain) { + return getMapper().findByDomain(domain); + }; + +} diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java index e7e98b8d..0d0ff499 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java @@ -17,7 +17,6 @@ package org.maxkey.authz.oauth2.provider.endpoint; import java.io.IOException; -import java.util.Enumeration; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -32,8 +31,6 @@ import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.oauth2.common.OAuth2Constants; import org.maxkey.authz.oauth2.common.util.OAuth2Utils; @@ -44,6 +41,8 @@ import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; import org.maxkey.util.AuthorizationHeaderCredential; import org.maxkey.util.AuthorizationHeaderUtils; import org.maxkey.web.WebContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.security.authentication.AuthenticationDetailsSource; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; @@ -84,7 +83,7 @@ import org.springframework.web.HttpRequestMethodNotSupportedException; OAuth2Constants.ENDPOINT.ENDPOINT_TENCENT_IOA_TOKEN+"/*"}) public class TokenEndpointAuthenticationFilter implements Filter { - private static final Log logger = LogFactory.getLog(TokenEndpointAuthenticationFilter.class); + final static Logger _logger = LoggerFactory.getLogger(TokenEndpointAuthenticationFilter.class); private AuthenticationDetailsSource authenticationDetailsSource = new WebAuthenticationDetailsSource(); boolean allowOnlyPost; @@ -122,7 +121,7 @@ public class TokenEndpointAuthenticationFilter implements Filter { public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { - logger.debug("Authentication TokenEndpoint "); + _logger.debug("Authentication TokenEndpoint "); if(authenticationManager==null) { authenticationManager= WebContext.getBean("oauth20UserAuthenticationManager",AuthenticationManager.class); } @@ -133,26 +132,12 @@ public class TokenEndpointAuthenticationFilter implements Filter { oauth20ClientAuthenticationManager = WebContext.getBean("oauth20ClientAuthenticationManager",AuthenticationManager.class); } - final boolean debug = logger.isDebugEnabled(); + final boolean debug = _logger.isDebugEnabled(); final HttpServletRequest request = (HttpServletRequest) req; final HttpServletResponse response = (HttpServletResponse) res; - if(logger.isTraceEnabled()) { - logger.trace("getRequestURL : "+request.getRequestURL()); - logger.trace("getMethod : "+request.getMethod()); - Enumeration headerNames = request.getHeaderNames(); - while (headerNames.hasMoreElements()) { - String key = (String) headerNames.nextElement(); - String value = request.getHeader(key); - logger.trace("Header key "+key +" , value " + value); - } - - Enumeration parameterNames = request.getParameterNames(); - while (parameterNames.hasMoreElements()) { - String key = (String) parameterNames.nextElement(); - String value = request.getParameter(key); - logger.trace("Parameter "+key +" , value " + value); - } + if(_logger.isTraceEnabled()) { + WebContext.printRequest(request); } try { @@ -162,7 +147,7 @@ public class TokenEndpointAuthenticationFilter implements Filter { usernamepassword(request,response); }else { Authentication authentication=ClientCredentials(request,response); - logger.trace("getPrincipal " + authentication.getPrincipal().getClass()); + _logger.trace("getPrincipal " + authentication.getPrincipal().getClass()); SigninPrincipal auth = null; if(authentication.getPrincipal() instanceof SigninPrincipal) { //authorization_code @@ -181,7 +166,7 @@ public class TokenEndpointAuthenticationFilter implements Filter { SecurityContextHolder.clearContext(); if (debug) { - logger.debug("Authentication request for failed: " + failed); + _logger.debug("Authentication request for failed: " + failed); } onUnsuccessfulAuthentication(request, response, failed); @@ -193,17 +178,17 @@ public class TokenEndpointAuthenticationFilter implements Filter { } public void usernamepassword(HttpServletRequest request, HttpServletResponse response) throws IOException,ServletException { - logger.debug("Authentication TokenEndpoint "); + _logger.debug("Authentication TokenEndpoint "); try { Authentication credentials = extractCredentials(request); if (credentials != null) { - logger.debug("Authentication credentials found for '" + credentials.getName() + "'"); + _logger.debug("Authentication credentials found for '" + credentials.getName() + "'"); Authentication authResult = authenticationManager.authenticate(credentials); - logger.debug("Authentication success: " + authResult.getName()); + _logger.debug("Authentication success: " + authResult.getName()); String clientId = request.getParameter(OAuth2Constants.PARAMETER.CLIENT_ID); String clientSecret = request.getParameter(OAuth2Constants.PARAMETER.CLIENT_SECRET); UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(clientId, @@ -237,7 +222,7 @@ public class TokenEndpointAuthenticationFilter implements Filter { catch (AuthenticationException failed) { SecurityContextHolder.clearContext(); - logger.debug("Authentication request for failed: " + failed); + _logger.debug("Authentication request for failed: " + failed); onUnsuccessfulAuthentication(request, response, failed); @@ -261,7 +246,7 @@ public class TokenEndpointAuthenticationFilter implements Filter { clientSecret=ahc.getCredential(); } - logger.trace("clientId "+clientId +" , clientSecret " + clientSecret); + _logger.trace("clientId "+clientId +" , clientSecret " + clientSecret); // If the request is already authenticated we can assume that this // filter is not needed diff --git a/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties b/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties index 41eb0651..8beaa058 100644 --- a/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties +++ b/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties @@ -18,7 +18,7 @@ application.title =MaxKey #for dynamic service discovery spring.application.name =maxkey-monitor -application.formatted-version =v3.2.0 GA +application.formatted-version =v3.2.1 GA #nacos discovery spring.cloud.nacos.discovery.enabled =${NACOS_DISCOVERY_ENABLED:false} spring.cloud.nacos.discovery.instance-enabled =false diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java index c032f4e2..51270c28 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java @@ -24,7 +24,9 @@ import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService import org.maxkey.authn.support.socialsignon.service.SocialsAssociate; import org.maxkey.authn.support.socialsignon.service.SocialsAssociateService; import org.maxkey.configuration.ApplicationConfig; +import org.maxkey.entity.Institutions; import org.maxkey.entity.SocialsProvider; +import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +57,9 @@ public class SocialSignOnListController { ModelAndView modelAndView=new ModelAndView("social/socialSignOnProvider"); if(applicationConfig.getLoginConfig().isSocialSignOn()){ - List listSocialSignOnProvider= socialSignOnProviderService.getSocialSignOnProviders(); + Institutions inst = (Institutions)WebContext.getAttribute(WebConstants.CURRENT_INST); + List listSocialSignOnProvider = + socialSignOnProviderService.loadSocialsProviders(inst.getId()).getSocialSignOnProviders(); SocialsAssociate socialSignOnUser=new SocialsAssociate(); socialSignOnUser.setUserId(WebContext.getUserInfo().getId()); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java index ac78bb43..dfaeba20 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java @@ -29,6 +29,7 @@ import org.maxkey.authn.LoginCredential; import org.maxkey.authn.support.kerberos.KerberosService; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; import org.maxkey.configuration.ApplicationConfig; +import org.maxkey.entity.Institutions; import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.persistence.service.UserInfoService; @@ -94,8 +95,11 @@ public class LoginEndpoint { */ @Operation(summary = "登录接口", description = "用户登录地址",method="GET") @RequestMapping(value={"/login"}) - public ModelAndView login() { + public ModelAndView login(HttpServletRequest request) { _logger.debug("LoginController /login."); + + WebContext.printRequest(request); + boolean isAuthenticated= WebContext.isAuthenticated(); if(isAuthenticated){ @@ -123,7 +127,8 @@ public class LoginEndpoint { //load Social Sign On Providers if(applicationConfig.getLoginConfig().isSocialSignOn()){ _logger.debug("Load Social Sign On Providers "); - modelAndView.addObject("ssopList", socialSignOnProviderService.getSocialSignOnProviders()); + Institutions inst = (Institutions)WebContext.getAttribute(WebConstants.CURRENT_INST); + modelAndView.addObject("sspLogin", socialSignOnProviderService.loadSocialsProviders(inst.getId())); } Object loginErrorMessage=WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE); @@ -152,9 +157,7 @@ public class LoginEndpoint { @RequestMapping("/login/{username}") @ResponseBody public HashMap queryLoginUserAuth(@PathVariable("username") String username) { - UserInfo userInfo=new UserInfo(); - userInfo.setUsername(username); - userInfo=userInfoService.load(userInfo); + UserInfo userInfo=userInfoService.findByUsername(username); HashMap authnType=new HashMap (); authnType.put("authnType", userInfo.getAuthnType()); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java index e3757652..764adf15 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java @@ -148,8 +148,10 @@ public class LogoutEndpoint { WebConstants.ONLINE_TICKET_NAME, UUID.randomUUID().toString() ); - request.getSession().invalidate(); + //for(String removeAttribute : WebContext.logoutAttributeNameList) { + // request.getSession().removeAttribute(removeAttribute); + //} SecurityContextHolder.clearContext(); modelAndView.setViewName(viewName); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties index d0200591..6a1f7878 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties @@ -16,7 +16,7 @@ #MaxKey Title and Version # ############################################################################ application.title =MaxKey -application.formatted-version =v3.2.0 GA +application.formatted-version =v3.2.1 GA #for dynamic service discovery spring.application.name =maxkey ############################################################################ diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4j2.xml b/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4j2.xml index d81eedf0..a988a3de 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4j2.xml +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4j2.xml @@ -26,7 +26,6 @@ - diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl index 29d36bad..b990ce9e 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl @@ -2,7 +2,7 @@
-
+
" style="width:55px;heigth:55px">
<@locale code="global.application"/>
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl index 5182b1bb..c8815cd5 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl @@ -3,7 +3,7 @@
-
+
" style="width:55px;heigth:55px">
<@locale code="global.application"/>
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl index 035274b6..7dfcd1a1 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl @@ -78,8 +78,12 @@ <#include "loginmobile.ftl">
- <#include "loginworkweixin.ftl"> - <#-- <#include "logindingtalk.ftl">--> + <#if sspLogin.workWeixinLogin != 'none'> + <#include "loginscanworkweixin.ftl"> + + <#if sspLogin.dingTalkLogin != 'none'> + <#include "loginscandingtalk.ftl"> +
@@ -91,7 +95,7 @@ <@locale code="login.text.otherlogins"/>： - <#list ssopList as ssop> + <#list sspLogin.socialSignOnProviders as ssop> <#if (ssop_index)%4==0> @@ -104,7 +108,7 @@ - <#if (ssopList?size)%4!=0> + <#if (sspLogin.socialSignOnProviders?size)%4!=0> diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/logindingtalk.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginscandingtalk.ftl similarity index 91% rename from maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/logindingtalk.ftl rename to maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginscandingtalk.ftl index eb94a400..7f916da7 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/logindingtalk.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginscandingtalk.ftl @@ -1,6 +1,12 @@ + <#if sspLogin.dingTalkLogin == 'https'> - var dingtalkredirect_uri=""; + + <#if sspLogin.dingTalkLogin == 'http'> + + + + + <#if sspLogin.workWeixinLogin == 'http'> + +