Validate ips on register

1 files changed, 6 insertions, 2 deletions

diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidator.java
index 3dcb5a13d6d..816da5d095d 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidator.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidator.java
@@ -87,11 +87,15 @@ public class InstanceValidator {
         log.log(Level.FINE, () -> String.format("Validating instance %s.", providerUniqueId));
 
         PublicKey publicKey = keyProvider.getPublicKey(signedIdentityDocument.signingKeyVersion());
-        if (signer.hasValidSignature(signedIdentityDocument, publicKey)) {
+        if (! signer.hasValidSignature(signedIdentityDocument, publicKey)) {
+            log.log(Level.SEVERE, () -> String.format("Instance %s has invalid signature.", providerUniqueId));
+            return false;
+        }
+
+        if(validateAttributes(instanceConfirmation, providerUniqueId)) {
             log.log(Level.FINE, () -> String.format("Instance %s is valid.", providerUniqueId));
             return true;
         }
-        log.log(Level.SEVERE, () -> String.format("Instance %s has invalid signature.", providerUniqueId));
         return false;
     }