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

Jump to bottom

40 : Added keycloak configuration #1

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

40 : Added keycloak configuration #1

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5d04727
40 : Added keycloak configuration
rehammuzzamil May 17, 2021
6d5577f
40 : Added keycloak configuration
rehammuzzamil May 20, 2021
7ec7479
40 : Added keycloak configuration
rehammuzzamil May 20, 2021
9373176
40 : Added keycloak configuration
rehammuzzamil May 20, 2021
5046a53
40 : Added keycloak configuration
rehammuzzamil May 20, 2021
e3b5f8c
40 : Add keycloak configuration
rehammuzzamil May 25, 2021
0b88bb6
Set skip to false to resolve duplicate finder plugin exceptions while…
rehammuzzamil May 25, 2021
6dccf41
Code cleanup
rehammuzzamil May 25, 2021
a2f4fb8
Removed redundant application.yml from the autoconfigure package
rehammuzzamil May 26, 2021
cdff49d
40 : Create a separate security configuration package
rehammuzzamil Jun 1, 2021
0d60ce9
40 : Revert changes on spring boot module
rehammuzzamil Jun 1, 2021
362038d
40 : Add authentication work
rehammuzzamil Jun 10, 2021
e15dbd0
40 : Add authentication work
rehammuzzamil Jun 14, 2021
bd15971
40 : Code cleanup
rehammuzzamil Jun 15, 2021
fa8c094
40 : Code cleanup
rehammuzzamil Jun 15, 2021
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: 1 addition & 1 deletion hapi-deployable-pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<checkCompileClasspath>true</checkCompileClasspath>
<checkRuntimeClasspath>false</checkRuntimeClasspath>
<checkTestClasspath>false</checkTestClasspath>
<skip>false</skip>
<skip>true</skip>
<quiet>false</quiet>
<preferLocal>true</preferLocal>
<useResultFile>true</useResultFile>
Expand Down
26 changes: 24 additions & 2 deletions hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>${spring_boot_version}</version>
</dependency>

<!-- Optional dependencies -->
Expand Down Expand Up @@ -69,7 +68,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
<version>${spring_boot_version}</version>
</dependency>

<!-- Test dependencies -->
Expand Down Expand Up @@ -111,6 +109,23 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
</dependencies>

<dependencyManagement>
Expand All @@ -123,6 +138,13 @@
<scope>import</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.keycloak.bom</groupId>
<artifactId>keycloak-adapter-bom</artifactId>
<version>13.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
4 changes: 4 additions & 0 deletions ...oconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.util.CollectionUtils;

Expand All @@ -88,6 +89,8 @@
@Configuration
@AutoConfigureAfter({DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
@EnableConfigurationProperties(FhirProperties.class)
@EnableWebSecurity
@Import({ KeycloakSecurityConfig.class })
rehammuzzamil marked this conversation as resolved.
Show resolved Hide resolved
public class FhirAutoConfiguration {


Expand All @@ -105,6 +108,7 @@ public FhirContext fhirContext() {
}



@Configuration
@ConditionalOnClass(AbstractJaxRsProvider.class)
@EnableConfigurationProperties(FhirProperties.class)
Expand Down
48 changes: 48 additions & 0 deletions ...configure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/KeycloakSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package ca.uhn.fhir.spring.boot.autoconfigure;

import org.keycloak.adapters.KeycloakConfigResolver;
import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver;
import org.keycloak.adapters.springsecurity.KeycloakConfiguration;
import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationProvider;
import org.keycloak.adapters.springsecurity.config.KeycloakWebSecurityConfigurerAdapter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.core.authority.mapping.SimpleAuthorityMapper;
import org.springframework.security.core.session.SessionRegistryImpl;
import org.springframework.security.web.authentication.session.RegisterSessionAuthenticationStrategy;
import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;

@KeycloakConfiguration
public class KeycloakSecurityConfig extends KeycloakWebSecurityConfigurerAdapter {

@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) {

KeycloakAuthenticationProvider keycloakAuthenticationProvider = keycloakAuthenticationProvider();
keycloakAuthenticationProvider.setGrantedAuthoritiesMapper(new SimpleAuthorityMapper());
auth.authenticationProvider(keycloakAuthenticationProvider);
}

@Bean
public KeycloakConfigResolver keycloakConfigResolver() {
return new KeycloakSpringBootConfigResolver();
}

@Bean
@Override
protected SessionAuthenticationStrategy sessionAuthenticationStrategy() {
return new RegisterSessionAuthenticationStrategy(new SessionRegistryImpl());
}

@Override
protected void configure(HttpSecurity http) throws Exception {
super.configure(http);
http.authorizeRequests()
.antMatchers("/**")
.authenticated();
;
}

}
6 changes: 6 additions & 0 deletions hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
keycloak:
auth-server-url: http://localhost:8181/auth/
rehammuzzamil marked this conversation as resolved.
Show resolved Hide resolved
realm: Opensrp
resource: opensrp-server
credentials:
secret: b30a2b3a-f56e-483f-9ca7-e428a651b88d
13 changes: 12 additions & 1 deletion ...oot-samples/hapi-fhir-spring-boot-sample-server-jersey/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,20 @@ hapi:
validation:
enabled: true
request-only: true
keycloak:
realm: Opensrp
management:
security:
enabled: false
logging:
level:
ca.uhn.fhir.jaxrs: debug
ca.uhn.fhir.jaxrs: debug
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be affected if we rename the group id

org.keycloak: debug
keycloak:
rehammuzzamil marked this conversation as resolved.
Show resolved Hide resolved
auth-server-url: http://localhost:8181/auth/
realm: Opensrp
resource: opensrp-server
credentials:
secret: b30a2b3a-f56e-483f-9ca7-e428a651b88d