root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'stable' into rabbitmq-management-236

This commit is contained in:
Jean-Sébastien Pédron 2016-11-24 12:09:26 +01:00
parent 347fe1f330 6b926bbf73
commit a30b6072b9
4 changed files with 442 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbitmq_management/Makefile vendored
View File

@ -1,7 +1,7 @@
PROJECT = rabbitmq_management
DEPS = rabbit_common rabbit amqp_client cowboy cowlib rabbitmq_web_dispatch rabbitmq_management_agent
TEST_DEPS = rabbitmq_ct_helpers proper
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers proper
dep_cowboy_commit = 1.0.3
dep_rabbitmq_web_dispatch = git https://github.com/rabbitmq/rabbitmq-web-dispatch.git stable
LOCAL_DEPS += xmerl mnesia ranch ssl crypto public_key

729
deps/rabbitmq_management/erlang.mk vendored
View File

File diff suppressed because it is too large Load Diff

14
deps/rabbitmq_management/priv/www/js/main.js vendored
View File

@ -33,6 +33,19 @@ function login_route () {
// we've changed url.
}
function login_route_with_path() {
var params = ('' + this.params['splat']).split('/');
var user = params.shift();
var pass = params.shift();
var userpass = '' + user + ':' + pass,
location = window.location.href,
hash = window.location.hash;
set_auth_pref(decodeURIComponent(userpass));
location = location.substr(0, location.length - hash.length) + '#/' + params.join('/');
check_login();
window.location.replace(location);
}
function start_app_login() {
app = new Sammy.Application(function () {
this.put('#/login', function() {
@ -42,6 +55,7 @@ function start_app_login() {
check_login();
});
this.get('#/login/:username/:password', login_route);
this.get(/\#\/login\/(.*)/, login_route_with_path);
});
app.run();
if (get_pref('auth') != null) {

4
deps/rabbitmq_management/rabbitmq-components.mk vendored
View File

@ -26,8 +26,10 @@ dep_rabbitmq_auth_backend_ldap = git_rmq rabbitmq-auth-backend-ldap $(cur
dep_rabbitmq_auth_mechanism_ssl = git_rmq rabbitmq-auth-mechanism-ssl $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_boot_steps_visualiser = git_rmq rabbitmq-boot-steps-visualiser $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_clusterer = git_rmq rabbitmq-clusterer $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_cli = git_rmq rabbitmq-cli $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_codegen = git_rmq rabbitmq-codegen $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_consistent_hash_exchange = git_rmq rabbitmq-consistent-hash-exchange $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_ct_client_helpers = git_rmq rabbitmq-ct-client-helpers $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_ct_helpers = git_rmq rabbitmq-ct-helpers $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_delayed_message_exchange = git_rmq rabbitmq-delayed-message-exchange $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_dotnet_client = git_rmq rabbitmq-dotnet-client $(current_rmq_ref) $(base_rmq_ref) master
@ -88,8 +90,10 @@ RABBITMQ_COMPONENTS = amqp_client \
rabbitmq_auth_mechanism_ssl \
rabbitmq_boot_steps_visualiser \
rabbitmq_clusterer \
rabbitmq_cli \
rabbitmq_codegen \
rabbitmq_consistent_hash_exchange \
rabbitmq_ct_client_helpers \
rabbitmq_ct_helpers \
rabbitmq_delayed_message_exchange \
rabbitmq_dotnet_client \