Merge pull request #15120 from thingsboard/fix/oauth2

Improved Apple OAuth2 mapper and refactored OAuth2 client validation

application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AppleOAuth2ClientMapper.java

@@ -79,9 +79,13 @@ public class AppleOAuth2ClientMapper extends AbstractOAuth2ClientMapper implemen
                     }
                 }
                 if (user.has(EMAIL)) {
-                    JsonNode email = user.get(EMAIL);
-                    if (email != null && email.isTextual()) {
-                        updated.put(EMAIL, email.asText());
+                    JsonNode emailNode = user.get(EMAIL);
+                    if (emailNode != null && emailNode.isTextual()) {
+                        Object tokenEmail = attributes.get(EMAIL);
+                        if (tokenEmail != null && !emailNode.asText().equals(tokenEmail.toString())) {
+                            log.warn("Apple OAuth2 callback: ignoring email [{}] from user POST parameter " +
+                                    "that differs from validated ID token email [{}]", emailNode.asText(), tokenEmail);
+                        }
                     }
                 }
             }

dao/src/main/java/org/thingsboard/server/dao/service/validator/Oauth2ClientDataValidator.java

@@ -35,12 +35,17 @@ public class Oauth2ClientDataValidator extends DataValidator<OAuth2Client> {
     @Override
     protected void validateDataImpl(TenantId tenantId, OAuth2Client oAuth2Client) {
         OAuth2MapperConfig mapperConfig = oAuth2Client.getMapperConfig();
-        if (mapperConfig.getType() == MapperType.BASIC) {
+        MapperType type = mapperConfig.getType();
+        if (type == MapperType.BASIC || type == MapperType.GITHUB || type == MapperType.APPLE) {
             OAuth2BasicMapperConfig basicConfig = mapperConfig.getBasic();
             if (basicConfig == null) {
                 throw new DataValidationException("Basic config should be specified!");
             }
-            if (StringUtils.isEmpty(basicConfig.getEmailAttributeKey())) {
+            if (type == MapperType.GITHUB) {
+                if (!StringUtils.isEmpty(basicConfig.getEmailAttributeKey())) {
+                    throw new DataValidationException("Email attribute key cannot be configured for GITHUB mapper type!");
+                }
+            } else if (StringUtils.isEmpty(basicConfig.getEmailAttributeKey())) {
                 throw new DataValidationException("Email attribute key should be specified!");
             }
             if (basicConfig.getTenantNameStrategy() == null) {
@@ -51,23 +56,7 @@ public class Oauth2ClientDataValidator extends DataValidator<OAuth2Client> {
                 throw new DataValidationException("Tenant name pattern should be specified!");
             }
         }
-        if (mapperConfig.getType() == MapperType.GITHUB) {
-            OAuth2BasicMapperConfig basicConfig = mapperConfig.getBasic();
-            if (basicConfig == null) {
-                throw new DataValidationException("Basic config should be specified!");
-            }
-            if (!StringUtils.isEmpty(basicConfig.getEmailAttributeKey())) {
-                throw new DataValidationException("Email attribute key cannot be configured for GITHUB mapper type!");
-            }
-            if (basicConfig.getTenantNameStrategy() == null) {
-                throw new DataValidationException("Tenant name strategy should be specified!");
-            }
-            if (basicConfig.getTenantNameStrategy() == TenantNameStrategyType.CUSTOM
-                    && StringUtils.isEmpty(basicConfig.getTenantNamePattern())) {
-                throw new DataValidationException("Tenant name pattern should be specified!");
-            }
-        }
-        if (mapperConfig.getType() == MapperType.CUSTOM) {
+        if (type == MapperType.CUSTOM) {
             OAuth2CustomMapperConfig customConfig = mapperConfig.getCustom();
             if (customConfig == null) {
                 throw new DataValidationException("Custom config should be specified!");