Skip to content

Password/passphrase validation and field order #1153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
e9gille merged 2 commits into from
Sep 20, 2023
Merged

Password/passphrase validation and field order #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00d37d5
Validate password when listing interpreters
e9gille Sep 20, 2023
a4d5d26
Reorder ssh keyfile password
e9gille Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,17 @@
<div class="col col-sm-12 col-md-3"><label for=cn_ssh_user class=cn_label><u>U</u>ser:</label></div>
<div class="col col-sm-12 col-md-9"><input id=cn_ssh_user name=user size=10></div>
</div>
<div class="row">
<div class="col col-sm-12 col-md-3"><label for=cn_ssh_pass class=cn_label><u>P</u>assword&nbsp;/&nbsp;passphrase:</label></div>
<div class="col col-sm-12 col-md-9"><input id=cn_ssh_pass type=password></div>
</div>
<div class="row">
<div class="col col-sm-12 col-md-3"><label for=cn_ssh_key class=cn_label><u>K</u>ey file:</label></div>
<div class="col col-sm-12 col-md-9">
<input id=cn_ssh_key name=ssh_key class=browse>
<button id=cn_ssh_key_dots class=tb_btn><span class="fas fa-ellipsis-h"></span></button>
</div>
</div>
<div class="row">
<div class="col col-sm-12 col-md-3"><label for=cn_ssh_pass class=cn_label><u>P</u>assword&nbsp;/&nbsp;passphrase:</label></div>
<div class="col col-sm-12 col-md-9"><input id=cn_ssh_pass type=password></div>
</div>
</div>
<div id=cn_ssl hidden>
<div class="row">
Expand Down
11 changes: 3 additions & 8 deletions src/cn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
$.err(`${q.cwd.labels[0].innerText} "${untildify(x.cwd)}" does not exist`, () => { q.cwd.focus(); });
return 0;
}
if (x === sel && ssh) {
if (ssh) {
if (!q.ssh_pass.value && !q.ssh_key.value) {
passwdPrompt(`Password for user ${x.user || user}:`, 'Password');
return 0;
Expand Down Expand Up @@ -485,11 +485,6 @@
port: +x.ssh_port || 22,
user: x.user || user,
};
// if (x.ssh_auth_type === 'key') {
// o.key = x.ssh_key;
// } else {
// o.pass = x === sel ? q.ssh_pass.value : '';
// }
x.ssh_key && (o.key = x.ssh_key);
x === sel && q.ssh_pass.value && (o.pass = q.ssh_pass.value);
const c = sshExec(o, '/bin/sh', (e, sm) => {
Expand Down Expand Up @@ -1147,8 +1142,8 @@
const m = HP.exec(h.l); // parse host and port
m ? go({
type: 'listen',
host: m[1],
port: +m[2] || 4502,
host: m[1],
port: +m[2] || 4502,
respawn: !!m[3],
log: h.log,
}) : $.err('Invalid $RIDE_LISTEN');
Expand Down