Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix unit test

This commit is contained in:
Olivier Lamy 2015-01-30 22:14:42 +11:00
parent 0e1a45a716
commit 88a2ef7a1c
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
View File

@ -80,7 +80,7 @@ public class DefaultUserService
implements UserService
{
private Logger log = LoggerFactory.getLogger( getClass() );
private final Logger log = LoggerFactory.getLogger( getClass() );
private static final String VALID_USERNAME_CHARS = "[a-zA-Z_0-9\\-.@]*";

10
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AbstractInterceptor.java
View File

@ -19,9 +19,9 @@ package org.apache.archiva.redback.rest.services.interceptors;
* under the License.
*/
import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.apache.cxf.jaxrs.model.OperationResourceInfo;
import org.apache.cxf.message.Message;
import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -65,8 +65,14 @@ public abstract class AbstractInterceptor
Method method = operationResourceInfo.getAnnotatedMethod();
log.debug( " method name {}", method == null ? "null" : method.getName() );
RedbackAuthorization redbackAuthorization = method.getAnnotation( RedbackAuthorization.class );
log.debug( "class {}, resourceClass {}, method {}, redbackAuthorization {}", //
operationResourceInfo.getClassResourceInfo().getServiceClass(), //
operationResourceInfo.getClassResourceInfo().getResourceClass(), //
method, //
redbackAuthorization );
return redbackAuthorization;
}
}

17
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java
View File

@ -66,6 +66,7 @@ public class PermissionsInterceptor
public void filter( ContainerRequestContext containerRequestContext )
{
Message message = JAXRSUtils.getCurrentMessage();
RedbackAuthorization redbackAuthorization = getRedbackAuthorization( message );
@ -79,8 +80,8 @@ public class PermissionsInterceptor
}
String[] permissions = redbackAuthorization.permissions();
//olamy: no value is an array with an empty String
if ( permissions != null && permissions.length > 0 && !( permissions.length == 1 && StringUtils.isEmpty(
permissions[0] ) ) )
if ( permissions != null && permissions.length > 0 //
&& !( permissions.length == 1 && StringUtils.isEmpty( permissions[0] ) ) )
{
HttpServletRequest request = getHttpServletRequest( message );
SecuritySession securitySession = httpAuthenticator.getSecuritySession( request.getSession( true ) );
@ -90,7 +91,8 @@ public class PermissionsInterceptor
{
try
{
authenticationResult = httpAuthenticator.getAuthenticationResult( request, getHttpServletResponse( message ) );
authenticationResult =
httpAuthenticator.getAuthenticationResult( request, getHttpServletResponse( message ) );
}
catch ( AuthenticationException e )
{
@ -139,10 +141,11 @@ public class PermissionsInterceptor
catch ( AuthorizationException e )
{
log.debug( e.getMessage(), e );
containerRequestContext.abortWith( Response.status( Response.Status.FORBIDDEN ).build() );
return;
}
}
containerRequestContext.abortWith( Response.status( Response.Status.FORBIDDEN ).build() );
return;
}
else
@ -165,10 +168,12 @@ public class PermissionsInterceptor
return;
}
}
log.warn( "http path {} doesn't contain any informations regarding permissions ",
log.warn( "http path {} doesn't contain any informations regarding permissions ", //
message.get( Message.REQUEST_URI ) );
// here we failed to authenticate so 403 as there is no detail on karma for this
// it must be marked as it's exposed
containerRequestContext.abortWith( Response.status( Response.Status.FORBIDDEN ).build() );
}
}

2
redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j2-test.xml
View File

@ -21,7 +21,7 @@
<appenders>
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n}" />
<PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%L] [%t] %-5level %logger{36} - %msg%n}" />
</Console>
</appenders>