From 171b209e80f8c83720e58dde8e919ba7a414dfc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= Date: Thu, 3 May 2018 20:59:10 +0200 Subject: [PATCH] do not send sync_disabled during registration attempt --- .../symmetric/service/impl/NodeService.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java index 5dd77f4ee9..15f1f8934b 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java @@ -924,7 +924,11 @@ public AuthenticationStatus getAuthenticationStatus(String nodeId, String securi if (node == null) { retVal = AuthenticationStatus.REGISTRATION_REQUIRED; } else if (!syncEnabled(node)) { - retVal = AuthenticationStatus.SYNC_DISABLED; + if(registrationOpen(node)){ + retVal = AuthenticationStatus.REGISTRATION_REQUIRED; + }else{ + retVal = AuthenticationStatus.SYNC_DISABLED; + } } else if (!isNodeAuthorized(nodeId, securityToken)) { retVal = AuthenticationStatus.FORBIDDEN; } @@ -937,6 +941,14 @@ protected boolean syncEnabled(Node node) { syncEnabled = node.isSyncEnabled(); } return syncEnabled; - } + } + + protected boolean registrationOpen(Node node){ + NodeSecurity security = findNodeSecurity(node.getNodeId()); + if(security != null){ + return security.isRegistrationEnabled(); + } + return false; + } }