You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2016/11/01 18:25:39 UTC
[1/2] mina-sshd git commit: [SSHD-704] No need to wipe string bytes
after being placed in the buffer
Repository: mina-sshd
Updated Branches:
refs/heads/master 95ea8a314 -> 6c92dcce8
[SSHD-704] No need to wipe string bytes after being placed in the buffer
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/cac8383c
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/cac8383c
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/cac8383c
Branch: refs/heads/master
Commit: cac8383c2648b3f2493df2c50fced6c46b2d7230
Parents: 95ea8a3
Author: Lyor Goldstein <ly...@gmail.com>
Authored: Tue Nov 1 19:43:03 2016 +0200
Committer: Lyor Goldstein <ly...@gmail.com>
Committed: Tue Nov 1 19:43:03 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/sshd/common/util/buffer/Buffer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/cac8383c/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/Buffer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/Buffer.java b/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/Buffer.java
index a5cdb87..234d5cc 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/Buffer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/Buffer.java
@@ -617,7 +617,7 @@ public abstract class Buffer implements Readable {
if (GenericUtils.isEmpty(string)) {
putBytes(GenericUtils.EMPTY_BYTE_ARRAY);
} else {
- putAndWipeBytes(string.getBytes(charset));
+ putBytes(string.getBytes(charset));
}
}
[2/2] mina-sshd git commit: [SSHD-706] Added more checks if
DEBUG/TRACE level enabled before issuing the relevant log messages
Posted by lg...@apache.org.
[SSHD-706] Added more checks if DEBUG/TRACE level enabled before issuing the relevant log messages
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/6c92dcce
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/6c92dcce
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/6c92dcce
Branch: refs/heads/master
Commit: 6c92dcce81d0bba7810f09a5c4664d59d436e729
Parents: cac8383
Author: Lyor Goldstein <ly...@gmail.com>
Authored: Tue Nov 1 20:28:02 2016 +0200
Committer: Lyor Goldstein <ly...@gmail.com>
Committed: Tue Nov 1 20:28:02 2016 +0200
----------------------------------------------------------------------
.../sshd/agent/common/AbstractAgentClient.java | 14 ++---
.../java/org/apache/sshd/client/SshClient.java | 4 +-
.../sshd/common/channel/AbstractChannel.java | 16 ++++--
.../channel/ChannelAsyncOutputStream.java | 6 +--
.../org/apache/sshd/common/channel/Window.java | 20 +++++---
.../common/helpers/AbstractFactoryManager.java | 54 ++++++++++++++------
.../common/session/helpers/AbstractSession.java | 48 ++++++++++++-----
.../session/helpers/SessionTimeoutListener.java | 16 ++++--
.../pubkey/CachingPublicKeyAuthenticator.java | 8 ++-
.../deprecated/ClientUserAuthServiceOld.java | 25 ++++++---
.../deprecated/UserAuthKeyboardInteractive.java | 10 ++--
.../sshd/deprecated/UserAuthPublicKey.java | 8 ++-
12 files changed, 165 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java b/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
index 58dc735..dd007db 100644
--- a/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
@@ -47,8 +47,7 @@ public abstract class AbstractAgentClient extends AbstractLoggingBean {
int avail = buffer.available();
if (avail < 4) {
if (log.isTraceEnabled()) {
- log.trace("Received message total length ({}) below minimum ({})",
- avail, 4);
+ log.trace("Received message total length ({}) below minimum ({})", avail, 4);
}
return;
}
@@ -60,8 +59,7 @@ public abstract class AbstractAgentClient extends AbstractLoggingBean {
avail = buffer.available();
if (avail < (len + 4)) {
if (log.isTraceEnabled()) {
- log.trace("Received request length ({}) below minimum ({})",
- avail, len + 4);
+ log.trace("Received request length ({}) below minimum ({})", avail, len + 4);
}
return;
}
@@ -130,14 +128,18 @@ public abstract class AbstractAgentClient extends AbstractLoggingBean {
case SshAgentConstants.SSH2_AGENTC_ADD_IDENTITY: {
KeyPair keyToAdd = req.getKeyPair();
String comment = req.getString();
- log.debug("SSH2_AGENTC_ADD_IDENTITY comment={}", comment);
+ if (log.isDebugEnabled()) {
+ log.debug("SSH2_AGENTC_ADD_IDENTITY comment={}", comment);
+ }
agent.addIdentity(keyToAdd, comment);
rep.putByte(SshAgentConstants.SSH_AGENT_SUCCESS);
break;
}
case SshAgentConstants.SSH2_AGENTC_REMOVE_IDENTITY: {
PublicKey keyToRemove = req.getPublicKey();
- log.debug("SSH2_AGENTC_REMOVE_IDENTITY {}", keyToRemove.getClass().getSimpleName());
+ if (log.isDebugEnabled()) {
+ log.debug("SSH2_AGENTC_REMOVE_IDENTITY {}", keyToRemove.getClass().getSimpleName());
+ }
agent.removeIdentity(keyToRemove);
rep.putByte(SshAgentConstants.SSH_AGENT_SUCCESS);
break;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
index 1d4879b..3502b1b 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
@@ -542,7 +542,9 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa
for (String l : locations) {
if (!loader.isValidLocation(l)) {
if (ignoreNonExisting) {
- log.debug("loadClientIdentities - skip non-existing identity location: {}", l);
+ if (log.isDebugEnabled()) {
+ log.debug("loadClientIdentities - skip non-existing identity location: {}", l);
+ }
continue;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java
index 503a0fd..b4810b2 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java
@@ -404,18 +404,26 @@ public abstract class AbstractChannel
}
if (this.channelListeners.add(listener)) {
- log.trace("addChannelListener({})[{}] registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addChannelListener({})[{}] registered", this, listener);
+ }
} else {
- log.trace("addChannelListener({})[{}] ignored duplicate", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addChannelListener({})[{}] ignored duplicate", this, listener);
+ }
}
}
@Override
public void removeChannelListener(ChannelListener listener) {
if (this.channelListeners.remove(listener)) {
- log.trace("removeChannelListener({})[{}] removed", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removeChannelListener({})[{}] removed", this, listener);
+ }
} else {
- log.trace("removeChannelListener({})[{}] not registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removeChannelListener({})[{}] not registered", this, listener);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java
index 8c12bd2..2ba01fd 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java
@@ -72,7 +72,7 @@ public class ChannelAsyncOutputStream extends AbstractCloseable implements IoOut
}
protected synchronized void doWriteIfPossible(boolean resume) {
- final IoWriteFutureImpl future = pendingWrite.get();
+ IoWriteFutureImpl future = pendingWrite.get();
if (future == null) {
if (log.isTraceEnabled()) {
log.trace("doWriteIfPossible({})[resume={}] no pending write future", this, resume);
@@ -80,8 +80,8 @@ public class ChannelAsyncOutputStream extends AbstractCloseable implements IoOut
return;
}
- final Buffer buffer = future.getBuffer();
- final int total = buffer.available();
+ Buffer buffer = future.getBuffer();
+ int total = buffer.available();
if (total > 0) {
Channel channel = getChannel();
Window remoteWindow = channel.getRemoteWindow();
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
index 48f0080..f443165 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
@@ -123,7 +123,9 @@ public class Window extends AbstractLoggingBean implements java.nio.channels.Cha
}
if (initialized.getAndSet(true)) {
- log.debug("init({}) re-initializing", this);
+ if (log.isDebugEnabled()) {
+ log.debug("init({}) re-initializing", this);
+ }
}
if (log.isDebugEnabled()) {
@@ -259,13 +261,17 @@ public class Window extends AbstractLoggingBean implements java.nio.channels.Cha
public long waitForSpace(long maxWaitTime) throws InterruptedException, WindowClosedException, SocketTimeoutException {
checkInitialized("waitForSpace");
+ long available;
synchronized (lock) {
waitForCondition(SPACE_AVAILABLE_PREDICATE, maxWaitTime);
- if (log.isDebugEnabled()) {
- log.debug("waitForSpace({}) available: {}", this, sizeHolder);
- }
- return sizeHolder.get();
+ available = sizeHolder.get();
}
+
+ if (log.isDebugEnabled()) {
+ log.debug("waitForSpace({}) available: {}", this, available);
+ }
+
+ return available;
}
/**
@@ -333,7 +339,9 @@ public class Window extends AbstractLoggingBean implements java.nio.channels.Cha
@Override
public void close() throws IOException {
if (!closed.getAndSet(true)) {
- log.debug("Closing {}", this);
+ if (log.isDebugEnabled()) {
+ log.debug("Closing {}", this);
+ }
}
// just in case someone is still waiting
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/main/java/org/apache/sshd/common/helpers/AbstractFactoryManager.java
----------------------------------------------------------------------
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 dc5685c..0b4802d 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
@@ -283,18 +283,26 @@ public abstract class AbstractFactoryManager extends AbstractKexFactoryManager i
}
if (this.sessionListeners.add(listener)) {
- log.trace("addSessionListener({})[{}] registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addSessionListener({})[{}] registered", this, listener);
+ }
} else {
- log.trace("addSessionListener({})[{}] ignored duplicate", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addSessionListener({})[{}] ignored duplicate", this, listener);
+ }
}
}
@Override
public void removeSessionListener(SessionListener listener) {
if (this.sessionListeners.remove(listener)) {
- log.trace("removeSessionListener({})[{}] removed", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removeSessionListener({})[{}] removed", this, listener);
+ }
} else {
- log.trace("removeSessionListener({})[{}] not registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removeSessionListener({})[{}] not registered", this, listener);
+ }
}
}
@@ -313,18 +321,26 @@ public abstract class AbstractFactoryManager extends AbstractKexFactoryManager i
}
if (this.channelListeners.add(listener)) {
- log.trace("addChannelListener({})[{}] registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addChannelListener({})[{}] registered", this, listener);
+ }
} else {
- log.trace("addChannelListener({})[{}] ignored duplicate", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addChannelListener({})[{}] ignored duplicate", this, listener);
+ }
}
}
@Override
public void removeChannelListener(ChannelListener listener) {
if (this.channelListeners.remove(listener)) {
- log.trace("removeChannelListener({})[{}] removed", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removeChannelListener({})[{}] removed", this, listener);
+ }
} else {
- log.trace("removeChannelListener({})[{}] not registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removeChannelListener({})[{}] not registered", this, listener);
+ }
}
}
@@ -348,9 +364,13 @@ public abstract class AbstractFactoryManager extends AbstractKexFactoryManager i
}
if (this.tunnelListeners.add(listener)) {
- log.trace("addPortForwardingEventListener({})[{}] registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addPortForwardingEventListener({})[{}] registered", this, listener);
+ }
} else {
- log.trace("addPortForwardingEventListener({})[{}] ignored duplicate", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addPortForwardingEventListener({})[{}] ignored duplicate", this, listener);
+ }
}
}
@@ -361,13 +381,17 @@ public abstract class AbstractFactoryManager extends AbstractKexFactoryManager i
}
if (this.tunnelListeners.remove(listener)) {
- log.trace("removePortForwardingEventListener({})[{}] removed", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removePortForwardingEventListener({})[{}] removed", this, listener);
+ }
} else {
- log.trace("removePortForwardingEventListener({})[{}] not registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removePortForwardingEventListener({})[{}] not registered", this, listener);
+ }
}
}
- protected void setupSessionTimeout(final AbstractSessionFactory<?, ?> sessionFactory) {
+ protected void setupSessionTimeout(AbstractSessionFactory<?, ?> sessionFactory) {
// set up the the session timeout listener and schedule it
sessionTimeoutListener = createSessionTimeoutListener();
addSessionListener(sessionTimeoutListener);
@@ -376,7 +400,7 @@ public abstract class AbstractFactoryManager extends AbstractKexFactoryManager i
.scheduleAtFixedRate(sessionTimeoutListener, 1, 1, TimeUnit.SECONDS);
}
- protected void removeSessionTimeout(final AbstractSessionFactory<?, ?> sessionFactory) {
+ protected void removeSessionTimeout(AbstractSessionFactory<?, ?> sessionFactory) {
stopSessionTimeoutListener(sessionFactory);
}
@@ -384,7 +408,7 @@ public abstract class AbstractFactoryManager extends AbstractKexFactoryManager i
return new SessionTimeoutListener();
}
- protected void stopSessionTimeoutListener(final AbstractSessionFactory<?, ?> sessionFactory) {
+ protected void stopSessionTimeoutListener(AbstractSessionFactory<?, ?> sessionFactory) {
// cancel the timeout monitoring task
if (timeoutListenerFuture != null) {
try {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
index 89263eb..97b5e4d 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
@@ -2034,18 +2034,26 @@ public abstract class AbstractSession extends AbstractKexFactoryManager implemen
}
if (this.sessionListeners.add(listener)) {
- log.trace("addSessionListener({})[{}] registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addSessionListener({})[{}] registered", this, listener);
+ }
} else {
- log.trace("addSessionListener({})[{}] ignored duplicate", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addSessionListener({})[{}] ignored duplicate", this, listener);
+ }
}
}
@Override
public void removeSessionListener(SessionListener listener) {
if (this.sessionListeners.remove(listener)) {
- log.trace("removeSessionListener({})[{}] removed", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removeSessionListener({})[{}] removed", this, listener);
+ }
} else {
- log.trace("removeSessionListener({})[{}] not registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removeSessionListener({})[{}] not registered", this, listener);
+ }
}
}
@@ -2064,18 +2072,26 @@ public abstract class AbstractSession extends AbstractKexFactoryManager implemen
}
if (this.channelListeners.add(listener)) {
- log.trace("addChannelListener({})[{}] registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addChannelListener({})[{}] registered", this, listener);
+ }
} else {
- log.trace("addChannelListener({})[{}] ignored duplicate", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addChannelListener({})[{}] ignored duplicate", this, listener);
+ }
}
}
@Override
public void removeChannelListener(ChannelListener listener) {
if (this.channelListeners.remove(listener)) {
- log.trace("removeChannelListener({})[{}] removed", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removeChannelListener({})[{}] removed", this, listener);
+ }
} else {
- log.trace("removeChannelListener({})[{}] not registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removeChannelListener({})[{}] not registered", this, listener);
+ }
}
}
@@ -2099,9 +2115,13 @@ public abstract class AbstractSession extends AbstractKexFactoryManager implemen
}
if (this.tunnelListeners.add(listener)) {
- log.trace("addPortForwardingEventListener({})[{}] registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addPortForwardingEventListener({})[{}] registered", this, listener);
+ }
} else {
- log.trace("addPortForwardingEventListener({})[{}] ignored duplicate", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("addPortForwardingEventListener({})[{}] ignored duplicate", this, listener);
+ }
}
}
@@ -2112,9 +2132,13 @@ public abstract class AbstractSession extends AbstractKexFactoryManager implemen
}
if (this.tunnelListeners.remove(listener)) {
- log.trace("removePortForwardingEventListener({})[{}] removed", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removePortForwardingEventListener({})[{}] removed", this, listener);
+ }
} else {
- log.trace("removePortForwardingEventListener({})[{}] not registered", this, listener);
+ if (log.isTraceEnabled()) {
+ log.trace("removePortForwardingEventListener({})[{}] not registered", this, listener);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionTimeoutListener.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionTimeoutListener.java b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionTimeoutListener.java
index da7818d..0da3e66 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionTimeoutListener.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionTimeoutListener.java
@@ -42,9 +42,13 @@ public class SessionTimeoutListener extends AbstractLoggingBean implements Sessi
public void sessionCreated(Session session) {
if ((session instanceof AbstractSession) && ((session.getAuthTimeout() > 0L) || (session.getIdleTimeout() > 0L))) {
sessions.add((AbstractSession) session);
- log.debug("sessionCreated({}) tracking", session);
+ if (log.isDebugEnabled()) {
+ log.debug("sessionCreated({}) tracking", session);
+ }
} else {
- log.trace("sessionCreated({}) not tracked", session);
+ if (log.isTraceEnabled()) {
+ log.trace("sessionCreated({}) not tracked", session);
+ }
}
}
@@ -68,9 +72,13 @@ public class SessionTimeoutListener extends AbstractLoggingBean implements Sessi
@Override
public void sessionClosed(Session s) {
if (sessions.remove(s)) {
- log.debug("sessionClosed({}) un-tracked", s);
+ if (log.isDebugEnabled()) {
+ log.debug("sessionClosed({}) un-tracked", s);
+ }
} else {
- log.trace("sessionClosed({}) not tracked", s);
+ if (log.isTraceEnabled()) {
+ log.trace("sessionClosed({}) not tracked", s);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/CachingPublicKeyAuthenticator.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/CachingPublicKeyAuthenticator.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/CachingPublicKeyAuthenticator.java
index 5e2fad5..383d57b 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/CachingPublicKeyAuthenticator.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/CachingPublicKeyAuthenticator.java
@@ -107,9 +107,13 @@ public class CachingPublicKeyAuthenticator extends AbstractLoggingBean implement
public void sessionClosed(Session session) {
Map<PublicKey, Boolean> map = cache.remove(session);
if (map == null) {
- log.debug("sessionClosed({}) not cached", session);
+ if (log.isDebugEnabled()) {
+ log.debug("sessionClosed({}) not cached", session);
+ }
} else {
- log.debug("sessionClosed({}) removed from cache", session);
+ if (log.isDebugEnabled()) {
+ log.debug("sessionClosed({}) removed from cache", session);
+ }
}
session.removeSessionListener(this);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
index b8aa9b5..4e8e11d 100644
--- a/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
+++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
@@ -162,28 +162,38 @@ public class ClientUserAuthServiceOld extends AbstractCloseable implements Servi
* @throws java.io.IOException
*/
private void processUserAuth(Buffer buffer) throws IOException {
- log.debug("processing {}", userAuth);
+ if (log.isDebugEnabled()) {
+ log.debug("processing {}", userAuth);
+ }
Result result = userAuth.next(buffer);
switch (result) {
case Success:
- log.debug("succeeded with {}", userAuth);
+ if (log.isDebugEnabled()) {
+ log.debug("succeeded with {}", userAuth);
+ }
session.setAuthenticated();
session.switchToNextService();
// Will wake up anyone sitting in waitFor
authFuture.setAuthed(true);
break;
case Failure:
- log.debug("failed with {}", userAuth);
+ if (log.isDebugEnabled()) {
+ log.debug("failed with {}", userAuth);
+ }
this.userAuth = null;
// Will wake up anyone sitting in waitFor
this.authFuture.setAuthed(false);
break;
case Continued:
// Will wake up anyone sitting in waitFor
- log.debug("continuing with {}", userAuth);
+ if (log.isDebugEnabled()) {
+ log.debug("continuing with {}", userAuth);
+ }
break;
default:
- log.debug("ignored result={} for {}", result, userAuth);
+ if (log.isDebugEnabled()) {
+ log.debug("ignored result={} for {}", result, userAuth);
+ }
}
}
@@ -196,7 +206,10 @@ public class ClientUserAuthServiceOld extends AbstractCloseable implements Servi
}
public AuthFuture auth(UserAuth userAuth) throws IOException {
- log.debug("Trying authentication with {}", userAuth);
+ if (log.isDebugEnabled()) {
+ log.debug("Trying authentication with {}", userAuth);
+ }
+
synchronized (lock) {
if (readyForAuth(userAuth)) {
processUserAuth(null);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java
index f6f301e..3c5efa6 100644
--- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java
+++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java
@@ -74,8 +74,10 @@ public class UserAuthKeyboardInteractive extends AbstractUserAuth {
prompt[i] = buffer.getString();
echo[i] = buffer.getBoolean();
}
- log.debug("Promt: {}", Arrays.toString(prompt));
- log.debug("Echo: {}", echo);
+ if (log.isDebugEnabled()) {
+ log.debug("Promt: {}", Arrays.toString(prompt));
+ log.debug("Echo: {}", echo);
+ }
String[] rep = null;
if (num == 0) {
@@ -113,7 +115,9 @@ public class UserAuthKeyboardInteractive extends AbstractUserAuth {
return Result.Failure;
}
default:
- log.debug("Received unknown packet {}", cmd);
+ if (log.isDebugEnabled()) {
+ log.debug("Received unknown packet {}", cmd);
+ }
return Result.Continued;
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/6c92dcce/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java
index 5ca0afe..7fd811b 100644
--- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java
+++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java
@@ -94,7 +94,9 @@ public class UserAuthPublicKey extends AbstractUserAuth {
} else {
int cmd = buffer.getUByte();
if (cmd == SshConstants.SSH_MSG_USERAUTH_SUCCESS) {
- log.debug("Received SSH_MSG_USERAUTH_SUCCESS");
+ if (log.isDebugEnabled()) {
+ log.debug("Received SSH_MSG_USERAUTH_SUCCESS");
+ }
return Result.Success;
}
if (cmd == SshConstants.SSH_MSG_USERAUTH_FAILURE) {
@@ -105,7 +107,9 @@ public class UserAuthPublicKey extends AbstractUserAuth {
}
return Result.Failure;
} else {
- log.debug("Received unknown packet {}", cmd);
+ if (log.isDebugEnabled()) {
+ log.debug("Received unknown packet {}", cmd);
+ }
// TODO: check packets
return Result.Continued;
}