Skip to content

Fixed wrangler permissions for 6.7.1 #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fixed wrangler permissions for 6.7.1 #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95a014e
updated jackson version
achernatsky-cybervision Oct 21, 2022
4057da1
added property validation
achernatsky-cybervision Oct 21, 2022
522aa62
fixed wrangler permissions
achernatsky-cybervision Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cdap-ldap-role/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<properties>
<security.authorizer.class>io.cdap.cdap.security.authorization.ldap.role.LDAPRoleAccessController</security.authorizer.class>
<jackson.version>2.8.8</jackson.version>
<jackson.version>2.13.4</jackson.version>
<maven.build.timestamp.format>HH:mm:ss dd-MM-yyyy</maven.build.timestamp.format>
</properties>

Expand Down Expand Up @@ -118,6 +118,7 @@
<manifestEntries>
<Build-Time>${maven.build.timestamp}</Build-Time>
<Build-Commit-Hash>${buildNumber}</Build-Commit-Hash>
<Specification-Version>${version}</Specification-Version>
</manifestEntries>
<manifest>
<mainClass>
Expand Down
30 changes: 25 additions & 5 deletions ...le/src/main/java/io/cdap/cdap/security/authorization/ldap/role/RoleAuthorizationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static boolean getDisablePermissionsPropagationValue(Properties propertie
* @return {@link GroupWithRolesProvider}
*/
public static GroupWithRolesProvider createLDAPGroupRoleProvider(Properties properties) {
String yamlPath = properties.getProperty(RoleAuthorizationConstants.ROLE_YAML_PATH);
String yamlPath = getProperty(RoleAuthorizationConstants.ROLE_YAML_PATH, properties);
return new GroupWithRolesProvider(yamlPath);
}

Expand All @@ -97,10 +97,10 @@ public static LDAPSearchConfig createSearchConfig(Properties properties) {
String recursiveSearchString = properties.getProperty(RoleAuthorizationConstants.LDAP_RECURSIVE_SEARCH);

return LDAPSearchConfig.builder()
.withUrl(properties.getProperty(RoleAuthorizationConstants.LDAP_URL))
.withSearchBaseDn(properties.getProperty(RoleAuthorizationConstants.LDAP_SEARCH_BASE_DN))
.withSearchFilter(properties.getProperty(RoleAuthorizationConstants.LDAP_SEARCH_FILTER))
.withMemberAttribute(properties.getProperty(RoleAuthorizationConstants.LDAP_MEMBER_ATTRIBUTE))
.withUrl(getProperty(RoleAuthorizationConstants.LDAP_URL, properties))
.withSearchBaseDn(getProperty(RoleAuthorizationConstants.LDAP_SEARCH_BASE_DN, properties))
.withSearchFilter(getProperty(RoleAuthorizationConstants.LDAP_SEARCH_FILTER, properties))
.withMemberAttribute(properties.getProperty((RoleAuthorizationConstants.LDAP_MEMBER_ATTRIBUTE)))
.withLookUpBindDN(properties.getProperty(RoleAuthorizationConstants.LDAP_LOOKUP_BIND_DN))
.withLookUpBindPassword(properties.getProperty(RoleAuthorizationConstants.LDAP_LOOKUP_BIND_PASSWORD))
.withIgnoreSSLVerify(Boolean.parseBoolean(ignoreSSLVerifyString))
Expand Down Expand Up @@ -156,4 +156,24 @@ public static Set<? extends Permission> getPropagatedPermissions(EntityId entity

return principalPermissions.getPermissions(namespace, EntityType.NAMESPACE, permissions);
}

/**
* Returns property's value
*
* @param propertyName {@link EntityId}
* @param properties Set of {@link Permission}
* @return property's value
* @throws RuntimeException - if property is empty or not set
*/
public static String getProperty(String propertyName, Properties properties) throws RuntimeException {
String value = properties.getProperty(propertyName);

if (value == null || value.isEmpty()) {
String errorMsg = String.format("Value for property '%s' was not found, please check it",
propertyName);
throw new RuntimeException(errorMsg);
}

return value;
}
}
8 changes: 7 additions & 1 deletion ...ava/io/cdap/cdap/security/authorization/ldap/role/permission/RolePermissionConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,13 @@ public static List<EntityTypeWithPermission> convertToEntityTypeWithPermission(R
case USE_WRANGLER:
return Arrays.asList(
new EntityTypeWithPermission(EntityType.APPLICATION, StandardPermission.GET, true),
new EntityTypeWithPermission(EntityType.DATASET, StandardPermission.LIST, true)
new EntityTypeWithPermission(EntityType.DATASET, StandardPermission.LIST, true),
new EntityTypeWithPermission(EntityType.SYSTEM_APP_ENTITY, StandardPermission.LIST),
new EntityTypeWithPermission(EntityType.SYSTEM_APP_ENTITY, StandardPermission.USE),
new EntityTypeWithPermission(EntityType.SYSTEM_APP_ENTITY, StandardPermission.GET),
new EntityTypeWithPermission(EntityType.SYSTEM_APP_ENTITY, StandardPermission.CREATE),
new EntityTypeWithPermission(EntityType.SYSTEM_APP_ENTITY, StandardPermission.DELETE),
new EntityTypeWithPermission(EntityType.SYSTEM_APP_ENTITY, StandardPermission.UPDATE)
);
case MANAGE_SECURE_KEY:
return Arrays.asList(
Expand Down