openstack
/
charm-rabbitmq-server
Code Issues Proposed changes

Grant user all permissions on default '/' vhost

This commit is contained in:
Adam Gandelman 2011-07-08 15:39:47 -07:00
parent 2af685aaf8
commit f57411b753
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hooks/amqp-relation-changed
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
set -ue set -ue
echo "CHANGED" >>/tmp/log
# peer gives us a username, we generate credentials and access in return
RABBIT_USER=`relation-get username` RABBIT_USER=`relation-get username`
RABBIT_PASSWD=`relation-get password`
DEFAULT_ETH=$(ip route | grep default | awk '{ print $5 }') DEFAULT_ETH=$(ip route | grep default | awk '{ print $5 }')
IP=$(ifconfig $DEFAULT_ETH | grep 'inet addr' | awk '{ print $2 }' | cut -d: -f2) IP=$(ifconfig $DEFAULT_ETH | grep 'inet addr' | awk '{ print $2 }' | cut -d: -f2)
@ -12,7 +12,15 @@ PASSWD_FILE="/var/run/ensemble/$RABBIT_USER.passwd"
if ! which pwgen ; then apt-get -y install pwgen ; fi if ! which pwgen ; then apt-get -y install pwgen ; fi
if [[ -z $RABBIT_USER ]] || [[ -z $RABBIT_PASSWD ]] ; then if [[ -e $PASSWD_FILE ]] ; then
PASSWORD=$(cat $PASSWD_FILE)
else
PASSWORD=$(pwgen 10 1)
echo $PASSWORD >$PASSWD_FILE
chmod 0400 $PASSWD_FILE
fi
if [[ -z $RABBIT_USER ]] ; then
ensemble-log "Peer not ready." ensemble-log "Peer not ready."
exit 0 exit 0
fi fi
@ -27,10 +35,14 @@ function user_is_admin {
function user_create { function user_create {
ensemble-log "Creating user $1." ensemble-log "Creating user $1."
PASSWORD=$(pwgen 10 1)
$RABBIT_CTL add_user $1 $PASSWORD || return 1 $RABBIT_CTL add_user $1 $PASSWORD || return 1
[[ ! -e $PASSWD_FILE ]] && echo $PASSWORD>$PASSWD_FILE
chmod 0400 $PASSWD_FILE # grant the user all permissions on the default vhost /
# TODO: investigate sane permissions
ensemble-log "Granting permission to $1 on vhost /"
$RABBIT_CTL set_permissions -p / $1 ".*" ".*" ".*"
if [[ $2 == 'admin' ]] ; then if [[ $2 == 'admin' ]] ; then
user_is_admin $1 && return 0 user_is_admin $1 && return 0
ensemble-log "Granting user $1 admin access" ensemble-log "Granting user $1 admin access"
@ -44,9 +56,6 @@ else
ensemble-log "RabbiqMQ user $RABBIT_USER already exists." ensemble-log "RabbiqMQ user $RABBIT_USER already exists."
fi fi
if [[ ! -e $PASSWD_FILE ]] ; then ensemble-log "Giving peer credentials for $RABBIT_USER@$IP"
ensemble-log "WARN: $RABBIT_USER exists, but $PASSWD_FILE does not!"
fi
ensemble-log "Giving peer my IP - $IP"
relation-set ip=$IP relation-set ip=$IP
relation-set password=$PASSWORD

2
metadata.yaml
View File

@ -1,6 +1,6 @@
ensemble: formula ensemble: formula
name: rabbitmq name: rabbitmq
revision: 11 revision: 15
summary: "An AMQP server written in Erlang" summary: "An AMQP server written in Erlang"
description: | description: |
RabbitMQ is an implementation of AMQP, the emerging standard for high RabbitMQ is an implementation of AMQP, the emerging standard for high