diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-08 22:22:17 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-08 22:22:17 +0000 |
| commit | fb4989f8e1fecbe54e9fb61b223f2cd860671faf (patch) | |
| tree | 3692264139d712f1dd1bea024090f3cdba1e6423 /qpid/java/broker-core/src | |
| parent | eaf2392debf030ccec166c0ab6a6532cf94ab3a0 (diff) | |
| download | qpid-python-fb4989f8e1fecbe54e9fb61b223f2cd860671faf.tar.gz | |
QPID-5745 : [Java Broker] enforce disconnect of AMQP 0-x connections when authentication is not performed in a timely manner
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616899 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src')
4 files changed, 9 insertions, 3 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java index 8dabd3eed6..e98ff1a79a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java @@ -38,6 +38,12 @@ public interface Port<X extends Port<X>> extends ConfiguredObject<X> String KEY_STORE = "keyStore"; String TRUST_STORES = "trustStores"; + + String CONNECTION_MAXIMUM_AUTHENTICATION_DELAY = "connection.maximumAuthenticationDelay"; + + @ManagedContextDefault(name = CONNECTION_MAXIMUM_AUTHENTICATION_DELAY) + long DEFAULT_MAX_CONNECTION_AUTHENTICATION_DELAY = 10000l; + // Attributes @ManagedAttribute(defaultValue = "*") diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java index c9045999b9..5041e22104 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java @@ -89,7 +89,7 @@ public interface AMQConnectionModel<T extends AMQConnectionModel<T,S>, S extends long getLastIoTime(); - Port getPort(); + Port<?> getPort(); Transport getTransport(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java index fefd04e81d..0eabcd725e 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java @@ -293,7 +293,7 @@ public class MultiVersionProtocolEngine implements ServerProtocolEngine else { msgheader.limit(_header.remaining()); - msg.position(_header.remaining()); + msg.position(msg.position()+_header.remaining()); } _header.put(msgheader); diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java index c36f87c4ae..8d025c50dc 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java @@ -590,7 +590,7 @@ public class MockConsumer implements ConsumerTarget } @Override - public Port getPort() + public Port<?> getPort() { return null; } |