digicert 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd07d0672b7d9440725cbdc1156f2ed227d5a8cc
-  data.tar.gz: 3dcc363333f577e065de67969432da97c22f25fd
+  metadata.gz: e2099a3dbed371814f946054f72c991ca11b8327
+  data.tar.gz: 14593dbf7ac9ef432fb80fdf1314d6dfc790b81e
 SHA512:
-  metadata.gz: 05c814b1d75b31baee08750aba853d8516c218f45ca67767b772157447f68fc51956eb10864b83277c033d9f5a1774b25498f028748fb8a8ad23e5724a699da8
-  data.tar.gz: 2f4691a607f4a97a459212a00ef1d407593019f581abe204ba32d062702ac0359f313200f17948dae6c277b4bb06aef6838767429280d69bd74b27369a9627fb
+  metadata.gz: 9914c23d6e411677f84f8d926408d85a6487f4d050d573106c3e3b23b0df6380acd914b670e59c777650f9330e3ea6fcb68f7a9b63632a77158f70721a9203bf
+  data.tar.gz: d970af1cb439d97d7c9a35f70ebae5b813149b208922641983e3c0c4120d32c8c5075db0344d385b260d75ad0cb4cac2fdf419d10fb882bbaec5387368cd5e1c

data/.rubocop.yml

@@ -1,9 +1,4 @@
 AllCops:
-  Include:
-    - "**/*.rake"
-    - "**/Gemfile"
-    - "**/Rakefile"
-
   Exclude:
     - db/schema.rb
 
@@ -357,8 +352,18 @@ Style/TrailingCommaInArguments:
     - no_comma
   Enabled: true
 
-Style/TrailingCommaInLiteral:
-  Description: 'Checks for trailing comma in array and hash literals.'
+Style/TrailingCommaInArrayLiteral:
+  Description: 'Checks for trailing comma in array literals.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
+  EnforcedStyleForMultiline: comma
+  SupportedStylesForMultiline:
+    - comma
+    - consistent_comma
+    - no_comma
+  Enabled: true
+
+Style/TrailingCommaInHashLiteral:
+  Description: 'Checks for trailing comma in hash literals.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
   EnforcedStyleForMultiline: comma
   SupportedStylesForMultiline:
@@ -403,6 +408,13 @@ Layout/AlignParameters:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-double-indent'
   Enabled: false
 
+Layout/ConditionPosition:
+  Description: >-
+                 Checks for condition placed in a confusing position relative to
+                 the keyword.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#same-line-condition'
+  Enabled: false
+
 Layout/DotPosition:
   Description: 'Checks the position of the dot in multi-line method calls.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains'
@@ -455,13 +467,6 @@ Lint/CircularArgumentReference:
   Description: "Don't refer to the keyword argument in the default value."
   Enabled: false
 
-Lint/ConditionPosition:
-  Description: >-
-                 Checks for condition placed in a confusing position relative to
-                 the keyword.
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#same-line-condition'
-  Enabled: false
-
 Lint/DeprecatedClassMethods:
   Description: 'Check for deprecated class method calls.'
   Enabled: false
@@ -487,7 +492,7 @@ Lint/HandleExceptions:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions'
   Enabled: false
 
-Lint/LiteralInCondition:
+Lint/LiteralAsCondition:
   Description: 'Checks of literals used in conditions.'
   Enabled: false
 
@@ -528,7 +533,7 @@ Lint/UnderscorePrefixedVariableName:
   Description: 'Do not use prefix `_` for a variable that is used.'
   Enabled: false
 
-Lint/UnneededDisable:
+Lint/UnneededCopDisableDirective:
   Description: >-
                  Checks for rubocop:disable comments that can be removed.
                  Note: this cop is not disabled when disabling all cops.

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.4.0 (2018-07-22)
+
+* Add option support on certificate duplication
+* Fix duplicate certificate finder related issue
+* Fix duplication issue for `EV Plus` certificate
+* Fix server platform id issue from order manager
+
 ## 0.3.0 (2017-12-08)
 
 * Minor updates in the readme and `rubocop` configuration

