Mailing-List: contact dev-help@brooklyn.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@brooklyn.incubator.apache.org
From: grkvlt <git@git.apache.org>
To: dev@brooklyn.incubator.apache.org
Reply-To: dev@brooklyn.incubator.apache.org
References: <git-pr-225-incubator-brooklyn@git.apache.org>
In-Reply-To: <git-pr-225-incubator-brooklyn@git.apache.org>
Subject: [GitHub] incubator-brooklyn pull request: Miscellaneous 20141007
Content-Type: text/plain
Message-Id: <20141008010007.59D4090632B@tyr.zones.apache.org>
Date: Wed,  8 Oct 2014 01:00:07 +0000 (UTC)

Github user grkvlt commented on a diff in the pull request:

    https://github.com/apache/incubator-brooklyn/pull/225#discussion_r18559698
  
    --- Diff: 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}
    --- End diff --
    
    Note that they won't actually work with the M1 release in the script; but if you change version to 0.7.0-SNAPSHOT I think it's all good.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---