Audit logging interceptor changes

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-with-new-repoapi@748021 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James William Dumay 2009-02-26 05:32:30 +00:00
parent ff25a896f5
commit c2497e80a7
6 changed files with 82 additions and 4 deletions

View File

@ -41,6 +41,7 @@ import org.apache.maven.archiva.repository.ManagedRepositoryContent;
import org.apache.maven.archiva.repository.RepositoryContentFactory;
import org.apache.maven.archiva.repository.RepositoryException;
import org.apache.maven.archiva.repository.RepositoryNotFoundException;
import org.apache.maven.archiva.repository.audit.Auditable;
import org.apache.maven.archiva.repository.content.RepositoryRequest;
import org.apache.maven.archiva.repository.layout.LayoutException;
import org.apache.maven.model.DistributionManagement;

View File

@ -72,7 +72,13 @@ public interface RepositoryContext extends ResourceContext
/**
* Gets the ContentType of the Response
* @return
* @return contentType
*/
String getContentType();
/**
* Gets the IP Address of the requester
* @return ipAdress
*/
String getRemoteIP();
}

View File

@ -0,0 +1,64 @@
package org.apache.archiva.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.util.ArrayList;
import java.util.List;
import org.apache.archiva.repository.api.RepositoryContext;
import org.apache.archiva.repository.api.interceptor.PostRepositoryInterceptor;
import org.apache.maven.archiva.repository.audit.AuditEvent;
import org.apache.maven.archiva.repository.audit.AuditListener;
import org.apache.maven.archiva.repository.audit.Auditable;
public class AuditLoggingPostRepositoryInterceptor implements PostRepositoryInterceptor, Auditable
{
private final List<AuditListener> auditListeners = new ArrayList<AuditListener>();
public void intercept(RepositoryContext context)
{
triggerAuditEvent(context);
}
private void triggerAuditEvent( RepositoryContext context )
{
AuditEvent event = new AuditEvent( context.getRepositoryId(), context.getPrincipal(), context.getLogicalPath(), context.getRequestType().toString() );
event.setRemoteIP( context.getRemoteIP() );
for ( AuditListener listener : auditListeners )
{
listener.auditEvent( event );
}
}
public void addAuditListener(AuditListener auditListener)
{
auditListeners.add(auditListener);
}
public void clearAuditListeners()
{
auditListeners.clear();
}
public void removeAuditListener(AuditListener auditListener)
{
auditListeners.add(auditListener);
}
}

View File

@ -97,7 +97,7 @@ public class GroupRepositoryManager implements RepositoryManager
if (isMetadataRequest(context) && isProjectReference(context))
{
ArchivaRepositoryMetadata mainMetadata = null;
for (final String repositoryId : groupConfiguration.getRepositories() )
for (final String repositoryId : new ArrayList<String>(groupConfiguration.getRepositories()) )
{
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final MutableResourceContext resourceContext = getMetadataLogicalPathWithoutChecksum(context);
@ -173,7 +173,7 @@ public class GroupRepositoryManager implements RepositoryManager
final RepositoryGroupConfiguration groupConfiguration = getGroupConfiguration(context.getRepositoryId());
final LinkedHashMap<String, Status> statusMap = new LinkedHashMap<String, Status>();
for (final String repositoryId : groupConfiguration.getRepositories())
for (final String repositoryId : new ArrayList<String>(groupConfiguration.getRepositories()))
{
final MutableResourceContext resourceContext = getMetadataLogicalPathWithoutChecksum(context);
resourceContext.setRepositoryId(repositoryId);
@ -229,7 +229,7 @@ public class GroupRepositoryManager implements RepositoryManager
private boolean readFromGroup(final RepositoryGroupConfiguration groupConfiguration, ResourceContext context, OutputStream os)
{
for (final String repositoryId : groupConfiguration.getRepositories())
for (final String repositoryId : new ArrayList<String>(groupConfiguration.getRepositories()))
{
final MutableResourceContext resourceContext = new MutableResourceContext(context);
resourceContext.setRepositoryId(repositoryId);

View File

@ -3,6 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<bean name="auditLoggingPostRepositoryInteceptor" class="org.apache.archiva.repository.AuditLoggingPostRepositoryInterceptor"/>
<bean name="repositoryFactory" class="org.apache.archiva.repository.DefaultRepositoryFactory" lazy-init="true">
<constructor-arg ref="repositoryContentFactory"/>
</bean>

View File

@ -66,6 +66,11 @@ public class HttpRepositoryContext implements RepositoryContext
}
}
public String getRemoteIP()
{
return request.getRemoteAddr();
}
private static String getPrincipal(HttpServletRequest request)
{
String header = request.getHeader( "Authorization" );