Skip to content

Commit c136253

Browse files
authored
Revert "[grid] Add config blocked-routes and specific blocked-delete-session in Router" (#15921)
1 parent 406427b commit c136253

File tree

11 files changed

+0
-1222
lines changed

11 files changed

+0
-1222
lines changed

java/src/org/openqa/selenium/grid/commands/Hub.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import java.net.MalformedURLException;
3232
import java.net.URL;
3333
import java.util.Collections;
34-
import java.util.List;
3534
import java.util.Set;
3635
import java.util.logging.Level;
3736
import java.util.logging.Logger;
@@ -49,8 +48,6 @@
4948
import org.openqa.selenium.grid.log.LoggingOptions;
5049
import org.openqa.selenium.grid.router.ProxyWebsocketsIntoGrid;
5150
import org.openqa.selenium.grid.router.Router;
52-
import org.openqa.selenium.grid.router.httpd.BlockedRoute;
53-
import org.openqa.selenium.grid.router.httpd.BlockedRoutesFilter;
5451
import org.openqa.selenium.grid.router.httpd.RouterOptions;
5552
import org.openqa.selenium.grid.security.BasicAuthenticationFilter;
5653
import org.openqa.selenium.grid.security.Secret;
@@ -210,13 +207,6 @@ protected Handlers createHandlers(Config config) {
210207
httpHandler = httpHandler.with(new BasicAuthenticationFilter(uap.username(), uap.password()));
211208
}
212209

213-
// Apply blocked routes filter
214-
List<BlockedRoute> blockedRoutes = routerOptions.getBlockedRoutes();
215-
if (!blockedRoutes.isEmpty()) {
216-
LOG.info("Blocking " + blockedRoutes.size() + " route(s): " + blockedRoutes);
217-
httpHandler = BlockedRoutesFilter.with(httpHandler, blockedRoutes);
218-
}
219-
220210
// Allow the liveness endpoint to be reached, since k8s doesn't make it easy to authenticate
221211
// these checks
222212
httpHandler = combine(httpHandler, Route.get("/readyz").to(() -> readinessCheck));

java/src/org/openqa/selenium/grid/commands/Standalone.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.net.URI;
3333
import java.net.URL;
3434
import java.util.Collections;
35-
import java.util.List;
3635
import java.util.Set;
3736
import java.util.logging.Level;
3837
import java.util.logging.Logger;
@@ -54,8 +53,6 @@
5453
import org.openqa.selenium.grid.node.ProxyNodeWebsockets;
5554
import org.openqa.selenium.grid.node.config.NodeOptions;
5655
import org.openqa.selenium.grid.router.Router;
57-
import org.openqa.selenium.grid.router.httpd.BlockedRoute;
58-
import org.openqa.selenium.grid.router.httpd.BlockedRoutesFilter;
5956
import org.openqa.selenium.grid.router.httpd.RouterOptions;
6057
import org.openqa.selenium.grid.security.BasicAuthenticationFilter;
6158
import org.openqa.selenium.grid.security.Secret;
@@ -216,13 +213,6 @@ protected Handlers createHandlers(Config config) {
216213
httpHandler = httpHandler.with(new BasicAuthenticationFilter(uap.username(), uap.password()));
217214
}
218215

219-
// Apply blocked routes filter
220-
List<BlockedRoute> blockedRoutes = routerOptions.getBlockedRoutes();
221-
if (!blockedRoutes.isEmpty()) {
222-
LOG.info("Blocking " + blockedRoutes.size() + " route(s): " + blockedRoutes);
223-
httpHandler = BlockedRoutesFilter.with(httpHandler, blockedRoutes);
224-
}
225-
226216
// Allow the liveness endpoint to be reached, since k8s doesn't make it easy to authenticate
227217
// these checks
228218
httpHandler = combine(httpHandler, Route.get("/readyz").to(() -> readinessCheck));

java/src/org/openqa/selenium/grid/router/httpd/BlockedRoute.java

Lines changed: 0 additions & 221 deletions
This file was deleted.

java/src/org/openqa/selenium/grid/router/httpd/BlockedRoutesFilter.java

Lines changed: 0 additions & 86 deletions
This file was deleted.

0 commit comments

Comments
 (0)