Skip to content

Commit

Permalink
RANGER-873: Ranger policy model to support data masking
Browse files Browse the repository at this point in the history
  • Loading branch information
@mneethiraj
mneethiraj committed Mar 22, 2016
1 parent ca84cf7 commit d242dd6
Show file tree
Hide file tree
Showing 37 changed files with 2,859 additions and 277 deletions.
2 changes: 2 additions & 0 deletions agents-common/src/main/java/org/apache/ranger/plugin/errors/ValidationErrorCode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ public enum ValidationErrorCode {
POLICY_VALIDATION_ERR_POLICY_ITEM_ACCESS_TYPE_DENY(3023, "Currently deny access types are not supported. Access type is set to deny."),
POLICY_VALIDATION_ERR_INVALID_RESOURCE_NO_COMPATIBLE_HIERARCHY_SINGLE(3024, "Invalid resources specified. {0} policy can specify values for the following resources: {1}"),
POLICY_VALIDATION_ERR_INVALID_RESOURCE_MISSING_MANDATORY_SINGLE(3025, "Invalid resources specified. {0} policy must specify values for the following resources: {1}"),
POLICY_VALIDATION_ERR_POLICY_UPDATE_MOVE_SERVICE_NOT_ALLOWED(3026, "attempt to move policy id={0} from service={1} to service={2} is not allowed"),
POLICY_VALIDATION_ERR_POLICY_TYPE_CHANGE_NOT_ALLOWED(3027, "attempt to change type of policy id={0} from type={1} to type={2} is not allowed"),
;


Expand Down
222 changes: 221 additions & 1 deletion agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class RangerPolicy extends RangerBaseModelObject implements java.io.Serializable {
public static final int POLICY_TYPE_ACCESS = 0;
public static final int POLICY_TYPE_DATAMASK = 1;

// For future use
private static final long serialVersionUID = 1L;
Expand All @@ -55,6 +57,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
private List<RangerPolicyItem> denyPolicyItems = null;
private List<RangerPolicyItem> allowExceptions = null;
private List<RangerPolicyItem> denyExceptions = null;
private List<RangerDataMaskPolicyItem> dataMaskPolicyItems = null;


/**
Expand Down Expand Up @@ -87,6 +90,7 @@ public RangerPolicy(String service, String name, Integer policyType, String desc
setDenyPolicyItems(null);
setAllowExceptions(null);
setDenyExceptions(null);
setDataMaskPolicyItems(null);
}

/**
Expand All @@ -106,6 +110,8 @@ public void updateFrom(RangerPolicy other) {
setDenyPolicyItems(other.getDenyPolicyItems());
setAllowExceptions(other.getAllowExceptions());
setDenyExceptions(other.getDenyExceptions());
setDataMaskPolicyItems(other.getDataMaskPolicyItems());

}

/**
Expand Down Expand Up @@ -332,6 +338,28 @@ public void setDenyExceptions(List<RangerPolicyItem> denyExceptions) {
}
}

public List<RangerDataMaskPolicyItem> getDataMaskPolicyItems() {
return dataMaskPolicyItems;
}

public void setDataMaskPolicyItems(List<RangerDataMaskPolicyItem> dataMaskPolicyItems) {
if(this.dataMaskPolicyItems == null) {
this.dataMaskPolicyItems = new ArrayList<RangerDataMaskPolicyItem>();
}

if(this.dataMaskPolicyItems == dataMaskPolicyItems) {
return;
}

this.dataMaskPolicyItems.clear();

if(dataMaskPolicyItems != null) {
for(RangerDataMaskPolicyItem dataMaskPolicyItem : dataMaskPolicyItems) {
this.dataMaskPolicyItems.add(dataMaskPolicyItem);
}
}
}

@Override
public String toString( ) {
StringBuilder sb = new StringBuilder();
Expand Down Expand Up @@ -834,8 +862,95 @@ public boolean equals(Object obj) {
} else if (!users.equals(other.users))
return false;
return true;

}
}

@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown=true)
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public static class RangerDataMaskPolicyItem extends RangerPolicyItem implements java.io.Serializable {
private static final long serialVersionUID = 1L;

private RangerPolicyItemDataMaskInfo dataMaskInfo = null;

public RangerDataMaskPolicyItem() {
this(null, null, null, null, null, null);
}

public RangerDataMaskPolicyItem(List<RangerPolicyItemAccess> accesses, RangerPolicyItemDataMaskInfo dataMaskDetail, List<String> users, List<String> groups, List<RangerPolicyItemCondition> conditions, Boolean delegateAdmin) {
super(accesses, users, groups, conditions, delegateAdmin);

setDataMaskInfo(dataMaskDetail);
}

/**
* @return the dataMaskInfo
*/
public RangerPolicyItemDataMaskInfo getDataMaskInfo() {
return dataMaskInfo;
}

/**
* @param dataMaskInfo the dataMaskInfo to set
*/
public void setDataMaskInfo(RangerPolicyItemDataMaskInfo dataMaskInfo) {
this.dataMaskInfo = dataMaskInfo;
}

@Override
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
result = prime * result + ((dataMaskInfo == null) ? 0 : dataMaskInfo.hashCode());
return result;
}

@Override
public boolean equals(Object obj) {
if(! super.equals(obj))
return false;
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
RangerDataMaskPolicyItem other = (RangerDataMaskPolicyItem) obj;
if (dataMaskInfo == null) {
if (other.dataMaskInfo != null)
return false;
} else if (!dataMaskInfo.equals(other.dataMaskInfo))
return false;
return true;
}

@Override
public String toString( ) {
StringBuilder sb = new StringBuilder();

toString(sb);

return sb.toString();
}

public StringBuilder toString(StringBuilder sb) {
sb.append("RangerDataMaskPolicyItem={");

super.toString(sb);

sb.append("dataMaskInfo={");
if(dataMaskInfo != null) {
dataMaskInfo.toString(sb);
}
sb.append("} ");

sb.append("}");

return sb;
}

}

