Skip to content
Snippets Groups Projects
Commit d04733de authored by Manuel Spuhler's avatar Manuel Spuhler
Browse files

Merge branch 'master' of ssh://lab01560.intranet.chuv:2222/web-analytics/portal-backend

parents 5e0cf7f0 f40f0cca
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.bumpversion.cfg
+ 1
− 1
View file @ d04733de
[bumpversion] [bumpversion]
current_version = 2.8.0 current_version = 2.8.1
commit = True commit = True
tag = True tag = True
tag_name = {new_version} tag_name = {new_version}
......
hbp.yml
+ 5
− 5
View file @ d04733de
...@@ -58,9 +58,9 @@ testing: ...@@ -58,9 +58,9 @@ testing:
command: ./test.sh command: ./test.sh
release_management: release_management:
current_version: 2.8.0 current_version: 2.8.1
current_code_release: https://github.com/HBPMedical/portal-backend/archive/2.8.0.zip current_code_release: https://github.com/HBPMedical/portal-backend/archive/2.8.1.zip
current_binary_release: https://pypi.python.org/pypi/portal-backend/2.8.0 current_binary_release: https://pypi.python.org/pypi/portal-backend/2.8.1
release_script: 'publish.sh' release_script: 'publish.sh'
continuous_integration: continuous_integration:
...@@ -75,10 +75,10 @@ continuous_integration: ...@@ -75,10 +75,10 @@ continuous_integration:
distribution: distribution:
docker_hub: docker_hub:
name: hbpmip/portal-backend name: hbpmip/portal-backend
current_tag: 2.8.0 current_tag: 2.8.1
url: https://hub.docker.com/r/hbpmip/portal-backend/ url: https://hub.docker.com/r/hbpmip/portal-backend/
badge: https://img.shields.io/badge/docker-hbpmip%2Fportal--backend-008bb8.svg badge: https://img.shields.io/badge/docker-hbpmip%2Fportal--backend-008bb8.svg
command: docker pull hbpmip/portal-backend:2.8.0 command: docker pull hbpmip/portal-backend:2.8.1
planning: planning:
github: github:
......
pom.xml
+ 1
− 1
View file @ d04733de
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<groupId>eu.hbp.mip</groupId> <groupId>eu.hbp.mip</groupId>
<artifactId>portal-backend</artifactId> <artifactId>portal-backend</artifactId>
<version>2.8.0</version><!-- BUMP_VERSION --> <version>2.8.1</version><!-- BUMP_VERSION -->
<packaging>jar</packaging> <packaging>jar</packaging>
<name>portal-backend</name> <name>portal-backend</name>
......
src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
+ 13
− 76
View file @ d04733de
package eu.hbp.mip.configuration; package eu.hbp.mip.configuration;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import eu.hbp.mip.model.User;
import eu.hbp.mip.model.UserInfo; import eu.hbp.mip.model.UserInfo;
import eu.hbp.mip.repositories.UserRepository;
import eu.hbp.mip.utils.CORSFilter; import eu.hbp.mip.utils.CORSFilter;
import eu.hbp.mip.utils.CustomLoginUrlAuthenticationEntryPoint; import eu.hbp.mip.utils.CustomLoginUrlAuthenticationEntryPoint;
import eu.hbp.mip.utils.HTTPUtil; import eu.hbp.mip.utils.HTTPUtil;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.security.oauth2.resource.ResourceServerProperties; import org.springframework.boot.autoconfigure.security.oauth2.resource.ResourceServerProperties;
import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoTokenServices; import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoTokenServices;
import org.springframework.boot.context.embedded.FilterRegistrationBean; import org.springframework.boot.context.embedded.FilterRegistrationBean;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
...@@ -41,10 +32,6 @@ import org.springframework.security.web.csrf.CsrfFilter; ...@@ -41,10 +32,6 @@ import org.springframework.security.web.csrf.CsrfFilter;
import org.springframework.security.web.csrf.CsrfToken; import org.springframework.security.web.csrf.CsrfToken;
import org.springframework.security.web.csrf.CsrfTokenRepository; import org.springframework.security.web.csrf.CsrfTokenRepository;
import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository; import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.filter.OncePerRequestFilter;
import org.springframework.web.util.WebUtils; import org.springframework.web.util.WebUtils;
...@@ -55,9 +42,6 @@ import javax.servlet.http.Cookie; ...@@ -55,9 +42,6 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.security.Principal;
// See https://spring.io/guides/tutorials/spring-boot-oauth2/ for reference about configuring OAuth2 login // See https://spring.io/guides/tutorials/spring-boot-oauth2/ for reference about configuring OAuth2 login
// also http://cscarioni.blogspot.ch/2013/04/pro-spring-security-and-oauth-2.html // also http://cscarioni.blogspot.ch/2013/04/pro-spring-security-and-oauth-2.html
...@@ -67,7 +51,6 @@ import java.security.Principal; ...@@ -67,7 +51,6 @@ import java.security.Principal;
*/ */
@Configuration @Configuration
@EnableOAuth2Client @EnableOAuth2Client
@RestController
public class SecurityConfiguration extends WebSecurityConfigurerAdapter { public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
private static final Logger LOGGER = LoggerFactory.getLogger(SecurityConfiguration.class); private static final Logger LOGGER = LoggerFactory.getLogger(SecurityConfiguration.class);
...@@ -75,12 +58,6 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { ...@@ -75,12 +58,6 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
@Autowired @Autowired
private OAuth2ClientContext oauth2ClientContext; private OAuth2ClientContext oauth2ClientContext;
@Autowired
private UserRepository userRepository;
@Autowired
private UserInfo userInfo;
/** /**
* Enable HBP collab authentication (1) or disable it (0). Default is 1 * Enable HBP collab authentication (1) or disable it (0). Default is 1
*/ */
...@@ -111,11 +88,6 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { ...@@ -111,11 +88,6 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
@Value("#{'${hbp.resource.revokeTokenUri:https://services.humanbrainproject.eu/oidc/revoke}'}") @Value("#{'${hbp.resource.revokeTokenUri:https://services.humanbrainproject.eu/oidc/revoke}'}")
private String revokeTokenURI; private String revokeTokenURI;
/**
* Set to true if using no-auth mode and user has clicked on the login button
*/
private boolean fakeAuth = false;
@Override @Override
protected void configure(HttpSecurity http) throws Exception { protected void configure(HttpSecurity http) throws Exception {
// @formatter:off // @formatter:off
...@@ -139,8 +111,6 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { ...@@ -139,8 +111,6 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
http.antMatcher("/**") http.antMatcher("/**")
.authorizeRequests() .authorizeRequests()
.antMatchers("/**").permitAll().and().csrf().disable(); .antMatchers("/**").permitAll().and().csrf().disable();
User user = userInfo.getUser();
userRepository.save(user);
} }
} }
...@@ -174,6 +144,14 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { ...@@ -174,6 +144,14 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
return new ResourceServerProperties(); return new ResourceServerProperties();
} }
public boolean isAuthentication() {
return authentication;
}
public String getFrontendRedirectAfterLogin() {
return frontendRedirectAfterLogin;
}
private Filter csrfHeaderFilter() { private Filter csrfHeaderFilter() {
return new OncePerRequestFilter() { return new OncePerRequestFilter() {
@Override @Override
...@@ -200,56 +178,15 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { ...@@ -200,56 +178,15 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
return repository; return repository;
} }
@RequestMapping(path = "/user", method = RequestMethod.GET)
public Object user(Principal principal, HttpServletResponse response) {
ObjectMapper mapper = new ObjectMapper();
try {
String userJSON = mapper.writeValueAsString(userInfo.getUser());
Cookie cookie = new Cookie("user", URLEncoder.encode(userJSON, "UTF-8"));
cookie.setSecure(true);
cookie.setPath("/");
response.addCookie(cookie);
} catch (JsonProcessingException | UnsupportedEncodingException e) {
LOGGER.trace("Cannot read user json", e);
}
if(!authentication)
{
if(!fakeAuth)
{
response.setStatus(401);
}
String principalJson = "{\"principal\": \"anonymous\", \"name\": \"anonymous\", \"userAuthentication\": {" +
"\"details\": {\"preferred_username\": \"anonymous\"}}}";
return new Gson().fromJson(principalJson, Object.class);
}
return principal;
}
@RequestMapping(path = "/user", method = RequestMethod.POST)
public ResponseEntity<Void> postUser(@ApiParam(value = "Has the user agreed on the NDA") @RequestParam(value = "agreeNDA") Boolean agreeNDA) {
User user = userInfo.getUser();
if (user != null) {
user.setAgreeNDA(agreeNDA);
userRepository.save(user);
}
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@RequestMapping(path = "/login/hbp", method = RequestMethod.GET)
@ConditionalOnExpression("${hbp.authentication.enabled:0}")
public void noLogin(HttpServletResponse httpServletResponse) throws IOException {
fakeAuth = true;
httpServletResponse.sendRedirect(frontendRedirectAfterLogin);
}
private class CustomLogoutHandler implements LogoutHandler { private class CustomLogoutHandler implements LogoutHandler {
@Override @Override
public void logout(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Authentication authentication) { public void logout(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Authentication authentication) {
fakeAuth = false; // Hackish way of accessing to this information...
final UserInfo userInfo = (UserInfo) httpServletRequest.getSession().getAttribute("userInfo");
if (userInfo != null) {
userInfo.setFakeAuth(false);
}
if (oauth2ClientContext == null || oauth2ClientContext.getAccessToken() == null) if (oauth2ClientContext == null || oauth2ClientContext.getAccessToken() == null)
{ {
......
src/main/java/eu/hbp/mip/controllers/SecurityApi.java 0 → 100644
+ 86
− 0
View file @ d04733de
package eu.hbp.mip.controllers;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import eu.hbp.mip.configuration.SecurityConfiguration;
import eu.hbp.mip.model.User;
import eu.hbp.mip.model.UserInfo;
import eu.hbp.mip.repositories.UserRepository;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.security.Principal;
@RestController
public class SecurityApi {
private static final Logger LOGGER = LoggerFactory.getLogger(SecurityApi.class);
@Autowired
private UserInfo userInfo;
@Autowired
private UserRepository userRepository;
@Autowired
private SecurityConfiguration securityConfiguration;
@RequestMapping(path = "/user", method = RequestMethod.GET)
public Object user(Principal principal, HttpServletResponse response) {
ObjectMapper mapper = new ObjectMapper();
try {
String userJSON = mapper.writeValueAsString(userInfo.getUser());
Cookie cookie = new Cookie("user", URLEncoder.encode(userJSON, "UTF-8"));
cookie.setSecure(true);
cookie.setPath("/");
response.addCookie(cookie);
} catch (JsonProcessingException | UnsupportedEncodingException e) {
LOGGER.trace("Cannot read user json", e);
}
if (!securityConfiguration.isAuthentication()) {
if (!userInfo.isFakeAuth()) {
response.setStatus(401);
}
String principalJson = "{\"principal\": \"anonymous\", \"name\": \"anonymous\", \"userAuthentication\": {" +
"\"details\": {\"preferred_username\": \"anonymous\"}}}";
return new Gson().fromJson(principalJson, Object.class);
}
return principal;
}
@RequestMapping(path = "/user", method = RequestMethod.POST)
public ResponseEntity<Void> postUser(@ApiParam(value = "Has the user agreed on the NDA") @RequestParam(value = "agreeNDA") Boolean agreeNDA) {
User user = userInfo.getUser();
if (user != null) {
user.setAgreeNDA(agreeNDA);
userRepository.save(user);
}
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@RequestMapping(path = "/login/hbp", method = RequestMethod.GET)
@ConditionalOnExpression("${hbp.authentication.enabled:0}")
public void noLogin(HttpServletResponse httpServletResponse) throws IOException {
userInfo.setFakeAuth(true);
httpServletResponse.sendRedirect(securityConfiguration.getFrontendRedirectAfterLogin());
}
}
src/main/java/eu/hbp/mip/model/UserInfo.java
+ 18
− 1
View file @ d04733de
...@@ -4,13 +4,17 @@ import eu.hbp.mip.repositories.UserRepository; ...@@ -4,13 +4,17 @@ import eu.hbp.mip.repositories.UserRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.security.oauth2.provider.OAuth2Authentication;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.inject.Named;
@Component @Component
@Scope("session") @Scope(value = "session", proxyMode=ScopedProxyMode.TARGET_CLASS)
@Named("userInfo")
public class UserInfo { public class UserInfo {
@Autowired @Autowired
...@@ -24,6 +28,11 @@ public class UserInfo { ...@@ -24,6 +28,11 @@ public class UserInfo {
private User user; private User user;
/**
* Set to true if using no-auth mode and user has clicked on the login button
*/
private boolean fakeAuth = false;
/** /**
* returns the user for the current session. * returns the user for the current session.
* <p> * <p>
...@@ -57,6 +66,14 @@ public class UserInfo { ...@@ -57,6 +66,14 @@ public class UserInfo {
return user; return user;
} }
public boolean isFakeAuth() {
return fakeAuth;
}
public void setFakeAuth(boolean fakeAuth) {
this.fakeAuth = fakeAuth;
}
private String getUserInfos() { private String getUserInfos() {
OAuth2Authentication oAuth2Authentication = (OAuth2Authentication) SecurityContextHolder.getContext().getAuthentication(); OAuth2Authentication oAuth2Authentication = (OAuth2Authentication) SecurityContextHolder.getContext().getAuthentication();
Authentication userAuthentication = oAuth2Authentication.getUserAuthentication(); Authentication userAuthentication = oAuth2Authentication.getUserAuthentication();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment