You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/05/14 07:32:36 UTC
[syncope] branch master updated: SYNCOPE-1559: Support GoogleAuth
MFA configuration (#187)
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new a2abb31 SYNCOPE-1559: Support GoogleAuth MFA configuration (#187)
a2abb31 is described below
commit a2abb31ccd523f090f6374dafb5db89d52b48e22
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Thu May 14 12:02:28 2020 +0430
SYNCOPE-1559: Support GoogleAuth MFA configuration (#187)
---
.../src/test/resources/domains/MasterContent.xml | 2 +-
core/persistence-jpa/src/test/resources/domains/MasterContent.xml | 2 +-
docker/wa/src/main/resources/application.properties | 2 +-
docker/wa/src/main/resources/wa.properties | 7 +++----
fit/wa-reference/src/main/resources/wa.properties | 7 +++----
pom.xml | 5 +++++
wa/starter/pom.xml | 4 ++++
wa/starter/src/main/resources/application.properties | 2 +-
wa/starter/src/main/resources/wa.properties | 7 +++----
9 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
index 3394661..5412606 100644
--- a/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
@@ -66,7 +66,7 @@ under the License.
<AuthModule id="4c3ed7e8-7008-11ea-bc55-0242ac130003" name="DefaultJDBCAuthModule"
description="JDBC auth module" jsonConf='{"@class":"org.apache.syncope.common.lib.auth.JDBCAuthModuleConf","name":"MyJDBCAuthModuleConf", "sql":"SELECT * FROM table WHERE name=?"}'/>
<AuthModule id="4c3ed4e6-7008-11ea-bc55-0242ac130003" name="DefaultGoogleMfaAuthModule"
- description="Google Mfa auth module" jsonConf='{"@class":"org.apache.syncope.common.lib.auth.GoogleMfaAuthModuleConf","name":"MyGoogleMfaAuthModuleConf","codeDigits":6,"issuer":"SyncopeTest"}'/>
+ description="Google Mfa auth module" jsonConf='{"@class":"org.apache.syncope.common.lib.auth.GoogleMfaAuthModuleConf","name":"MyGoogleMfaAuthModuleConf","codeDigits":6,"issuer":"SyncopeTest", "label":"SyncopeTest", "timeStepSize":30, "windowSize":3}'/>
<AuthModule id="4c3ed8f6-7008-11ea-bc55-0242ac130003" name="DefaultOIDCAuthModule"
description="OIDC auth module"
jsonConf='{"@class":"org.apache.syncope.common.lib.auth.OIDCAuthModuleConf","name":"MyOIDCAuthModuleConf", "discoveryUri":"https://accounts.google.com/.well-known/openid-configuration", "id":"client-id", "secret": "client-secret" }'/>
diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
index 7e1c33b..d914022 100644
--- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
@@ -66,7 +66,7 @@ under the License.
<AuthModule id="4c3ed7e8-7008-11ea-bc55-0242ac130003" name="DefaultJDBCAuthModule"
description="JDBC auth module" jsonConf='{"@class":"org.apache.syncope.common.lib.auth.JDBCAuthModuleConf","name":"MyJDBCAuthModuleConf", "sql":"SELECT * FROM users_table WHERE name=?", "fieldPassword": "password"}'/>
<AuthModule id="4c3ed4e6-7008-11ea-bc55-0242ac130003" name="DefaultGoogleMfaAuthModule"
- description="Google Mfa auth module" jsonConf='{"@class":"org.apache.syncope.common.lib.auth.GoogleMfaAuthModuleConf","name":"MyGoogleMfaAuthModuleConf","codeDigits":6,"issuer":"SyncopeTest"}'/>
+ description="Google Mfa auth module" jsonConf='{"@class":"org.apache.syncope.common.lib.auth.GoogleMfaAuthModuleConf","name":"MyGoogleMfaAuthModuleConf","codeDigits":6,"issuer":"SyncopeTest", "label":"SyncopeTest", "timeStepSize":30, "windowSize":3}'/>
<AuthModule id="4c3ed8f6-7008-11ea-bc55-0242ac130003" name="DefaultOIDCAuthModule"
description="OIDC auth module"
jsonConf='{"@class":"org.apache.syncope.common.lib.auth.OIDCAuthModuleConf","name":"MyOIDCAuthModuleConf", "discoveryUri":"https://accounts.google.com/.well-known/openid-configuration", "id":"client-id", "secret": "client-secret" }'/>
diff --git a/docker/wa/src/main/resources/application.properties b/docker/wa/src/main/resources/application.properties
index ef67775..0047d91 100644
--- a/docker/wa/src/main/resources/application.properties
+++ b/docker/wa/src/main/resources/application.properties
@@ -36,7 +36,7 @@ management.endpoint.loggers.enabled=true
management.endpoint.refresh.enabled=true
management.endpoint.registeredServices.enabled=true
-cas.serviceRegistry.schedule.enabled=false
+cas.service-registry.schedule.enabled=false
##
# Allow configuration classes to override bean definitions from Spring Boot
diff --git a/docker/wa/src/main/resources/wa.properties b/docker/wa/src/main/resources/wa.properties
index c98a6e7..051d549 100644
--- a/docker/wa/src/main/resources/wa.properties
+++ b/docker/wa/src/main/resources/wa.properties
@@ -22,14 +22,13 @@ useGZIPCompression=true
# Conf directories
conf.directory=${conf.directory}
cas.standalone.configurationDirectory=${conf.directory}
-cas.authn.oidc.jwks.jwksFile=file:${conf.directory}/oidc.keystore
+cas.authn.oidc.jwks.jwks-file=file:${conf.directory}/oidc.keystore
cas.server.name=http://localhost:8080
cas.server.prefix=${cas.server.name}/syncope-wa
cas.server.scope=syncope.org
-cas.authn.samlIdp.entityId=https://syncope.apache.org/saml
-cas.authn.samlIdp.metadata.location=file:${conf.directory}
+cas.authn.saml-idp.entity-id=https://syncope.apache.org/saml
# Disable access to the login endpoint
# if no target application is specified.
@@ -37,7 +36,7 @@ cas.sso.allow-missing-service-parameter=true
# Disable the acceptable usage policy
# by default for now.
-cas.acceptableUsagePolicy.enabled=false
+cas.acceptable-usage-policy.enabled=false
management.endpoints.web.exposure.include=health,loggers,refresh
management.endpoint.health.show-details=always
diff --git a/fit/wa-reference/src/main/resources/wa.properties b/fit/wa-reference/src/main/resources/wa.properties
index c98a6e7..051d549 100644
--- a/fit/wa-reference/src/main/resources/wa.properties
+++ b/fit/wa-reference/src/main/resources/wa.properties
@@ -22,14 +22,13 @@ useGZIPCompression=true
# Conf directories
conf.directory=${conf.directory}
cas.standalone.configurationDirectory=${conf.directory}
-cas.authn.oidc.jwks.jwksFile=file:${conf.directory}/oidc.keystore
+cas.authn.oidc.jwks.jwks-file=file:${conf.directory}/oidc.keystore
cas.server.name=http://localhost:8080
cas.server.prefix=${cas.server.name}/syncope-wa
cas.server.scope=syncope.org
-cas.authn.samlIdp.entityId=https://syncope.apache.org/saml
-cas.authn.samlIdp.metadata.location=file:${conf.directory}
+cas.authn.saml-idp.entity-id=https://syncope.apache.org/saml
# Disable access to the login endpoint
# if no target application is specified.
@@ -37,7 +36,7 @@ cas.sso.allow-missing-service-parameter=true
# Disable the acceptable usage policy
# by default for now.
-cas.acceptableUsagePolicy.enabled=false
+cas.acceptable-usage-policy.enabled=false
management.endpoints.web.exposure.include=health,loggers,refresh
management.endpoint.health.show-details=always
diff --git a/pom.xml b/pom.xml
index fd9350d..7a7ea3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1646,6 +1646,11 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-gauth</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-support-oidc-services</artifactId>
<version>${cas.version}</version>
</dependency>
diff --git a/wa/starter/pom.xml b/wa/starter/pom.xml
index 18d92b4..10c3cba 100644
--- a/wa/starter/pom.xml
+++ b/wa/starter/pom.xml
@@ -208,6 +208,10 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-gauth</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-webapp-config</artifactId>
</dependency>
<dependency>
diff --git a/wa/starter/src/main/resources/application.properties b/wa/starter/src/main/resources/application.properties
index a3fee6b..fd5b260 100644
--- a/wa/starter/src/main/resources/application.properties
+++ b/wa/starter/src/main/resources/application.properties
@@ -36,7 +36,7 @@ management.endpoint.loggers.enabled=true
management.endpoint.refresh.enabled=true
management.endpoint.registeredServices.enabled=true
-cas.serviceRegistry.schedule.enabled=false
+cas.service-registry.schedule.enabled=false
##
# Allow configuration classes to override bean definitions from Spring Boot
diff --git a/wa/starter/src/main/resources/wa.properties b/wa/starter/src/main/resources/wa.properties
index 8a344e6..6f2df05 100644
--- a/wa/starter/src/main/resources/wa.properties
+++ b/wa/starter/src/main/resources/wa.properties
@@ -22,14 +22,13 @@ useGZIPCompression=true
# Conf directories
conf.directory=${conf.directory}
cas.standalone.configuration-directory=${conf.directory}
-cas.authn.oidc.jwks.jwksFile=file:${conf.directory}/oidc.keystore
+cas.authn.oidc.jwks.jwks-file=file:${conf.directory}/oidc.keystore
cas.server.name=http://localhost:8080
cas.server.prefix=${cas.server.name}/syncope-wa
cas.server.scope=syncope.org
-cas.authn.samlIdp.entityId=https://syncope.apache.org/saml
-cas.authn.samlIdp.metadata.location=file:${conf.directory}
+cas.authn.saml-idp.entity-id=https://syncope.apache.org/saml
# Disable access to the login endpoint
# if no target application is specified.
@@ -37,7 +36,7 @@ cas.sso.allow-missing-service-parameter=true
# Disable the acceptable usage policy
# by default for now.
-cas.acceptableUsagePolicy.enabled=false
+cas.acceptable-usage-policy.enabled=false
management.endpoints.web.exposure.include=health,loggers,refresh
management.endpoint.health.show-details=always