Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-14225 CVE-2020-25638 Potential for SQL injection on use_sql_comments logging enabled

This commit is contained in:
Andrea Boriero 2020-09-29 20:56:30 +01:00 committed by Sanne Grinovero
parent d48e19d973
commit d22bbb5c33
12 changed files with 217 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
View File

@ -24,6 +24,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.regex.Pattern;
import org.hibernate.HibernateException;
import org.hibernate.LockMode;
@ -140,6 +141,9 @@ public abstract class Dialect implements ConversionContext {
*/
public static final String CLOSED_QUOTE = "`\"]";
private static final Pattern ESCAPE_CLOSING_COMMENT_PATTERN = Pattern.compile( "\\*/" );
private static final Pattern ESCAPE_OPENING_COMMENT_PATTERN = Pattern.compile( "/\\*" );
private final TypeNames typeNames = new TypeNames();
private final TypeNames hibernateTypeNames = new TypeNames();
@ -3002,6 +3006,14 @@ public abstract class Dialect implements ConversionContext {
}
protected String prependComment(String sql, String comment) {
return "/* " + comment + " */ " + sql;
return "/* " + escapeComment( comment ) + " */ " + sql;
}
public static String escapeComment(String comment) {
if ( StringHelper.isNotEmpty( comment ) ) {
final String escaped = ESCAPE_CLOSING_COMMENT_PATTERN.matcher( comment ).replaceAll( "*\\\\/" );
return ESCAPE_OPENING_COMMENT_PATTERN.matcher( escaped ).replaceAll( "/\\\\*" );
}
return comment;
}
}

2
hibernate-core/src/main/java/org/hibernate/loader/plan/exec/query/internal/SelectStatementBuilder.java
View File

