You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/02/05 12:52:48 UTC
[7/7] git commit: updated refs/heads/master to c31e8e7
CLOUDSTACK-8215: Change Date calculation to Joda DateTime
(cherry picked from commit 03e07c41b5835e2a2007d132a0987cc371537ada)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c31e8e74
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c31e8e74
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c31e8e74
Branch: refs/heads/master
Commit: c31e8e7409bf0b2104cd6be89d5608edfe089c3f
Parents: fdf4bd2
Author: Erik Weber <te...@gmail.com>
Authored: Thu Feb 5 11:31:42 2015 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Feb 5 17:22:31 2015 +0530
----------------------------------------------------------------------
.../apache/cloudstack/utils/auth/SAMLUtils.java | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c31e8e74/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
index 7ad74bc..a6d2d34 100644
--- a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
+++ b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
@@ -25,6 +25,7 @@ import org.apache.log4j.Logger;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.x509.X509V1CertificateGenerator;
import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
import org.opensaml.Configuration;
import org.opensaml.common.SAMLVersion;
import org.opensaml.common.xml.SAMLConstants;
@@ -89,8 +90,6 @@ import java.security.cert.X509Certificate;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
-import java.util.Calendar;
-import java.util.Date;
import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
@@ -315,25 +314,16 @@ public class SAMLUtils {
}
public static X509Certificate generateRandomX509Certificate(KeyPair keyPair) throws NoSuchAlgorithmException, NoSuchProviderException, CertificateEncodingException, SignatureException, InvalidKeyException {
- Date referenceDate = new Date();
- Calendar validityBeginDate = Calendar.getInstance();
- validityBeginDate.setTime(referenceDate);
- validityBeginDate.add(Calendar.DAY_OF_YEAR, -1);
-
- Calendar validityEndDate = Calendar.getInstance();
- validityEndDate.setTime(referenceDate);
- validityEndDate.add(Calendar.YEAR, 3);
-
+ DateTime now = DateTime.now(DateTimeZone.UTC);
X500Principal dnName = new X500Principal("CN=ApacheCloudStack");
X509V1CertificateGenerator certGen = new X509V1CertificateGenerator();
certGen.setSerialNumber(BigInteger.valueOf(System.currentTimeMillis()));
certGen.setSubjectDN(dnName);
certGen.setIssuerDN(dnName);
- certGen.setNotBefore(validityBeginDate.getTime());
- certGen.setNotAfter(validityEndDate.getTime());
+ certGen.setNotBefore(now.minusDays(1).toDate());
+ certGen.setNotAfter(now.plusYears(3).toDate());
certGen.setPublicKey(keyPair.getPublic());
certGen.setSignatureAlgorithm("SHA256WithRSAEncryption");
-
return certGen.generate(keyPair.getPrivate(), "BC");
}