kumaab commented on code in PR #442:
URL: https://github.com/apache/ranger/pull/442#discussion_r1880788021
##########
agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcher.java:
##########
@@ -28,176 +34,173 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.ranger.plugin.policyengine.RangerAccessRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class RangerTimeOfDayMatcher extends RangerAbstractConditionEvaluator {
- private static final Logger LOG =
LoggerFactory.getLogger(RangerTimeOfDayMatcher.class);
- boolean _allowAny;
- List<int[]> _durations = new ArrayList<>();
-
- @Override
- public void init() {
- if(LOG.isDebugEnabled()) {
- LOG.debug("==> RangerTimeOfDayMatcher.init(" +
condition + ")");
- }
-
- super.init();
-
- if (condition == null) {
- LOG.debug("init: null policy condition! Will match
always!");
- _allowAny = true;
- } else if (CollectionUtils.isEmpty(condition.getValues())) {
- LOG.debug("init: empty conditions collection on policy
condition! Will match always!");
- _allowAny = true;
- } else {
- for (String value : condition.getValues()) {
- if (StringUtils.isEmpty(value)) {
- LOG.warn("init: Unexpected: one of the
value in condition is null or empty!");
- } else {
- int[] aDuration =
extractDuration(value);
- if (aDuration != null) {
- _durations.add(aDuration);
- }
- }
- }
- }
-
- if (_durations.isEmpty()) {
- LOG.debug("No valid durations found. Will always
match!");
- _allowAny = true;
- }
-
- if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerTimeOfDayMatcher.init(" +
condition + "): durations[" + toString() + "]");
- }
- }
-
- // match "9am-5pm", "9 Am - 5 PM", "9 am.- 5 P.M", "9:30 AM - 4:00p.m."
etc. spaces around - and after digits are allowed and dots in am/pm string in
mixed cases is allowed
- static final Pattern _Pattern = Pattern.compile("
*(\\d{1,2})(:(\\d{1,2}))? *([aApP])\\.?[mM]\\.? *- *(\\d{1,2})(:(\\d{1,2}))?
*([aApP])\\.?[mM]\\.? *");
-
- int[] extractDuration(String value) {
- if(LOG.isDebugEnabled()) {
- LOG.debug("==> RangerTimeOfDayMatcher.extractDuration("
+ value + ")");
- }
-
- int[] result = null;
- if (value == null) {
- LOG.warn("extractDuration: null input value!");
- } else {
- Matcher m = _Pattern.matcher(value);
- if (!m.matches()) {
- LOG.warn("extractDuration: input[" + value + "]
did not match pattern!");
- } else {
- int startHour = Integer.parseInt(m.group(1));
- int startMin = 0;
- if (m.group(3) != null) {
- startMin = Integer.parseInt(m.group(3));
- }
- String startType = m.group(4).toUpperCase();
-
- int endHour = Integer.parseInt(m.group(5));
- int endMinute = 0;
- if (m.group(7) != null) {
- endMinute =
Integer.parseInt(m.group(7));
- }
- String endType = m.group(8).toUpperCase();
- if(startHour == 12) {
- if("A".equals(startType)) {
- startHour = 0;
- }
- } else if ("P".equals(startType)) {
- startHour += 12;
- }
-
- if(endHour == 12) {
- if("A".equals(endType)) {
- endHour = 0;
- }
- } else if ("P".equals(endType)) {
- endHour += 12;
- }
-
- result = new int[] { (startHour*60)+startMin,
(endHour*60)+endMinute };
- }
- }
-
- if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerTimeOfDayMatcher.extractDuration("
+ value + "): duration:" + Arrays.toString(result));
- }
- return result;
- }
-
- @Override
- public boolean isMatched(RangerAccessRequest request) {
-
- if(LOG.isDebugEnabled()) {
- LOG.debug("==> RangerTimeOfDayMatcher.isMatched(" +
request + ")");
- }
-
- boolean matched = true;
- if (_allowAny) {
- LOG.debug("isMatched: allowAny flag is true.
Matched!");
- } else if (request == null) {
- LOG.warn("isMatched: Unexpected: Request is null!
Implicitly matched!");
- } else if (request.getAccessTime() == null) {
- LOG.warn("isMatched: Unexpected: Accesstime on the
request is null! Implicitly matched!");
- } else {
- Date date = request.getAccessTime();
- Calendar calendar = GregorianCalendar.getInstance();
- calendar.setTime(date);
- int hourOfDay = calendar.get(Calendar.HOUR_OF_DAY);
- int minutes = calendar.get(Calendar.MINUTE);
- if (! durationMatched(_durations, hourOfDay, minutes)) {
- matched = false;
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("isMatched: None of the
durations contains this hour of day[" + hourOfDay + "] and minutes[" + minutes
+ "]");
- }
- }
- }
-
- if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerTimeOfDayMatcher.isMatched(" +
request+ "): " + matched);
- }
-
- return matched;
- }
-
- boolean durationMatched(List<int[]> durations, int hourOfDay, int
minutes) {
- for (int[] aDuration : durations) {
- int start = aDuration[0];
- int end = aDuration[1];
- int minutesOfDay = hourOfDay*60 + minutes;
- if(start < end) {
- if (start <= minutesOfDay && minutesOfDay <=
end) {
- return true;
- }
- } else {
- if(start <= minutesOfDay || minutesOfDay <=
end) {
- return true;
- }
- }
- }
- return false;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
-
- sb.append("RangerTimeOfDayMatcher {");
- sb.append("_allowAny=").append(_allowAny).append(" ");
- sb.append("_durations=[");
- for(int[] duration : _durations) {
- sb.append("{start=").append(duration[0]).append(";
end=").append(duration[1]).append("} ");
- }
- sb.append("]");
- sb.append("}");
-
- return sb.toString();
- }
+ private static final Logger LOG =
LoggerFactory.getLogger(RangerTimeOfDayMatcher.class);
+
+ // match "9am-5pm", "9 Am - 5 PM", "9 am.- 5 P.M", "9:30 AM - 4:00p.m."
etc. spaces around - and after digits are allowed and dots in am/pm string in
mixed cases is allowed
+ static final Pattern PATTERN = Pattern.compile(" *(\\d{1,2})(:(\\d{1,2}))?
*([aApP])\\.?[mM]\\.? *- *(\\d{1,2})(:(\\d{1,2}))? *([aApP])\\.?[mM]\\.? *");
+
+ boolean allowAny;
+ final List<int[]> durations = new ArrayList<>();
+
+ @Override
+ public void init() {
+ LOG.debug("==> RangerTimeOfDayMatcher.init({})", condition);
+
+ super.init();
+
+ if (condition == null) {
+ LOG.debug("init: null policy condition! Will match always!");
+
+ allowAny = true;
+ } else if (CollectionUtils.isEmpty(condition.getValues())) {
+ LOG.debug("init: empty conditions collection on policy condition!
Will match always!");
+
+ allowAny = true;
+ } else {
+ for (String value : condition.getValues()) {
+ if (StringUtils.isEmpty(value)) {
+ LOG.warn("init: Unexpected: one of the value in condition
is null or empty!");
+ } else {
+ int[] aDuration = extractDuration(value);
+
+ if (aDuration != null) {
+ durations.add(aDuration);
+ }
+ }
+ }
+ }
+
+ if (durations.isEmpty()) {
+ LOG.debug("No valid durations found. Will always match!");
+
+ allowAny = true;
+ }
+
+ LOG.debug("<== RangerTimeOfDayMatcher.init({}): durations[{}]",
condition, this);
+ }
+
+ @Override
+ public boolean isMatched(RangerAccessRequest request) {
+ LOG.debug("==> RangerTimeOfDayMatcher.isMatched({})", request);
+
+ boolean matched = true;
+
+ if (allowAny) {
+ LOG.debug("isMatched: allowAny flag is true. Matched!");
+ } else if (request == null) {
+ LOG.warn("isMatched: Unexpected: Request is null! Implicitly
matched!");
+ } else if (request.getAccessTime() == null) {
+ LOG.warn("isMatched: Unexpected: Accesstime on the request is
null! Implicitly matched!");
+ } else {
+ Date date = request.getAccessTime();
+ Calendar calendar = GregorianCalendar.getInstance();
+
+ calendar.setTime(date);
+
+ int hourOfDay = calendar.get(Calendar.HOUR_OF_DAY);
+ int minutes = calendar.get(Calendar.MINUTE);
+
+ if (!durationMatched(durations, hourOfDay, minutes)) {
+ matched = false;
+
+ LOG.debug("isMatched: None of the durations contains this hour
of day[{}] and minutes[{}]", hourOfDay, minutes);
+ }
+ }
+
+ LOG.debug("<== RangerTimeOfDayMatcher.isMatched({})): {}", request,
matched);
+
+ return matched;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("RangerTimeOfDayMatcher {");
+ sb.append("allowAny=").append(allowAny).append(" ");
+ sb.append("durations=[");
+ for (int[] duration : durations) {
+ sb.append("{start=").append(duration[0]).append(";
end=").append(duration[1]).append("} ");
+ }
+ sb.append("]");
+ sb.append("}");
+
+ return sb.toString();
+ }
+
+ int[] extractDuration(String value) {
Review Comment:
for readability:
```
int[] extractDuration(String value) {
LOG.debug("==> RangerTimeOfDayMatcher.extractDuration({})", value);
if (value == null) {
LOG.warn("extractDuration: null input value!");
return null;
}
Matcher matcher = PATTERN.matcher(value);
if (!matcher.matches()) {
LOG.warn("extractDuration: input[{}] did not match pattern!", value);
return null;
}
int startHour = parseHour(matcher.group(1), matcher.group(4));
int startMinute = parseMinute(matcher.group(3));
int endHour = parseHour(matcher.group(5), matcher.group(8));
int endMinute = parseMinute(matcher.group(7));
int[] result = {(startHour * 60) + startMinute, (endHour * 60) +
endMinute};
LOG.debug("<== RangerTimeOfDayMatcher.extractDuration({}): duration:{}",
value, Arrays.toString(result));
return result;
}
private int parseHour(String hourStr, String period) {
int hour = Integer.parseInt(hourStr);
if ("A".equalsIgnoreCase(period) && hour == 12) {
hour = 0;
} else if ("P".equalsIgnoreCase(period) && hour != 12) {
hour += 12;
}
return hour;
}
private int parseMinute(String minuteStr) {
return minuteStr != null ? Integer.parseInt(minuteStr) : 0;
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@ranger.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
