import java.io.PrintWriter;
import java.io.StringWriter;
+import com.sun.security.auth.UserPrincipal;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.http.HttpServletRequest;
import org.onap.dmaap.dbcapi.service.DmaapService;
import org.onap.dmaap.dbcapi.util.DmaapConfig;
import org.onap.dmaap.dbcapi.util.PermissionBuilder;
-import sun.security.acl.PrincipalImpl;
@RunWith(MockitoJUnitRunner.class)
public class AAFAuthorizationFilterTest {
@Test
public void doFilter_shouldSkipAuthorization_whenAAFnotUsed() throws Exception {
//given
- filter.setAafEnabled(false);
+ filter.setCadiEnabled(false);
//when
filter.doFilter(servletRequest,servletResponse,filterChain);
String permission = "org.onap.dmaap-bc.api.topics|mr|GET";
when(permissionBuilder.buildPermission(servletRequest)).thenReturn(permission);
configureServletRequest(permission, user, true);
- filter.setAafEnabled(true);
+ filter.setCadiEnabled(true);
//when
filter.doFilter(servletRequest,servletResponse,filterChain);
String permission = "org.onap.dmaap-bc.api.topics|mr|GET";
when(permissionBuilder.buildPermission(servletRequest)).thenReturn(permission);
configureServletRequest(permission, user, false);
- filter.setAafEnabled(true);
+ filter.setCadiEnabled(true);
String errorMsgJson = "{\"code\":403,\"message\":\"User "+user+" does not have permission "
+ permission +"\",\"fields\":\"Authorization\",\"2xx\":false}";
}
private void configureServletRequest(String permission, String user, boolean isUserInRole) {
- when(servletRequest.getUserPrincipal()).thenReturn(new PrincipalImpl(user));
+ when(servletRequest.getUserPrincipal()).thenReturn(new UserPrincipal(user));
when(servletRequest.isUserInRole(permission)).thenReturn(isUserInRole);
}
private void configureAAFUsage(Boolean isUsed) {
- doReturn(isUsed.toString()).when(dmaapConfig).getProperty(eq(AAFAuthorizationFilter.AAF_AUTHZ_FLAG), anyString());
+ doReturn(isUsed.toString()).when(dmaapConfig).getProperty(eq(AAFAuthorizationFilter.CADI_AUTHZ_FLAG), anyString());
}
-}
\ No newline at end of file
+}