add @SInCE

apache · Feb 6, 2015 · 47cd662 · 47cd662
1 parent f77d21b
commit 47cd662
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...in/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java b/...in/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java
@@ -136,12 +136,7 @@ public void filter( ContainerRequestContext containerRequestContext )
                                 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;

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
@@ -74,6 +74,14 @@ boolean isAuthorized( SecuritySession session, String permission )
     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;