From 9bac9464a16255ba827b34dd4234eb7b820a6cdc Mon Sep 17 00:00:00 2001
From: shimingxy <shimingxy@163.com>
Date: Thu, 6 Feb 2020 14:03:35 +0800
Subject: [PATCH] ssl support

ssl support
---
 .../service/SocialSignOnProviderService.java  |   4 +--
 maxkey-web-maxkey/maxkeyserver.keystore       | Bin 0 -> 2231 bytes
 .../main/java/org/maxkey/MaxKeyConfig.java    |  32 ++++++++++++++++++
 .../src/main/resources/application.properties |  12 +++++--
 .../config/applicationLogin.properties        |  16 ++++-----
 .../spring/maxkey-support-social.xml          |  16 ++++-----
 6 files changed, 60 insertions(+), 20 deletions(-)
 create mode 100644 maxkey-web-maxkey/maxkeyserver.keystore

diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java b/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java
index a35bb9f1..028d62b2 100644
--- a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java
+++ b/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java
@@ -46,7 +46,7 @@ public class SocialSignOnProviderService{
 			authRequest = new AuthTwitterRequest(authConfig);
 		}else if(provider.equalsIgnoreCase("google")) {
 			authRequest = new AuthGoogleRequest(authConfig);
-		}else if(provider.equalsIgnoreCase("Windows")) {
+		}else if(provider.equalsIgnoreCase("microsoft")) {
 			authRequest = new AuthMicrosoftRequest(authConfig);
 		}else if(provider.equalsIgnoreCase("Linkedin")) {
 			authRequest = new AuthLinkedinRequest(authConfig);
@@ -72,7 +72,7 @@ public class SocialSignOnProviderService{
 			return ((AuthUser)authResponse.getData()).getUuid();
 		}else if(provider.equalsIgnoreCase("google")) {
 			return ((AuthUser)authResponse.getData()).getUuid();
-		}else if(provider.equalsIgnoreCase("Windows")) {
+		}else if(provider.equalsIgnoreCase("microsoft")) {
 			return ((AuthUser)authResponse.getData()).getUuid();
 		}else if(provider.equalsIgnoreCase("Linkedin")) {
 			return ((AuthUser)authResponse.getData()).getUuid();
diff --git a/maxkey-web-maxkey/maxkeyserver.keystore b/maxkey-web-maxkey/maxkeyserver.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..c8faec185bb103916e0612d999c98fcfee39702d
GIT binary patch
literal 2231
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

literal 0
HcmV?d00001

diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java
index 365dcf67..b34fc703 100644
--- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java
+++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java
@@ -1,7 +1,12 @@
 package org.maxkey;
 
+import org.apache.catalina.Context;
+import org.apache.catalina.connector.Connector;
+import org.apache.tomcat.util.descriptor.web.SecurityCollection;
+import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
 import org.maxkey.authz.oauth2.provider.endpoint.TokenEndpointAuthenticationFilter;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.ConfigurableWebServerFactory;
 import org.springframework.boot.web.server.ErrorPage;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
@@ -56,4 +61,31 @@ public class MaxKeyConfig {
             }
         };
 	}
+	
+	 @Bean
+	    public Connector connector(){
+	        Connector connector=new Connector("org.apache.coyote.http11.Http11NioProtocol");
+	        connector.setScheme("http");
+	        connector.setPort(80);
+	        connector.setSecure(false);
+	        connector.setRedirectPort(443);
+	        return connector;
+	    }
+
+	    @Bean
+	    public TomcatServletWebServerFactory tomcatServletWebServerFactory(Connector connector){
+	        TomcatServletWebServerFactory tomcat=new TomcatServletWebServerFactory(){
+	            @Override
+	            protected void postProcessContext(Context context) {
+	                SecurityConstraint securityConstraint=new SecurityConstraint();
+	                securityConstraint.setUserConstraint("CONFIDENTIAL");
+	                SecurityCollection collection=new SecurityCollection();
+	                collection.addPattern("/*");
+	                securityConstraint.addCollection(collection);
+	                context.addConstraint(securityConstraint);
+	            }
+	        };
+	        tomcat.addAdditionalTomcatConnectors(connector);
+	        return tomcat;
+	    }
 }
