You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/22 12:53:13 UTC
[1/5] git commit: updated refs/heads/master to a3688e0
Repository: cloudstack
Updated Branches:
refs/heads/master 63203cec1 -> a3688e0eb
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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e66dd8c1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e66dd8c1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e66dd8c1
Branch: refs/heads/master
Commit: e66dd8c1e00abb9a3b4cbe0b8b50c83b251a728c
Parents: 62f57d2
Author: David Amorim Faria <d....@tech.leaseweb.com>
Authored: Mon Nov 16 16:02:46 2015 +0100
Committer: David Amorim Faria <d....@tech.leaseweb.com>
Committed: Mon Nov 16 19:30:25 2015 +0100
----------------------------------------------------------------------
packaging/package.sh | 168 ++++++++++++++++++++++++++--------------------
1 file changed, 95 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e66dd8c1/packaging/package.sh
----------------------------------------------------------------------
diff --git a/packaging/package.sh b/packaging/package.sh
index 5e7304a..484b398 100755
--- a/packaging/package.sh
+++ b/packaging/package.sh
@@ -18,26 +18,37 @@
function usage() {
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 "The commonly used Arguments are:"
- echo "-p|--pack oss|OSS To package with only redistributable libraries (default)"
- echo "-p|--pack noredist|NOREDIST To package with non-redistributable libraries"
- echo "-d centos7|centos63|fedora20|fedora21 To build a package for a distribution"
- echo "-s simulator|SIMULATOR To build for Simulator"
+ echo "The supported arguments are:"
+ echo " To package with only redistributable libraries (default)"
+ echo " -p|--pack oss|OSS"
+ echo " To package with non-redistributable libraries"
+ 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 "Examples: ./package.sh -p|--pack oss|OSS"
- echo " ./package.sh -p|--pack noredist|NOREDIST"
- echo " ./package.sh (Default OSS)"
- exit 1
+ echo "Examples: ./package.sh --pack oss"
+ echo " ./package.sh --pack noredist"
+ echo " ./package.sh --pack oss --distribution centos7 --release 42"
+ echo " ./package.sh --distribution centos7 --release 42"
+ echo " ./package.sh --distribution centos7"
}
# packaging
# $1 redist flag
# $2 simulator flag
# $3 distribution name
+# $4 package release version
function packaging() {
- CWD=`pwd`
+ CWD=$(pwd)
RPMDIR=$CWD/../dist/rpmbuild
PACK_PROJECT=cloudstack
if [ -n "$1" ] ; then
@@ -48,116 +59,127 @@ function packaging() {
fi
DISTRO=$3
- MVN=`which mvn`
+ MVN=$(which mvn)
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
- 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
fi
fi
- 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
- REALVER=`echo $VERSION | cut -d '-' -f 1`
- DEFVER="-D_ver $REALVER"
- DEFPRE="-D_prerelease 1"
- DEFREL="-D_rel SNAPSHOT"
+ 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
+ REALVER=$(echo "$VERSION" | cut -d '-' -f 1)
+ if [ -n "$4" ] ; then
+ DEFPRE="-D_prerelease $4"
+ DEFREL="-D_rel SNAPSHOT$4"
+ else
+ DEFPRE="-D_prerelease 1"
+ DEFREL="-D_rel SNAPSHOT"
+ fi
else
- REALVER=`echo $VERSION`
- DEFVER="-D_ver $REALVER"
- DEFREL="-D_rel 1"
+ REALVER="$VERSION"
+ if [ -n "$4" ] ; then
+ DEFREL="-D_rel $4"
+ else
+ DEFREL="-D_rel 1"
+ 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/BUILD
- mkdir -p $RPMDIR/RPMS
- mkdir -p $RPMDIR/SRPMS
- mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION
+ mkdir -p "$RPMDIR/SPECS"
+ mkdir -p "$RPMDIR/BUILD"
+ mkdir -p "$RPMDIR/RPMS"
+ mkdir -p "$RPMDIR/SRPMS"
+ mkdir -p "$RPMDIR/SOURCES/$PACK_PROJECT-$VERSION"
echo ". preparing source tarball"
- (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 ../; 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")
echo ". executing rpmbuild"
- cp $DISTRO/cloud.spec $RPMDIR/SPECS
-
- (cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} ${DEFOSSNOSS+"$DEFOSSNOSS"} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec)
+ cp "$DISTRO/cloud.spec" "$RPMDIR/SPECS"
+ (cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+$DEFOSSNOSS} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec)
if [ $? -ne 0 ]; then
echo "RPM Build Failed "
- exit 1
+ exit 3
else
echo "RPM Build Done"
fi
exit
-
}
-
TARGETDISTRO=""
-sim=""
-packageval=""
+SIM=""
+PACKAGEVAL=""
+RELEASE=""
- SHORTOPTS="hp:d:"
- LONGOPTS="help,pack:,simulator:distribution"
- ARGS=$(getopt -s bash -u -a --options $SHORTOPTS --longoptions $LONGOPTS --name $0 -- "$@")
- eval set -- "$ARGS"
- echo "$ARGS"
- while [ $# -gt 0 ] ; do
- case "$1" in
- -h | --help)
+SHORTOPTS="hp:s:d:r:"
+LONGOPTS="help,pack:simulator:distribution:release:"
+ARGS=$(getopt -s bash -u -a --options "$SHORTOPTS" --longoptions "$LONGOPTS" --name "$0" -- "$@")
+eval set -- "$ARGS"
+echo "$ARGS"
+while [ $# -gt 0 ] ; do
+ case "$1" in
+ -h | --help)
usage
exit 0
;;
-p | --pack)
- echo "Doing CloudStack Packaging ....."
- packageval=$2
- echo "$packageval"
- if [ "$packageval" == "oss" -o "$packageval" == "OSS" ] ; then
- packageval=""
- elif [ "$packageval" == "noredist" -o "$packageval" == "NOREDIST" ] ; then
- packageval="noredist"
+ echo "Packaging CloudStack..."
+ PACKAGEVAL=$2
+ echo "$PACKAGEVAL"
+ if [ "$PACKAGEVAL" == "oss" -o "$PACKAGEVAL" == "OSS" ] ; then
+ PACKAGEVAL=""
+ elif [ "$PACKAGEVAL" == "noredist" -o "$PACKAGEVAL" == "NOREDIST" ] ; then
+ PACKAGEVAL="noredist"
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
fi
shift
;;
-s | --simulator)
- sim=$2
- echo "$sim"
- if [ "$sim" == "default" -o "$sim" == "DEFAULT" ] ; then
- sim = "false"
- elif [ "$sim" == "simulator" -o "$sim" == "SIMULATOR" ] ; then
- sim="simulator"
+ SIM=$2
+ echo "$SIM"
+ if [ "$SIM" == "default" -o "$SIM" == "DEFAULT" ] ; then
+ SIM="false"
+ elif [ "$SIM" == "simulator" -o "$SIM" == "SIMULATOR" ] ; then
+ SIM="simulator"
else
- echo "Error: Incorrect value provided in package.sh script for -o, Please see help ./package.sh --help|-h for more details."
- exit 1
+ echo "Error: Unsupported value for --simulator"
+ usage
+ exit 1
fi
shift
;;
-d | --distribution)
TARGETDISTRO=$2
+ if [ -z "$TARGETDISTRO" ] ; then
+ echo "Error: Missing target distribution"
+ usage
+ exit 1
+ fi
+ shift
+ ;;
+ -r | --release)
+ RELEASE=$2
shift
;;
-)
- echo "Unrecognized option..."
+ echo "Error: Unrecognized option"
usage
exit 1
;;
*)
shift
;;
- esac
- done
+ esac
+done
- if [ -z "$TARGETDISTRO" ]
- then
- echo "Missing target distribution"
- usage
- exit 1
- fi
+packaging "$PACKAGEVAL" "$SIM" "$TARGETDISTRO" "$RELEASE"
- packaging "$packageval" "$sim" "$TARGETDISTRO"
[4/5] git commit: updated refs/heads/master to a3688e0
Posted by re...@apache.org.
Merge pull request #1058 from greenqloud/pr/password_security
Shuffling the password to avoid having a subset of characters in fixed positions.Related to CLOUDSTACK-9052.
I am shuffling the characters in the password, to avoid having a certain char type in fixed positions. I modified the tests accordingly to only check that the different character types are present.
I think it would be good to remove the hard requirement to have at least one of digits, upper-case, and lowercase chars, as it reduces the number of possible combinations passwords can take. What do you think?
* pr/1058:
CLOUDSTACK-9052 Shuffling the password to avoid having a subset of characters in fixed positions.
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3f7a86d8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3f7a86d8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3f7a86d8
Branch: refs/heads/master
Commit: 3f7a86d8efac3b198040be09f359727a6798dbf3
Parents: 7a77ddc 52ccfaa
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sun Nov 22 12:46:31 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Nov 22 12:46:32 2015 +0100
----------------------------------------------------------------------
.../java/com/cloud/utils/PasswordGenerator.java | 25 +++++++++----
.../com/cloud/utils/PasswordGeneratorTest.java | 39 ++++++++++++++++----
2 files changed, 48 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[2/5] git commit: updated refs/heads/master to a3688e0
Posted by re...@apache.org.
CLOUDSTACK-9052 Shuffling the password to avoid having a subset of characters in fixed positions.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52ccfaac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52ccfaac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52ccfaac
Branch: refs/heads/master
Commit: 52ccfaac0cb59163c408e1d465f0dffa40f1062b
Parents: e1cc673
Author: nnesic <ne...@greenqloud.com>
Authored: Tue Nov 10 17:22:31 2015 +0000
Committer: nnesic <ne...@greenqloud.com>
Committed: Thu Nov 19 13:17:20 2015 +0000
----------------------------------------------------------------------
.../java/com/cloud/utils/PasswordGenerator.java | 25 +++++++++----
.../com/cloud/utils/PasswordGeneratorTest.java | 39 ++++++++++++++++----
2 files changed, 48 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52ccfaac/utils/src/main/java/com/cloud/utils/PasswordGenerator.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/com/cloud/utils/PasswordGenerator.java b/utils/src/main/java/com/cloud/utils/PasswordGenerator.java
index 0d79143..3ba54f2 100644
--- a/utils/src/main/java/com/cloud/utils/PasswordGenerator.java
+++ b/utils/src/main/java/com/cloud/utils/PasswordGenerator.java
@@ -20,6 +20,9 @@
package com.cloud.utils;
import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import java.util.Random;
/**
@@ -48,14 +51,19 @@ public class PasswordGenerator {
password.append(generateAlphaNumeric(r));
}
} else {
- // Generate random 3-character string with a lowercase character,
- // uppercase character, and a digit
- password.append(generateLowercaseChar(r)).append(generateUppercaseChar(r)).append(generateDigit(r));
-
- // Generate a random n-character string with only lowercase
- // characters
- for (int i = 0; i < num - 3; i++) {
- password.append(generateLowercaseChar(r));
+ List<Character> passwordChars = new ArrayList<Character>();
+ passwordChars.add(generateLowercaseChar(r));
+ passwordChars.add(generateUppercaseChar(r));
+ passwordChars.add(generateDigit(r));
+
+ for (int i = passwordChars.size(); i < num; i++) {
+ passwordChars.add(generateAlphaNumeric(r));
+ }
+
+ Collections.shuffle(passwordChars, new SecureRandom());
+
+ for (char c : passwordChars) {
+ password.append(c);
}
}
@@ -87,4 +95,5 @@ public class PasswordGenerator {
return psk.toString();
}
+
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52ccfaac/utils/src/test/java/com/cloud/utils/PasswordGeneratorTest.java
----------------------------------------------------------------------
diff --git a/utils/src/test/java/com/cloud/utils/PasswordGeneratorTest.java b/utils/src/test/java/com/cloud/utils/PasswordGeneratorTest.java
index 413b866..e71436d 100644
--- a/utils/src/test/java/com/cloud/utils/PasswordGeneratorTest.java
+++ b/utils/src/test/java/com/cloud/utils/PasswordGeneratorTest.java
@@ -30,13 +30,36 @@ public class PasswordGeneratorTest {
Assert.assertTrue(PasswordGenerator.generateRandomPassword(1).length() == 3);
Assert.assertTrue(PasswordGenerator.generateRandomPassword(5).length() == 5);
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
- // char
- Assert.assertTrue(Character.isLowerCase(password.charAt(0)));
- // the second character is a random upper case char
- Assert.assertTrue(Character.isUpperCase(password.charAt(1)));
- // and the third is a digit
- Assert.assertTrue(Character.isDigit(password.charAt(2)));
+
+ Assert.assertTrue(containsDigit(password));
+ Assert.assertTrue(containsLowercase(password));
+ Assert.assertTrue(containsUppercase(password));
+ }
+
+ private boolean containsUppercase(String password) {
+ 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;
}
}
[3/5] git commit: updated refs/heads/master to a3688e0
Posted by re...@apache.org.
Merge pull request #1075 from davidamorimfaria/packaging_release_version
CLOUDSTACK-9065: Packaging RPM, add option for package release version, cleanup and lintIn package.sh
* lint
* adjust exit codes (1 for usage, 2 for maven, 3 for rpmbuild)
* fix variable naming for consistency
* add option for package release version
* revise synopsis and usage
* pr/1075:
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
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a77ddcd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a77ddcd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a77ddcd
Branch: refs/heads/master
Commit: 7a77ddcd80b2477736cf03afa019420542eb2a93
Parents: 238c483 e66dd8c
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Nov 21 19:15:08 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Nov 21 19:15:09 2015 +0100
----------------------------------------------------------------------
packaging/package.sh | 168 ++++++++++++++++++++++++++--------------------
1 file changed, 95 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
[5/5] git commit: updated refs/heads/master to a3688e0
Posted by re...@apache.org.
Merge release branch 4.6 to master
* 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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a3688e0e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a3688e0e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a3688e0e
Branch: refs/heads/master
Commit: a3688e0eb5a888dfb628d176f6aec0a634ba2d7e
Parents: 63203ce 3f7a86d
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sun Nov 22 12:52:43 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Nov 22 12:52:43 2015 +0100
----------------------------------------------------------------------
packaging/package.sh | 168 +++++++++++--------
.../java/com/cloud/utils/PasswordGenerator.java | 25 ++-
.../com/cloud/utils/PasswordGeneratorTest.java | 39 ++++-
3 files changed, 143 insertions(+), 89 deletions(-)
----------------------------------------------------------------------