Skip to content

added option to disable trivial auth methods - #128

Merged
mkj merged 3 commits into
mkj:masterfrom
manfred-kaiser:master
Aug 19, 2021
Merged

mkj merged 3 commits into
mkj:masterfrom
manfred-kaiser:master

Conversation

@manfred-kaiser

@manfred-kaiser manfred-kaiser commented Jun 17, 2021

Copy link
Copy Markdown
Contributor

I have added an option -o ExitOnTrivialAuth=yes to disable trivial authentications as discussed in our mails

@manfred-kaiser

Copy link
Copy Markdown
Contributor Author

I have renamed to argument to -o DisableTrivialAuth=yes to match OpenSSH's parameter

@manfred-kaiser
manfred-kaiser marked this pull request as draft June 21, 2021 08:37
@manfred-kaiser
manfred-kaiser marked this pull request as ready for review June 21, 2021 08:48
@manfred-kaiser

Copy link
Copy Markdown
Contributor Author

Would you merge this pull request, because we are planning to create a CVE and I think this should be mitigated before we publish a full disclosure.

@mkj mkj left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I'll try to get it merged soon.

Comment thread cli-authpubkey.c Outdated
/* Send a trial request */
send_msg_userauth_pubkey(key, sigtype, 0);
cli_ses.lastprivkey = key;
cli_ses.is_trivial_auth = 0;

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It shouldn't clear is_trivial_auth here since it doesn't require any user interaction? For pubkey auth I guess it should clear is_trivial_auth for an agent pubkey signature (not trial request), otherwise leave it set.

Comment thread cli-authpubkey.c
buf_putbytes(sigbuf, ses.writepayload->data, ses.writepayload->len);
cli_buf_put_sign(ses.writepayload, key, sigtype, sigbuf);
buf_free(sigbuf); /* Nothing confidential in the buffer */
cli_ses.is_trivial_auth = 0;

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I have fixed trivial auth detection for public keys. It should work now as expected.

@manfred-kaiser

Copy link
Copy Markdown
Contributor Author

Hello, we are planning to release information about trivial succes authentication. Do you need help with merging the pull requests and creating the new release?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants