add @since
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/47cd662a Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/47cd662a Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/47cd662a Branch: refs/heads/master Commit: 47cd662af744fd4eb6e4baaf38aeacadca96e27a Parents: f77d21b Author: Olivier Lamy <[email protected]> Authored: Fri Feb 6 23:10:16 2015 +1100 Committer: Olivier Lamy <[email protected]> Committed: Fri Feb 6 23:10:16 2015 +1100 ---------------------------------------------------------------------- .../rest/services/interceptors/PermissionsInterceptor.java | 7 +------ .../org/apache/archiva/redback/system/SecuritySystem.java | 8 ++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/47cd662a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java ---------------------------------------------------------------------- diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java index fc2a11f..7c35753 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java @@ -136,12 +136,7 @@ public class PermissionsInterceptor securitySystem.authorize( authenticationResult.getUser(), permission, // StringUtils.isBlank( redbackAuthorization.resource() ) // ? null : redbackAuthorization.resource() ); - /* - if ( securitySystem.isAuthorized( securitySession, permission, // - StringUtils.isBlank( redbackAuthorization.resource() ) // - ? null : redbackAuthorization.resource() ) ) - */ - if ( authenticationResult != null && authorizationResult.isAuthorized() ) + if ( authenticationResult != null && authorizationResult.isAuthorized() ) { log.debug( "isAuthorized for permission {}", permission ); return; http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/47cd662a/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystem.java ---------------------------------------------------------------------- diff --git a/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystem.java b/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystem.java index ad751cd..270ece7 100644 --- a/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystem.java +++ b/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystem.java @@ -74,6 +74,14 @@ public interface SecuritySystem AuthorizationResult authorize( SecuritySession session, String permission, String resource ) throws AuthorizationException; + /** + * @since 2.3 + * @param user + * @param permission + * @param resource + * @return + * @throws AuthorizationException + */ AuthorizationResult authorize( User user, String permission, String resource ) throws AuthorizationException;
