honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reject invalid param prefix. 

An unrecognized param prefix had been silently ignored.
Reject it with a DataFormatException instead.
This commit is contained in:
Michael Buckley 2021-02-04 10:34:03 -05:00
parent 3dac899e3a
commit 50acfbede3
3 changed files with 68 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseParamWithPrefix.java
View File

@ -20,6 +20,8 @@ package ca.uhn.fhir.rest.param;
* #L%
*/
import ca.uhn.fhir.parser.DataFormatException;
import static org.apache.commons.lang3.StringUtils.isBlank;
public abstract class BaseParamWithPrefix<T extends BaseParam> extends BaseParam {
@ -58,8 +60,9 @@ public abstract class BaseParamWithPrefix<T extends BaseParam> extends BaseParam
if (!isBlank(prefix)) {
myPrefix = ParamPrefixEnum.forValue(prefix);
if (myPrefix == null) {
// prefix doesn't match standard values. Try legacy values
switch (prefix) {
case ">=":
myPrefix = ParamPrefixEnum.GREATERTHAN_OR_EQUALS;
@ -77,14 +80,9 @@ public abstract class BaseParamWithPrefix<T extends BaseParam> extends BaseParam
myPrefix = ParamPrefixEnum.APPROXIMATE;
break;
default :
ourLog.warn("Invalid prefix being ignored: {}", prefix);
break;
throw new DataFormatException("Invalid prefix: \"" + prefix + "\"");
}
if (myPrefix != null) {
ourLog.warn("Date parameter has legacy prefix '{}' which has been removed from FHIR. This should be replaced with '{}'", prefix, myPrefix);
}
ourLog.warn("Date parameter has legacy prefix '{}' which has been removed from FHIR. This should be replaced with '{}'", prefix, myPrefix.getValue());
}
}
@ -107,4 +105,5 @@ public abstract class BaseParamWithPrefix<T extends BaseParam> extends BaseParam
myPrefix = thePrefix;
return (T) this;
}
}

61
hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/param/DateParamTest.java Normal file
View File

@ -0,0 +1,61 @@
package ca.uhn.fhir.rest.param;
import ca.uhn.fhir.parser.DataFormatException;
import org.junit.jupiter.api.Test;
import java.time.Month;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import static org.junit.jupiter.api.Assertions.*;
public class DateParamTest {
@Test
public void testBasicParse() {
DateParam input = new DateParam("2020-01-01");
// too bad value is a j.u.Date instead of a new JSR-310 type
// DataParam parses using default tz, so go backwards.
ZonedDateTime zonedDateTime = input.getValue().toInstant().atZone(ZoneId.systemDefault());
assertEquals(2020,zonedDateTime.getYear());
assertEquals(Month.JANUARY,zonedDateTime.getMonth());
assertEquals(1,zonedDateTime.getDayOfMonth());
assertNull(input.getPrefix());
}
@Test
public void testBadDateFormat() {
try {
DateParam input = new DateParam("09-30-1960");
fail();
} catch (DataFormatException e) {
// expected
}
}
@Test
public void testPrefixParse() {
DateParam input = new DateParam("gt2020-01-01");
assertEquals(ParamPrefixEnum.GREATERTHAN, input.getPrefix());
}
@Test
public void testLegacyPrefixParse() {
DateParam input = new DateParam(">2020-01-01");
assertEquals(ParamPrefixEnum.GREATERTHAN, input.getPrefix());
}
@Test
public void testJunkDateIssue1465() {
// Issue 1464 - the string "junk" wasn't returning 400 as expected. Parsed as a prefix instead, and discarded.
try {
DateParam input = new DateParam("junk");
fail();
} catch (DataFormatException e) {
// expected
}
}
}

22
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java
View File

@ -5163,28 +5163,6 @@ public class FhirResourceDaoR4SearchNoFtTest extends BaseJpaR4Test {
}
}
@Test
public void testIssueDateFormatError1465() {
try {
SearchParameterMap map = SearchParameterMap.newSynchronous();
map.add("birthdate", new DateParam("09-30-1960"));
myPatientDao.search(map);
fail();
} catch (DataFormatException e) {
assertEquals("Invalid date/time format: \"09-30-1960\"", e.getMessage());
}
try {
SearchParameterMap map = SearchParameterMap.newSynchronous();
map.add("birthdate", new DateParam("junk"));
myPatientDao.search(map);
fail();
} catch (DataFormatException e) {
assertEquals("Invalid date/time format: \"junk\"", e.getMessage());
}
}
@Test
public void testDateSearchParametersShouldBeTimezoneIndependent() {