You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2018/06/01 15:00:20 UTC
[10/11] qpid-dispatch git commit: Merge branch 'master' into
DISPATCH-965
Merge branch 'master' into DISPATCH-965
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/234be477
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/234be477
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/234be477
Branch: refs/heads/master
Commit: 234be477019c20ad4f70fb4c0e03625ce0f447f3
Parents: 85ef129 91def84
Author: Kenneth Giusti <kg...@apache.org>
Authored: Thu May 31 15:14:14 2018 -0400
Committer: Kenneth Giusti <kg...@apache.org>
Committed: Thu May 31 15:14:14 2018 -0400
----------------------------------------------------------------------
.gitignore | 1 +
CMakeLists.txt | 5 +-
README | 4 +-
console/README.md | 24 +
console/config/.gitignore | 2 -
console/config/README | 28 -
console/config/config.py | 467 -
console/config/css/brokers.ttf | Bin 2272 -> 0 bytes
console/config/css/dispatch.css | 738 -
console/config/css/mock.css | 165 -
console/config/css/plugin.css | 986 -
console/config/css/site-base.css | 4706 ---
console/config/deploy | 38 -
.../config/deployments/install_dispatch.yaml | 78 -
console/config/deployments/run_dispatch.yaml | 37 -
console/config/favicon-32x32.png | Bin 1055 -> 0 bytes
console/config/html/qdrTopology.html | 279 -
console/config/index.html | 91 -
console/config/js/dispatchPlugin.js | 157 -
console/config/js/qdrNewNode.js | 329 -
console/config/js/qdrService.js | 282 -
console/config/js/qdrTopology.js | 2034 --
console/config/mock/__init__.py | 23 -
console/config/mock/schema.py | 59 -
console/config/mock/section.py | 116 -
console/config/package.json | 37 -
console/config/schema.json | 1814 --
console/config/topologies/config-2/A.conf | 40 -
console/config/topologies/config-2/B.conf | 31 -
console/dispatch-dashboard/MANIFEST.in | 3 -
console/dispatch-dashboard/README.rst | 59 -
console/dispatch-dashboard/dispatch/__init__.py | 18 -
.../dispatch-dashboard/dispatch/dashboard.py | 28 -
.../dispatch/overv/__init__.py | 18 -
.../dispatch-dashboard/dispatch/overv/panel.py | 25 -
.../dispatch/overv/templates/overv/index.html | 32 -
.../dispatch-dashboard/dispatch/overv/tests.py | 24 -
.../dispatch-dashboard/dispatch/overv/urls.py | 25 -
.../dispatch-dashboard/dispatch/overv/views.py | 27 -
.../static/dashboard/dispatch/connect.json | 2 -
.../dashboard/dispatch/dispatch.comService.js | 937 -
.../dashboard/dispatch/dispatch.module.js | 256 -
.../static/dashboard/dispatch/dispatch.scss | 2135 --
.../dashboard/dispatch/jquery.dynatree.min.js | 4 -
.../static/dashboard/dispatch/lib/d3.v3.min.js | 5 -
.../static/dashboard/dispatch/lib/rhea-min.js | 4 -
.../static/dashboard/dispatch/lib/slider.js | 233 -
.../static/dashboard/dispatch/lib/ui-grid.js | 28540 -----------------
.../dispatch/overv/overview.controller.js | 1430 -
.../dashboard/dispatch/overv/overview.module.js | 178 -
.../dashboard/dispatch/qdrChartService.js | 1109 -
.../dispatch/topology/config-file-header.html | 17 -
.../topology/download-dialog-template.html | 42 -
.../dispatch/topology/node-config-template.html | 70 -
.../dispatch/topology/topology.controller.js | 1703 -
.../topology/topology.download-controller.js | 150 -
.../topology/topology.form-controller.js | 73 -
.../dispatch/topology/topology.module.js | 112 -
.../topology/topology.node-controller.js | 294 -
.../dispatch/templates/dispatch/base.html | 29 -
.../dispatch/topology/__init__.py | 18 -
.../dispatch/topology/panel.py | 25 -
.../topology/templates/topology/index.html | 54 -
.../dispatch/topology/tests.py | 24 -
.../dispatch/topology/urls.py | 25 -
.../dispatch/topology/views.py | 27 -
.../enabled/_4000_dispatch.py | 38 -
.../enabled/_4030_dispatch_overv_panel.py | 33 -
.../enabled/_4050_dispatch_topology_panel.py | 33 -
console/dispatch-dashboard/setup.py | 42 -
console/stand-alone/index.html | 35 +-
console/stand-alone/package.json | 3 +-
console/stand-alone/plugin/css/brokers.ttf | Bin 0 -> 2272 bytes
console/stand-alone/plugin/css/dispatch.css | 2164 ++
console/stand-alone/plugin/html/qdrCharts.html | 48 +
console/stand-alone/plugin/html/qdrConnect.html | 105 +
console/stand-alone/plugin/html/qdrList.html | 144 +
.../stand-alone/plugin/html/qdrOverview.html | 283 +
console/stand-alone/plugin/html/qdrSchema.html | 60 +
.../stand-alone/plugin/html/qdrTopology.html | 280 +
.../plugin/html/tmplChartConfig.html | 85 +
.../stand-alone/plugin/html/tmplListChart.html | 40 +
.../stand-alone/plugin/html/tmplListTree.html | 42 +
.../plugin/html/tmplOverviewTree.html | 48 +
console/stand-alone/plugin/js/chord/matrix.js | 19 +-
console/stand-alone/plugin/js/chord/qdrChord.js | 2 +-
console/stand-alone/plugin/js/dispatchPlugin.js | 10 +-
.../stand-alone/plugin/js/dlgChartController.js | 204 +
.../stand-alone/plugin/js/qdrChartService.js | 859 +
console/stand-alone/plugin/js/qdrCharts.js | 160 +
console/stand-alone/plugin/js/qdrGlobals.js | 46 +
console/stand-alone/plugin/js/qdrList.js | 940 +
console/stand-alone/plugin/js/qdrListChart.js | 146 +
console/stand-alone/plugin/js/qdrOverview.js | 1774 +
.../plugin/js/qdrOverviewChartsController.js | 134 +
.../plugin/js/qdrOverviewLogsController.js | 70 +
console/stand-alone/plugin/js/qdrSchema.js | 83 +
console/stand-alone/plugin/js/qdrService.js | 269 +
console/stand-alone/plugin/js/qdrSettings.js | 176 +
.../plugin/js/qdrTopAddressesController.js | 218 +
.../plugin/js/topology/qdrTopology.js | 1608 +
.../stand-alone/plugin/js/topology/traffic.js | 440 +
doc/book/policy.adoc | 59 +
include/qpid/dispatch/message.h | 12 +-
python/qpid_dispatch/management/qdrouter.json | 7 +
python/qpid_dispatch_internal/dispatch.py | 4 +
.../qpid_dispatch_internal/management/config.py | 17 +-
.../policy/policy_local.py | 33 +-
.../policy/policy_manager.py | 8 +
src/dispatch.c | 15 +
src/http-libwebsockets.c | 16 +-
src/message.c | 18 +-
src/message_private.h | 1 +
src/policy.c | 109 +-
src/policy.h | 25 +
src/router_core/connections.c | 2 +
src/router_core/forwarder.c | 9 +-
src/router_core/router_core_private.h | 2 +-
src/router_core/transfer.c | 60 +-
tests/CMakeLists.txt | 1 +
tests/parse_tree_tests.c | 67 +
tests/policy-8/management-access.json | 46 +
..._tests_disallow_link_resumable_link_route.py | 3 +-
tests/system_tests_one_router.py | 141 +-
tests/system_tests_policy.py | 75 +
tests/system_tests_ssl.py | 592 +
126 files changed, 11675 insertions(+), 50614 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/234be477/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 52d844c,4ab831e..0b06144
--- a/.gitignore
+++ b/.gitignore
@@@ -13,4 -13,4 +13,5 @@@ tests/policy-1/policy-*.jso
.settings
console/test/topolgies/config-*
.history
+.tox
+ .vscode
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/234be477/python/qpid_dispatch_internal/dispatch.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/234be477/python/qpid_dispatch_internal/management/config.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/234be477/python/qpid_dispatch_internal/policy/policy_local.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/234be477/python/qpid_dispatch_internal/policy/policy_manager.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/234be477/src/policy.c
----------------------------------------------------------------------
diff --cc src/policy.c
index 35f3fb8,c7f9e50..31d31da
--- a/src/policy.c
+++ b/src/policy.c
@@@ -558,16 -574,15 +583,16 @@@ bool _qd_policy_approve_link_name(cons
// Create a temporary writable copy of incoming allowed list
char t_allow[QPALN_SIZE + 1]; // temporary buffer for normal allow lists
+ int buflen = sizeof(t_allow);
char * pa = t_allow;
- if (a_len > QPALN_SIZE) {
- pa = (char *)malloc(a_len + 1); // malloc a buffer for larger allow lists
+ if (a_len >= buflen) {
+ buflen = a_len + 1;
+ pa = (char *)malloc(buflen); // malloc a buffer for larger allow lists
+ if (!pa)
+ return false;
}
- strcpy(pa, allowed);
- if (!pa)
- return false;
--
+ strcpy(pa, allowed); /* We know we have allocated enoough space */
+ pa[a_len] = 0;
// Do reverse user substitution into proposed
char substbuf[QPALN_USERBUFSIZE];
char * prop2 = _qd_policy_link_user_name_subst(username, proposed, substbuf, QPALN_USERBUFSIZE);
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/234be477/tests/CMakeLists.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/234be477/tests/system_tests_disallow_link_resumable_link_route.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/234be477/tests/system_tests_one_router.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/234be477/tests/system_tests_policy.py
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org