hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

74236: Implement boundary checks

Browse Source
This commit is contained in:
Bruno Roemers
2021-01-25 20:59:05 +01:00
parent 4a2152c482
commit 5f68a227da
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
dspace-api/src/main/java/org/dspace/submit/model/AccessConditionOption.java
View File

@@ -8,6 +8,7 @@
package org.dspace.submit.model;
import java.sql.SQLException;
import java.text.ParseException;
import java.util.Date;
import org.dspace.authorize.AuthorizeException;
@@ -18,6 +19,7 @@ import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.eperson.Group;
import org.dspace.eperson.service.GroupService;
import org.dspace.util.DateMathParser;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -38,6 +40,8 @@ public class AccessConditionOption {
@Autowired
GroupService groupService;
DateMathParser dateMathParser = new DateMathParser();
/** An unique name identifying the access contion option **/
private String name;
@@ -140,7 +144,8 @@ public class AccessConditionOption {
}
public void createResourcePolicy(Context context, Bitstream b, String name, String description,
Date startDate, Date endDate) throws SQLException, AuthorizeException {
Date startDate, Date endDate)
throws SQLException, AuthorizeException, ParseException {
if (getHasStartDate() && startDate == null) {
throw new IllegalStateException("The access condition " + getName() + " requires a start date.");
}
@@ -153,7 +158,39 @@ public class AccessConditionOption {
if (!getHasEndDate() && endDate != null) {
throw new IllegalStateException("The access condition " + getName() + " cannot contain an end date.");
}
//TODO: check date limits as well
Date earliestStartDate = null;
if (getStartDateLimit() != null) {
earliestStartDate = dateMathParser.parseMath(getStartDateLimit());
}
Date latestEndDate = null;
if (getEndDateLimit() != null) {
latestEndDate = dateMathParser.parseMath(getEndDateLimit());
}
// throw if latestEndDate before earliestStartDate
if (earliestStartDate != null && latestEndDate != null && earliestStartDate.compareTo(latestEndDate) > 0) {
throw new IllegalStateException(String.format(
"The boundaries of %s overlap: [%s, %s]", getName(), getStartDateLimit(), getEndDateLimit()
));
}
// throw if startDate before earliestStartDate
if (earliestStartDate != null && earliestStartDate.compareTo(startDate) > 0) {
throw new IllegalStateException(String.format(
"The start date of access condition %s should be later than %s from now.",
getName(), getStartDateLimit()
));
}
// throw if endDate after latestEndDate
if (latestEndDate != null && latestEndDate.compareTo(endDate) < 0) {
throw new IllegalStateException(String.format(
"The end date of access condition %s should be earlier than %s from now.", getName(), getEndDateLimit()
));
}
Group group = groupService.findByName(context, getGroupName());
authorizeService.createResourcePolicy(context, b, group, null, Constants.READ,
ResourcePolicy.TYPE_CUSTOM, name, description, startDate,

5
dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyUtils.java
View File

@@ -8,6 +8,7 @@
package org.dspace.app.rest.submit.factory.impl;
import java.sql.SQLException;
import java.text.ParseException;
import java.util.Date;
import java.util.Iterator;
@@ -47,7 +48,7 @@ public class BitstreamResourcePolicyUtils {
*/
public static void findApplyResourcePolicy(Context context, Iterator<UploadConfiguration> uploadConfigs,
Bitstream b, UploadBitstreamAccessConditionDTO newAccessCondition)
throws SQLException, AuthorizeException {
throws SQLException, AuthorizeException, ParseException {
String name = newAccessCondition.getName();
String description = newAccessCondition.getDescription();
@@ -75,7 +76,7 @@ public class BitstreamResourcePolicyUtils {
public static void findApplyResourcePolicy(Context context, Iterator<UploadConfiguration> uploadConfigs,
Bitstream b, String name, String description,
Date startDate, Date endDate)
throws SQLException, AuthorizeException {
throws SQLException, AuthorizeException, ParseException {
while (uploadConfigs
.hasNext()) {
UploadConfiguration uploadConfiguration = uploadConfigs.next();