data/lib/digicert/duplicate_certificate_finder.rb

@@ -5,7 +5,11 @@ module Digicert
     end
 
     def find
-      certificate_by_date_created
+      certificate_by_date_created || raise(
+        Digicert::Errors::RequestError.new(
+          request: "The request is still pending, needs an approval first!",
+        ),
+      )
     end
 
     def self.find_by(request_id:)
@@ -17,7 +21,9 @@ module Digicert
     attr_reader :request_id
 
     def certificate_by_date_created
-      certificates_by_date_created.first
+      if request.status == "approved"
+        certificates_by_date_created.first
+      end
     end
 
     def certificates_by_date_created

data/lib/digicert/order.rb

@@ -33,8 +33,8 @@ module Digicert
       Digicert::OrderDuplicator.create(order_id: resource_id, **attributes)
     end
 
-    def duplicate_certificates
-      Digicert::DuplicateCertificate.all(order_id: resource_id)
+    def duplicate_certificates(attributes = {})
+      Digicert::DuplicateCertificate.all(order_id: resource_id, **attributes)
     end
 
     def email_validations

data/lib/digicert/order_manager.rb

@@ -17,10 +17,16 @@ module Digicert
     def order_attributes
       {
         common_name: order.certificate.common_name,
-        dns_names: order.certificate.dns_names,
+        dns_names: simplified_certificate_dns_names,
         csr: order.certificate.csr,
         signature_hash: order.certificate.signature_hash,
-        server_platform: { id: order.certificate.server_platform.id },
+
+        # In a recent changes, the order response does not seem
+        # to have the paltform id in it, so let's not try to fetch
+        # the platform id for now, and once confirmed then we can
+        # also adjust this as necessary.
+        #
+        # server_platform: { id: order.certificate.server_platform.id },
       }
     end
 
@@ -28,6 +34,19 @@ module Digicert
       @order ||= Digicert::Order.fetch(order_id)
     end
 
+    def simplified_certificate_dns_names
+      if order.product.name_id == "ssl_ev_plus"
+        simplify_dns_name_to_duplicate_ev_plus
+      else
+        order.certificate.dns_names
+      end
+    end
+
+    def simplify_dns_name_to_duplicate_ev_plus
+      dns_names = order.certificate.dns_names
+      dns_names.select { |dns_name| dns_name.match(/.+\..+\..+/) }.uniq
+    end
+
     # Expose the resource_id as order_id, as it sounds
     # more readable and all of it's subclasses are only
     # gonna deal with order.

data/lib/digicert/version.rb

@@ -21,5 +21,5 @@
 # ++
 
 module Digicert
-  VERSION = "0.3.1".freeze
+  VERSION = "0.4.0".freeze
 end

data/spec/digicert/certificate_request_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Digicert::CertificateRequest do
       certificate_request = Digicert::CertificateRequest.fetch(request_id)
 
       expect(certificate_request.order.id).not_to be_nil
-      expect(certificate_request.status).to eq("pending")
+      expect(certificate_request.status).to eq("approved")
       expect(certificate_request.requester.first_name).not_to be_nil
     end
   end

data/spec/digicert/duplicate_certificate_finder_spec.rb

@@ -2,17 +2,32 @@ require "spec_helper"
 
 RSpec.describe Digicert::DuplicateCertificateFinder do
   describe ".find" do
-    it "finds the duplicate certificate" do
-      request_id = 123_456_789
+    context "approved request" do
+      it "finds the duplicate certificate" do
+        request_id = 123_456_789
 
-      stub_digicert_certificate_request_fetch_api(request_id)
-      stub_digicert_order_duplications_api(order_id)
+        stub_digicert_certificate_request_fetch_api(request_id)
+        stub_digicert_order_duplications_api(order_id)
 
-      certificate = Digicert::DuplicateCertificateFinder.find_by(
-        request_id: request_id,
-      )
+        certificate = Digicert::DuplicateCertificateFinder.find_by(
+          request_id: request_id,
+        )
 
