HHH-19708 disallow write operations in read-only session

Author: gavinking

hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java

@@ -298,6 +298,12 @@ boolean isReadOnly() {
 		return readOnly;
 	}
 
+	void checkNotReadOnly() {
+		if ( isReadOnly() ) {
+			throw new IllegalStateException( "Session is in read-only mode" );
+		}
+	}
+
 	private static SessionEventListenerManager createSessionEventsManager(
 			SessionFactoryOptions factoryOptions, SessionCreationOptions options) {
 		final var customListeners = options.getCustomSessionEventListener();
@@ -1403,7 +1409,7 @@ public ProcedureCall getNamedProcedureCall(String name) {
 			throw new IllegalArgumentException( "No named stored procedure call with given name '" + name + "'" );
 		}
 		@SuppressWarnings("UnnecessaryLocalVariable")
-		final ProcedureCall procedureCall = memento.makeProcedureCall( this );
+		final var procedureCall = memento.makeProcedureCall( this );
 //		procedureCall.setComment( "Named stored procedure call [" + name + "]" );
 		return procedureCall;
 	}

hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java

@@ -479,7 +479,7 @@ private void managedFlush() {
 		}
 		else {
 			log.trace( "Automatically flushing session" );
-			doFlush();
+			fireFlush();
 		}
 	}
 
@@ -679,6 +679,7 @@ public void persist(String entityName, Object object, PersistContext copiedAlrea
 	private void firePersist(final PersistEvent event) {
 		Throwable originalException = null;
 		try {
+			checkNotReadOnly();
 			checkTransactionSynchStatus();
 			checkNoUnresolvedActionsBeforeOperation();
 
@@ -785,6 +786,7 @@ public void merge(String entityName, Object object, MergeContext copiedAlready)
 
 	private Object fireMerge(MergeEvent event) {
 		try {
+			checkNotReadOnly();
 			checkTransactionSynchStatus();
 			checkNoUnresolvedActionsBeforeOperation();
 			eventListenerGroups.eventListenerGroup_MERGE
@@ -880,6 +882,7 @@ private void logRemoveOrphanBeforeUpdates(String timing, String entityName, Obje
 
 	private void fireDelete(final DeleteEvent event) {
 		try {
+			checkNotReadOnly();
 			pulseTransactionCoordinator();
 			eventListenerGroups.eventListenerGroup_DELETE
 					.fireEventOnEachListener( event, DeleteEventListener::onDelete );
@@ -1423,22 +1426,24 @@ public boolean isDirty() {
 	@Override
 	public void flush() {
 		checkOpen();
-		doFlush();
+		fireFlush();
 	}
 
-	private void doFlush() {
-		try {
-			pulseTransactionCoordinator();
-			checkTransactionNeededForUpdateOperation();
-			if ( persistenceContext.getCascadeLevel() > 0 ) {
-				throw new HibernateException( "Flush during cascade is dangerous" );
+	private void fireFlush() {
+		if ( !isReadOnly() ) {
+			try {
+				pulseTransactionCoordinator();
+				checkTransactionNeededForUpdateOperation();
+				if ( persistenceContext.getCascadeLevel() > 0 ) {
+					throw new HibernateException( "Flush during cascade is dangerous" );
+				}
+				eventListenerGroups.eventListenerGroup_FLUSH
+						.fireEventOnEachListener( new FlushEvent( this ), FlushEventListener::onFlush );
+				delayedAfterCompletion();
+			}
+			catch (RuntimeException e) {
+				throw getExceptionConverter().convert( e );
 			}
-			eventListenerGroups.eventListenerGroup_FLUSH
-					.fireEventOnEachListener( new FlushEvent( this ), FlushEventListener::onFlush );
-			delayedAfterCompletion();
-		}
-		catch ( RuntimeException e ) {
-			throw getExceptionConverter().convert( e );
 		}
 	}
 
@@ -1484,7 +1489,7 @@ public void forceFlush(EntityKey key) {
 			);
 		}
 		checkOpenOrWaitingForAutoClose();
-		doFlush();
+		fireFlush();
 	}
 
 	@Override @Deprecated

hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java

@@ -172,6 +172,7 @@ public void insertMultiple(List<?> entities) {
 	@Override
 	public Object insert(String entityName, Object entity) {
 		checkOpen();
+		checkNotReadOnly();
 		final var persister = getEntityPersister( entityName, entity );
 		final Object id;
 		final Object[] state = persister.getValues( entity );
@@ -311,6 +312,7 @@ public void deleteMultiple(List<?> entities) {
 	@Override
 	public void delete(String entityName, Object entity) {
 		checkOpen();
+		checkNotReadOnly();
 		final var persister = getEntityPersister( entityName, entity );
 		final Object id = persister.getIdentifier( entity, this );
 		final Object version = persister.getVersion( entity );
@@ -388,6 +390,7 @@ public void updateMultiple(List<?> entities) {
 	@Override
 	public void update(String entityName, Object entity) {
 		checkOpen();
+		checkNotReadOnly();
 		final var persister = getEntityPersister( entityName, entity );
 		final Object id = persister.getIdentifier( entity, this );
 		final Object[] state = persister.getValues( entity );
@@ -474,6 +477,7 @@ public void upsertMultiple(List<?> entities) {
 	@Override
 	public void upsert(String entityName, Object entity) {
 		checkOpen();
+		checkNotReadOnly();
 		final var persister = getEntityPersister( entityName, entity );
 		final Object id = idToUpsert( entity, persister );
 		final Object[] state = persister.getValues( entity );