Skip to content

Upgrade dependencies and fix deprecations and warnings. #1

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

Open
josephwofford wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade dependencies and fix deprecations and warnings. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
90 changes: 13 additions & 77 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,14 @@
<version>1.0.0-SNAPSHOT</version>

<properties>
<!-- ================ CAMUNDA VERSIONS ================ -->

<!-- Community Edition -->
<camunda.version>7.13.0</camunda.version>
<!-- Enterprise Edition -->
<!-- <camunda.version>7.13.0-ee</camunda.version>-->

<camunda.spring-boot.version>7.13.0</camunda.spring-boot.version>

<!-- ============== SPRING BOOT VERSIONS ============== -->

<!-- 7.12 and above -->
<spring-boot.version>2.2.6.RELEASE</spring-boot.version>

<camunda.version>7.15.0</camunda.version>
<spring-boot.version>2.5.4</spring-boot.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<version.java>1.8</version.java>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml>
<azure.version>2.2.4</azure.version>

<azure.version>3.8.0</azure.version>
</properties>

<dependencyManagement>
Expand All @@ -51,7 +37,7 @@
<type>pom</type>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-bom</artifactId>
<version>${azure.version}</version>
<type>pom</type>
Expand All @@ -61,75 +47,26 @@
</dependencyManagement>

<dependencies>

<!-- ================ CAMUNDA ================ -->

<!-- Community Edition -->
<dependency>
<groupId>org.camunda.bpm.springboot</groupId>
<artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
<version>${camunda.spring-boot.version}</version>
</dependency>

<!-- Enterprise Edition -->
<!-- <dependency>-->
<!-- <groupId>org.camunda.bpm.springboot</groupId>-->
<!-- <artifactId>camunda-bpm-spring-boot-starter-webapp-ee</artifactId>-->
<!-- <version>${camunda.spring-boot.version}-ee</version>-->
<!-- </dependency>-->

<!-- ================ general - data ================ -->

<!-- <dependency>-->
<!-- <groupId>com.h2database</groupId>-->
<!-- <artifactId>h2</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.2.3</version>
<groupId>org.camunda.bpm.springboot</groupId>
<artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.12</version>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>

<!-- ================ spring boot ================ -->

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<version>${spring-boot.version}</version>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>

<!-- ================ spring security ================ -->

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-client</artifactId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-jose</artifactId>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
</dependency>

<!-- ================ microsoft azure ================ -->

<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-active-directory-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-spring-boot</artifactId>
<version>${azure.version}</version>
</dependency>

</dependencies>

<build>
Expand All @@ -151,5 +88,4 @@
</plugin>
</plugins>
</build>

</project>
40 changes: 15 additions & 25 deletions src/main/java/com/camunda/example/oauth2/config/WebAppSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,47 @@
package com.camunda.example.oauth2.config;

import com.camunda.example.oauth2.filter.CamundaAuthenticationFilter;
import com.azure.spring.aad.webapp.AADWebSecurityConfigurerAdapter;
import com.camunda.example.oauth2.filter.WebAppAuthenticationProvider;
import org.camunda.bpm.webapp.impl.security.auth.ContainerBasedAuthenticationFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.security.SecurityProperties;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
import org.springframework.security.oauth2.core.oidc.user.OidcUser;

import java.util.Collections;
import static java.util.Collections.singletonMap;
import static org.camunda.bpm.engine.rest.security.auth.ProcessEngineAuthenticationFilter.AUTHENTICATION_PROVIDER_PARAM;
import static org.springframework.boot.autoconfigure.security.SecurityProperties.BASIC_AUTH_ORDER;

