generator-jhipster 7.9.0 → 7.9.3

package/generators/server/templates/src/main/java/package/config/CRLFLogConverter.java.ejs

@@ -0,0 +1,57 @@
+package <%= packageName %>.config;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.pattern.CompositeConverter;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+import org.springframework.boot.ansi.AnsiColor;
+import org.springframework.boot.ansi.AnsiElement;
+import org.springframework.boot.ansi.AnsiOutput;
+import org.springframework.boot.ansi.AnsiStyle;
+
+public class CRLFLogConverter extends CompositeConverter<ILoggingEvent> {
+    public static final Marker CRLF_SAFE_MARKER = MarkerFactory.getMarker("CRLF_SAFE");
+
+    private static final String[] SAFE_LOGGERS = { "org.hibernate" };
+    private static final Map<String, AnsiElement> ELEMENTS;
+
+	static {
+		Map<String, AnsiElement> ansiElements = new HashMap<>();
+		ansiElements.put("faint", AnsiStyle.FAINT);
+		ansiElements.put("red", AnsiColor.RED);
+		ansiElements.put("green", AnsiColor.GREEN);
+		ansiElements.put("yellow", AnsiColor.YELLOW);
+		ansiElements.put("blue", AnsiColor.BLUE);
+		ansiElements.put("magenta", AnsiColor.MAGENTA);
+		ansiElements.put("cyan", AnsiColor.CYAN);
+		ELEMENTS = Collections.unmodifiableMap(ansiElements);
+	}
+
+    @Override
+    protected String transform(ILoggingEvent event, String in) {
+        AnsiElement element = ELEMENTS.get(getFirstOption());
+        if ((event.getMarker() != null && event.getMarker().contains(CRLF_SAFE_MARKER)) || isLoggerSafe(event)) {
+            return in;
+        }
+        String replacement = element == null ? "_" : toAnsiString("_", element);
+        return in.replaceAll("[\n\r\t]", replacement);
+    }
+
+    protected boolean isLoggerSafe(ILoggingEvent event) {
+        for (String safeLogger : SAFE_LOGGERS) {
+            if (event.getLoggerName().startsWith(safeLogger)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+	protected String toAnsiString(String in, AnsiElement element) {
+		return AnsiOutput.toString(element, in);
+	}
+}

package/generators/server/templates/src/main/java/package/config/EurekaWorkaroundConfiguration.java.ejs

@@ -0,0 +1,49 @@
+<%#
+ Copyright 2013-2022 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+// This is a workaround for
+// https://github.com/jhipster/jhipster-registry/issues/537
+// https://github.com/jhipster/generator-jhipster/issues/18533
+// The original issue will be fixed with spring cloud 2021.0.4
+// https://github.com/spring-cloud/spring-cloud-netflix/issues/3941
+package <%= packageName %>.config;
+
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class EurekaWorkaroundConfiguration implements HealthIndicator {
+
+    private boolean applicationIsUp = false;
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void onStartup() {
+        this.applicationIsUp = true;
+    }
+
+    @Override
+    public Health health() {
+        if (!applicationIsUp) {
+            return Health.down().build();
+        }
+        return Health.up().build();
+    }
+}

package/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs

@@ -23,11 +23,11 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import tech.jhipster.config.JHipsterProperties;
 import org.slf4j.LoggerFactory;
-<%_ if (serviceDiscoveryConsul || (serviceDiscoveryType && applicationTypeGateway || applicationTypeMicroservice)) { _%>
+<%_ if (serviceDiscoveryConsul || (serviceDiscoveryAny && applicationTypeGateway || applicationTypeMicroservice)) { _%>
 import org.springframework.beans.factory.ObjectProvider;
 <%_ } _%>
 import org.springframework.beans.factory.annotation.Value;
-<%_ if (serviceDiscoveryType && (applicationTypeGateway || applicationTypeMicroservice)) { _%>
+<%_ if (serviceDiscoveryAny && (applicationTypeGateway || applicationTypeMicroservice)) { _%>
 import org.springframework.boot.info.BuildProperties;
 <%_ } _%>
 <%_ if (serviceDiscoveryConsul) { _%>
@@ -58,7 +58,7 @@ public class LoggingConfiguration {
 <%_ if (serviceDiscoveryConsul) { _%>
                                 ObjectProvider<ConsulRegistration> consulRegistration,
 <%_ } _%>
-<%_ if (serviceDiscoveryType && (applicationTypeMicroservice || applicationTypeGateway)) { _%>
+<%_ if (serviceDiscoveryAny && (applicationTypeMicroservice || applicationTypeGateway)) { _%>
                                 ObjectProvider<BuildProperties> buildProperties,
 <%_ } _%>
                                 ObjectMapper mapper) throws JsonProcessingException {
@@ -68,7 +68,7 @@ public class LoggingConfiguration {
         Map<String, String> map = new HashMap<>();
         map.put("app_name", appName);
         map.put("app_port", serverPort);
-<%_ if (serviceDiscoveryType && (applicationTypeMicroservice || applicationTypeGateway)) { _%>
+<%_ if (serviceDiscoveryAny && (applicationTypeMicroservice || applicationTypeGateway)) { _%>
         buildProperties.ifAvailable(it -> map.put("version", it.getVersion()));
 <%_ } _%>
 <%_ if (serviceDiscoveryConsul) { _%>

package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs

@@ -37,13 +37,6 @@ import org.springframework.http.HttpMethod;
 <%_ } _%>
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-<%_ if (!applicationTypeMicroservice || !authenticationTypeOauth2) { _%>
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-<%_ } else { _%>
-  <%_ if (devDatabaseTypeH2Any) { _%>
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-  <%_ } _%>
-<%_ } _%>
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.web.SecurityFilterChain;
 <%_ if (authenticationTypeJwt || (authenticationTypeOauth2 && applicationTypeMicroservice)) { _%>
@@ -91,7 +84,9 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import <%= packageName %>.security.oauth2.CustomClaimConverter;
 <%_ } _%>
+<%_ if(!skipClient) { _%>
 import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter;
+<%_ } _%>
 <%_ if (!applicationTypeMicroservice) { _%>
 import org.springframework.web.filter.CorsFilter;
 <%_ } _%>
@@ -165,6 +160,9 @@ public class SecurityConfiguration {
         // @formatter:off
         http
             .csrf()
+<%_ if (devDatabaseTypeH2Any) { _%>
+            .ignoringAntMatchers("/h2-console/**")
+<%_ } _%>
 <%_ if ((authenticationTypeOauth2 || authenticationTypeSession) && !applicationTypeMicroservice) { _%>
             .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
         .and()
@@ -201,22 +199,23 @@ public class SecurityConfiguration {
             .logoutSuccessHandler(ajaxLogoutSuccessHandler())
             .permitAll()
 <%_ } _%>
+<%_ if (!skipClient) { _%>
         .and()
             .headers()
-            .contentSecurityPolicy(jHipsterProperties.getSecurity().getContentSecurityPolicy())
-        .and()
-            .referrerPolicy(ReferrerPolicyHeaderWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN)
-        .and()
-            .permissionsPolicy().policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")
-        .and()
-            .frameOptions()
-            .sameOrigin()
-        .and()
+                .contentSecurityPolicy(jHipsterProperties.getSecurity().getContentSecurityPolicy())
+            .and()
+                .referrerPolicy(ReferrerPolicyHeaderWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN)
+            .and()
+                .permissionsPolicy().policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")
+            .and()
+                .frameOptions().sameOrigin()
+<%_ } _%>
 <%_ if (authenticationTypeJwt || (authenticationTypeOauth2 && applicationTypeMicroservice)) { _%>
-            .sessionManagement()
-            .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
         .and()
+            .sessionManagement()
+                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
 <%_ } _%>
+        .and()
             .authorizeRequests()
 <%_ if (!applicationTypeMicroservice) { _%>
             .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()

package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs

@@ -134,6 +134,10 @@ import reactor.core.publisher.Mono;
   <%_ if (!applicationTypeMicroservice) { _%>
 import org.springframework.web.reactive.function.client.WebClient;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Map;
   <%_ } _%>
@@ -141,7 +145,6 @@ import java.util.Map;
 import java.util.HashSet;
 import java.util.Set;
   <%_ if (!applicationTypeMicroservice) { _%>
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
   <%_ } _%>
 <%_ } _%>
@@ -170,8 +173,13 @@ public class SecurityConfiguration {
 
     private final ReactiveClientRegistrationRepository clientRegistrationRepository;
 
-    // todo: optimize for scale https://github.com/jhipster/generator-jhipster/issues/18868
-    private final Map<String, Mono<Jwt>> users = new ConcurrentHashMap<>();
+    // See https://github.com/jhipster/generator-jhipster/issues/18868
+    // We don't use a distributed cache or the user selected cache implementation here on purpose
+    private final Cache<String, Mono<Jwt>> users = Caffeine.newBuilder()
+        .maximumSize(10_000)
+        .expireAfterWrite(Duration.ofHours(1))
+        .recordStats()
+        .build();
 
   <%_ } _%>
 <%_ } _%>
@@ -268,7 +276,7 @@ public class SecurityConfiguration {
 <%_ } _%>
         .and()
             .headers()
-            .contentSecurityPolicy(jHipsterProperties.getSecurity().getContentSecurityPolicy())
+                .contentSecurityPolicy(jHipsterProperties.getSecurity().getContentSecurityPolicy())
             .and()
                 .referrerPolicy(ReferrerPolicyServerHttpHeadersWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN)
             .and()
@@ -425,7 +433,7 @@ public class SecurityConfiguration {
                     return Mono.just(jwt);
                 }
                 // Retrieve user info from OAuth provider if not already loaded
-                return users.computeIfAbsent(jwt.getSubject(), s -> {
+                return users.get(jwt.getSubject(), s -> {
                     WebClient webClient = WebClient.create();
 
                     return webClient

package/generators/server/templates/src/main/java/package/domain/AbstractAuditingEntity.java.ejs

@@ -21,7 +21,7 @@ package <%= packageName %>.domain;
 <%_ if (databaseTypeCouchbase) { _%>
 import org.springframework.data.couchbase.core.mapping.Field;
 <%_ } _%>
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 <%_ if (!reactive) { _%>
 import org.springframework.data.annotation.CreatedBy;
 <%_ } _%>
@@ -58,10 +58,13 @@ import javax.persistence.MappedSuperclass;
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
 <%_ } _%>
-public abstract class AbstractAuditingEntity implements Serializable {
+@JsonIgnoreProperties(value = { "createdBy", "createdDate", "lastModifiedBy", "lastModifiedDate" }, allowGetters = true)
+public abstract class AbstractAuditingEntity<T> implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public abstract T getId();
+
 <%_ if (!reactive) { _%>
     @CreatedBy
 <%_ } _%>
@@ -77,7 +80,6 @@ public abstract class AbstractAuditingEntity implements Serializable {
 <%_ if (databaseTypeNeo4j) { _%>
     @Property("created_by")
 <%_ } _%>
-    @JsonIgnore
     private String createdBy;
 
     @CreatedDate
@@ -93,7 +95,6 @@ public abstract class AbstractAuditingEntity implements Serializable {
 <%_ if (databaseTypeNeo4j) { _%>
     @Property("created_date")
 <%_ } _%>
-    @JsonIgnore
     private Instant createdDate = Instant.now();
 
 <%_ if (!reactive) { _%>
@@ -111,7 +112,6 @@ public abstract class AbstractAuditingEntity implements Serializable {
 <%_ if (databaseTypeNeo4j) { _%>
     @Property("last_modified_by")
 <%_ } _%>
-    @JsonIgnore
     private String lastModifiedBy;
 
     @LastModifiedDate
@@ -127,7 +127,6 @@ public abstract class AbstractAuditingEntity implements Serializable {
 <%_ if (databaseTypeNeo4j) { _%>
     @Property("last_modified_date")
 <%_ } _%>
-    @JsonIgnore
     private Instant lastModifiedDate = Instant.now();
 
     public String getCreatedBy() {

package/generators/server/templates/src/main/java/package/domain/User.java.ejs

@@ -131,7 +131,7 @@ import static org.springframework.data.couchbase.core.mapping.id.GenerationStrat
 <%_ if (searchEngineElasticsearch) { _%>
 @org.springframework.data.elasticsearch.annotations.Document(indexName = "user")
 <%_ } _%>
-public class <%= asEntity('User') %><% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %> extends AbstractAuditingEntity<% } %> implements Serializable {
+public class <%= asEntity('User') %><% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %> extends AbstractAuditingEntity<<%= user.primaryKey.type %>><% } %> implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs

@@ -315,7 +315,7 @@ public interface UserRepository extends R2dbcRepository<<%= asEntity('User') %>,
     Mono<Void> deleteAllUserAuthorities();
 
     @Query("DELETE FROM <%= jhiTablePrefix %>_user_authority WHERE user_id = :userId")
-    Mono<Void> deleteUserAuthorities(Long userId);
+    Mono<Void> deleteUserAuthorities(<%= user.primaryKey.type %> userId);
 
 }
 

package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs

@@ -20,6 +20,8 @@ package <%= packageName %>.security.oauth2;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import <%= packageName %>.security.SecurityUtils;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.http.HttpEntity;
@@ -35,11 +37,11 @@ import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -55,8 +57,13 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
 
     private final ClientRegistration registration;
 
-    // todo: optimize for scale https://github.com/jhipster/generator-jhipster/issues/18868
-    private final Map<String, ObjectNode> users = new ConcurrentHashMap<>();
+    // See https://github.com/jhipster/generator-jhipster/issues/18868
+    // We don't use a distributed cache or the user selected cache implementation here on purpose
+    private final Cache<String, ObjectNode> users = Caffeine.newBuilder()
+        .maximumSize(10_000)
+        .expireAfterWrite(Duration.ofHours(1))
+        .recordStats()
+        .build();
 
     public CustomClaimConverter(ClientRegistration registration, RestTemplate restTemplate) {
         this.registration = registration;
@@ -64,11 +71,11 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
     }
 
     public Map<String, Object> convert(Map<String, Object> claims) {
+        Map<String, Object> convertedClaims = this.delegate.convert(claims);
         // Only look up user information if identity claims are missing
         if (claims.containsKey("given_name") && claims.containsKey("family_name")) {
-            return claims;
+            return convertedClaims;
         }
-        Map<String, Object> convertedClaims = this.delegate.convert(claims);
         RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
         if (attributes instanceof ServletRequestAttributes) {
             // Retrieve and set the token
@@ -77,7 +84,7 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
             headers.set("Authorization", buildBearer(token));
 
             // Retrieve user info from OAuth provider if not already loaded
-            ObjectNode user = users.computeIfAbsent(claims.get("sub").toString(), s -> {
+            ObjectNode user = users.get(claims.get("sub").toString(), s -> {
                 ResponseEntity<ObjectNode> userInfo = restTemplate.exchange(registration.getProviderDetails().getUserInfoEndpoint().getUri(), HttpMethod.GET, new HttpEntity<String>(headers), ObjectNode.class);
                 return userInfo.getBody();
             });

package/generators/server/templates/src/main/java/package/service/dto/AdminUserDTO.java.ejs

@@ -25,6 +25,7 @@ import <%= packageName %>.domain.Authority;<% } %>
 import <%= packageName %>.domain.<%= asEntity('User') %>;
 <%_ } _%>
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 <%_ if (databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase || databaseTypeSql) { _%>
 import java.time.Instant;
@@ -40,7 +41,8 @@ import java.util.stream.Collectors;
 /**
  * A DTO representing a user, with his authorities.
  */
-public class <%= asDto('AdminUser') %> {
+public class <%= asDto('AdminUser') %> implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private <%= user.primaryKey.type %> id;
 

package/generators/server/templates/src/main/java/package/service/dto/PasswordChangeDTO.java.ejs

@@ -18,10 +18,14 @@
 -%>
 package <%= packageName %>.service.dto;
 
+import java.io.Serializable;
+
 /**
  * A DTO representing a password change required data - current and new password.
  */
-public class PasswordChangeDTO {
+public class PasswordChangeDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private String currentPassword;
     private String newPassword;
 

package/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs

@@ -22,6 +22,7 @@ package <%= packageName %>.service.dto;
 import <%= packageName %>.domain.<%= asEntity('User') %>;
 <%_ } _%>
 
+import java.io.Serializable;
 <%_ if (user.primaryKey.hasUUID) { _%>
 import java.util.UUID;
 <%_ } _%>
@@ -29,7 +30,8 @@ import java.util.UUID;
 /**
  * A DTO representing a user, with only the public attributes.
  */
-public class <%= asDto('User') %> {
+public class <%= asDto('User') %> implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private <%= user.primaryKey.type %> id;