@JsonAutoDetect(fieldVisibility=Visibility.ANY)
Expand Down Expand Up @@ -1061,4 +1176,109 @@ public boolean equals(Object obj) {
}

}

@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown=true)
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public static class RangerPolicyItemDataMaskInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;

private String dataMaskType = null;
private String conditionExpr = null;
private String valueExpr = null;

public RangerPolicyItemDataMaskInfo() { }

public RangerPolicyItemDataMaskInfo(String dataMaskType, String conditionExpr, String valueExpr) {
setDataMaskType(dataMaskType);
setConditionExpr(conditionExpr);
setValueExpr(valueExpr);
}

public String getDataMaskType() {
return dataMaskType;
}

public void setDataMaskType(String dataMaskType) {
this.dataMaskType = dataMaskType;
}

public String getConditionExpr() {
return conditionExpr;
}

public void setConditionExpr(String conditionExpr) {
this.conditionExpr = conditionExpr;
}

public String getValueExpr() {
return valueExpr;
}

public void setValueExpr(String valueExpr) {
this.valueExpr = valueExpr;
}

@Override
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
result = prime * result + ((dataMaskType == null) ? 0 : dataMaskType.hashCode());
result = prime * result + ((conditionExpr == null) ? 0 : conditionExpr.hashCode());
result = prime * result + ((valueExpr == null) ? 0 : valueExpr.hashCode());
return result;
}

@Override
public boolean equals(Object obj) {
if(! super.equals(obj))
return false;
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
RangerPolicyItemDataMaskInfo other = (RangerPolicyItemDataMaskInfo) obj;
if (dataMaskType == null) {
if (other.dataMaskType != null)
return false;
} else if (!dataMaskType.equals(other.dataMaskType))
return false;
if (conditionExpr == null) {
if (other.conditionExpr != null)
return false;
} else if (!conditionExpr.equals(other.conditionExpr))
return false;
if (valueExpr == null) {
if (other.valueExpr != null)
return false;
} else if (!valueExpr.equals(other.valueExpr))
return false;
return true;
}

@Override
public String toString( ) {
StringBuilder sb = new StringBuilder();

toString(sb);

return sb.toString();
}

public StringBuilder toString(StringBuilder sb) {
sb.append("RangerPolicyItemDataMaskInfo={");

sb.append("dataMaskType={").append(dataMaskType).append("} ");
sb.append("conditionExpr={").append(conditionExpr).append("} ");
sb.append("valueExpr={").append(valueExpr).append("} ");

sb.append("}");

return sb;
}
}
}
2 changes: 1 addition & 1 deletion ...ts-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public String toString() {
if (!isPolicyValidForResourceSignatureComputation()) {
return "";
}
int type = 0;
int type = RangerPolicy.POLICY_TYPE_ACCESS;
if (_policy.getPolicyType() != null) {
type = _policy.getPolicyType();
}
Expand Down
Loading

0 comments on commit d242dd6

Please sign in to comment.