@Configuration
@EnableWebSecurity(debug = true)
@Order(SecurityProperties.BASIC_AUTH_ORDER - 15)
public class WebAppSecurityConfig extends WebSecurityConfigurerAdapter {
@Order(BASIC_AUTH_ORDER - 15)
public class WebAppSecurityConfig extends AADWebSecurityConfigurerAdapter {

private final Logger logger = LoggerFactory.getLogger(WebAppSecurityConfig.class.getName());

@Autowired
private OAuth2UserService<OidcUserRequest, OidcUser> oidcUserService;

@Override
protected void configure(HttpSecurity http) throws Exception {

super.configure(http);
http.csrf().disable();
http.authorizeRequests().antMatchers("/app/admin/**", "/app/cockpit/**", "/app/tasklist/**").authenticated()
.and()
.authorizeRequests().antMatchers("/**").permitAll()
.and()
.oauth2Login()
.userInfoEndpoint()
.oidcUserService(oidcUserService);
.authorizeRequests().antMatchers("/**").permitAll();

http.csrf().disable();
}

@Bean
@Order(SecurityProperties.BASIC_AUTH_ORDER - 15)
public FilterRegistrationBean<CamundaAuthenticationFilter> containerBasedAuthenticationFilter() {
@Order(BASIC_AUTH_ORDER - 15)
public FilterRegistrationBean<ContainerBasedAuthenticationFilter> containerBasedAuthenticationFilter() {

logger.info("++++++++ WebAppSecurityConfig.containerBasedAuthenticationFilter()....");
FilterRegistrationBean<CamundaAuthenticationFilter> filterRegistration
= new FilterRegistrationBean<>();
filterRegistration.setFilter(new CamundaAuthenticationFilter());
filterRegistration.setInitParameters(Collections.singletonMap("authentication-provider", WebAppAuthenticationProvider.class.getName()));
FilterRegistrationBean<ContainerBasedAuthenticationFilter> filterRegistration = new FilterRegistrationBean<>();
filterRegistration.setFilter(new ContainerBasedAuthenticationFilter());
filterRegistration.setInitParameters(singletonMap(AUTHENTICATION_PROVIDER_PARAM, WebAppAuthenticationProvider.class.getName()));
filterRegistration.setOrder(101); // make sure the filter is registered after the Spring Security Filter Chain
filterRegistration.addUrlPatterns("/*");
return filterRegistration;
Expand Down
31 changes: 0 additions & 31 deletions src/main/java/com/camunda/example/oauth2/filter/CamundaAuthenticationFilter.java
View file
Open in desktop

This file was deleted.

13 changes: 8 additions & 5 deletions src/main/java/com/camunda/example/oauth2/filter/WebAppAuthenticationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
import java.util.List;
import java.util.stream.Collectors;

import static org.camunda.bpm.engine.rest.security.auth.AuthenticationResult.successful;
import static org.camunda.bpm.engine.rest.security.auth.AuthenticationResult.unsuccessful;

public class WebAppAuthenticationProvider extends ContainerBasedAuthenticationProvider {

private final Logger logger = LoggerFactory.getLogger(WebAppAuthenticationProvider.class.getName());
Expand All @@ -25,17 +28,17 @@ public AuthenticationResult extractAuthenticatedUser(HttpServletRequest request,

if (authentication == null) {
logger.debug("++ authentication == null...return unsuccessful.");
return AuthenticationResult.unsuccessful();
return unsuccessful();
}

logger.debug("++ authentication IS NOT NULL");
String name = authentication.getName();
if (name == null || name.isEmpty()) {
return AuthenticationResult.unsuccessful();
return unsuccessful();
}

logger.debug("++ name = " + name);
AuthenticationResult authenticationResult = new AuthenticationResult(name, true);
AuthenticationResult authenticationResult = successful(name);
authenticationResult.setGroups(getUserGroups(authentication));

return authenticationResult;
Expand All @@ -51,10 +54,10 @@ private List<String> getUserGroups(Authentication authentication) {
.map(res -> res.substring(5)) // Strip "ROLE_"
.collect(Collectors.toList());

logger.debug("++ groupIds = " + groupIds.toString());
logger.debug("++ groupIds = " + groupIds);

return groupIds;

}

}
}