-      expect(certificate.id).not_to be_nil
+        expect(certificate.id).not_to be_nil
+      end
+    end
+
+    context "pending request" do
+      it "returns RequestError with a message" do
+        request_id = 456_789_012
+        stub_digicert_certificate_request_fetch_api(
+          request_id, "certificate_request_pending"
+        )
+
+        expect do
+          Digicert::DuplicateCertificateFinder.find_by(request_id: request_id)
+        end.to raise_error(Digicert::Errors::RequestError)
+      end
     end
   end
 

data/spec/digicert/order_duplicator_spec.rb

@@ -11,6 +11,17 @@ RSpec.describe Digicert::OrderDuplicator do
       expect(order.id).not_to be_nil
       expect(order.requests.first.id).not_to be_nil
     end
+
+    context "ev plus certificate" do
+      it "cleanup data and duplicates an order" do
+        stub_digicert_order_fetch_api(order_id, "ssl_ev_order")
+
+        stub_digicert_ev_plus_duplicate_api
+        order = Digicert::OrderDuplicator.create(order_id: order_id)
+
+        expect(order.id).not_to be_nil
+      end
+    end
   end
 
   def order_id
@@ -23,10 +34,16 @@ RSpec.describe Digicert::OrderDuplicator do
       dns_names: order.certificate.dns_names,
       csr: order.certificate.csr,
       signature_hash: order.certificate.signature_hash,
-      server_platform: { id: order.certificate.server_platform.id },
+      # server_platform: { id: order.certificate.server_platform.id },
     }
   end
 
+  def stub_digicert_ev_plus_duplicate_api
+    attributes = certificate_attributes
+    attributes[:dns_names] = [attributes[:dns_names].last]
+    stub_digicert_order_duplicate_api(order_id, attributes)
+  end
+
   def order
     @order ||= Digicert::Order.fetch(order_id)
   end

data/spec/digicert/order_reissuer_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe Digicert::OrderReissuer do
       dns_names: order.certificate.dns_names,
       csr: order.certificate.csr,
       signature_hash: order.certificate.signature_hash,
-      server_platform: { id: order.certificate.server_platform.id },
+      # server_platform: { id: order.certificate.server_platform.id },
     }
   end
 

data/spec/digicert/order_spec.rb

@@ -100,11 +100,11 @@ RSpec.describe Digicert::Order do
       order = Digicert::Order.find(order_id)
       allow(Digicert::DuplicateCertificate).to receive(:all)
 
-      order.duplicate_certificates
+      order.duplicate_certificates(sort: "date_created")
 
       expect(
         Digicert::DuplicateCertificate,
-      ).to have_received(:all).with(order_id: order_id)
+      ).to have_received(:all).with(order_id: order_id, sort: "date_created")
     end
   end
 

data/spec/fixtures/certificate_request.json

@@ -2,7 +2,7 @@
   "id": 123456789,
   "date": "2014-08-19T18:16:07+00:00",
   "type": "new_request",