@ -187,7 +187,7 @@ public class SelectStatementBuilder {
StringBuilder buf = new StringBuilder( guesstimatedBufferSize );
if ( StringHelper.isNotEmpty( comment ) ) {
buf.append( "/* " ).append( comment ).append( " */ " );
buf.append( "/* " ).append( Dialect.escapeComment( comment ) ).append( " */ " );
}
buf.append( "select " )

4
hibernate-core/src/main/java/org/hibernate/sql/Delete.java
View File

@ -9,6 +9,8 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import org.hibernate.dialect.Dialect;
/**
* An SQL <tt>DELETE</tt> statement
*
@ -36,7 +38,7 @@ public class Delete {
public String toStatementString() {
StringBuilder buf = new StringBuilder( tableName.length() + 10 );
if ( comment!=null ) {
buf.append( "/* " ).append(comment).append( " */ " );
buf.append( "/* " ).append( Dialect.escapeComment( comment ) ).append( " */ " );
}
buf.append( "delete from " ).append(tableName);
if ( where != null || !primaryKeyColumns.isEmpty() || versionColumnName != null ) {

2
hibernate-core/src/main/java/org/hibernate/sql/Insert.java
View File

@ -90,7 +90,7 @@ public class Insert {
public String toStatementString() {
StringBuilder buf = new StringBuilder( columns.size()*15 + tableName.length() + 10 );
if ( comment != null ) {
buf.append( "/* " ).append( comment ).append( " */ " );
buf.append( "/* " ).append( Dialect.escapeComment( comment ) ).append( " */ " );
}
buf.append("insert into ")
.append(tableName);

2
hibernate-core/src/main/java/org/hibernate/sql/InsertSelect.java
View File

@ -65,7 +65,7 @@ public class InsertSelect {
StringBuilder buf = new StringBuilder( (columnNames.size() * 15) + tableName.length() + 10 );
if ( comment!=null ) {
buf.append( "/* " ).append( comment ).append( " */ " );
buf.append( "/* " ).append( Dialect.escapeComment( comment ) ).append( " */ " );
}
buf.append( "insert into " ).append( tableName );
if ( !columnNames.isEmpty() ) {

2
hibernate-core/src/main/java/org/hibernate/sql/QuerySelect.java
View File

@ -126,7 +126,7 @@ public class QuerySelect {
public String toQueryString() {
StringBuilder buf = new StringBuilder( 50 );
if ( comment != null ) {
buf.append( "/* " ).append( comment ).append( " */ " );
buf.append( "/* " ).append( Dialect.escapeComment( comment ) ).append( " */ " );
}
buf.append( "select " );
if ( distinct ) {

2
hibernate-core/src/main/java/org/hibernate/sql/Select.java
View File

@ -40,7 +40,7 @@ public class Select {
public String toStatementString() {
StringBuilder buf = new StringBuilder(guesstimatedBufferSize);
if ( StringHelper.isNotEmpty(comment) ) {
buf.append("/* ").append(comment).append(" */ ");
buf.append( "/* " ).append( Dialect.escapeComment( comment ) ).append( " */ " );
}
buf.append("select ").append(selectClause)

2
hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java
View File

@ -148,7 +148,7 @@ public class SimpleSelect {
);
if ( comment != null ) {
buf.append( "/* " ).append( comment ).append( " */ " );
buf.append( "/* " ).append( Dialect.escapeComment( comment ) ).append( " */ " );
}
buf.append( "select " );

2
hibernate-core/src/main/java/org/hibernate/sql/Update.java
View File

@ -166,7 +166,7 @@ public class Update {
public String toStatementString() {
StringBuilder buf = new StringBuilder( (columns.size() * 15) + tableName.length() + 10 );
if ( comment!=null ) {
buf.append( "/* " ).append( comment ).append( " */ " );
buf.append( "/* " ).append( Dialect.escapeComment( comment ) ).append( " */ " );
}
buf.append( "update " ).append( tableName ).append( " set " );
boolean assignmentsAppended = false;

46
hibernate-core/src/test/java/org/hibernate/test/comments/TestEntity.java Normal file
View File

@ -0,0 +1,46 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.comments;
import javax.persistence.Entity;
import javax.persistence.Id;
/**
* @author Andrea Boriero
*/
@Entity
public class TestEntity {
@Id
private String id;
private String value;
public TestEntity() {
}
public TestEntity(String id, String value) {
this.id = id;
this.value = value;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}

37
hibernate-core/src/test/java/org/hibernate/test/comments/TestEntity2.java Normal file
View File

@ -0,0 +1,37 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.comments;
import javax.persistence.Entity;
import javax.persistence.Id;
/**
* @author Andrea Boriero
*/
@Entity
public class TestEntity2 {
@Id
private String id;
private String value;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}

111
hibernate-core/src/test/java/org/hibernate/test/comments/UseSqlCommentTest.java Normal file
View File

@ -0,0 +1,111 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.comments;
import java.util.List;
import java.util.Map;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CompoundSelection;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Root;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
import static org.junit.Assert.assertThat;
/**
* @author Andrea Boriero
*/
public class UseSqlCommentTest extends BaseEntityManagerFunctionalTestCase {
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[] { TestEntity.class, TestEntity2.class };
}
@Override
protected void addMappings(Map settings) {
settings.put( AvailableSettings.USE_SQL_COMMENTS, "true" );
settings.put( AvailableSettings.FORMAT_SQL, "false" );
}
@Before
public void setUp() {
doInJPA( this::entityManagerFactory, entityManager -> {
TestEntity testEntity = new TestEntity();
testEntity.setId( "test1" );
testEntity.setValue( "value1" );
entityManager.persist( testEntity );
TestEntity2 testEntity2 = new TestEntity2();
testEntity2.setId( "test2" );
testEntity2.setValue( "value2" );
entityManager.persist( testEntity2 );
} );
}
@Test
public void testIt() {
String appendLiteral = "*/select id as col_0_0_,value as col_1_0_ from testEntity2 where 1=1 or id=?--/*";
doInJPA( this::entityManagerFactory, entityManager -> {
List<TestEntity> result = findUsingQuery( "test1", appendLiteral, entityManager );
TestEntity test1 = result.get( 0 );
assertThat( test1.getValue(), is( appendLiteral ) );
} );
doInJPA( this::entityManagerFactory, entityManager -> {
List<TestEntity> result = findUsingCriteria( "test1", appendLiteral, entityManager );
TestEntity test1 = result.get( 0 );
assertThat( test1.getValue(), is( appendLiteral ) );
} );
}
public List<TestEntity> findUsingCriteria(String id, String appendLiteral, EntityManager entityManager) {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
CriteriaQuery<TestEntity> criteria = builder.createQuery( TestEntity.class );
Root<TestEntity> root = criteria.from( TestEntity.class );
Path<Object> idPath = root.get( "id" );
CompoundSelection<TestEntity> selection = builder.construct(
TestEntity.class,
idPath,
builder.literal( appendLiteral )
);
criteria.select( selection );
criteria.where( builder.equal( idPath, builder.parameter( String.class, "where_id" ) ) );
TypedQuery<TestEntity> query = entityManager.createQuery( criteria );
query.setParameter( "where_id", id );
return query.getResultList();
}
public List<TestEntity> findUsingQuery(String id, String appendLiteral, EntityManager entityManager) {
TypedQuery<TestEntity> query =
entityManager.createQuery(
"select new org.hibernate.test.comments.TestEntity(id, '"
+ appendLiteral.replace( "'", "''" )
+ "') from TestEntity where id=:where_id",
TestEntity.class
);
query.setParameter( "where_id", id );
return query.getResultList();
}
}