Shirly Radco has uploaded a new change for review. Change subject: packaging: fix java filed for jasper upgrade 6.0.1 ......................................................................
packaging: fix java filed for jasper upgrade 6.0.1 Change-Id: I2d19eaa7e1909bba619094de7e7b79e467a9ca67 Signed-off-by: Shirly Radco <[email protected]> --- M ovirt-engine-reports/EngineAuthentication/build.xml M ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java M ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineUserDetails.java 3 files changed, 40 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/37/38337/1 diff --git a/ovirt-engine-reports/EngineAuthentication/build.xml b/ovirt-engine-reports/EngineAuthentication/build.xml index 6571009..6508d36 100644 --- a/ovirt-engine-reports/EngineAuthentication/build.xml +++ b/ovirt-engine-reports/EngineAuthentication/build.xml @@ -5,14 +5,16 @@ <path id="local.classpath"> <fileset dir="${jasper.lib}"><filename name="commons-logging-*.jar"/></fileset> - <fileset dir="${jasper.lib}"><filename name="jasperserver-api-common-*.jar"/></fileset> - <fileset dir="${jasper.lib}"><filename name="jasperserver-api-metadata-*.jar"/></fileset> <fileset dir="${jasper.lib}"><filename name="jasperserver-api-metadata-impl-*.jar"/></fileset> <fileset dir="${jasper.lib}"><filename name="servlet-api-*.jar"/></fileset> - <fileset dir="${jasper.lib}"><filename name="spring-core-*.jar"/></fileset> - <fileset dir="${jasper.lib}"><filename name="spring-context-*.jar"/></fileset> <fileset dir="${jasper.lib}"><filename name="spring-beans-*.jar"/></fileset> + <fileset dir="${jasper.lib}"><filename name="spring-context-*.jar"/></fileset> + <fileset dir="${jasper.lib}"><filename name="spring-core-*.jar"/></fileset> <fileset dir="${jasper.lib}"><filename name="spring-security-core-*.jar"/></fileset> + <fileset dir="${jasper.lib}"><filename name="spring-security-web-*.jar"/></fileset> + <fileset dir="${jasper.lib}"><filename name="spring-web-*.jar"/></fileset> + <fileset dir="${jasper.lib}"><filename name="jasperserver-api-common-*.jar"/></fileset> + <fileset dir="${jasper.lib}"><filename name="jasperserver-api-metadata-*.jar"/></fileset> </path> <target name="all"> diff --git a/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java b/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java index 57b6e7b..2e4260a 100644 --- a/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java +++ b/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java @@ -19,7 +19,9 @@ import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import java.util.ArrayList; import java.util.Calendar; +import java.util.Collection; import java.util.Date; import java.util.Properties; @@ -32,20 +34,21 @@ import javax.net.ssl.X509TrustManager; import javax.servlet.FilterChain; import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.security.Authentication; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; -import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.ui.AuthenticationDetailsSource; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.WebAuthenticationDetailsSource; -import org.springframework.security.ui.preauth.AbstractPreAuthenticatedProcessingFilter; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.GrantedAuthorityImpl; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.authentication.AuthenticationDetailsSource; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter; import com.jaspersoft.jasperserver.api.metadata.user.domain.impl.client.MetadataUserDetails; @@ -106,7 +109,7 @@ } @Override - public void afterPropertiesSet() throws Exception { + public void afterPropertiesSet() { super.afterPropertiesSet(); if (authenticationProperties != null) { @@ -127,10 +130,18 @@ sslInsecure = Boolean.valueOf(props.getProperty("sslInsecure", Boolean.toString(sslInsecure))); sslNoHostVerification = Boolean.valueOf(props.getProperty("sslNoHostVerification", Boolean.toString(sslNoHostVerification))); } + catch (IOException exception) { + logger.error("can't load authentication properties file '" + authenticationPropertiesFile.getAbsolutePath() + "'", exception); + } } } - setupSSLContext(); + try { + setupSSLContext(); + } + catch (Exception exception) { + logger.error("can't setup SSL context", exception); + } } @Override @@ -144,12 +155,12 @@ } @Override - public int getOrder() { - return FilterChainOrder.PRE_AUTH_FILTER; + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException { + doFilterHttp((HttpServletRequest) request, (HttpServletResponse) response, chain); } - @Override - public void doFilterHttp(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + private void doFilterHttp(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws IOException, ServletException { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication == null || (authentication != null && !authentication.isAuthenticated())) { @@ -301,8 +312,8 @@ String password = ""; userName = userName.trim(); - GrantedAuthority[] grantedAuthorities = new GrantedAuthority[1]; - grantedAuthorities[0] = new GrantedAuthorityImpl("ROLE_USER"); + Collection<GrantedAuthority> grantedAuthorities = new ArrayList<GrantedAuthority>(1); + grantedAuthorities.add(new GrantedAuthorityImpl("ROLE_USER")); Calendar recheckOn = Calendar.getInstance(); recheckOn.setTime(new Date()); diff --git a/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineUserDetails.java b/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineUserDetails.java index c85f1f6..e8bf035 100644 --- a/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineUserDetails.java +++ b/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineUserDetails.java @@ -1,16 +1,17 @@ package org.ovirt.authentication; import java.util.Calendar; +import java.util.Collection; import java.util.Date; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; public class EngineUserDetails implements UserDetails { public EngineUserDetails(String userName, String password, - GrantedAuthority[] authorities, + Collection<GrantedAuthority> authorities, String userSessionID, Calendar recheckSessionIdOn, boolean isAccountNonExpired, @@ -33,7 +34,7 @@ private String userName; private String password; - private GrantedAuthority[] authorities; + private Collection<GrantedAuthority> authorities; private String userSessionID; private Calendar recheckSessionIdOn; private boolean isAccountNonExpired; @@ -42,7 +43,7 @@ private boolean isEnabled; @Override - public GrantedAuthority[] getAuthorities() { + public Collection<GrantedAuthority> getAuthorities() { return authorities; } -- To view, visit https://gerrit.ovirt.org/38337 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d19eaa7e1909bba619094de7e7b79e467a9ca67 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Shirly Radco <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
