mirror of https://github.com/OpenVidu/openvidu.git
openvidu-server: fix SecurityConfig path precedence
parent
2eda703c3a
commit
67b6aa7158
|
|
@ -74,23 +74,47 @@ public class SecurityConfig {
|
||||||
*/
|
*/
|
||||||
protected void configureAuthorization(HttpSecurity http) throws Exception {
|
protected void configureAuthorization(HttpSecurity http) throws Exception {
|
||||||
http.authorizeHttpRequests(auth -> {
|
http.authorizeHttpRequests(auth -> {
|
||||||
auth.requestMatchers(HttpMethod.GET, RequestMappings.API + "/config/openvidu-publicurl").permitAll()
|
configurePublicEndpoints(auth);
|
||||||
.requestMatchers(HttpMethod.GET, RequestMappings.ACCEPT_CERTIFICATE).permitAll()
|
configureProtectedEndpoints(auth);
|
||||||
.requestMatchers("/openvidu/**").permitAll() // Allow WebSocket connections
|
configureWebSocketEndpoints(auth);
|
||||||
.requestMatchers(RequestMappings.API + "/**").hasRole("ADMIN")
|
|
||||||
.requestMatchers(HttpMethod.GET, RequestMappings.CDR + "/**").hasRole("ADMIN")
|
|
||||||
.requestMatchers(HttpMethod.GET, RequestMappings.FRONTEND_CE + "/**").hasRole("ADMIN")
|
|
||||||
.requestMatchers(HttpMethod.GET, RequestMappings.CUSTOM_LAYOUTS + "/**").hasRole("ADMIN");
|
|
||||||
|
|
||||||
// Secure recordings depending on OPENVIDU_RECORDING_PUBLIC_ACCESS
|
|
||||||
if (openviduConf.getOpenViduRecordingPublicAccess()) {
|
|
||||||
auth.requestMatchers(HttpMethod.GET, RequestMappings.RECORDINGS + "/**").permitAll();
|
|
||||||
} else {
|
|
||||||
auth.requestMatchers(HttpMethod.GET, RequestMappings.RECORDINGS + "/**").hasRole("ADMIN");
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configure public endpoints. Can be overridden by subclasses.
|
||||||
|
*/
|
||||||
|
protected void configurePublicEndpoints(org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer<?>.AuthorizationManagerRequestMatcherRegistry auth) {
|
||||||
|
// Public endpoints
|
||||||
|
auth.requestMatchers(HttpMethod.GET, RequestMappings.API + "/config/openvidu-publicurl").permitAll()
|
||||||
|
.requestMatchers(HttpMethod.GET, RequestMappings.ACCEPT_CERTIFICATE).permitAll();
|
||||||
|
|
||||||
|
// Secure recordings depending on OPENVIDU_RECORDING_PUBLIC_ACCESS
|
||||||
|
if (openviduConf.getOpenViduRecordingPublicAccess()) {
|
||||||
|
auth.requestMatchers(HttpMethod.GET, RequestMappings.RECORDINGS + "/**").permitAll();
|
||||||
|
} else {
|
||||||
|
auth.requestMatchers(HttpMethod.GET, RequestMappings.RECORDINGS + "/**").hasRole("ADMIN");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configure protected API endpoints. Can be extended by subclasses.
|
||||||
|
*/
|
||||||
|
protected void configureProtectedEndpoints(org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer<?>.AuthorizationManagerRequestMatcherRegistry auth) {
|
||||||
|
// Protected API endpoints (must come before WebSocket to take precedence)
|
||||||
|
auth.requestMatchers(RequestMappings.API + "/**").hasRole("ADMIN")
|
||||||
|
.requestMatchers(HttpMethod.GET, RequestMappings.CDR + "/**").hasRole("ADMIN")
|
||||||
|
.requestMatchers(HttpMethod.GET, RequestMappings.FRONTEND_CE + "/**").hasRole("ADMIN")
|
||||||
|
.requestMatchers(HttpMethod.GET, RequestMappings.CUSTOM_LAYOUTS + "/**").hasRole("ADMIN");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configure WebSocket endpoints. Should be called last to avoid interfering with more specific rules.
|
||||||
|
*/
|
||||||
|
protected void configureWebSocketEndpoints(org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer<?>.AuthorizationManagerRequestMatcherRegistry auth) {
|
||||||
|
// WebSocket endpoints: allow without authentication
|
||||||
|
auth.requestMatchers("/openvidu", "/openvidu/info").permitAll();
|
||||||
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public CorsFilter corsFilter() {
|
public CorsFilter corsFilter() {
|
||||||
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue