Author: brett
Date: Thu Mar 4 05:18:44 2010
New Revision: 918857
URL: http://svn.apache.org/viewvc?rev=918857&view=rev
Log:
[MRM-1355] fix username for audit log
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java?rev=918857&r1=918856&r2=918857&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
Thu Mar 4 05:18:44 2010
@@ -71,14 +71,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
/**
*/
public class ArchivaDavResource
@@ -427,8 +419,9 @@
throws DavException
{
String path = logicalResource + "/" + member.getDisplayName();
-
- triggerAuditEvent( checkDavResourceIsArchivaDavResource( member
).remoteAddr, locator.getRepositoryId(), path,
+
+ ArchivaDavResource resource = checkDavResourceIsArchivaDavResource(
member );
+ triggerAuditEvent( resource.remoteAddr, resource.principal,
locator.getRepositoryId(), path,
event );
}
@@ -447,13 +440,13 @@
{
FileUtils.moveDirectory( getLocalResource(),
resource.getLocalResource() );
- triggerAuditEvent( remoteAddr, locator.getRepositoryId(),
logicalResource, AuditEvent.MOVE_DIRECTORY );
+ triggerAuditEvent( remoteAddr, principal,
locator.getRepositoryId(), logicalResource, AuditEvent.MOVE_DIRECTORY );
}
else
{
FileUtils.moveFile( getLocalResource(),
resource.getLocalResource() );
- triggerAuditEvent( remoteAddr, locator.getRepositoryId(),
logicalResource, AuditEvent.MOVE_FILE );
+ triggerAuditEvent( remoteAddr, principal,
locator.getRepositoryId(), logicalResource, AuditEvent.MOVE_FILE );
}
log.debug( ( isCollection() ? "Directory '" : "File '" ) +
getLocalResource().getName() + "' moved to '" +
@@ -485,13 +478,13 @@
{
FileUtils.copyDirectory( getLocalResource(),
resource.getLocalResource() );
- triggerAuditEvent( remoteAddr, locator.getRepositoryId(),
logicalResource, AuditEvent.COPY_DIRECTORY );
+ triggerAuditEvent( remoteAddr, principal,
locator.getRepositoryId(), logicalResource, AuditEvent.COPY_DIRECTORY );
}
else
{
FileUtils.copyFile( getLocalResource(),
resource.getLocalResource() );
- triggerAuditEvent( remoteAddr, locator.getRepositoryId(),
logicalResource, AuditEvent.COPY_FILE );
+ triggerAuditEvent( remoteAddr, principal,
locator.getRepositoryId(), logicalResource, AuditEvent.COPY_FILE );
}
log.debug( ( isCollection() ? "Directory '" : "File '" ) +
getLocalResource().getName() + "' copied to '" +
destination + "' (current user '" + this.principal + "')" );
@@ -658,7 +651,8 @@
return (ArchivaDavResource) resource;
}
- private void triggerAuditEvent( String remoteIP, String repositoryId,
String resource, String action )
+ private void triggerAuditEvent( String remoteIP, String principal, String
repositoryId, String resource,
+ String action )
{
AuditEvent event = new AuditEvent( repositoryId, principal, resource,
action );
event.setRemoteIP( remoteIP );
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java?rev=918857&r1=918856&r2=918857&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
Thu Mar 4 05:18:44 2010
@@ -800,6 +800,11 @@
return archivaLocator;
}
+ public ArchivaAuditLogsDao getAuditLogsDao()
+ {
+ return auditLogsDao;
+ }
+
private static class LogicalResource
{
private String path;
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java?rev=918857&r1=918856&r2=918857&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
Thu Mar 4 05:18:44 2010
@@ -22,6 +22,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -32,6 +33,10 @@
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.database.ArchivaAuditLogsDao;
+import
org.apache.maven.archiva.database.constraints.MostRecentArchivaAuditLogsConstraint;
+import org.apache.maven.archiva.model.ArchivaAuditLogs;
+import org.apache.maven.archiva.repository.audit.AuditLog;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.security.ServletAuthenticator;
import org.codehaus.plexus.redback.authentication.AuthenticationException;
@@ -376,6 +381,10 @@
servletAuthControl.verify();
// assertEquals(HttpServletResponse.SC_CREATED,
response.getResponseCode());
+
+ ArchivaAuditLogsDao auditLogsDao =
archivaDavResourceFactory.getAuditLogsDao();
+ List<ArchivaAuditLogs> auditLogs = auditLogsDao.queryAuditLogs( new
MostRecentArchivaAuditLogsConstraint() );
+ assertEquals( "admin", auditLogs.get( 0 ).getUsername() );
}
// test get with invalid user, and guest has read access to repo
