This is an automated email from the ASF dual-hosted git repository. alexoree pushed a commit to branch feature/JUDDI-558 in repository https://gitbox.apache.org/repos/asf/juddi.git
commit 56fb8a92c1ee463ec166b386d9642cd3453d184d Author: Alex O'Ree <[email protected]> AuthorDate: Thu Dec 12 17:14:24 2019 -0500 JUDDI-558 WIP --- .../org/apache/juddi/api/impl/UDDIInquiryImpl.java | 4 ++-- .../security/rbac/RoleBasedAccessControlImpl.java | 2 +- .../juddi/api/impl/API_180_RbacSecurityTest.java | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java index ea1d530..b3cbfb4 100644 --- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java +++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java @@ -507,11 +507,11 @@ public class UDDIInquiryImpl extends AuthenticatedService implements UDDIInquiry long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(InquiryQuery.GET_BUSINESSDETAIL, QueryStatus.SUCCESS, procTime); - List<org.uddi.api_v3.BusinessEntity> FilterBindingTemplates = + List<org.uddi.api_v3.BusinessEntity> filterBindingTemplates = AccessControlFactory.getAccessControlInstance().filterBusinesses( this.ctx, entityPublisher, result.getBusinessEntity()); result.getBusinessEntity().clear(); - result.getBusinessEntity().addAll(FilterBindingTemplates); + result.getBusinessEntity().addAll(filterBindingTemplates); return result; } finally { diff --git a/juddi-core/src/main/java/org/apache/juddi/security/rbac/RoleBasedAccessControlImpl.java b/juddi-core/src/main/java/org/apache/juddi/security/rbac/RoleBasedAccessControlImpl.java index 7888378..ce4203c 100644 --- a/juddi-core/src/main/java/org/apache/juddi/security/rbac/RoleBasedAccessControlImpl.java +++ b/juddi-core/src/main/java/org/apache/juddi/security/rbac/RoleBasedAccessControlImpl.java @@ -230,7 +230,7 @@ public class RoleBasedAccessControlImpl implements IAccessControl { //load access rules from database for (BusinessEntity bs : items) { //get the permission for this entity. - UddiEntity ue = loadEntity(bs.getBusinessKey(), org.apache.juddi.model.BusinessService.class); + UddiEntity ue = loadEntity(bs.getBusinessKey(), org.apache.juddi.model.BusinessEntity.class); if (ue == null) { redact(bs); continue; //access denied diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_180_RbacSecurityTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_180_RbacSecurityTest.java index 4962f8e..f36dcf1 100644 --- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_180_RbacSecurityTest.java +++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_180_RbacSecurityTest.java @@ -105,10 +105,10 @@ public class API_180_RbacSecurityTest { TModel m = tckTModel.saveUDDIPublisherTmodel(authInfoUDDI); List<String> keys = new ArrayList<>(); keys.add(m.getTModelKey()); - keys.clear(); + // keys.clear(); grant(AccessLevel.READ, keys, RoleBasedAccessControlImpl.EVERYONE); keys = tckTModel.saveTModels(authInfoUDDI, TckTModel.TMODELS_XML); - + keys.clear(); grant(AccessLevel.READ, keys, RoleBasedAccessControlImpl.EVERYONE); tckTModel.saveJoePublisherTmodel(authInfoJoe); tckBusiness.saveJoePublisherBusiness(authInfoJoe); @@ -123,7 +123,9 @@ public class API_180_RbacSecurityTest { tckTModel.deleteCreatedTModels(authInfoJoe); Registry.stop(); System.clearProperty(AppConfig.JUDDI_CONFIGURATION_FILE_SYSTEM_PROPERTY); + AppConfig.triggerReload(); + AccessControlFactory.reset(); } @Test @@ -150,20 +152,18 @@ public class API_180_RbacSecurityTest { Assert.assertNotNull(response); permissions = publisher.getPermissions(request); //Assert.assertEquals(permissions.getLevel().size(), 1); - boolean ok =false; - Permission p1=null; - for (Permission p:permissions.getLevel()){ + boolean ok = false; + Permission p1 = null; + for (Permission p : permissions.getLevel()) { if (p.getTarget().equals(TckPublisher.getSamPublisherId()) && p.getEntityId().equals(TckBusiness.JOE_BUSINESS_KEY) - && p.getLevel()==AccessLevel.READ){ - ok=true; - p1=p; + && p.getLevel() == AccessLevel.READ) { + ok = true; + p1 = p; } - - + } Assert.assertTrue(ok); - p1.setAction(Action.REMOVE); req.getLevel().clear(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
