apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.6 to master

Browse Source 
* 4.6:
  CLOUDSTACK-9052 Shuffling the password to avoid having a subset of characters in fixed positions.
  Refactor package.sh:  * lint  * adjust exit codes (1 for usage, 2 for maven, 3 for rpmbuild)  * variable naming consistency  * add option for package release version  * revise synopsis and usage
This commit is contained in:
Remi Bergsma 2015-11-22 12:52:43 +01:00
commit a3688e0eb5
3 changed files with 142 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
packaging/package.sh
View File

@ -18,26 +18,37 @@
function usage() { function usage() {
echo "" echo ""
echo "usage: ./package.sh [-p|--pack] [-h|--help] [ARGS]" echo "usage: ./package.sh [-h|--help] -d|--distribution <name> [-r|--release <version>] [-p|--pack oss|OSS|noredist|NOREDIST] [-s|--simulator default|DEFAULT|simulator|SIMULATOR]"
echo "" echo ""
echo "The commonly used Arguments are:" echo "The supported arguments are:"
echo "-p|--pack oss|OSS To package with only redistributable libraries (default)" echo " To package with only redistributable libraries (default)"
echo "-p|--pack noredist|NOREDIST To package with non-redistributable libraries" echo " -p|--pack oss|OSS"
echo "-d centos7|centos63|fedora20|fedora21 To build a package for a distribution" echo " To package with non-redistributable libraries"
echo "-s simulator|SIMULATOR To build for Simulator" echo " -p|--pack noredist|NOREDIST"
echo " To build a package for a distribution (mandatory)"
echo " -d|--distribution centos7|centos63|fedora20|fedora21"
echo " To set the package release version (optional)"
echo " (default is 1 for normal and prereleases, empty for SNAPSHOT)"
echo " -r|--release version(integer)"
echo " To build for Simulator (optional)"
echo " -s|--simulator default|DEFAULT|simulator|SIMULATOR"
echo " To display this information"
echo " -h|--help"
echo "" echo ""
echo "Examples: ./package.sh -p|--pack oss|OSS" echo "Examples: ./package.sh --pack oss"
echo " ./package.sh -p|--pack noredist|NOREDIST" echo " ./package.sh --pack noredist"
echo " ./package.sh (Default OSS)" echo " ./package.sh --pack oss --distribution centos7 --release 42"
exit 1 echo " ./package.sh --distribution centos7 --release 42"
echo " ./package.sh --distribution centos7"
} }
# packaging # packaging
# $1 redist flag # $1 redist flag
# $2 simulator flag # $2 simulator flag
# $3 distribution name # $3 distribution name
# $4 package release version
function packaging() { function packaging() {
CWD=`pwd` CWD=$(pwd)
RPMDIR=$CWD/../dist/rpmbuild RPMDIR=$CWD/../dist/rpmbuild
PACK_PROJECT=cloudstack PACK_PROJECT=cloudstack
if [ -n "$1" ] ; then if [ -n "$1" ] ; then
@ -48,61 +59,67 @@ function packaging() {
fi fi
DISTRO=$3 DISTRO=$3
MVN=`which mvn` MVN=$(which mvn)
if [ -z "$MVN" ] ; then if [ -z "$MVN" ] ; then
MVN=`locate bin/mvn | grep -e mvn$ | tail -1` MVN=$(locate bin/mvn | grep -e mvn$ | tail -1)
if [ -z "$MVN" ] ; then if [ -z "$MVN" ] ; then
echo "mvn not found\n cannot retrieve version to package\n RPM Build Failed" echo -e "mvn not found\n cannot retrieve version to package\n RPM Build Failed"
exit 2 exit 2
fi fi
fi fi
VERSION=`(cd ../; $MVN org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep --color=none '^[0-9]\.'` VERSION=$(cd ../; $MVN org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep --color=none '^[0-9]\.')
if echo $VERSION | grep -q SNAPSHOT ; then if echo "$VERSION" | grep -q SNAPSHOT ; then
REALVER=`echo $VERSION | cut -d '-' -f 1` REALVER=$(echo "$VERSION" | cut -d '-' -f 1)
DEFVER="-D_ver $REALVER" if [ -n "$4" ] ; then
DEFPRE="-D_prerelease $4"
DEFREL="-D_rel SNAPSHOT$4"
else
DEFPRE="-D_prerelease 1" DEFPRE="-D_prerelease 1"
DEFREL="-D_rel SNAPSHOT" DEFREL="-D_rel SNAPSHOT"
fi
else
REALVER="$VERSION"
if [ -n "$4" ] ; then
DEFREL="-D_rel $4"
else else
REALVER=`echo $VERSION`
DEFVER="-D_ver $REALVER"
DEFREL="-D_rel 1" DEFREL="-D_rel 1"
fi fi
fi
DEFVER="-D_ver $REALVER"
echo Preparing to package Apache CloudStack ${VERSION} echo "Preparing to package Apache CloudStack $VERSION"
mkdir -p $RPMDIR/SPECS mkdir -p "$RPMDIR/SPECS"
mkdir -p $RPMDIR/BUILD mkdir -p "$RPMDIR/BUILD"
mkdir -p $RPMDIR/RPMS mkdir -p "$RPMDIR/RPMS"
mkdir -p $RPMDIR/SRPMS mkdir -p "$RPMDIR/SRPMS"
mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION mkdir -p "$RPMDIR/SOURCES/$PACK_PROJECT-$VERSION"
echo ". preparing source tarball" echo ". preparing source tarball"
(cd ../; tar -c --exclude .git --exclude dist . | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x ) (cd ../; tar -c --exclude .git --exclude dist . | tar -C "$RPMDIR/SOURCES/$PACK_PROJECT-$VERSION" -x )
(cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION) (cd "$RPMDIR/SOURCES/"; tar -czf "$PACK_PROJECT-$VERSION.tgz" "$PACK_PROJECT-$VERSION")
echo ". executing rpmbuild" echo ". executing rpmbuild"
cp $DISTRO/cloud.spec $RPMDIR/SPECS cp "$DISTRO/cloud.spec" "$RPMDIR/SPECS"
(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} ${DEFOSSNOSS+"$DEFOSSNOSS"} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec)
(cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+$DEFOSSNOSS} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "RPM Build Failed " echo "RPM Build Failed "
exit 1 exit 3
else else
echo "RPM Build Done" echo "RPM Build Done"
fi fi
exit exit
} }
TARGETDISTRO="" TARGETDISTRO=""
sim="" SIM=""
packageval="" PACKAGEVAL=""
RELEASE=""
SHORTOPTS="hp:d:" SHORTOPTS="hp:s:d:r:"
LONGOPTS="help,pack:,simulator:distribution" LONGOPTS="help,pack:simulator:distribution:release:"
ARGS=$(getopt -s bash -u -a --options $SHORTOPTS --longoptions $LONGOPTS --name $0 -- "$@") ARGS=$(getopt -s bash -u -a --options "$SHORTOPTS" --longoptions "$LONGOPTS" --name "$0" -- "$@")
eval set -- "$ARGS" eval set -- "$ARGS"
echo "$ARGS" echo "$ARGS"
while [ $# -gt 0 ] ; do while [ $# -gt 0 ] ; do
@ -112,38 +129,49 @@ packageval=""
exit 0 exit 0
;; ;;
-p | --pack) -p | --pack)
echo "Doing CloudStack Packaging ....." echo "Packaging CloudStack..."
packageval=$2 PACKAGEVAL=$2
echo "$packageval" echo "$PACKAGEVAL"
if [ "$packageval" == "oss" -o "$packageval" == "OSS" ] ; then if [ "$PACKAGEVAL" == "oss" -o "$PACKAGEVAL" == "OSS" ] ; then
packageval="" PACKAGEVAL=""
elif [ "$packageval" == "noredist" -o "$packageval" == "NOREDIST" ] ; then elif [ "$PACKAGEVAL" == "noredist" -o "$PACKAGEVAL" == "NOREDIST" ] ; then
packageval="noredist" PACKAGEVAL="noredist"
else else
echo "Error: Incorrect value provided in package.sh script, Please see help ./package.sh --help|-h for more details." echo "Error: Unsupported value for --pack"
usage
exit 1 exit 1
fi fi
shift shift
;; ;;
-s | --simulator) -s | --simulator)
sim=$2 SIM=$2
echo "$sim" echo "$SIM"
if [ "$sim" == "default" -o "$sim" == "DEFAULT" ] ; then if [ "$SIM" == "default" -o "$SIM" == "DEFAULT" ] ; then
sim = "false" SIM="false"
elif [ "$sim" == "simulator" -o "$sim" == "SIMULATOR" ] ; then elif [ "$SIM" == "simulator" -o "$SIM" == "SIMULATOR" ] ; then
sim="simulator" SIM="simulator"
else else
echo "Error: Incorrect value provided in package.sh script for -o, Please see help ./package.sh --help|-h for more details." echo "Error: Unsupported value for --simulator"
usage
exit 1 exit 1
fi fi
shift shift
;; ;;
-d | --distribution) -d | --distribution)
TARGETDISTRO=$2 TARGETDISTRO=$2
if [ -z "$TARGETDISTRO" ] ; then
echo "Error: Missing target distribution"
usage
exit 1
fi
shift
;;
-r | --release)
RELEASE=$2
shift shift
;; ;;
-) -)
echo "Unrecognized option..." echo "Error: Unrecognized option"
usage usage
exit 1 exit 1
;; ;;
@ -153,11 +181,5 @@ packageval=""
esac esac
done done
if [ -z "$TARGETDISTRO" ] packaging "$PACKAGEVAL" "$SIM" "$TARGETDISTRO" "$RELEASE"
then
echo "Missing target distribution"
usage
exit 1
fi
packaging "$packageval" "$sim" "$TARGETDISTRO"

