Move authentication json-rpc HTTP handler first in the execution pipe…

…line [hyperledger#535] Signed-off-by: Diego López León <[email protected]> Signed-off-by: Diego López León <[email protected]>
diega · Apr 26, 2022 · 9038a64 · 9038a64
1 parent 236abe4
commit 9038a64
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java
@@ -344,19 +344,16 @@ private Router buildRouter() {
         .route(HealthService.READINESS_PATH)
         .method(HttpMethod.GET)
         .handler(readinessService::handleRequest);
-    Route mainRoute =
-        router
-            .route("/")
-            .method(HttpMethod.POST)
-            .produces(APPLICATION_JSON)
-            .handler(
-                HandlerFactory.timeout(
-                    new TimeoutOptions(config.getHttpTimeoutSec()), rpcMethods, true));
+    Route mainRoute = router.route("/").method(HttpMethod.POST).produces(APPLICATION_JSON);
     if (authenticationService.isPresent()) {
       mainRoute.handler(
           HandlerFactory.authentication(authenticationService.get(), config.getNoAuthRpcApis()));
     }
-    mainRoute.handler(this::handleJsonRPCRequest);
+    mainRoute
+        .handler(
+            HandlerFactory.timeout(
+                new TimeoutOptions(config.getHttpTimeoutSec()), rpcMethods, true))
+        .handler(this::handleJsonRPCRequest);
 
     if (authenticationService.isPresent()) {
       router