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

Fix cors configuration from properties #7578

Merged
merged 3 commits into from
Mar 28, 2023
Merged

Fix cors configuration from properties #7578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0c494b
change cors configuration
bogdan-sava Mar 27, 2023
c08c631
add params filter for /api/token uri
bogdan-sava Mar 27, 2023
332122e
Merge branch 'main' into springsecurity
bogdan-sava Mar 28, 2023
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
12 changes: 8 additions & 4 deletions ...ain/java/org/odpi/openmetadata/userinterface/uichassis/springboot/api/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,18 @@

import org.odpi.openmetadata.userinterface.uichassis.springboot.auth.model.LoginRequest;
import org.odpi.openmetadata.userinterface.uichassis.springboot.auth.service.TokenService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

@RestController
public class AuthController {

private static final Logger LOG = LoggerFactory.getLogger(AuthController.class);

private final TokenService tokenService;
private final AuthenticationManager authenticationManager;

Expand All @@ -34,4 +31,11 @@ public String token(@RequestBody LoginRequest userLogin) throws AuthenticationEx
return tokenService.generateToken(authentication);
}

@PostMapping(value = "/api/token", params = {"username","password"})
public String token(@RequestParam String username, @RequestParam String password) throws AuthenticationException {
Authentication authentication = authenticationManager
.authenticate(new UsernamePasswordAuthenticationToken(username, password));
return tokenService.generateToken(authentication);
}

}
26 changes: 10 additions & 16 deletions ...in/java/org/odpi/openmetadata/userinterface/uichassis/springboot/auth/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@
import org.springframework.security.oauth2.jwt.NimbusJwtDecoder;
import org.springframework.security.oauth2.jwt.NimbusJwtEncoder;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

import java.util.Arrays;
import java.util.List;

/**
Expand Down Expand Up @@ -76,22 +74,18 @@ JwtDecoder jwtDecoder() throws JOSEException {
}

/**
*Returns CorsConfigurationSource the cors configuration
*Returns WebMvcConfigurer for the cors configuration
* The bean is based on springboot configuration property cors.allowed-origins
*/
@Bean
@ConditionalOnProperty(value = "cors.allowed-origins")
CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration configuration = new CorsConfiguration();
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
if( allowedOrigins!=null && !allowedOrigins.isEmpty()) {
configuration.setAllowedOrigins(allowedOrigins);
configuration.setAllowedMethods(Arrays.asList("GET","POST"));
configuration.addExposedHeader("x-auth-token");
configuration.setAllowedHeaders(Arrays.asList("content-type","x-auth-token"));
source.registerCorsConfiguration("/**", configuration);
}
return source;
public WebMvcConfigurer corsConfigurer() {
return new WebMvcConfigurer() {
@Override
public void addCorsMappings( CorsRegistry registry ) {
registry.addMapping("/**").allowedOrigins(allowedOrigins.toArray(new String[]{}));
}
};
}

@Bean
Expand Down