GH-5380 Allow deleting invalid/corrupt repositories: skip repo init on DELETE in RepositoryInterceptor and add LocalRepositoryManager fallback cleanup

Author: hmottestad

tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/RepositoryInterceptor.java

@@ -105,6 +105,13 @@ protected void setRequestAttributes(HttpServletRequest request) throws ClientHTT
 			request.setAttribute(REPOSITORY_KEY, new RepositoryConfigRepository(repositoryManager));
 		} else if (nextRepositoryID != null) {
 			try {
+				// For DELETE requests we must not attempt to initialize the repository,
+				// otherwise a corrupt/invalid configuration can block deletion.
+				if ("DELETE".equals(request.getMethod())) {
+					request.setAttribute(REPOSITORY_ID_KEY, nextRepositoryID);
+					return;
+				}
+
 				Repository repository = repositoryManager.getRepository(nextRepositoryID);
 				if (repository == null && !"PUT".equals(request.getMethod())) {
 					throw new ClientHTTPException(SC_NOT_FOUND, "Unknown repository: " + nextRepositoryID);

tools/server/src/test/java/org/eclipse/rdf4j/http/server/LmdbInvalidIndexDeletionIT.java

@@ -14,12 +14,15 @@
 
 import org.eclipse.rdf4j.http.protocol.Protocol;
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Model;
+import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.ValueFactory;
 import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
 import org.eclipse.rdf4j.repository.RepositoryException;
 import org.eclipse.rdf4j.repository.config.RepositoryConfig;
+import org.eclipse.rdf4j.repository.http.HTTPRepository;
 import org.eclipse.rdf4j.repository.manager.RemoteRepositoryManager;
 import org.eclipse.rdf4j.repository.sail.config.SailRepositoryConfig;
 import org.eclipse.rdf4j.sail.config.AbstractSailImplConfig;
@@ -69,8 +72,8 @@ class GenericLmdbConfig extends AbstractSailImplConfig {
 			}
 
 			@Override
-			public org.eclipse.rdf4j.model.Resource export(org.eclipse.rdf4j.model.Model m) {
-				org.eclipse.rdf4j.model.Resource node = super.export(m);
+			public Resource export(Model m) {
+				Resource node = super.export(m);
 				ValueFactory vf = SimpleValueFactory.getInstance();
 				IRI tripleIdx = vf.createIRI("http://rdf4j.org/config/sail/lmdb#tripleIndexes");
 				m.add(node, tripleIdx, vf.createLiteral(tripleIndexes));
@@ -83,11 +86,14 @@ public org.eclipse.rdf4j.model.Resource export(org.eclipse.rdf4j.model.Model m)
 
 		RemoteRepositoryManager manager = RemoteRepositoryManager.getInstance(TestServer.SERVER_URL);
 		try {
-			// Create config on server (does not initialize the underlying store yet)
-			manager.addRepositoryConfig(repoConfig);
+			try {
+				// Create config on server (does not initialize the underlying store yet)
+				manager.addRepositoryConfig(repoConfig);
+			} catch (Exception ignored) {
+			}
 
 			// Trigger initialization by opening a connection; expected to fail due to invalid index
-			Repository httpRepo = new org.eclipse.rdf4j.repository.http.HTTPRepository(
+			Repository httpRepo = new HTTPRepository(
 					Protocol.getRepositoryLocation(TestServer.SERVER_URL, id));
 			try (RepositoryConnection conn = httpRepo.getConnection()) {
 				// attempt a trivial call to ensure init
@@ -104,8 +110,9 @@ public org.eclipse.rdf4j.model.Resource export(org.eclipse.rdf4j.model.Model m)
 			try {
 				manager.removeRepository(id);
 			} catch (Exception ignore) {
+			} finally {
+				manager.shutDown();
 			}
-			manager.shutDown();
 		}
 	}
 }