Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix test problems 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@756587 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2009-03-20 16:35:02 +00:00
parent 6681581426
commit 34c163502b
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditLog.java
View File

@ -46,7 +46,7 @@ public class AuditLog
StringBuffer msg = new StringBuffer();
msg.append( checkNull( event.getRepositoryId() ) ).append( DELIM );
msg.append( event.getUserId() ).append( DELIM );
msg.append( event.getRemoteIP() ).append( DELIM );
msg.append( checkNull( event.getRemoteIP() ) ).append( DELIM );
msg.append( '\"' ).append( checkNull( event.getResource() ) ).append( '\"' ).append( DELIM );
msg.append( '\"' ).append( event.getAction() ).append( '\"' );

5
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java
View File

@ -40,6 +40,11 @@ public final class ArchivaXworkUser
public static String getActivePrincipal( Map<String, ?> sessionMap )
{
if ( sessionMap == null )
{
return UserManager.GUEST_USERNAME;
}
SecuritySession securitySession =
(SecuritySession) sessionMap.get( SecuritySystemConstants.SECURITY_SESSION_KEY );

14
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
View File

@ -23,6 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.apache.maven.archiva.repository.audit.AuditEvent;
import org.apache.maven.archiva.repository.audit.AuditListener;
import org.apache.maven.archiva.repository.audit.Auditable;
@ -75,7 +77,7 @@ public abstract class PlexusActionSupport
protected void triggerAuditEvent( String repositoryId, String resource, String action )
{
AuditEvent event = new AuditEvent( repositoryId, getPrincipal(), resource, action );
event.setRemoteIP( ServletActionContext.getRequest().getRemoteAddr() );
event.setRemoteIP( getRemoteAddr() );
for ( AuditListener listener : auditListeners )
{
@ -86,7 +88,7 @@ public abstract class PlexusActionSupport
protected void triggerAuditEvent( String resource, String action )
{
AuditEvent event = new AuditEvent( getPrincipal(), resource, action );
event.setRemoteIP( ServletActionContext.getRequest().getRemoteAddr() );
event.setRemoteIP( getRemoteAddr() );
for ( AuditListener listener : auditListeners )
{
@ -97,7 +99,7 @@ public abstract class PlexusActionSupport
protected void triggerAuditEvent( String action )
{
AuditEvent event = new AuditEvent( getPrincipal(), action );
event.setRemoteIP( ServletActionContext.getRequest().getRemoteAddr() );
event.setRemoteIP( getRemoteAddr() );
for ( AuditListener listener : auditListeners )
{
@ -105,6 +107,12 @@ public abstract class PlexusActionSupport
}
}
private String getRemoteAddr()
{
HttpServletRequest request = ServletActionContext.getRequest();
return request != null ? request.getRemoteAddr() : null;
}
@SuppressWarnings( "unchecked" )
protected String getPrincipal()
{