23
utils/src/main/java/com/cloud/utils/PasswordGenerator.java
View File

@ -20,6 +20,9 @@
package com.cloud.utils; package com.cloud.utils;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random; import java.util.Random;
/** /**
@ -48,14 +51,19 @@ public class PasswordGenerator {
password.append(generateAlphaNumeric(r)); password.append(generateAlphaNumeric(r));
} }
} else { } else {
// Generate random 3-character string with a lowercase character, List<Character> passwordChars = new ArrayList<Character>();
// uppercase character, and a digit passwordChars.add(generateLowercaseChar(r));
password.append(generateLowercaseChar(r)).append(generateUppercaseChar(r)).append(generateDigit(r)); passwordChars.add(generateUppercaseChar(r));
passwordChars.add(generateDigit(r));
// Generate a random n-character string with only lowercase for (int i = passwordChars.size(); i < num; i++) {
// characters passwordChars.add(generateAlphaNumeric(r));
for (int i = 0; i < num - 3; i++) { }
password.append(generateLowercaseChar(r));
Collections.shuffle(passwordChars, new SecureRandom());
for (char c : passwordChars) {
password.append(c);
} }
} }
@ -87,4 +95,5 @@ public class PasswordGenerator {
return psk.toString(); return psk.toString();
} }
} }

39
utils/src/test/java/com/cloud/utils/PasswordGeneratorTest.java
View File

@ -30,13 +30,36 @@ public class PasswordGeneratorTest {
Assert.assertTrue(PasswordGenerator.generateRandomPassword(1).length() == 3); Assert.assertTrue(PasswordGenerator.generateRandomPassword(1).length() == 3);
Assert.assertTrue(PasswordGenerator.generateRandomPassword(5).length() == 5); Assert.assertTrue(PasswordGenerator.generateRandomPassword(5).length() == 5);
String password = PasswordGenerator.generateRandomPassword(8); String password = PasswordGenerator.generateRandomPassword(8);
// TODO: this might give more help to bruteforcing than desired
// the actual behavior is that the first character is a random lowercase Assert.assertTrue(containsDigit(password));
// char Assert.assertTrue(containsLowercase(password));
Assert.assertTrue(Character.isLowerCase(password.charAt(0))); Assert.assertTrue(containsUppercase(password));
// the second character is a random upper case char }
Assert.assertTrue(Character.isUpperCase(password.charAt(1)));
// and the third is a digit private boolean containsUppercase(String password) {
Assert.assertTrue(Character.isDigit(password.charAt(2))); for (char c : password.toCharArray()) {
if (Character.isUpperCase(c)) {
return true;
}
}
return false;
}
private boolean containsLowercase(String password) {
for (char c : password.toCharArray()) {
if (Character.isLowerCase(c)) {
return true;
}
}
return false;
}
private boolean containsDigit(String password) {
for (char c : password.toCharArray()) {
if (Character.isDigit(c)) {
return true;
}
}
return false;
} }
} }