Merge branch 'develop' into releases/2019.11

wultra · Jan 21, 2020 · 3dbcec3 · 3dbcec3
2 parents 8689f1a + 2cb217a
commit 3dbcec3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/.env b/.env
@@ -163,6 +163,11 @@ WEBFLOW_PASSWORD_ENCRYPTION_KEY=
 WEBFLOW_SMS_RESEND_DELAY_MS=60000
 WEBFLOW_TIMEOUT_WARNING_DELAY_MS=60000
 WEBFLOW_AFS_ENABLED=false
+WEBFLOW_AFS_TYPE=THREAT_MARK
+WEBFLOW_AFS_DETECT_IP_ADDRESS=false
+WEBFLOW_AFS_FORCE_IPV4=true
+WEBFLOW_AFS_TM_COOKIES_DEVICE_TAG=
+WEBFLOW_AFS_TM_COOKIES_SESSION_SID=
 WEBFLOW_SPRING_JMX_ENABLED=false
 WEBFLOW_SPRING_JMX_DEFAULT_DOMAIN=powerauth-webflow
 WEBFLOW_APPLICATION_NAME=powerauth-webflow

diff --git a/deploy/data/mysql/powerauth-webflow.sql b/deploy/data/mysql/powerauth-webflow.sql
@@ -292,7 +292,7 @@ CREATE UNIQUE INDEX ns_operation_afs_unique on ns_operation_afs (operation_id, r
 -- default oauth 2.0 client
 -- Note: bcrypt('changeme', 12) => '$2a$12$MkYsT5igDXSDgRwyDVz1B.93h8F81E4GZJd/spy/1vhjM4CJgeed.'
 INSERT INTO oauth_client_details (client_id, client_secret, scope, authorized_grant_types, web_server_redirect_uri, additional_information, autoapprove)
-VALUES ('democlient', '$2a$12$MkYsT5igDXSDgRwyDVz1B.93h8F81E4GZJd/spy/1vhjM4CJgeed.', 'profile', 'authorization_code', 'http://localhost:8080/powerauth-webflow-client/connect/demo', '{}', 'true');
+VALUES ('democlient', '$2a$12$MkYsT5igDXSDgRwyDVz1B.93h8F81E4GZJd/spy/1vhjM4CJgeed.', 'profile', 'authorization_code', 'http://localhost:8888/connect/demo', '{}', 'true');
 
 -- authentication methods
 INSERT INTO ns_auth_method (auth_method, order_number, check_user_prefs, user_prefs_column, user_prefs_default, check_auth_fails, max_auth_fails, has_user_interface, has_mobile_token, display_name_key)

diff --git a/docker-compose-pa-all.yml b/docker-compose-pa-all.yml
@@ -85,6 +85,7 @@ services:
             - POWERAUTH_SERVER_RESTRICT_ACCESS=${POWERAUTH_SERVER_RESTRICT_ACCESS}
             - POWERAUTH_SERVER_RECOVERY_MAX_FAILED_ATTEMPTS=${POWERAUTH_SERVER_RECOVERY_MAX_FAILED_ATTEMPTS}
             - POWERAUTH_SERVER_MASTER_DB_ENCRYPTION_KEY=${POWERAUTH_SERVER_MASTER_DB_ENCRYPTION_KEY}
+            - POWERAUTH_SERVER_SECURE_VAULT_ENABLE_BIOMETRY=${POWERAUTH_SERVER_SECURE_VAULT_ENABLE_BIOMETRY}
             - POWERAUTH_SERVER_APPLICATION_NAME=${POWERAUTH_SERVER_APPLICATION_NAME}
             - POWERAUTH_SERVER_APPLICATION_DISPLAY_NAME=${POWERAUTH_SERVER_APPLICATION_DISPLAY_NAME}
             - POWERAUTH_SERVER_APPLICATION_ENVIRONMENT=${POWERAUTH_SERVER_APPLICATION_ENVIRONMENT}
@@ -318,6 +319,12 @@ services:
             - WEBFLOW_PASSWORD_ENCRYPTION_TRANSFORMATION=${WEBFLOW_PASSWORD_ENCRYPTION_TRANSFORMATION}
             - WEBFLOW_PASSWORD_ENCRYPTION_KEY=${WEBFLOW_PASSWORD_ENCRYPTION_KEY}
             - WEBFLOW_SMS_RESEND_DELAY_MS=${WEBFLOW_SMS_RESEND_DELAY_MS}
+            - WEBFLOW_AFS_ENABLED=${WEBFLOW_AFS_ENABLED}
+            - WEBFLOW_AFS_TYPE=${WEBFLOW_AFS_TYPE}
+            - WEBFLOW_AFS_DETECT_IP_ADDRESS=${WEBFLOW_AFS_DETECT_IP_ADDRESS}
+            - WEBFLOW_AFS_FORCE_IPV4=${WEBFLOW_AFS_FORCE_IPV4}
+            - WEBFLOW_AFS_TM_COOKIES_DEVICE_TAG=${WEBFLOW_AFS_TM_COOKIES_DEVICE_TAG}
+            - WEBFLOW_AFS_TM_COOKIES_SESSION_SID=${WEBFLOW_AFS_TM_COOKIES_SESSION_SID}
             - WEBFLOW_TIMEOUT_WARNING_DELAY_MS=${WEBFLOW_TIMEOUT_WARNING_DELAY_MS}
             - WEBFLOW_SPRING_JMX_ENABLED=${WEBFLOW_SPRING_JMX_ENABLED}
             - WEBFLOW_SPRING_JMX_DEFAULT_DOMAIN=${WEBFLOW_SPRING_JMX_DEFAULT_DOMAIN}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -69,6 +69,7 @@ services:
             - POWERAUTH_SERVER_RESTRICT_ACCESS=${POWERAUTH_SERVER_RESTRICT_ACCESS}
             - POWERAUTH_SERVER_RECOVERY_MAX_FAILED_ATTEMPTS=${POWERAUTH_SERVER_RECOVERY_MAX_FAILED_ATTEMPTS}
             - POWERAUTH_SERVER_MASTER_DB_ENCRYPTION_KEY=${POWERAUTH_SERVER_MASTER_DB_ENCRYPTION_KEY}
+            - POWERAUTH_SERVER_SECURE_VAULT_ENABLE_BIOMETRY=${POWERAUTH_SERVER_SECURE_VAULT_ENABLE_BIOMETRY}
             - POWERAUTH_SERVER_APPLICATION_NAME=${POWERAUTH_SERVER_APPLICATION_NAME}
             - POWERAUTH_SERVER_APPLICATION_DISPLAY_NAME=${POWERAUTH_SERVER_APPLICATION_DISPLAY_NAME}
             - POWERAUTH_SERVER_APPLICATION_ENVIRONMENT=${POWERAUTH_SERVER_APPLICATION_ENVIRONMENT}