brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [1/2] git commit: Fix password generation in install script
Date Wed, 08 Oct 2014 22:50:55 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master f7d8691c4 -> d27b7851c


Fix password generation in install script


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ac3887e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ac3887e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ac3887e8

Branch: refs/heads/master
Commit: ac3887e8248796565563936514af8cc5158a31c9
Parents: f7d8691
Author: Andrew Kennedy <grkvlt@apache.org>
Authored: Wed Oct 8 00:09:52 2014 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Wed Oct 8 23:48:58 2014 +0100

----------------------------------------------------------------------
 brooklyn-install.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac3887e8/brooklyn-install.sh
----------------------------------------------------------------------
diff --git a/brooklyn-install.sh b/brooklyn-install.sh
index 2ee166a..b28984b 100755
--- a/brooklyn-install.sh
+++ b/brooklyn-install.sh
@@ -237,20 +237,19 @@ if ! ssh ${SSH_OPTS} ${USER}@${HOST} "test -f .brooklyn/brooklyn.properties";
th
     log -n "Configuring Brooklyn properties..."
     ssh ${SSH_OPTS} ${USER}@${HOST} "mkdir -p .brooklyn"
     ssh ${SSH_OPTS} ${USER}@${HOST} "curl -L -s -o .brooklyn/brooklyn.properties http://brooklyncentral.github.io/use/guide/quickstart/brooklyn.properties"
-    ssh ${SSH_OPTS} ${USER}@${HOST} "curl -L -s -o .brooklyn/catalog.xml http://brooklyncentral.github.io/use/guide/quickstart/catalog.xml"
 
     # Generate Brooklyn admin password
     if ${GENERATE_PASSWORD}; then
-        GENERATED=$(dd if=/dev/random bs=1 count=8 2> /dev/null | uuencode -m - | sed
-n 2p | tr -dc "A-Za-z0-9")
+        GENERATED=$(dd if=/dev/random bs=1 count=32 2> /dev/null | uuencode -m - | sed
-n 2p | tr -dc "A-Za-z0-9")
         SALT=$(echo ${GENERATED} | cut -c1-4)
         PASSWORD=$(echo ${GENERATED} | cut -c5-12)
         which shasum && SHA256="shasum -a 256"
         which sha256sum && SHA256="sha256sum"
-        HASH=$(echo -n ${SALT}${PASSWORD} | ${SHA256} | cut -d\  -f1)
+        HASH=$(printf '${SALT}${PASSWORD}\\00' | ${SHA256} | cut -d\  -f1)
         ssh ${SSH_OPTS} ${USER}@${HOST} "tee -a .brooklyn/brooklyn.properties" > /dev/null
2>&1 <<EOF
-brooklyn.webconsole.security.users=${USER}
-brooklyn.webconsole.security.user.${USER}=${SALT}
-brooklyn.webconsole.security.user.${USER}=${HASH}
+brooklyn.webconsole.security.users = ${USER}
+brooklyn.webconsole.security.user.${USER}.salt = ${SALT}
+brooklyn.webconsole.security.user.${USER}.sha256 = ${HASH}
 EOF
     else
         ssh ${SSH_OPTS} ${USER}@${HOST} "sed -i.bak 's/^# brooklyn.webconsole.security.provider
= brooklyn.rest.security.provider.AnyoneSecurityProvider/brooklyn.webconsole.security.provider
= brooklyn.rest.security.provider.AnyoneSecurityProvider/' .brooklyn/brooklyn.properties"


Mime
View raw message