-  "status": "pending",
+  "status": "approved",
   "date_processed": "2014-08-19T18:17:07+00:00",
   "requester": {
     "id": 151435,

data/spec/fixtures/certificate_request_pending.json

@@ -0,0 +1,116 @@
+{
+  "id": 456789012,
+  "date": "2014-08-19T18:16:07+00:00",
+  "type": "new_request",
+  "status": "pending",
+  "date_processed": "2014-08-19T18:17:07+00:00",
+  "requester": {
+    "id": 151435,
+    "first_name": "Clive",
+    "last_name": "Collegedean",
+    "email": "clivecollegedean@digicert.com"
+  },
+  "processor": {
+    "id": 154478,
+    "first_name": "John",
+    "last_name": "Smith",
+    "email": "john.smith@digicert.com"
+  },
+  "order": {
+    "id": 542757,
+    "certificate": {
+      "common_name": "www.example.com",
+      "dns_names": [
+        "www.example.com"
+      ],
+      "date_created": "2014-12-04T20:32:59+00:00",
+      "csr": "------ [CSR HERE] ------",
+      "organization": {
+        "id": 123456,
+        "name": "DigiCert Inc",
+        "city": "Lehi",
+        "state": "Utah",
+        "country": "US"
+      },
+      "server_platform": {
+        "id": 31,
+        "name": "nginx",
+        "install_url": "https:\/\/www.digicert.com\/ssl-certificate-installation-nginx.htm",
+        "csr_url": "https:\/\/www.digicert.com\/csr-creation-nginx.htm"
+      },
+      "signature_hash": "sha256",
+      "key_size": 2048,
+      "ca_cert": {
+        "id": "1E2F5A55FEA1A",
+        "name": "DigiCert High Assurance SHA2"
+      }
+    },
+    "status": "issued",
+    "is_renewal": true,
+    "date_created": "2014-04-10T19:32:59+00:00",
+    "organization": {
+      "id": 123456,
+      "name": "DigiCert Inc",
+      "city": "Lehi",
+      "state": "Utah",
+      "country": "US"
+    },
+    "validity_years": 2,
+    "disable_renewal_notifications": false,
+    "auto_renew": 0,
+    "container": {
+      "id": 5,
+      "name": "College of Science"
+    },
+    "product": {
+      "name_id": "ssl_plus",
+      "name": "SSL Plus",
+      "type": "ssl_certificate",
+      "validation_type": "code_signing_certificate",
+      "validation_name": "EV CS",
+      "validation_description": "Code Signing Organization Extended Validation (EV CS)"
+    },
+    "organization_contact": {
+      "first_name": "Jay",
+      "last_name": "Smith",
+      "email": "Jay.Smith@digicert.com",
+      "job_title": "VP",
+      "telephone": "8015555555"
+    },
+    "technical_contact": {
+      "first_name": "Jay",
+      "last_name": "Smith",
+      "email": "Jay.Smith@digicert.com",
+      "job_title": "VP",
+      "telephone": "8015555555"
+    },
+    "user": {
+      "id": 4564312,
+      "first_name": "first",
+      "last_name": "name",
+      "email": "first.name@digicert.com"
+    },
+    "requests": [
+      {
+        "id": 4321,
+        "date": "2014-04-10T19:32:59+00:00",
+        "type": "new request",
+        "status": "pending",
+        "comments": "request comments"
+      }
+    ],
+    "cs_provisioning_method": "ship_token",
+    "ship_info": {
+      "name": "Some Guy",
+      "addr1": "333 S 520 W",
+      "addr2": "Suite 500",
+      "city": "Lindon",
+      "state": "Utah",
+      "zip": 84042,
+      "country": "US",
+      "method": "STANDARD"
+    }
+  },
+  "comments": "Comments for the approver",
+  "processor_comment": "Comment left by the person who approved\/rejected the request."
+}

data/spec/fixtures/ssl_ev_order.json

@@ -0,0 +1,108 @@
+{
+  "id": 123456789,
+  "certificate": {
+    "id": 112358,
+    "thumbprint": "7D236B54D19D5EACF0881FAF24D51DFE5D23E945",
+    "serial_number": "0669D46CAE79EF684A69777490602485",
+    "common_name": "digicert.com",
+    "dns_names": [
+      "digicert.com",
+      "www.digicert.com"
+    ],
+    "date_created": "2014-08-19T18:16:07+00:00",
+    "valid_from": "2014-08-19",
+    "valid_till": "2015-08-19",
+    "csr": "------ [CSR HERE] ------",
+    "organization": {
+      "id": 117483
+    },
+    "organization_units": [
+      "Digicert"
+    ],
+    "server_platform": {
+      "id": 45,
+      "name": "nginx",
+      "install_url": "https:\/\/www.digicert.com\/ssl-certificate-installation-nginx.htm",
+      "csr_url": "https:\/\/www.digicert.com\/csr-creation-nginx.htm"
+    },
+    "signature_hash": "sha256",
+    "key_size": 2048,
+    "ca_cert": {
+      "id": "f7slk4shv9s2wr3",
+      "name": "DCert Private CA"
+    }
+  },
+  "status": "approved",
+  "is_renewal": true,
+  "is_renewed": false,
+  "renewed_order_id": 0,
+  "business_unit": "Some Unit",
+  "date_created": "2014-08-19T18:16:07+00:00",
+  "organization": {
+    "name": "DigiCert, Inc.",
+    "display_name": "DigiCert, Inc.",
+    "is_active": true,
+    "city": "Lindon",
+    "state": "Utah",
+    "country": "us"
+  },
+  "disable_renewal_notifications": false,
+  "container": {
+    "id": 5,
+    "name": "College of Science"
+  },
+  "product": {
+    "name_id": "ssl_ev_plus",
+    "name": "SSL EV Plus",
+    "type": "ssl_certificate",
+    "validation_type": "ov",
+    "validation_name": "OV",
+    "validation_description": "Normal Organization Validation"
+  },
+  "organization_contact": {
+    "first_name": "Some",
+    "last_name": "Guy",
+    "email": "someguy@digicert.com",
+    "telephone": "8015551212"
+  },
+  "technical_contact": {
+    "first_name": "Some",
+    "last_name": "Guy",
+    "email": "someguy@digicert.com",
+    "telephone": "8015551212"
+  },
+  "user": {
+    "id": 153208,
+    "first_name": "Clive",
+    "last_name": "Collegedean",
+    "email": "clivecollegedean@digicert.com"
+  },
+  "requests": [
+    {
+      "id": 1,
+      "date": "2015-01-01T18:20:00+00:00",
+      "type": "new_request",
+      "status": "approved",
+      "comments": "Form autofill"
+    }
+  ],
+  "receipt_id": 123892,
+  "cs_provisioning_method": "none",
+  "send_minus_90": true,
+  "send_minus_60": true,
+  "send_minus_30": true,
+  "send_minus_7": true,
+  "send_minus_3": true,
+  "send_plus_7": true,
+  "public_id": "MZv8RhHDVl9R3Ieko3iMX89wvYT3bYPA",
+  "allow_duplicates": false,
+  "user_assignments": [
+    {
+      "id": 153208,
+      "first_name": "Clive",
+      "last_name": "Collegedean",
+      "email": "clivecollegedean@digicert.com"
+    }
+  ],
+  "payment_method": "balance"
+}

data/spec/support/fake_digicert_api.rb

@@ -18,11 +18,13 @@ module Digicert
       )
     end
 
