You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2016/05/02 21:53:28 UTC
qpid-dispatch git commit: DISPATCH-287: Allow management access from
'localhost', '0.0.0.0',
and ''. This forgives dispatch tools underlying connection support variances
until the tools can go to a specific application/hostname on demand.
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 2a0e82fcb -> 9dede38ce
DISPATCH-287: Allow management access from 'localhost', '0.0.0.0', and ''.
This forgives dispatch tools underlying connection support variances until
the tools can go to a specific application/hostname on demand.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/9dede38c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/9dede38c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/9dede38c
Branch: refs/heads/master
Commit: 9dede38ce660293f9ffad78028d2b68bd8d381cc
Parents: 2a0e82f
Author: Chuck Rolke <cr...@redhat.com>
Authored: Mon May 2 15:52:42 2016 -0400
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Mon May 2 15:52:42 2016 -0400
----------------------------------------------------------------------
tests/policy-1/management-access.json | 49 +++++++++++++++++++-
tests/policy-2/test-router-with-policy.json.in | 44 ++++++++++++++++++
tests/policy-3/test-sender-receiver-limits.json | 44 ++++++++++++++++++
tests/system_tests_policy.py | 2 +-
4 files changed, 137 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9dede38c/tests/policy-1/management-access.json
----------------------------------------------------------------------
diff --git a/tests/policy-1/management-access.json b/tests/policy-1/management-access.json
index 9071d22..b642b94 100644
--- a/tests/policy-1/management-access.json
+++ b/tests/policy-1/management-access.json
@@ -18,7 +18,10 @@
##
# A policy to allow unrestricted access to management
-# from host 0.0.0.0
+# from host
+# 0.0.0.0 - proton 0.12
+# localhost - proton 0.13
+# unnamed host- proton 0.13
[
["policyRuleset", {
"applicationName": "",
@@ -41,5 +44,49 @@
}
}
}
+ ],
+ ["policyRuleset", {
+ "applicationName": "0.0.0.0",
+ "maxConnections": 50,
+ "maxConnPerUser": 5,
+ "maxConnPerHost": 20,
+ "connectionAllowDefault": true,
+ "settings": {
+ "default" : {
+ "maxFrameSize": 222222,
+ "maxMessageSize": 222222,
+ "maxSessionWindow": 222222,
+ "maxSessions": 2,
+ "maxSenders": 22,
+ "maxReceivers": 22,
+ "allowDynamicSrc": true,
+ "allowAnonymousSender": true,
+ "sources": "$management",
+ "targets": "$management"
+ }
+ }
+ }
+ ],
+ ["policyRuleset", {
+ "applicationName": "localhost",
+ "maxConnections": 50,
+ "maxConnPerUser": 5,
+ "maxConnPerHost": 20,
+ "connectionAllowDefault": true,
+ "settings": {
+ "default" : {
+ "maxFrameSize": 222222,
+ "maxMessageSize": 222222,
+ "maxSessionWindow": 222222,
+ "maxSessions": 2,
+ "maxSenders": 22,
+ "maxReceivers": 22,
+ "allowDynamicSrc": true,
+ "allowAnonymousSender": true,
+ "sources": "$management",
+ "targets": "$management"
+ }
+ }
+ }
]
]
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9dede38c/tests/policy-2/test-router-with-policy.json.in
----------------------------------------------------------------------
diff --git a/tests/policy-2/test-router-with-policy.json.in b/tests/policy-2/test-router-with-policy.json.in
index 13e04c9..ad07a8d 100644
--- a/tests/policy-2/test-router-with-policy.json.in
+++ b/tests/policy-2/test-router-with-policy.json.in
@@ -166,5 +166,49 @@
}
}
}
+ ],
+ ["policyRuleset", {
+ "applicationName": "0.0.0.0",
+ "maxConnections": 50,
+ "maxConnPerUser": 5,
+ "maxConnPerHost": 20,
+ "connectionAllowDefault": true,
+ "settings": {
+ "default" : {
+ "maxFrameSize": 222222,
+ "maxMessageSize": 222222,
+ "maxSessionWindow": 222222,
+ "maxSessions": 2,
+ "maxSenders": 22,
+ "maxReceivers": 22,
+ "allowDynamicSrc": true,
+ "allowAnonymousSender": true,
+ "sources": "public, private, $management",
+ "targets": "public, private, $management"
+ }
+ }
+ }
+ ],
+ ["policyRuleset", {
+ "applicationName": "localhost",
+ "maxConnections": 50,
+ "maxConnPerUser": 5,
+ "maxConnPerHost": 20,
+ "connectionAllowDefault": true,
+ "settings": {
+ "default" : {
+ "maxFrameSize": 222222,
+ "maxMessageSize": 222222,
+ "maxSessionWindow": 222222,
+ "maxSessions": 2,
+ "maxSenders": 22,
+ "maxReceivers": 22,
+ "allowDynamicSrc": true,
+ "allowAnonymousSender": true,
+ "sources": "public, private, $management",
+ "targets": "public, private, $management"
+ }
+ }
+ }
]
]
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9dede38c/tests/policy-3/test-sender-receiver-limits.json
----------------------------------------------------------------------
diff --git a/tests/policy-3/test-sender-receiver-limits.json b/tests/policy-3/test-sender-receiver-limits.json
index 33286a7..f7fc033 100644
--- a/tests/policy-3/test-sender-receiver-limits.json
+++ b/tests/policy-3/test-sender-receiver-limits.json
@@ -22,5 +22,49 @@
}
}
}
+ ],
+ ["policyRuleset", {
+ "applicationName": "0.0.0.0",
+ "maxConnections": 50,
+ "maxConnPerUser": 2,
+ "maxConnPerHost": 4,
+ "connectionAllowDefault": true,
+ "settings": {
+ "default" : {
+ "maxFrameSize": 222222,
+ "maxMessageSize": 222222,
+ "maxSessionWindow": 222222,
+ "maxSessions": 2,
+ "maxSenders": 2,
+ "maxReceivers": 4,
+ "allowDynamicSrc": true,
+ "allowAnonymousSender": true,
+ "sources": "*",
+ "targets": "*"
+ }
+ }
+ }
+ ],
+ ["policyRuleset", {
+ "applicationName": "localhost",
+ "maxConnections": 50,
+ "maxConnPerUser": 2,
+ "maxConnPerHost": 4,
+ "connectionAllowDefault": true,
+ "settings": {
+ "default" : {
+ "maxFrameSize": 222222,
+ "maxMessageSize": 222222,
+ "maxSessionWindow": 222222,
+ "maxSessions": 2,
+ "maxSenders": 2,
+ "maxReceivers": 4,
+ "allowDynamicSrc": true,
+ "allowAnonymousSender": true,
+ "sources": "*",
+ "targets": "*"
+ }
+ }
+ }
]
]
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9dede38c/tests/system_tests_policy.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_policy.py b/tests/system_tests_policy.py
index 176d3c1..3a3e123 100644
--- a/tests/system_tests_policy.py
+++ b/tests/system_tests_policy.py
@@ -107,7 +107,7 @@ class LoadPolicyFromFolder(TestCase):
addr = self.address()
rulesets = json.loads(self.run_qdmanage('query --type=policyRuleset'))
- self.assertEqual(len(rulesets), 3)
+ self.assertEqual(len(rulesets), 5)
class SenderReceiverLimits(TestCase):
"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org