diff --git a/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-web-maxkey/src/main/resources/application.properties
index f6d2b698..543d2a89 100644
--- a/maxkey-web-maxkey/src/main/resources/application.properties
+++ b/maxkey-web-maxkey/src/main/resources/application.properties
@@ -1,7 +1,15 @@
 #server config
 #spring.profiles.active=dev
 #server port
-server.port=80
+#server.port=80
+server.port=443
+#ssl
+server.ssl.key-store=maxkeyserver.keystore
+server.ssl.key-alias=maxkey
+server.ssl.enabled=true
+server.ssl.key-store-password=maxkey
+server.ssl.key-store-type=JKS
+
 #web app context path
 server.servlet.context-path=/maxkey
 
@@ -22,4 +30,4 @@ spring.freemarker.suffix=.ftl
 #static resources
 spring.mvc.static-path-pattern=/static/**
 
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
diff --git a/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties b/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties
index 5f71c578..fc0e9a86 100644
--- a/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties
+++ b/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties
@@ -120,14 +120,14 @@ config.socialsignon.dingtalk.client.secret=Crm7YJbMKfRlvG2i1SHpg4GHVpqF_oXiEjhmR
 config.socialsignon.dingtalk.account.id=openid
 config.socialsignon.dingtalk.sortorder=4
 
-#Windows Live
-config.socialsignon.live.provider=Windows
-config.socialsignon.live.provider.name=Windows Live
-config.socialsignon.live.icon=images/social/live.png
-config.socialsignon.live.client.id=00000000401129A4
-config.socialsignon.live.client.secret=Kx-OAmHaoqG5vcitm3-TASOSZD1ebu64
-config.socialsignon.live.account.id=id
-config.socialsignon.live.sortorder=5
+#Microsoft
+config.socialsignon.microsoft.provider=microsoft
+config.socialsignon.microsoft.provider.name=Microsoft
+config.socialsignon.microsoft.icon=images/social/live.png
+config.socialsignon.microsoft.client.id=24aa73b6-7928-4e64-bd64-d8682e650f95
+config.socialsignon.microsoft.client.secret=PF[_AthtjVrtWVO2mNy@CJxY1@Z8FNf5
+config.socialsignon.microsoft.account.id=id
+config.socialsignon.microsoft.sortorder=5
 
 #facebook
 config.socialsignon.facebook.provider=facebook
diff --git a/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-social.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-social.xml
index 7502c939..a58222cf 100644
--- a/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-social.xml
+++ b/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-social.xml
@@ -49,13 +49,13 @@
 		<property name="sortOrder" value="${config.socialsignon.qq.sortorder}"/>
 	</bean>
 
-	<bean id="socialSignOnLive" class="org.maxkey.authn.support.socialsignon.service.SocialSignOnProvider">
-		<property name="provider" value="${config.socialsignon.live.provider}"/>
-		<property name="providerName" value="${config.socialsignon.live.provider.name}"/>
-		<property name="icon" value="${config.socialsignon.live.icon}"/>
-		<property name="clientId" value="${config.socialsignon.live.client.id}"/>
-		<property name="clientSecret" value="${config.socialsignon.live.client.secret}"/>
-		<property name="sortOrder" value="${config.socialsignon.live.sortorder}"/>
+	<bean id="socialSignOnMicrosoft" class="org.maxkey.authn.support.socialsignon.service.SocialSignOnProvider">
+		<property name="provider" value="${config.socialsignon.microsoft.provider}"/>
+		<property name="providerName" value="${config.socialsignon.microsoft.provider.name}"/>
+		<property name="icon" value="${config.socialsignon.microsoft.icon}"/>
+		<property name="clientId" value="${config.socialsignon.microsoft.client.id}"/>
+		<property name="clientSecret" value="${config.socialsignon.microsoft.client.secret}"/>
+		<property name="sortOrder" value="${config.socialsignon.microsoft.sortorder}"/>
 	</bean>
 
 	<bean id="socialSignOnFacebook" class="org.maxkey.authn.support.socialsignon.service.SocialSignOnProvider">
@@ -81,7 +81,7 @@
 				<ref bean="socialSignOnWeibo" />
 				<ref bean="socialSignOnQQ"/>
 				<ref bean="socialSignOnGoogle"/>
-				<ref bean="socialSignOnLive"/>
+				<ref bean="socialSignOnMicrosoft"/>
 				<ref bean="socialSignOnFacebook"/>
 				<ref bean="socialSignOndingtalk"/>