-    def stub_digicert_certificate_request_fetch_api(request_id)
+    def stub_digicert_certificate_request_fetch_api(request_id, json_file = nil)
+      json_file ||= "certificate_request"
+
       stub_api_response(
         :get,
         ["request", request_id].join("/"),
-        filename: "certificate_request",
+        filename: json_file,
         status: 200,
       )
     end
@@ -56,9 +58,9 @@ module Digicert
       )
     end
 
-    def stub_digicert_order_fetch_api(order_id)
+    def stub_digicert_order_fetch_api(order_id, file = "order")
       stub_api_response(
-        :get, ["order/certificate", order_id].join("/"), filename: "order"
+        :get, ["order/certificate", order_id].join("/"), filename: file
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digicert
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r509
@@ -220,6 +220,7 @@ files:
 - spec/fixtures/certificate.pem
 - spec/fixtures/certificate.zip
 - spec/fixtures/certificate_request.json
+- spec/fixtures/certificate_request_pending.json
 - spec/fixtures/certificate_requests.json
 - spec/fixtures/certificate_revoked.json
 - spec/fixtures/container.json
@@ -248,6 +249,7 @@ files:
 - spec/fixtures/product.json
 - spec/fixtures/products.json
 - spec/fixtures/rsa4096.key
+- spec/fixtures/ssl_ev_order.json
 - spec/requests/certificate_duplication_spec.rb
 - spec/requests/certificate_generation_spec.rb
 - spec/requests/certificate_reissuing_spec.rb
@@ -283,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Digicert Ruby API.