This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new b7c004f [SSHD-1034] Rename o.a.sshd.common.ForwardingFilter to
Forwarder
b7c004f is described below
commit b7c004f542116e2b5ae1462adfca1aa0b52154fa
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Jul 15 22:07:27 2020 +0200
[SSHD-1034] Rename o.a.sshd.common.ForwardingFilter to Forwarder
---
CHANGES.md | 4 +--
.../sshd/client/session/AbstractClientSession.java | 30 ++++++++---------
.../java/org/apache/sshd/common/BaseBuilder.java | 8 ++---
.../org/apache/sshd/common/FactoryManager.java | 6 ++--
...ForwardingFilter.java => DefaultForwarder.java} | 8 ++---
.../common/forward/DefaultForwarderFactory.java | 8 ++---
.../{ForwardingFilter.java => Forwarder.java} | 2 +-
...ingFilterFactory.java => ForwarderFactory.java} | 6 ++--
.../common/helpers/AbstractFactoryManager.java | 8 ++---
.../sshd/common/session/ConnectionService.java | 6 ++--
.../session/helpers/AbstractConnectionService.java | 16 ++++-----
.../sshd/common/session/helpers/SessionHelper.java | 38 +++++++++++-----------
.../sshd/server/forward/TcpipServerChannel.java | 5 +--
.../server/global/CancelTcpipForwardHandler.java | 4 +--
.../sshd/server/global/TcpipForwardHandler.java | 4 +--
.../sshd/common/forward/PortForwardingTest.java | 14 ++++----
.../forward}/ForwardingFilterTest.java | 6 +---
17 files changed, 85 insertions(+), 88 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index ee205d3..8840a8a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,12 +8,12 @@
# [Version 2.5.0 to 2.5.1](./docs/changes/2.5.1.md)
-# [Version 2.5.1 to 2.6.0](./docs/changes/2.6.0.md)
-
# Planned for next version
## Major code re-factoring
+* [SSHD-1034](https://issues.apache.org/jira/browse/SSHD-1034) Rename
{{org.apache.sshd.common.ForwardingFilter}} to {{Forwarder}}.
+
## Minor code helpers
## Behavioral changes and enhancements
diff --git
a/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
b/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
index a2c7825..d92e3c1 100644
---
a/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
+++
b/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
@@ -52,7 +52,7 @@ import org.apache.sshd.common.cipher.BuiltinCiphers;
import org.apache.sshd.common.cipher.CipherNone;
import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.config.keys.OpenSshCertificate;
-import org.apache.sshd.common.forward.ForwardingFilter;
+import org.apache.sshd.common.forward.Forwarder;
import org.apache.sshd.common.future.DefaultKeyExchangeFuture;
import org.apache.sshd.common.future.KeyExchangeFuture;
import org.apache.sshd.common.io.IoSession;
@@ -370,45 +370,45 @@ public abstract class AbstractClientSession extends
AbstractSession implements C
@Override
public SshdSocketAddress startLocalPortForwarding(SshdSocketAddress local,
SshdSocketAddress remote)
throws IOException {
- ForwardingFilter filter = getForwardingFilter();
- return filter.startLocalPortForwarding(local, remote);
+ Forwarder forwarder = getForwarder();
+ return forwarder.startLocalPortForwarding(local, remote);
}
@Override
public void stopLocalPortForwarding(SshdSocketAddress local) throws
IOException {
- ForwardingFilter filter = getForwardingFilter();
- filter.stopLocalPortForwarding(local);
+ Forwarder forwarder = getForwarder();
+ forwarder.stopLocalPortForwarding(local);
}
@Override
public SshdSocketAddress startRemotePortForwarding(SshdSocketAddress
remote, SshdSocketAddress local)
throws IOException {
- ForwardingFilter filter = getForwardingFilter();
- return filter.startRemotePortForwarding(remote, local);
+ Forwarder forwarder = getForwarder();
+ return forwarder.startRemotePortForwarding(remote, local);
}
@Override
public void stopRemotePortForwarding(SshdSocketAddress remote) throws
IOException {
- ForwardingFilter filter = getForwardingFilter();
- filter.stopRemotePortForwarding(remote);
+ Forwarder forwarder = getForwarder();
+ forwarder.stopRemotePortForwarding(remote);
}
@Override
public SshdSocketAddress startDynamicPortForwarding(SshdSocketAddress
local) throws IOException {
- ForwardingFilter filter = getForwardingFilter();
- return filter.startDynamicPortForwarding(local);
+ Forwarder forwarder = getForwarder();
+ return forwarder.startDynamicPortForwarding(local);
}
@Override
public void stopDynamicPortForwarding(SshdSocketAddress local) throws
IOException {
- ForwardingFilter filter = getForwardingFilter();
- filter.stopDynamicPortForwarding(local);
+ Forwarder forwarder = getForwarder();
+ forwarder.stopDynamicPortForwarding(local);
}
@Override
- protected ForwardingFilter getForwardingFilter() {
+ protected Forwarder getForwarder() {
ConnectionService service =
Objects.requireNonNull(getConnectionService(), "No connection service");
- return Objects.requireNonNull(service.getForwardingFilter(), "No
forwarder");
+ return Objects.requireNonNull(service.getForwarder(), "No forwarder");
}
@Override
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java
b/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java
index c833325..d6c6bb2 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java
@@ -32,7 +32,7 @@ import org.apache.sshd.common.compression.Compression;
import org.apache.sshd.common.file.FileSystemFactory;
import org.apache.sshd.common.file.nativefs.NativeFileSystemFactory;
import org.apache.sshd.common.forward.DefaultForwarderFactory;
-import org.apache.sshd.common.forward.ForwardingFilterFactory;
+import org.apache.sshd.common.forward.ForwarderFactory;
import org.apache.sshd.common.helpers.AbstractFactoryManager;
import org.apache.sshd.common.kex.BuiltinDHFactories;
import org.apache.sshd.common.kex.KeyExchangeFactory;
@@ -61,7 +61,7 @@ public class BaseBuilder<T extends AbstractFactoryManager, S
extends BaseBuilder
public static final ForwardingFilter DEFAULT_FORWARDING_FILTER =
RejectAllForwardingFilter.INSTANCE;
- public static final ForwardingFilterFactory DEFAULT_FORWARDER_FACTORY =
DefaultForwarderFactory.INSTANCE;
+ public static final ForwarderFactory DEFAULT_FORWARDER_FACTORY =
DefaultForwarderFactory.INSTANCE;
/**
* The default {@link BuiltinCiphers} setup in order of preference as
specified by
@@ -132,7 +132,7 @@ public class BaseBuilder<T extends AbstractFactoryManager,
S extends BaseBuilder
protected Factory<Random> randomFactory;
protected List<ChannelFactory> channelFactories;
protected FileSystemFactory fileSystemFactory;
- protected ForwardingFilterFactory forwarderFactory;
+ protected ForwarderFactory forwarderFactory;
protected List<RequestHandler<ConnectionService>> globalRequestHandlers;
protected ForwardingFilter forwardingFilter;
protected ChannelStreamPacketWriterResolver
channelStreamPacketWriterResolver;
@@ -219,7 +219,7 @@ public class BaseBuilder<T extends AbstractFactoryManager,
S extends BaseBuilder
return me();
}
- public S forwarderFactory(ForwardingFilterFactory forwarderFactory) {
+ public S forwarderFactory(ForwarderFactory forwarderFactory) {
this.forwarderFactory = forwarderFactory;
return me();
}
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java
b/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java
index 46e011d..b94e1b7 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java
@@ -29,7 +29,7 @@ import org.apache.sshd.common.channel.ChannelListenerManager;
import org.apache.sshd.common.channel.RequestHandler;
import
org.apache.sshd.common.channel.throttle.ChannelStreamPacketWriterResolverManager;
import org.apache.sshd.common.file.FileSystemFactory;
-import org.apache.sshd.common.forward.ForwardingFilterFactory;
+import org.apache.sshd.common.forward.ForwarderFactory;
import org.apache.sshd.common.forward.PortForwardingEventListenerManager;
import org.apache.sshd.common.io.IoServiceEventListenerManager;
import org.apache.sshd.common.io.IoServiceFactory;
@@ -434,9 +434,9 @@ public interface FactoryManager
/**
* Retrieve the forwarder factory used to support forwarding.
*
- * @return The {@link ForwardingFilterFactory}
+ * @return The {@link ForwarderFactory}
*/
- ForwardingFilterFactory getForwarderFactory();
+ ForwarderFactory getForwarderFactory();
/**
* Retrieve the <code>FileSystemFactory</code> to be used to traverse the
file system.
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwardingFilter.java
b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarder.java
similarity index 99%
rename from
sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwardingFilter.java
rename to
sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarder.java
index c225718..b687929 100644
---
a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwardingFilter.java
+++
b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarder.java
@@ -73,9 +73,9 @@ import org.apache.sshd.server.forward.TcpForwardingFilter;
*
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
-public class DefaultForwardingFilter
+public class DefaultForwarder
extends AbstractInnerCloseable
- implements ForwardingFilter, SessionHolder<Session>,
PortForwardingEventListenerManager {
+ implements Forwarder, SessionHolder<Session>,
PortForwardingEventListenerManager {
/**
* Used to configure the timeout (milliseconds) for receiving a response
for the forwarding request
@@ -114,7 +114,7 @@ public class DefaultForwardingFilter
private IoAcceptor localAcceptor;
private IoAcceptor dynamicAcceptor;
- public DefaultForwardingFilter(ConnectionService service) {
+ public DefaultForwarder(ConnectionService service) {
this.service = Objects.requireNonNull(service, "No connection
service");
this.sessionInstance = Objects.requireNonNull(service.getSession(),
"No session");
this.listenerProxy =
EventListenerUtils.proxyWrapper(PortForwardingEventListener.class, listeners);
@@ -1095,7 +1095,7 @@ public class DefaultForwardingFilter
if (debugEnabled) {
log.debug("sessionCreated(" + session + ") channel=" +
channel + " open failure details", t);
}
-
DefaultForwardingFilter.this.service.unregisterChannel(channel);
+ DefaultForwarder.this.service.unregisterChannel(channel);
channel.close(false);
}
});
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarderFactory.java
b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarderFactory.java
index b5048ed..6983684 100644
---
a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarderFactory.java
+++
b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarderFactory.java
@@ -25,11 +25,11 @@ import org.apache.sshd.common.session.ConnectionService;
import org.apache.sshd.common.util.EventListenerUtils;
/**
- * The default {@link ForwardingFilterFactory} implementation.
+ * The default {@link ForwarderFactory} implementation.
*
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
-public class DefaultForwarderFactory implements ForwardingFilterFactory,
PortForwardingEventListenerManager {
+public class DefaultForwarderFactory implements ForwarderFactory,
PortForwardingEventListenerManager {
public static final DefaultForwarderFactory INSTANCE = new
DefaultForwarderFactory() {
@Override
public void addPortForwardingEventListener(PortForwardingEventListener
listener) {
@@ -75,8 +75,8 @@ public class DefaultForwarderFactory implements
ForwardingFilterFactory, PortFor
}
@Override
- public ForwardingFilter create(ConnectionService service) {
- ForwardingFilter forwarder = new DefaultForwardingFilter(service);
+ public Forwarder create(ConnectionService service) {
+ Forwarder forwarder = new DefaultForwarder(service);
forwarder.addPortForwardingEventListenerManager(this);
return forwarder;
}
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwardingFilter.java
b/sshd-core/src/main/java/org/apache/sshd/common/forward/Forwarder.java
similarity index 98%
rename from
sshd-core/src/main/java/org/apache/sshd/common/forward/ForwardingFilter.java
rename to sshd-core/src/main/java/org/apache/sshd/common/forward/Forwarder.java
index 0983d9d..b006820 100644
---
a/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwardingFilter.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/Forwarder.java
@@ -28,7 +28,7 @@ import org.apache.sshd.common.util.net.SshdSocketAddress;
*
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
-public interface ForwardingFilter
+public interface Forwarder
extends PortForwardingManager,
PortForwardingEventListenerManager,
PortForwardingEventListenerManagerHolder,
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwardingFilterFactory.java
b/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwarderFactory.java
similarity index 86%
rename from
sshd-core/src/main/java/org/apache/sshd/common/forward/ForwardingFilterFactory.java
rename to
sshd-core/src/main/java/org/apache/sshd/common/forward/ForwarderFactory.java
index cda8a9f..6bf06f2 100644
---
a/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwardingFilterFactory.java
+++
b/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwarderFactory.java
@@ -26,13 +26,13 @@ import org.apache.sshd.common.session.ConnectionService;
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
@FunctionalInterface
-public interface ForwardingFilterFactory {
+public interface ForwarderFactory {
/**
* Creates the forwarder to be used for TCP/IP port forwards for this
session.
*
* @param service the {@link ConnectionService} the connections are
forwarded through
- * @return the {@link ForwardingFilter} that will listen for
connections and set up forwarding
+ * @return the {@link Forwarder} that will listen for connections
and set up forwarding
*/
- ForwardingFilter create(ConnectionService service);
+ Forwarder create(ConnectionService service);
}
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/helpers/AbstractFactoryManager.java
b/sshd-core/src/main/java/org/apache/sshd/common/helpers/AbstractFactoryManager.java
index 8537fd6..577b2ab 100644
---
a/sshd-core/src/main/java/org/apache/sshd/common/helpers/AbstractFactoryManager.java
+++
b/sshd-core/src/main/java/org/apache/sshd/common/helpers/AbstractFactoryManager.java
@@ -45,7 +45,7 @@ import org.apache.sshd.common.channel.RequestHandler;
import
org.apache.sshd.common.channel.throttle.ChannelStreamPacketWriterResolver;
import org.apache.sshd.common.config.VersionProperties;
import org.apache.sshd.common.file.FileSystemFactory;
-import org.apache.sshd.common.forward.ForwardingFilterFactory;
+import org.apache.sshd.common.forward.ForwarderFactory;
import org.apache.sshd.common.forward.PortForwardingEventListener;
import org.apache.sshd.common.io.DefaultIoServiceFactoryFactory;
import org.apache.sshd.common.io.IoServiceEventListener;
@@ -76,7 +76,7 @@ public abstract class AbstractFactoryManager extends
AbstractKexFactoryManager i
protected SshAgentFactory agentFactory;
protected ScheduledExecutorService executor;
protected boolean shutdownExecutor;
- protected ForwardingFilterFactory forwarderFactory;
+ protected ForwarderFactory forwarderFactory;
protected ForwardingFilter forwardingFilter;
protected FileSystemFactory fileSystemFactory;
protected List<ServiceFactory> serviceFactories;
@@ -257,11 +257,11 @@ public abstract class AbstractFactoryManager extends
AbstractKexFactoryManager i
}
@Override
- public ForwardingFilterFactory getForwarderFactory() {
+ public ForwarderFactory getForwarderFactory() {
return forwarderFactory;
}
- public void setForwarderFactory(ForwardingFilterFactory forwarderFactory) {
+ public void setForwarderFactory(ForwarderFactory forwarderFactory) {
this.forwarderFactory = forwarderFactory;
}
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionService.java
b/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionService.java
index 2a8f109..9e6a8e6 100644
---
a/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionService.java
+++
b/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionService.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import org.apache.sshd.agent.common.AgentForwardSupport;
import org.apache.sshd.common.Service;
import org.apache.sshd.common.channel.Channel;
-import org.apache.sshd.common.forward.ForwardingFilter;
+import org.apache.sshd.common.forward.Forwarder;
import org.apache.sshd.common.forward.PortForwardingEventListenerManager;
import org.apache.sshd.common.forward.PortForwardingEventListenerManagerHolder;
import org.apache.sshd.server.x11.X11ForwardSupport;
@@ -59,9 +59,9 @@ public interface ConnectionService
/**
* Retrieve the forwarder instance
*
- * @return The {@link ForwardingFilter}
+ * @return The {@link Forwarder}
*/
- ForwardingFilter getForwardingFilter();
+ Forwarder getForwarder();
// TODO: remove from interface, it's server side only
AgentForwardSupport getAgentForwardSupport();
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractConnectionService.java
b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractConnectionService.java
index d77aaa6..f8d9949 100644
---
a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractConnectionService.java
+++
b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractConnectionService.java
@@ -49,8 +49,8 @@ import org.apache.sshd.common.channel.RequestHandler;
import org.apache.sshd.common.channel.Window;
import org.apache.sshd.common.channel.exception.SshChannelNotFoundException;
import org.apache.sshd.common.channel.exception.SshChannelOpenException;
-import org.apache.sshd.common.forward.ForwardingFilter;
-import org.apache.sshd.common.forward.ForwardingFilterFactory;
+import org.apache.sshd.common.forward.Forwarder;
+import org.apache.sshd.common.forward.ForwarderFactory;
import org.apache.sshd.common.forward.PortForwardingEventListener;
import org.apache.sshd.common.forward.PortForwardingEventListenerManager;
import org.apache.sshd.common.io.AbstractIoWriteFuture;
@@ -109,7 +109,7 @@ public abstract class AbstractConnectionService
private final AtomicReference<AgentForwardSupport> agentForwardHolder =
new AtomicReference<>();
private final AtomicReference<X11ForwardSupport> x11ForwardHolder = new
AtomicReference<>();
- private final AtomicReference<ForwardingFilter> forwarderHolder = new
AtomicReference<>();
+ private final AtomicReference<Forwarder> forwarderHolder = new
AtomicReference<>();
private final AtomicBoolean allowMoreSessions = new AtomicBoolean(true);
private final Collection<PortForwardingEventListener> listeners = new
CopyOnWriteArraySet<>();
private final Collection<PortForwardingEventListenerManager>
managersHolder = new CopyOnWriteArraySet<>();
@@ -299,8 +299,8 @@ public abstract class AbstractConnectionService
}
@Override
- public ForwardingFilter getForwardingFilter() {
- ForwardingFilter forwarder;
+ public Forwarder getForwarder() {
+ Forwarder forwarder;
Session session = getSession();
synchronized (forwarderHolder) {
forwarder = forwarderHolder.get();
@@ -327,10 +327,10 @@ public abstract class AbstractConnectionService
super.preClose();
}
- protected ForwardingFilter createForwardingFilter(Session session) {
+ protected Forwarder createForwardingFilter(Session session) {
FactoryManager manager =
Objects.requireNonNull(session.getFactoryManager(), "No factory manager");
- ForwardingFilterFactory factory =
Objects.requireNonNull(manager.getForwarderFactory(), "No forwarder factory");
- ForwardingFilter forwarder = factory.create(this);
+ ForwarderFactory factory =
Objects.requireNonNull(manager.getForwarderFactory(), "No forwarder factory");
+ Forwarder forwarder = factory.create(this);
forwarder.addPortForwardingEventListenerManager(this);
return forwarder;
}
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionHelper.java
b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionHelper.java
index cb95c7b..8c17b29 100644
---
a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionHelper.java
+++
b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionHelper.java
@@ -50,7 +50,7 @@ import org.apache.sshd.common.SshException;
import
org.apache.sshd.common.channel.throttle.ChannelStreamPacketWriterResolver;
import
org.apache.sshd.common.channel.throttle.ChannelStreamPacketWriterResolverManager;
import org.apache.sshd.common.digest.Digest;
-import org.apache.sshd.common.forward.ForwardingFilter;
+import org.apache.sshd.common.forward.Forwarder;
import org.apache.sshd.common.future.DefaultSshFuture;
import org.apache.sshd.common.io.IoSession;
import org.apache.sshd.common.io.IoWriteFuture;
@@ -1274,57 +1274,57 @@ public abstract class SessionHelper extends
AbstractKexFactoryManager implements
protected abstract ConnectionService getConnectionService();
- protected ForwardingFilter getForwardingFilter() {
+ protected Forwarder getForwarder() {
ConnectionService service = getConnectionService();
- return (service == null) ? null : service.getForwardingFilter();
+ return (service == null) ? null : service.getForwarder();
}
@Override
public List<Map.Entry<Integer, SshdSocketAddress>>
getLocalForwardsBindings() {
- ForwardingFilter filter = getForwardingFilter();
- return (filter == null) ? Collections.emptyList() :
filter.getLocalForwardsBindings();
+ Forwarder forwarder = getForwarder();
+ return (forwarder == null) ? Collections.emptyList() :
forwarder.getLocalForwardsBindings();
}
@Override
public boolean isLocalPortForwardingStartedForPort(int port) {
- ForwardingFilter filter = getForwardingFilter();
- return (filter != null) &&
filter.isLocalPortForwardingStartedForPort(port);
+ Forwarder forwarder = getForwarder();
+ return (forwarder != null) &&
forwarder.isLocalPortForwardingStartedForPort(port);
}
@Override
public NavigableSet<Integer> getStartedLocalPortForwards() {
- ForwardingFilter filter = getForwardingFilter();
- return (filter == null) ? Collections.emptyNavigableSet() :
filter.getStartedLocalPortForwards();
+ Forwarder forwarder = getForwarder();
+ return (forwarder == null) ? Collections.emptyNavigableSet() :
forwarder.getStartedLocalPortForwards();
}
@Override
public SshdSocketAddress getBoundLocalPortForward(int port) {
- ForwardingFilter filter = getForwardingFilter();
- return (filter == null) ? null : filter.getBoundLocalPortForward(port);
+ Forwarder forwarder = getForwarder();
+ return (forwarder == null) ? null :
forwarder.getBoundLocalPortForward(port);
}
@Override
public List<Map.Entry<Integer, SshdSocketAddress>>
getRemoteForwardsBindings() {
- ForwardingFilter filter = getForwardingFilter();
- return (filter == null) ? Collections.emptyList() :
filter.getRemoteForwardsBindings();
+ Forwarder forwarder = getForwarder();
+ return (forwarder == null) ? Collections.emptyList() :
forwarder.getRemoteForwardsBindings();
}
@Override
public boolean isRemotePortForwardingStartedForPort(int port) {
- ForwardingFilter filter = getForwardingFilter();
- return (filter != null) &&
filter.isRemotePortForwardingStartedForPort(port);
+ Forwarder forwarder = getForwarder();
+ return (forwarder != null) &&
forwarder.isRemotePortForwardingStartedForPort(port);
}
@Override
public NavigableSet<Integer> getStartedRemotePortForwards() {
- ForwardingFilter filter = getForwardingFilter();
- return (filter == null) ? Collections.emptyNavigableSet() :
filter.getStartedRemotePortForwards();
+ Forwarder forwarder = getForwarder();
+ return (forwarder == null) ? Collections.emptyNavigableSet() :
forwarder.getStartedRemotePortForwards();
}
@Override
public SshdSocketAddress getBoundRemotePortForward(int port) {
- ForwardingFilter filter = getForwardingFilter();
- return (filter == null) ? null :
filter.getBoundRemotePortForward(port);
+ Forwarder forwarder = getForwarder();
+ return (forwarder == null) ? null :
forwarder.getBoundRemotePortForward(port);
}
@Override
diff --git
a/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
b/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
index aa07126..b34469f 100644
---
a/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
+++
b/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
@@ -36,6 +36,7 @@ import
org.apache.sshd.common.channel.ChannelAsyncOutputStream;
import org.apache.sshd.common.channel.ChannelFactory;
import org.apache.sshd.common.channel.Window;
import org.apache.sshd.common.channel.exception.SshChannelOpenException;
+import org.apache.sshd.common.forward.Forwarder;
import org.apache.sshd.common.forward.ForwardingTunnelEndpointsProvider;
import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.io.IoConnectFuture;
@@ -157,8 +158,8 @@ public class TcpipServerChannel extends
AbstractServerChannel implements Forward
address = new SshdSocketAddress(hostToConnect, portToConnect);
break;
case Forwarded: {
- org.apache.sshd.common.forward.ForwardingFilter ff =
service.getForwardingFilter();
- address = ff.getForwardedPort(portToConnect);
+ Forwarder forwarder = service.getForwarder();
+ address = forwarder.getForwardedPort(portToConnect);
break;
}
default:
diff --git
a/sshd-core/src/main/java/org/apache/sshd/server/global/CancelTcpipForwardHandler.java
b/sshd-core/src/main/java/org/apache/sshd/server/global/CancelTcpipForwardHandler.java
index 45b4c47..d06fb0a 100644
---
a/sshd-core/src/main/java/org/apache/sshd/server/global/CancelTcpipForwardHandler.java
+++
b/sshd-core/src/main/java/org/apache/sshd/server/global/CancelTcpipForwardHandler.java
@@ -22,7 +22,7 @@ import java.util.Objects;
import java.util.function.IntUnaryOperator;
import org.apache.sshd.common.SshConstants;
-import org.apache.sshd.common.forward.ForwardingFilter;
+import org.apache.sshd.common.forward.Forwarder;
import org.apache.sshd.common.session.ConnectionService;
import org.apache.sshd.common.session.Session;
import
org.apache.sshd.common.session.helpers.AbstractConnectionServiceRequestHandler;
@@ -64,7 +64,7 @@ public class CancelTcpipForwardHandler extends
AbstractConnectionServiceRequestH
log.debug("process({})[{}] {} reply={}", connectionService,
request, socketAddress, wantReply);
}
- ForwardingFilter forwarder =
Objects.requireNonNull(connectionService.getForwardingFilter(), "No TCP/IP
forwarder");
+ Forwarder forwarder =
Objects.requireNonNull(connectionService.getForwarder(), "No TCP/IP forwarder");
forwarder.localPortForwardingCancelled(socketAddress);
if (wantReply) {
diff --git
a/sshd-core/src/main/java/org/apache/sshd/server/global/TcpipForwardHandler.java
b/sshd-core/src/main/java/org/apache/sshd/server/global/TcpipForwardHandler.java
index db13ae0..9ccac7d 100644
---
a/sshd-core/src/main/java/org/apache/sshd/server/global/TcpipForwardHandler.java
+++
b/sshd-core/src/main/java/org/apache/sshd/server/global/TcpipForwardHandler.java
@@ -22,7 +22,7 @@ import java.util.Objects;
import java.util.function.IntUnaryOperator;
import org.apache.sshd.common.SshConstants;
-import org.apache.sshd.common.forward.ForwardingFilter;
+import org.apache.sshd.common.forward.Forwarder;
import org.apache.sshd.common.session.ConnectionService;
import org.apache.sshd.common.session.Session;
import
org.apache.sshd.common.session.helpers.AbstractConnectionServiceRequestHandler;
@@ -61,7 +61,7 @@ public class TcpipForwardHandler extends
AbstractConnectionServiceRequestHandler
String address = buffer.getString();
int port = buffer.getInt();
SshdSocketAddress socketAddress = new SshdSocketAddress(address, port);
- ForwardingFilter forwarder =
Objects.requireNonNull(connectionService.getForwardingFilter(), "No TCP/IP
forwarder");
+ Forwarder forwarder =
Objects.requireNonNull(connectionService.getForwarder(), "No TCP/IP forwarder");
SshdSocketAddress bound =
forwarder.localPortForwardingRequested(socketAddress);
if (log.isDebugEnabled()) {
log.debug("process({})[{}][want-reply-{}] {} => {}",
diff --git
a/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingTest.java
b/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingTest.java
index fca1bce..c4f9c32 100644
---
a/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingTest.java
+++
b/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingTest.java
@@ -179,9 +179,9 @@ public class PortForwardingTest extends BaseTestSupport {
REQUESTS_QUEUE.clear();
}
- ForwardingFilterFactory factory =
Objects.requireNonNull(sshd.getForwarderFactory(), "No ForwarderFactory");
- sshd.setForwarderFactory(new ForwardingFilterFactory() {
- private final Class<?>[] interfaces = { ForwardingFilter.class };
+ ForwarderFactory factory =
Objects.requireNonNull(sshd.getForwarderFactory(), "No ForwarderFactory");
+ sshd.setForwarderFactory(new ForwarderFactory() {
+ private final Class<?>[] interfaces = { Forwarder.class };
private final Map<String, String> method2req
= NavigableMapBuilder.<String, String>
builder(String.CASE_INSENSITIVE_ORDER)
.put("localPortForwardingRequested",
TcpipForwardHandler.REQUEST)
@@ -189,13 +189,13 @@ public class PortForwardingTest extends BaseTestSupport {
.build();
@Override
- public ForwardingFilter create(ConnectionService service) {
+ public Forwarder create(ConnectionService service) {
Thread thread = Thread.currentThread();
ClassLoader cl = thread.getContextClassLoader();
- ForwardingFilter forwarder = factory.create(service);
- return (ForwardingFilter) Proxy.newProxyInstance(cl,
interfaces, new InvocationHandler() {
- private final org.slf4j.Logger log =
LoggerFactory.getLogger(ForwardingFilter.class);
+ Forwarder forwarder = factory.create(service);
+ return (Forwarder) Proxy.newProxyInstance(cl, interfaces, new
InvocationHandler() {
+ private final org.slf4j.Logger log =
LoggerFactory.getLogger(Forwarder.class);
@SuppressWarnings("synthetic-access")
@Override
diff --git
a/sshd-core/src/test/java/org/apache/sshd/common/ForwardingFilterTest.java
b/sshd-core/src/test/java/org/apache/sshd/server/forward/ForwardingFilterTest.java
similarity index 92%
rename from
sshd-core/src/test/java/org/apache/sshd/common/ForwardingFilterTest.java
rename to
sshd-core/src/test/java/org/apache/sshd/server/forward/ForwardingFilterTest.java
index ff675de..3665586 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/ForwardingFilterTest.java
+++
b/sshd-core/src/test/java/org/apache/sshd/server/forward/ForwardingFilterTest.java
@@ -17,14 +17,10 @@
* under the License.
*/
-package org.apache.sshd.common;
+package org.apache.sshd.server.forward;
import org.apache.sshd.common.session.Session;
import org.apache.sshd.common.util.net.SshdSocketAddress;
-import org.apache.sshd.server.forward.AcceptAllForwardingFilter;
-import org.apache.sshd.server.forward.ForwardingFilter;
-import org.apache.sshd.server.forward.RejectAllForwardingFilter;
-import org.apache.sshd.server.forward.StaticDecisionForwardingFilter;
import org.apache.sshd.util.test.BaseTestSupport;
import org.junit.FixMethodOrder;
import org.junit.Test;
