From bfcfdb83a7d72ccc4ccd928e247fa34cca1b45af Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Fri, 1 Apr 2016 14:27:57 -0700
Subject: [PATCH] Closes #195

---
 lemur/certificates/views.py                   |  1 +
 lemur/plugins/lemur_verisign/plugin.py        |  6 ++++
 .../certificate/tracking.tpl.html             | 36 +++++++++++--------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/lemur/certificates/views.py b/lemur/certificates/views.py
index b6ddd5ce..432e6dbd 100644
--- a/lemur/certificates/views.py
+++ b/lemur/certificates/views.py
@@ -357,6 +357,7 @@ class CertificatesList(AuthenticatedResource):
         self.reqparse.add_argument('replacements', type=list, default=[], location='json')
         self.reqparse.add_argument('validityStart', type=str, location='json')  # TODO validate
         self.reqparse.add_argument('validityEnd', type=str, location='json')  # TODO validate
+        self.reqparse.add_argument('validityYears', type=int, location='json')  # TODO validate
         self.reqparse.add_argument('authority', type=valid_authority, location='json', required=True)
         self.reqparse.add_argument('description', type=str, location='json')
         self.reqparse.add_argument('country', type=str, location='json', required=True)
diff --git a/lemur/plugins/lemur_verisign/plugin.py b/lemur/plugins/lemur_verisign/plugin.py
index d4d18eca..ef0ba0e6 100644
--- a/lemur/plugins/lemur_verisign/plugin.py
+++ b/lemur/plugins/lemur_verisign/plugin.py
@@ -82,6 +82,12 @@ def process_options(options):
         data['specificEndDate'] = str(end_date)
         data['validityPeriod'] = period
 
+    elif options.get('validityYears'):
+        if options['validityYears'] in [1, 2]:
+            data['validityPeriod'] = str(options['validityYears']) + 'Y'
+        else:
+            raise Exception("Verisign issued certificates cannot exceed two years in validity")
+
     return data
 
 
diff --git a/lemur/static/app/angular/certificates/certificate/tracking.tpl.html b/lemur/static/app/angular/certificates/certificate/tracking.tpl.html
index e56541f0..54176eae 100644
--- a/lemur/static/app/angular/certificates/certificate/tracking.tpl.html
+++ b/lemur/static/app/angular/certificates/certificate/tracking.tpl.html
@@ -79,24 +79,32 @@
              tooltip="If no date is selected Lemur attempts to issue a 2 year certificate">
         Validity Range <span class="glyphicon glyphicon-question-sign"></span>
       </label>
-
-      <div class="col-sm-4">
-        <div>
-          <div class="input-group">
-            <input tooltip="Starting Date (yyyy/MM/dd)" class="form-control" datepicker-popup="yyyy/MM/dd"
-                   is-open="$parent.openNotBefore.isOpen" min-date="certificate.authority.notBefore"
-                   max-date="certificate.authority.maxDate" ng-model="certificate.validityStart"/>
-          <span class="input-group-btn">
-            <button class="btn btn-default" ng-click="openNotBefore($event)"><i
-              class="glyphicon glyphicon-calendar"></i></button>
-          </span>
-          </div>
+      <div class="col-sm-2">
+        <select ng-model="certificate.validityYears" class="form-control">
+          <option value="1">1 year</option>
+          <option value="2">2 years</option>
+          <option value="3">3 years</option>
+          <option value="4">4 years</option>
+        </select>
+      </div>
+      <span style="padding-top: 15px" class="text-center col-sm-1">
+        <strong>- or -</strong>
+      </span>
+      <div class="col-sm-3">
+        <div class="input-group">
+          <input tooltip="Starting Date (yyyy/MM/dd)" class="form-control" datepicker-popup="yyyy/MM/dd"
+                 is-open="$parent.openNotBefore.isOpen" min-date="certificate.authority.notBefore"
+                 max-date="certificate.authority.maxDate" ng-model="certificate.validityStart"/>
+        <span class="input-group-btn">
+          <button class="btn btn-default" ng-click="openNotBefore($event)"><i
+            class="glyphicon glyphicon-calendar"></i></button>
+        </span>
         </div>
       </div>
-      <span style="padding-top: 15px" class="text-center col-sm-2"><label><span
+      <span style="padding-top: 15px" class="text-center col-sm-1"><label><span
         class="glyphicon glyphicon-resize-horizontal"></span></label></span>
 
-      <div class="col-sm-4">
+      <div class="col-sm-3">
         <div>
           <div class="input-group">
             <input tooltip="Ending Date (yyyy/MM/dd)" class="form-control" datepicker-popup="yyyy/MM/dd"