From 4e9daa428615d318d8a924edc85fb287576bbeca Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Tue, 24 May 2022 18:48:21 -0700 Subject: [PATCH] Added SSH RSA PEM key support, #4002 --- views/default-mobile.handlebars | 8 ++++++-- views/default.handlebars | 4 +++- views/ssh.handlebars | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars index b2941325..642c2a4a 100644 --- a/views/default-mobile.handlebars +++ b/views/default-mobile.handlebars @@ -4834,7 +4834,9 @@ if (ok == true) { var reader = new FileReader(); reader.onload = function (e) { - var validkey = ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)); + var validkey = + ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)) || + ((e.target.result.indexOf('-----BEGIN RSA PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END RSA PRIVATE KEY-----') >= 0)); QE('idx_dlgOkButton', validkey); } reader.readAsText(Q('dp2key').files[0]); @@ -4872,7 +4874,9 @@ if (ok == true) { var reader = new FileReader(); reader.onload = function (e) { - var validkey = ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)); + var validkey = + ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)) || + ((e.target.result.indexOf('-----BEGIN RSA PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END RSA PRIVATE KEY-----') >= 0)); QE('idx_dlgOkButton', validkey); QS('d2badkey')['color'] = validkey ? '#000' : '#F00'; } diff --git a/views/default.handlebars b/views/default.handlebars index 1a4bb8a5..2a98a866 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -9805,7 +9805,9 @@ if (ok == true) { var reader = new FileReader(); reader.onload = function (e) { - var validkey = ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)); + var validkey = + ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)) || + ((e.target.result.indexOf('-----BEGIN RSA PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END RSA PRIVATE KEY-----') >= 0)); QE('idx_dlgOkButton', validkey); QS('d2badkey')['color'] = validkey?'#000':'#F00'; } diff --git a/views/ssh.handlebars b/views/ssh.handlebars index 1c49cb34..32c59ce2 100644 --- a/views/ssh.handlebars +++ b/views/ssh.handlebars @@ -145,7 +145,9 @@ if (ok == true) { var reader = new FileReader(); reader.onload = function (e) { - var validkey = ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)); + var validkey = + ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)) || + ((e.target.result.indexOf('-----BEGIN RSA PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END RSA PRIVATE KEY-----') >= 0)); QE('idx_dlgOkButton', validkey); QS('d2badkey')['color'] = validkey ? '#000' : '#F00'; }