git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@756564 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.2
import org.apache.jackrabbit.webdav.DavServletRequest; | import org.apache.jackrabbit.webdav.DavServletRequest; | ||||
import org.apache.jackrabbit.webdav.DavSessionProvider; | import org.apache.jackrabbit.webdav.DavSessionProvider; | ||||
import org.apache.jackrabbit.webdav.WebdavRequest; | import org.apache.jackrabbit.webdav.WebdavRequest; | ||||
import org.apache.maven.archiva.security.ArchivaXworkUser; | |||||
import org.apache.maven.archiva.security.ServletAuthenticator; | import org.apache.maven.archiva.security.ServletAuthenticator; | ||||
import org.apache.maven.archiva.webdav.util.RepositoryPathUtil; | import org.apache.maven.archiva.webdav.util.RepositoryPathUtil; | ||||
import org.apache.maven.archiva.webdav.util.WebdavMethodUtil; | import org.apache.maven.archiva.webdav.util.WebdavMethodUtil; | ||||
private HttpAuthenticator httpAuth; | private HttpAuthenticator httpAuth; | ||||
public ArchivaDavSessionProvider( ServletAuthenticator servletAuth, HttpAuthenticator httpAuth, ArchivaXworkUser archivaXworkUser ) | |||||
public ArchivaDavSessionProvider( ServletAuthenticator servletAuth, HttpAuthenticator httpAuth ) | |||||
{ | { | ||||
this.servletAuth = servletAuth; | this.servletAuth = servletAuth; | ||||
this.httpAuth = httpAuth; | this.httpAuth = httpAuth; |
import org.apache.maven.archiva.configuration.ConfigurationEvent; | import org.apache.maven.archiva.configuration.ConfigurationEvent; | ||||
import org.apache.maven.archiva.configuration.ConfigurationListener; | import org.apache.maven.archiva.configuration.ConfigurationListener; | ||||
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; | import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; | ||||
import org.apache.maven.archiva.security.ArchivaXworkUser; | |||||
import org.apache.maven.archiva.security.ServletAuthenticator; | import org.apache.maven.archiva.security.ServletAuthenticator; | ||||
import org.codehaus.plexus.spring.PlexusToSpringUtils; | import org.codehaus.plexus.spring.PlexusToSpringUtils; | ||||
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; | import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; | ||||
HttpAuthenticator httpAuth = | HttpAuthenticator httpAuth = | ||||
(HttpAuthenticator) wac.getBean( PlexusToSpringUtils.buildSpringId( HttpAuthenticator.ROLE, "basic" ) ); | (HttpAuthenticator) wac.getBean( PlexusToSpringUtils.buildSpringId( HttpAuthenticator.ROLE, "basic" ) ); | ||||
ArchivaXworkUser archivaXworkUser = | |||||
(ArchivaXworkUser) wac.getBean( PlexusToSpringUtils.buildSpringId( ArchivaXworkUser.class.getName() ) ); | |||||
sessionProvider = new ArchivaDavSessionProvider( servletAuth, httpAuth, archivaXworkUser ); | |||||
sessionProvider = new ArchivaDavSessionProvider( servletAuth, httpAuth ); | |||||
} | } | ||||
public void configurationEvent( ConfigurationEvent event ) | public void configurationEvent( ConfigurationEvent event ) |
throws Exception | throws Exception | ||||
{ | { | ||||
super.setUp(); | super.setUp(); | ||||
sessionProvider = new ArchivaDavSessionProvider(new ServletAuthenticatorMock(), new HttpAuthenticatorMock(), null); | |||||
sessionProvider = new ArchivaDavSessionProvider( new ServletAuthenticatorMock(), new HttpAuthenticatorMock() ); | |||||
request = new WebdavRequestImpl(new HttpServletRequestMock(), null); | request = new WebdavRequestImpl(new HttpServletRequestMock(), null); | ||||
} | } | ||||
import org.apache.maven.archiva.configuration.Configuration; | import org.apache.maven.archiva.configuration.Configuration; | ||||
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; | import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; | ||||
import org.apache.maven.archiva.security.ArchivaRoleConstants; | import org.apache.maven.archiva.security.ArchivaRoleConstants; | ||||
import org.apache.maven.archiva.security.ArchivaXworkUser; | |||||
import org.apache.maven.archiva.security.ServletAuthenticator; | import org.apache.maven.archiva.security.ServletAuthenticator; | ||||
import org.codehaus.plexus.redback.authentication.AuthenticationException; | import org.codehaus.plexus.redback.authentication.AuthenticationException; | ||||
import org.codehaus.plexus.redback.authentication.AuthenticationResult; | import org.codehaus.plexus.redback.authentication.AuthenticationResult; | ||||
httpAuthControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER ); | httpAuthControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER ); | ||||
httpAuth = (HttpAuthenticator) httpAuthControl.getMock(); | httpAuth = (HttpAuthenticator) httpAuthControl.getMock(); | ||||
ArchivaXworkUser archivaXworkUser = (ArchivaXworkUser) lookup( ArchivaXworkUser.class ); | |||||
davSessionProvider = new ArchivaDavSessionProvider( servletAuth, httpAuth, archivaXworkUser ); | |||||
davSessionProvider = new ArchivaDavSessionProvider( servletAuth, httpAuth ); | |||||
} | } | ||||
protected ManagedRepositoryConfiguration createManagedRepository( String id, String name, File location ) | protected ManagedRepositoryConfiguration createManagedRepository( String id, String name, File location ) |
{ | { | ||||
public UnauthenticatedDavSessionProvider() | public UnauthenticatedDavSessionProvider() | ||||
{ | { | ||||
super(null, null, null); | |||||
super( null, null ); | |||||
} | } | ||||
@Override | @Override |