Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OP-1373 remove warns at api startup #512

Merged
merged 5 commits into from
Dec 8, 2024
Merged

OP-1373 remove warns at api startup #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f120a32
Change log level for JWT token
mwithi Dec 8, 2024
9b0b477
Resolving AuthenticationProvider WARN
mwithi Dec 8, 2024
53f68c0
Disable Mustache Template WARN
mwithi Dec 8, 2024
16c2c70
Disable WARN - spring.jpa.open-in-view is enabled by default.
mwithi Dec 8, 2024
c55c47d
Rollback on WARN - HHH90000025: MariaDBDialect
mwithi Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions rsc/application.properties.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ server.servlet.session.cookie.http-only=true
#server.servlet.session.cookie.secure=true # only over HTTPS
spring.pid.fail-on-write-error=true
spring.pid.file=OH_API_PID
spring.mustache.check-template-location=false
spring.jpa.open-in-view=false

### In production change to http://<domain>
cors.allowed.origins=http://API_HOST:API_PORT,http://UI_HOST:UI_PORT
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/org/isf/config/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,10 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
import org.springframework.security.authorization.AuthorizationDecision;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.SecurityFilterChain;
Expand All @@ -56,9 +54,6 @@
@EnableWebSecurity
public class SecurityConfig {

@Autowired
private UserDetailsService userDetailsService;

private final TokenProvider tokenProvider;

@Autowired
Expand All @@ -75,14 +70,6 @@ public SecurityConfig(TokenProvider tokenProvider, PermissionManager permissionM
@Autowired
private CustomLogoutHandler customLogoutHandler;

@Bean
public DaoAuthenticationProvider authenticationProvider() {
DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
authProvider.setUserDetailsService(userDetailsService);
authProvider.setPasswordEncoder(encoder());
return authProvider;
}

@Bean
public PasswordEncoder encoder() {
return new BCryptPasswordEncoder();
Expand Down
32 changes: 16 additions & 16 deletions src/main/java/org/isf/security/jwt/TokenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public class TokenProvider implements Serializable {
@PostConstruct
public void init() {
String secret = env.getProperty("jwt.token.secret");
LOGGER.info("Initializing JWT key with secret: {}", secret);
LOGGER.debug("Initializing JWT key with secret: {}", secret);
byte[] keyBytes = secret.getBytes(StandardCharsets.UTF_8);
this.key = Keys.hmacShaKeyFor(keyBytes);

Expand Down Expand Up @@ -131,8 +131,8 @@ public Boolean isTokenExpired(String token) {

public String generateJwtToken(Authentication authentication, boolean rememberMe) {
final String authorities = authentication.getAuthorities().stream()
.map(GrantedAuthority::getAuthority)
.collect(Collectors.joining(","));
.map(GrantedAuthority::getAuthority)
.collect(Collectors.joining(","));

long now = System.currentTimeMillis();
Date validity;
Expand All @@ -143,21 +143,21 @@ public String generateJwtToken(Authentication authentication, boolean rememberMe
}

return Jwts.builder()
.setSubject(authentication.getName())
.claim(AUTHORITIES_KEY, authorities)
.setIssuedAt(new Date())
.signWith(key, SignatureAlgorithm.HS512)
.setExpiration(validity)
.compact();
.setSubject(authentication.getName())
.claim(AUTHORITIES_KEY, authorities)
.setIssuedAt(new Date())
.signWith(key, SignatureAlgorithm.HS512)
.setExpiration(validity)
.compact();
}

public String generateRefreshToken(Authentication authentication) {
return Jwts.builder()
.setSubject(authentication.getName())
.setIssuedAt(new Date())
.signWith(key, SignatureAlgorithm.HS512)
.setExpiration(new Date(System.currentTimeMillis() + this.tokenValidityInMillisecondsForRememberMe))
.compact();
.setSubject(authentication.getName())
.setIssuedAt(new Date())
.signWith(key, SignatureAlgorithm.HS512)
.setExpiration(new Date(System.currentTimeMillis() + this.tokenValidityInMillisecondsForRememberMe))
.compact();
}

public Authentication getAuthentication(String token) {
Expand All @@ -173,8 +173,8 @@ public Authentication getAuthentication(String token) {
}

final Collection< ? extends GrantedAuthority> authorities = Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(","))
.map(SimpleGrantedAuthority::new)
.collect(Collectors.toList());
.map(SimpleGrantedAuthority::new)
.collect(Collectors.toList());

User principal = new User(claims.getSubject(), "", authorities);

Expand Down
Loading