maxkey-authentications

build.gradle

@@ -1,5 +1,21 @@
 /*
- * This build file was auto generated by running the Gradle buildrelease.bat
+ * Copyright [2021] [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.
+ */
+ 
+/*
+ * MaxKey build file was auto generated by running the Gradle release.bat
  */
 
 defaultTasks "clean", "build"
@@ -148,7 +164,7 @@ subprojects {
          compile group: 'org.apache.poi', name: 'poi-ooxml', version: "${poiVersion}"
          compile group: 'org.apache.poi', name: 'poi-ooxml-schemas', version: "${poiVersion}"
          compile group: 'org.apache.poi', name: 'poi-scratchpad', version: "${poiVersion}"
-         compile group: 'org.apache.commons', name: 'not-yet-commons-ssl', version: '0.3.9'
+         //compile group: 'org.apache.commons', name: 'not-yet-commons-ssl', version: '0.3.9'
          
 		//logs
          compile group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: "${log4jVersion}"

maxkey-authentications/maxkey-authentication-captcha/build.gradle

@@ -0,0 +1,12 @@
+
+description = "maxkey-authentication-captcha"
+
+
+dependencies {
+	//local jars
+	compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar')
+	
+	compile project(":maxkey-core")
+	compile project(":maxkey-persistence")
+   
+}

maxkey-core/src/main/java/org/maxkey/web/image/ImageCaptchaEndpoint.java → maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptchaEndpoint.java

@@ -15,13 +15,14 @@
  */
  
 
-package org.maxkey.web.image;
+package org.maxkey.web.contorller;
 
 import com.google.code.kaptcha.Producer;
 import java.awt.image.BufferedImage;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.maxkey.web.WebConstants;
+import org.maxkey.web.image.AbstractImageEndpoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

maxkey-authentications/build.gradle → maxkey-authentications/maxkey-authentication-core/build.gradle

@@ -1,13 +1,11 @@
 
-description = "maxkey-authentications"
+description = "maxkey-authentication-core"
 
 
 dependencies {
 	//local jars
 	compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar')
 	
-	
-	
 	compile project(":maxkey-core")
 	compile project(":maxkey-persistence")
    	compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0")

maxkey-authentications/maxkey-authentication-social/build.gradle

@@ -0,0 +1,12 @@
+
+description = "maxkey-authentication-social"
+
+
+dependencies {
+	//local jars
+	compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar')
+	
+	compile project(":maxkey-core")
+	compile project(":maxkey-persistence")
+   
+}

maxkey-authentications/maxkey-authentication-social/src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+

maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java → maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java

@@ -70,7 +70,9 @@ public class SocialSignOnAutoConfiguration implements InitializingBean {
             socialSignOnProvider.setClientId(clientId);
             socialSignOnProvider.setClientSecret(clientSecret);
             socialSignOnProvider.setSortOrder(Integer.valueOf(sortOrder));
-            _logger.debug("socialSignOnProvider " + socialSignOnProvider);
+            _logger.debug("socialSignOnProvider " + socialSignOnProvider.getProvider() 
+            								+ "(" + socialSignOnProvider.getProviderName()+")");
+            _logger.trace("socialSignOnProvider " + socialSignOnProvider);
             socialSignOnProviderList.add(socialSignOnProvider);            
         }
         socialSignOnProviderService.setSocialSignOnProviders(socialSignOnProviderList);

maxkey-core/src/main/java/org/maxkey/web/image/AbstractImageEndpoint.java

@@ -45,7 +45,7 @@ public class AbstractImageEndpoint {
 
     @Autowired
     @Qualifier("applicationConfig")
-    ApplicationConfig applicationConfig;
+    protected ApplicationConfig applicationConfig;
 
     /**
      * producerImage.

maxkey-web-manage/build.gradle

@@ -61,6 +61,7 @@ jib {
 
 dependencies {
 	compile project(":maxkey-core")
+	compile project(":maxkey-authentications:maxkey-authentication-captcha")
    	compile project(":maxkey-persistence")
    	compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0")
    	compile project(":maxkey-protocols:maxkey-protocol-saml-2.0")   

maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java

@@ -48,6 +48,8 @@ public class MaxKeyMgtMvcConfig implements WebMvcConfigurer {
     
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
+    	_logger.debug("addResourceHandlers");
+    	 
         _logger.debug("add statics");
         registry.addResourceHandler("/static/**")
                 .addResourceLocations("classpath:/static/");
@@ -65,7 +67,7 @@ public class MaxKeyMgtMvcConfig implements WebMvcConfigurer {
         registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
 
-        _logger.debug("add addResourceHandler");
+        _logger.debug("addResourceHandler finished .");
     }
 
     @Override

maxkey-web-maxkey/build.gradle

@@ -64,7 +64,10 @@ dependencies {
 	compile project(":maxkey-core")
 	compile project(":maxkey-persistence")
    	
-   	compile project(":maxkey-authentications")
+   	compile project(":maxkey-authentications:maxkey-authentication-core")
+   	compile project(":maxkey-authentications:maxkey-authentication-social")
+   	compile project(":maxkey-authentications:maxkey-authentication-captcha")
+   	
 	
    	compile project(":maxkey-protocols:maxkey-protocol-authorize")
    	compile project(":maxkey-protocols:maxkey-protocol-cas")

maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java

@@ -68,6 +68,7 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer {
     
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
+    	_logger.debug("addResourceHandlers");
         _logger.debug("add statics");
         registry.addResourceHandler("/static/**")
                 .addResourceLocations("classpath:/static/");
@@ -85,7 +86,7 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer {
         registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
         
-        _logger.debug("add addResourceHandler");
+        _logger.debug("addResourceHandler finished .");
     }
 
     @Override

maxkey-web-maxkey/src/main/resources/kaptcha.properties

@@ -1,9 +0,0 @@
-kaptcha.image.width=80
-kaptcha.image.height=25
-kaptcha.border=no
-kaptcha.obscurificator.impl=com.google.code.kaptcha.impl.ShadowGimpy
-kaptcha.textproducer.font.size=23
-kaptcha.textproducer.char.string=0123456789
-kaptcha.textproducer.char.length=4
-kaptcha.noise.impl=com.google.code.kaptcha.impl.NoNoise
-#kaptcha.noise.color=white

settings.gradle

@@ -6,7 +6,10 @@ rootProject.name = 'MaxKey'
 //Common
 include 'maxkey-core'
 include 'maxkey-persistence'
-include 'maxkey-authentications'
+//include 'maxkey-authentications'
+include 'maxkey-authentications:maxkey-authentication-core'
+include 'maxkey-authentications:maxkey-authentication-captcha'
+include 'maxkey-authentications:maxkey-authentication-social'
 
 //identity
 include 'maxkey-identitys:maxkey-identity-scim'