v1.4.3

Author: jvanmalder

Jenkinsfile

@@ -73,6 +73,10 @@ pipeline {
                         reportDir: 'repo/build/reports/tests/test', reportFiles: 'index.html',
                         reportName: 'Repo Test Report',
                         allowMissing: true, alwaysLinkToLastBuild: true, keepAll: true])
+                    publishHTML([
+                        reportDir: 'build/reports', reportFiles: 'dependency-check-report.html',
+                        reportName: 'OWASP Dependency Analysis Report',
+                        allowMissing: true, alwaysLinkToLastBuild: true, keepAll: true])
                 }
             }
         }

app/src/main/java/eu/openanalytics/rdepot/Application.java

@@ -23,29 +23,15 @@
  */
 package eu.openanalytics.rdepot;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.annotation.Resource;
-
 import org.keycloak.adapters.springboot.KeycloakSpringBootProperties;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.env.Environment;
 import org.springframework.web.context.WebApplicationContext;
 
-import eu.openanalytics.rdepot.model.Repository;
-import eu.openanalytics.rdepot.service.RepositoryService;
-
 /**
  * @author jonas
  *

app/src/main/java/eu/openanalytics/rdepot/config/JWTAuthorizationFilter.java

@@ -21,24 +21,19 @@
 package eu.openanalytics.rdepot.config;
 
 import java.io.IOException;
-import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
-
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
-
 import eu.openanalytics.rdepot.model.ApiToken;
 import eu.openanalytics.rdepot.repository.ApiTokenRepository;
 import eu.openanalytics.rdepot.service.UserService;

app/src/main/java/eu/openanalytics/rdepot/config/LDAPSecurityConfig.java

@@ -22,9 +22,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.annotation.Resource;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -40,14 +38,12 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
 import org.springframework.security.ldap.authentication.AbstractLdapAuthenticationProvider;
 import org.springframework.security.ldap.authentication.AbstractLdapAuthenticator;
 import org.springframework.security.ldap.authentication.LdapAuthenticationProvider;
 import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
 import org.springframework.security.ldap.userdetails.LdapAuthoritiesPopulator;
-
 import eu.openanalytics.rdepot.authenticator.LDAPCustomBindAuthenticator;
 import eu.openanalytics.rdepot.service.UserService;
 

app/src/main/java/eu/openanalytics/rdepot/config/OIDCSecurityConfig.java

@@ -25,9 +25,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
 import javax.annotation.Resource;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
@@ -48,11 +46,9 @@
 import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
-import org.springframework.security.oauth2.core.OAuth2Error;
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
-
 import eu.openanalytics.rdepot.authenticator.OIDCCustomBindAuthenticator;
 import eu.openanalytics.rdepot.controller.ErrorController;
 import eu.openanalytics.rdepot.exception.AuthException;

app/src/main/java/eu/openanalytics/rdepot/config/SimpleAuthenticationConfig.java

@@ -21,7 +21,6 @@
 package eu.openanalytics.rdepot.config;
 
 import javax.annotation.Resource;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
@@ -32,9 +31,6 @@
 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.config.http.SessionCreationPolicy;
-import org.springframework.security.web.server.context.WebSessionServerSecurityContextRepository;
-
 import eu.openanalytics.rdepot.authenticator.SimpleCustomBindAuthenticator;
 import eu.openanalytics.rdepot.utils.CustomAuthenticationProvider;
 

app/src/main/java/eu/openanalytics/rdepot/config/WebApplicationConfig.java

@@ -27,10 +27,8 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
-
 import javax.annotation.Resource;
 import javax.sql.DataSource;
-
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
@@ -62,18 +60,14 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
-
 import com.google.gson.Gson;
-
-import eu.openanalytics.rdepot.controller.GlobalController;
 import eu.openanalytics.rdepot.formatter.RepositoryFormatter;
 import eu.openanalytics.rdepot.formatter.RoleFormatter;
 import eu.openanalytics.rdepot.formatter.UserFormatter;
 import eu.openanalytics.rdepot.mapper.HibernateAwareObjectMapper;
 import eu.openanalytics.rdepot.model.Repository;
 import eu.openanalytics.rdepot.model.Role;
 import eu.openanalytics.rdepot.model.User;
-import eu.openanalytics.rdepot.service.UserService;
 import eu.openanalytics.rdepot.storage.PackageStorage;
 import eu.openanalytics.rdepot.storage.PackageStorageLocalImpl;
 import eu.openanalytics.rdepot.storage.RepositoryStorage;

app/src/main/java/eu/openanalytics/rdepot/controller/ErrorController.java

@@ -21,45 +21,24 @@
 package eu.openanalytics.rdepot.controller;
 
 import java.io.IOException;
-import java.security.Principal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-
 import javax.annotation.Resource;
-import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.http.HttpEntity;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.core.env.Environment;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
-import org.springframework.security.oauth2.core.oidc.OidcIdToken;
-import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.GetMapping;
 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.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.ModelAndView;
 
 @Controller
 public class ErrorController extends SimpleUrlAuthenticationFailureHandler {

app/src/main/java/eu/openanalytics/rdepot/controller/SubmissionController.java

@@ -24,7 +24,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -43,9 +42,6 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import eu.openanalytics.rdepot.exception.PackageDeleteException;
-import eu.openanalytics.rdepot.exception.PackageNotFound;
 import eu.openanalytics.rdepot.exception.SubmissionAcceptException;
 import eu.openanalytics.rdepot.exception.SubmissionCreateException;
 import eu.openanalytics.rdepot.exception.SubmissionDeleteException;

app/src/main/java/eu/openanalytics/rdepot/controller/UserController.java

@@ -26,9 +26,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-
 import javax.validation.Valid;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -44,12 +42,10 @@
 import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
-
 import eu.openanalytics.rdepot.exception.NoAdminLeftException;
 import eu.openanalytics.rdepot.exception.UserActivateException;
 import eu.openanalytics.rdepot.exception.UserDeactivateException;