fix regex issues

rzcoder · rzcoder · commit 8edbf6f31e54 · 2015-02-27T02:51:59.000+05:00
diff --git a/src/formats/pkcs1.js b/src/formats/pkcs1.js
@@ -128,12 +128,12 @@ module.exports = {
      * @param data
      */
     autoImport: function (key, data) {
-        if (/^\s*-----BEGIN RSA PRIVATE KEY-----\s*([A-Za-z0-9+/=]+\s*)+-----END RSA PRIVATE KEY-----\s*$/g.test(data)) {
+        if (/^\s*-----BEGIN RSA PRIVATE KEY-----\s*(?=(([A-Za-z0-9+/=]+\s*)+))\1-----END RSA PRIVATE KEY-----\s*$/g.test(data)) {
             module.exports.privateImport(key, data);
             return true;
         }
 
-        if (/^\s*-----BEGIN RSA PUBLIC KEY-----\s*([A-Za-z0-9+/=]+\s*)+-----END RSA PUBLIC KEY-----\s*$/g.test(data)) {
+        if (/^\s*-----BEGIN RSA PUBLIC KEY-----\s*(?=(([A-Za-z0-9+/=]+\s*)+))\1-----END RSA PUBLIC KEY-----\s*$/g.test(data)) {
             module.exports.publicImport(key, data);
             return true;
         }
diff --git a/src/formats/pkcs8.js b/src/formats/pkcs8.js
@@ -167,12 +167,12 @@ module.exports = {
      * @param data
      */
     autoImport: function (key, data) {
-        if (/^\s*-----BEGIN PRIVATE KEY-----\s*([A-Za-z0-9+/=]+\s*)+-----END PRIVATE KEY-----\s*$/g.test(data)) {
+        if (/^\s*-----BEGIN PRIVATE KEY-----\s*(?=(([A-Za-z0-9+/=]+\s*)+))\1-----END PRIVATE KEY-----\s*$/g.test(data)) {
             module.exports.privateImport(key, data);
             return true;
         }
 
-        if (/^\s*-----BEGIN PUBLIC KEY-----\s*([A-Za-z0-9+/=]+\s*)+-----END PUBLIC KEY-----\s*$/g.test(data)) {
+        if (/^\s*-----BEGIN PUBLIC KEY-----\s*(?=(([A-Za-z0-9+/=]+\s*)+))\1-----END PUBLIC KEY-----\s*$/g.test(data)) {
             module.exports.publicImport(key, data);
             return true;
         }

Original file line number	Diff line number	Diff line change
`@@ -128,12 +128,12 @@ module.exports = {`
`128`	`128`	`* @param data`
`129`	`129`	`*/`
`130`	`130`	`autoImport: function (key, data) {`
`131`		`- if (/^\s-----BEGIN RSA PRIVATE KEY-----\s([A-Za-z0-9+/=]+\s)+-----END RSA PRIVATE KEY-----\s$/g.test(data)) {`
	`131`	`+ if (/^\s-----BEGIN RSA PRIVATE KEY-----\s(?=(([A-Za-z0-9+/=]+\s)+))\1-----END RSA PRIVATE KEY-----\s$/g.test(data)) {`
`132`	`132`	`module.exports.privateImport(key, data);`
`133`	`133`	`return true;`
`134`	`134`	`}`
`135`	`135`
`136`		`- if (/^\s-----BEGIN RSA PUBLIC KEY-----\s([A-Za-z0-9+/=]+\s)+-----END RSA PUBLIC KEY-----\s$/g.test(data)) {`
	`136`	`+ if (/^\s-----BEGIN RSA PUBLIC KEY-----\s(?=(([A-Za-z0-9+/=]+\s)+))\1-----END RSA PUBLIC KEY-----\s$/g.test(data)) {`
`137`	`137`	`module.exports.publicImport(key, data);`
`138`	`138`	`return true;`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,12 +167,12 @@ module.exports = {`
`167`	`167`	`* @param data`
`168`	`168`	`*/`
`169`	`169`	`autoImport: function (key, data) {`
`170`		`- if (/^\s-----BEGIN PRIVATE KEY-----\s([A-Za-z0-9+/=]+\s)+-----END PRIVATE KEY-----\s$/g.test(data)) {`
	`170`	`+ if (/^\s-----BEGIN PRIVATE KEY-----\s(?=(([A-Za-z0-9+/=]+\s)+))\1-----END PRIVATE KEY-----\s$/g.test(data)) {`
`171`	`171`	`module.exports.privateImport(key, data);`
`172`	`172`	`return true;`
`173`	`173`	`}`
`174`	`174`
`175`		`- if (/^\s-----BEGIN PUBLIC KEY-----\s([A-Za-z0-9+/=]+\s)+-----END PUBLIC KEY-----\s$/g.test(data)) {`
	`175`	`+ if (/^\s-----BEGIN PUBLIC KEY-----\s(?=(([A-Za-z0-9+/=]+\s)+))\1-----END PUBLIC KEY-----\s$/g.test(data)) {`
`176`	`176`	`module.exports.publicImport(key, data);`
`177`	`177`	`return true;`
`178`	`178`	`}`