Added SSH RSA PEM key support, #4002
Ylian Saint-Hilaire committed
May 24, 2022 at 18:48 UTC
4e9daa428615d318d8a924edc85fb287576bbeca
3 files changed
+12
-4
views/default-mobile.handlebars
+6
-2
@@ -4834,7 +4834,9 @@
4834
if (ok == true) {
4835
var reader = new FileReader();
4836
reader.onload = function (e) {
4837
- var validkey = ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0));
4837
+ var validkey =
4838
+ ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)) ||
4839
+ ((e.target.result.indexOf('-----BEGIN RSA PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END RSA PRIVATE KEY-----') >= 0));
4840
QE('idx_dlgOkButton', validkey);
4841
}
4842
reader.readAsText(Q('dp2key').files[0]);
@@ -4872,7 +4874,9 @@
4874
if (ok == true) {
4875
var reader = new FileReader();
4876
reader.onload = function (e) {
4875
- var validkey = ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0));
4877
+ var validkey =
4878
+ ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)) ||
4879
+ ((e.target.result.indexOf('-----BEGIN RSA PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END RSA PRIVATE KEY-----') >= 0));
4880
QE('idx_dlgOkButton', validkey);
4881
QS('d2badkey')['color'] = validkey ? '#000' : '#F00';
4882
}
views/default.handlebars
+3
-1
@@ -9805,7 +9805,9 @@
9805
if (ok == true) {
9806
var reader = new FileReader();
9807
reader.onload = function (e) {
9808
- var validkey = ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0));
9808
+ var validkey =
9809
+ ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)) ||
9810
+ ((e.target.result.indexOf('-----BEGIN RSA PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END RSA PRIVATE KEY-----') >= 0));
9811
QE('idx_dlgOkButton', validkey);
9812
QS('d2badkey')['color'] = validkey?'#000':'#F00';
9813
}
views/ssh.handlebars
+3
-1
@@ -145,7 +145,9 @@
145
if (ok == true) {
146
var reader = new FileReader();
147
reader.onload = function (e) {
148
- var validkey = ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0));
148
+ var validkey =
149
+ ((e.target.result.indexOf('-----BEGIN OPENSSH PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END OPENSSH PRIVATE KEY-----') >= 0)) ||
150
+ ((e.target.result.indexOf('-----BEGIN RSA PRIVATE KEY-----') >= 0) && (e.target.result.indexOf('-----END RSA PRIVATE KEY-----') >= 0));
151
QE('idx_dlgOkButton', validkey);
152
QS('d2badkey')['color'] = validkey ? '#000' : '#F00';
153
}