ADD encryption support for Between and InRange

This commit is contained in:
Roland Praml committed 2022-11-02 09:52:56 +01:00
1 parent dd0ed8ea76
commit 245ba9c6b3
3 files changed
+62 -6

No files matched your search

@@ -3,6 +3,7 @@ package io.ebeaninternal.server.expression;
import io.ebeaninternal.api.BindValuesKey; import io.ebeaninternal.api.BindValuesKey;
import io.ebeaninternal.api.SpiExpression; import io.ebeaninternal.api.SpiExpression;
import io.ebeaninternal.api.SpiExpressionRequest; import io.ebeaninternal.api.SpiExpressionRequest;
import io.ebeaninternal.server.el.ElPropertyValue;
import java.io.IOException; import java.io.IOException;
@@ -34,13 +35,24 @@ final class BetweenExpression extends AbstractExpression {
@Override @Override
public void addBindValues(SpiExpressionRequest request) { public void addBindValues(SpiExpressionRequest request) {
ElPropertyValue prop = getElProp(request);
if (prop != null && prop.isDbEncrypted()) {
// bind the key as well as the value
String encryptKey = prop.beanProperty().encryptKey().getStringValue();
request.addBindEncryptKey(encryptKey);
}
request.addBindValue(low()); request.addBindValue(low());
request.addBindValue(high()); request.addBindValue(high());
} }
@Override @Override
public void addSql(SpiExpressionRequest request) { public void addSql(SpiExpressionRequest request) {
request.append(propName).append(_BETWEEN); String pname = propName;
ElPropertyValue prop = getElProp(request);
if (prop != null && prop.isDbEncrypted()) {
pname = prop.beanProperty().decryptProperty(propName);
}
request.append(pname).append(_BETWEEN);
} }
@Override @Override
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.expression;
import io.ebeaninternal.api.BindValuesKey; import io.ebeaninternal.api.BindValuesKey;
import io.ebeaninternal.api.SpiExpression; import io.ebeaninternal.api.SpiExpression;
import io.ebeaninternal.api.SpiExpressionRequest; import io.ebeaninternal.api.SpiExpressionRequest;
import io.ebeaninternal.server.el.ElPropertyValue;
import java.io.IOException; import java.io.IOException;
@@ -32,13 +33,29 @@ final class InRangeExpression extends AbstractExpression {
@Override @Override
public void addBindValues(SpiExpressionRequest request) { public void addBindValues(SpiExpressionRequest request) {
ElPropertyValue prop = getElProp(request);
if (prop != null && prop.isDbEncrypted()) {
// bind the key twice, for both values
String encryptKey = prop.beanProperty().encryptKey().getStringValue();
request.addBindEncryptKey(encryptKey);
request.addBindValue(low());
request.addBindEncryptKey(encryptKey);
request.addBindValue(high());
return;
}
request.addBindValue(low()); request.addBindValue(low());
request.addBindValue(high()); request.addBindValue(high());
} }
@Override @Override
public void addSql(SpiExpressionRequest request) { public void addSql(SpiExpressionRequest request) {
request.append("(").append(propName).append(" >= ? and ").append(propName).append(" < ?)"); String pname = propName;
ElPropertyValue prop = getElProp(request);
if (prop != null && prop.isDbEncrypted()) {
pname = prop.beanProperty().decryptProperty(propName);
}
request.append("(").append(pname).append(" >= ? and ").append(pname).append(" < ?)");
} }
@Override @Override
@@ -1,13 +1,13 @@
package org.tests.basic.encrypt; package org.tests.basic.encrypt;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.SqlRow; import io.ebean.SqlRow;
import io.ebean.xtest.ForPlatform;
import io.ebean.xtest.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import io.ebean.config.dbplatform.DbEncrypt; import io.ebean.config.dbplatform.DbEncrypt;
import io.ebean.test.LoggedSql; import io.ebean.test.LoggedSql;
import io.ebean.xtest.BaseTestCase;
import io.ebean.xtest.ForPlatform;
import io.ebean.xtest.IgnorePlatform;
import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiEbeanServer;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicEncrypt; import org.tests.model.basic.EBasicEncrypt;
@@ -109,7 +109,8 @@ public class TestEncrypt extends BaseTestCase {
EBasicEncrypt e = new EBasicEncrypt(); EBasicEncrypt e = new EBasicEncrypt();
e.setName("testname"); e.setName("testname");
e.setDescription("testdesc"); e.setDescription("testdesc");
e.setDob(new Date(System.currentTimeMillis() - 100000)); long refTime = System.currentTimeMillis() - 100000;
e.setDob(new Date(refTime));
DB.save(e); DB.save(e);
@@ -152,6 +153,32 @@ public class TestEncrypt extends BaseTestCase {
list = DB.find(EBasicEncrypt.class).where().startsWith("description", "modde").findList(); list = DB.find(EBasicEncrypt.class).where().startsWith("description", "modde").findList();
assertEquals(1, list.size()); assertEquals(1, list.size());
// Note, we only have "date" precision (See #2878)
list = DB.find(EBasicEncrypt.class).where().between("dob",
new Date(refTime - 2 * 86400000), new Date(refTime - 1 * 86400000)).findList();
assertEquals(0, list.size());
list = DB.find(EBasicEncrypt.class).where().inRange("dob",
new Date(refTime - 2 * 86400000), new Date(refTime - 1 * 86400000)).findList();
assertEquals(0, list.size());
list = DB.find(EBasicEncrypt.class).where().between("dob",
new Date(refTime - 2 * 86400000), new Date(refTime + 1 * 86400000)).findList();
assertEquals(1, list.size());
list = DB.find(EBasicEncrypt.class).where().inRange("dob",
new Date(refTime - 2 * 86400000), new Date(refTime + 1 * 86400000)).findList();
assertEquals(1, list.size());
//list = DB.find(EBasicEncrypt.class).where().inRange("dob", new Date(refTime), new Date(refTime+1)).findList();
//assertEquals(1, list.size());
} }
} }