Add support for DC Certificates fix #83

Author: Josef Fröhle c5252118

LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2012 Andris Reinman
+Copyright (c) 2016 Josef Fröhle
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -3,7 +3,7 @@ pem
 
 Create private keys and certificates with node.js
 
-[![Build Status](https://secure.travis-ci.org/andris9/pem.png)](http://travis-ci.org/andris9/pem)
+[![Build Status](https://secure.travis-ci.org/Dexus/pem.png)](http://travis-ci.org/Dexus/pem)
 [![npm version](https://badge.fury.io/js/pem.svg)](http://badge.fury.io/js/pem)
 
 ## Installation
@@ -234,6 +234,10 @@ pem.config({
 // do something with the pem module
 ```
 
+### Specialthanks to
+
+- Andris Reinman (@andris9) - Initiator of pem
+
 ## License
 
 **MIT**

lib/pem.js

@@ -770,6 +770,9 @@ function fetchCertificateData(certData, callback) {
         //email
         tmp = extra.match(/emailAddress=([^\n\/].*?)[\n\/]/);
         certValues.emailAddress = tmp && tmp[1] || '';
+        // DC name
+        tmp = subject2.match(/\sDC=([^\n].*?)[\n]/);
+        certValues.dc = tmp && tmp[1] || '';
     }
 
     if ((issuer = certData.match(/Issuer:([^\n]*)\n/)) && issuer.length > 1) {
@@ -793,6 +796,9 @@ function fetchCertificateData(certData, callback) {
         // common name
         tmp = issuer2.match(/\sCN=([^\n].*?)[\n]/);
         certValues.issuer.commonName = tmp && tmp[1] || '';
+        // DC
+        tmp = issuer2.match(/\sDC=([^\n].*?)[\n]/);
+        certValues.issuer.dc = tmp && tmp[1] || '';
     }
 
     if ((san = certData.match(/X509v3 Subject Alternative Name: \n([^\n]*)\n/)) && san.length > 1) {
@@ -823,8 +829,8 @@ function fetchCertificateData(certData, callback) {
 
 function linebrakes(content) {
     var helper_x, subject, type;
-    helper_x = content.replace(/(C|L|O|OU|ST|CN)=/g, '\n$1=');
-    helper_x = preg_match_all('((C|L|O|OU|ST|CN)=[^\n].*)', helper_x);
+    helper_x = content.replace(/(C|L|O|OU|ST|CN|DC)=/g, '\n$1=');
+    helper_x = preg_match_all('((C|L|O|OU|ST|CN|DC)=[^\n].*)', helper_x);
     for (var p=0; p<helper_x.length; p++) {
         subject = helper_x[p].trim();
         type = subject.split('=');
@@ -872,6 +878,7 @@ function generateCSRSubject(options) {
             O: options.organization || options.O,
             OU: options.organizationUnit || options.OU,
             CN: options.commonName || options.CN || 'localhost',
+            DC: options.dc || options.DC || '',
             emailAddress: options.emailAddress
     };
 

package.json

@@ -9,7 +9,7 @@
   ],
   "name": "pem",
   "description": "Create private keys and certificates with node.js and io.js",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/Dexus/pem.git"
@@ -24,11 +24,11 @@
     "which": "^1.2.4"
   },
   "devDependencies": {
-    "grunt": "^0.4.5",
-    "grunt-contrib-jshint": "^0.11.3",
-    "grunt-contrib-nodeunit": "^0.4.1",
-    "nodeunit": "^0.9.1",
-    "semantic-release": "^6.3.2",
+    "grunt": "^1.0.1",
+    "grunt-contrib-jshint": "^1.1.0",
+    "grunt-contrib-nodeunit": "^1.0.0",
+    "nodeunit": "^0.10.2",
+    "semantic-release": "^6.3.4",
     "semantic-release-tamia": "^1.0.0"
   },
   "optionalDependencies": {},
@@ -37,9 +37,5 @@
     "iojs": "*"
   },
   "release": {
-    "analyzeCommits": "semantic-release-tamia/analyzeCommits",
-    "generateNotes": "semantic-release-tamia/generateNotes",
-    "verifyRelease": "semantic-release-tamia/verifyRelease",
-    "verifyConditions": "./"
   }
 }

test/pem.js

@@ -101,7 +101,8 @@ exports['General Tests'] = {
             organization: 'Node.ee',
             organizationUnit: 'test',
             commonName: 'www.node.ee',
-            emailAddress: '[email protected]'
+            emailAddress: '[email protected]',
+            dc: ''
         };
 
         pem.createCSR({ csrConfigFile: './test/fixtures/test.cnf' }, function(error, data) {
@@ -223,7 +224,8 @@ exports['General Tests'] = {
                     organization: '',
                     organizationUnit: '',
                     commonName: 'localhost',
-                    emailAddress: ''
+                    emailAddress: '',
+                    dc: ''
                 });
                 test.ok(fs.readdirSync('./tmp').length === 0);
                 test.done();
@@ -240,7 +242,8 @@ exports['General Tests'] = {
             organization: 'Node.ee',
             organizationUnit: 'test',
             commonName: 'www.node.ee',
-            emailAddress: '[email protected]'
+            emailAddress: '[email protected]',
+            dc: ''
         };
         pem.createCSR(Object.create(certInfo), function(error, data) {
             var csr = (data && data.csr || '').toString();
@@ -279,15 +282,17 @@ exports['General Tests'] = {
                         locality: '',
                         organization: '',
                         organizationUnit: '',
-                        commonName: 'localhost'
+                        commonName: 'localhost',
+                        dc: ''
                     },
                     country: '',
                     state: '',
                     locality: '',
                     organization: '',
                     organizationUnit: '',
                     commonName: 'localhost',
-                    emailAddress: ''
+                    emailAddress: '',
+                    dc: ''
                 });
                 test.ok(fs.readdirSync('./tmp').length === 0);
                 test.done();
@@ -303,15 +308,17 @@ exports['General Tests'] = {
                 locality: 'Tallinn',
                 organization: 'Node.ee',
                 organizationUnit: 'test',
-                commonName: 'www.node.ee'
+                commonName: 'www.node.ee',
+                dc: ''
             },
             country: 'EE',
             state: 'Harjumaa',
             locality: 'Tallinn',
             organization: 'Node.ee',
             organizationUnit: 'test',
             commonName: 'www.node.ee',
-            emailAddress: '[email protected]'
+            emailAddress: '[email protected]',
+            dc: ''
         };
         pem.createCertificate(Object.create(certInfo), function(error, data) {
             var certificate = (data && data.certificate || '').toString();