CURLOPT_SSH_HOSTKEY_FUNCTION #7959

mickae1 · 2021-11-04T15:41:00Z

The callback defined by CURLOPT_SSH_HOSTKEYCHECK_FUNCTION is called to check wether or not the connexion should continue.

the host key is passed in argument with a custom handle for the application.

mickae1 · 2021-11-04T15:41:33Z

I don't know how to squash all those commit ...

bagder · 2021-11-04T15:43:45Z

@mickae1 do a git rebase -i origin/master in your branch, squash them all as you see fit and then you force-push the remaining one(s) here again

mickae1 · 2021-11-04T16:17:42Z

@mickae1 do a git rebase -i origin/master in your branch, squash them all as you see fit and then you force-push the remaining one(s) here again

thanks, it's done :) .

mickae1 · 2021-11-04T16:39:15Z

I don't get what this error means :
lib1521.c: In function ‘test’: lib1521.c:4346:26: error: ‘ssh_hostkeycheck_cb’ undeclared (first use in this function) 4346 | ssh_hostkeycheck_cb); | ^~~~~~~~~~~~~~~~~~~

Where is this file lib1521.c ?? dynamically created ? From which conf file ?

bagder · 2021-11-04T20:32:49Z

lib1521.c is generated by mk-lib1521.pl

mickae1 · 2021-11-05T08:32:11Z

lib1521.c is generated by mk-lib1521.pl

Ok, Corrected. But there is a lot of error due to ".libs/libcurlu.a(libcurlu_la-libssh2.o) has no symbols"

Some times :
checksrc: 0 errors and 2 warnings
checksrc: 0 errors and 8 warnings suppressed
*** Error code 5

I don't understand why .....

I've a warning about:
./easyoptions.c:281:88: warning: Longer than 79 columns (LONGLINE)
{"SSH_HOSTKEYCHECK_FUNCTION", CURLOPT_SSH_HOSTKEYCHECK_FUNCTION, CURLOT_FUNCTION, 0},
./setopt.c:2500:85: warning: Longer than 79 columns (LONGLINE)
data->set.ssh_hostkeycheck_func = va_arg(param, curl_ssh_hostkeycheck_callback);

But I don't know how to fix it .....

other error like:
@azure-pipelinesazure-pipelines
/ curl.curl (linux ubuntu default)
Build log #L1148
Bash exited with code '2'.

mickae1 · 2021-11-05T08:46:33Z

Do you think it's possible to put this pull in the version 7.79.2 ?

bagder · 2021-11-05T10:02:02Z

The next release will be 7.80.0 and it has been closed for new features (such as this) for a few weeks already. Your PR's earliest chance is for a 7.81.0 release. Which might ship on January 5, 2022.

mickae1 · 2021-11-05T10:16:37Z

7.81.0

Ok, the files has been modified accordingly .

docs/libcurl/curl_easy_setopt.3

bagder · 2021-11-05T12:03:15Z

docs/libcurl/opts/CURLOPT_SSH_HOSTKEYCHECK.3

+                          int keylen); /*length of the key*/
+
+CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSH_HOSTKEYCHECK_FUNCTION,
+                          ssh_hostkeycheck_callback);


There's missing .fi there as a last line of the SYNOPSIS.

but in this file it's working, there is no .fi
I've clone the file and change only the text.

https://github.com/curl/curl/blob/master/docs/libcurl/opts/CURLOPT_SSH_KEYFUNCTION.3#L62

I tried :

.SH SYNOPSIS .nf #include <curl/curl.h> CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSH_HOSTKEYDATA, void *pointer); .fi

docs/libcurl/opts/CURLOPT_SSH_HOSTKEYCHECK.3

include/curl/curl.h

lib/setopt.c

lib/vssh/libssh2.c

docs/libcurl/opts/CURLOPT_SSH_HOSTKEYCHECK.3

mickae1 · 2021-11-10T13:06:07Z

@bagder , can you give me some hints to make this pull successful ?

Thank you,

mickae1 · 2021-12-14T08:43:58Z

The next release will be 7.80.0 and it has been closed for new features (such as this) for a few weeks already. Your PR's earliest chance is for a 7.81.0 release. Which might ship on January 5, 2022.

Hi @Badger,

Can you give me some news ? Because I would like to have this feature for the next release :)

Thanks,

danielgustafsson · 2021-12-14T08:46:41Z

Can you give me some news ? Because I would like to have this feature for the next release :)

The featurewindow for the next release is closed, so this feature didn't make it in for the January 5 release.

mickae1 · 2021-12-14T08:48:04Z

Can you give me some news ? Because I would like to have this feature for the next release :)

The featurewindow for the next release is closed, so this feature didn't make it in for the January 5 release.

Ok, can you tell me what I've to do for the next next release ?

What release would it be ? 7.82.0 ?

danielgustafsson · 2021-12-14T08:53:43Z

Can you give me some news ? Because I would like to have this feature for the next release :)

The featurewindow for the next release is closed, so this feature didn't make it in for the January 5 release.

Ok, can you tell me what I've to do for the next next release ?

I haven't been following along so I can't comment on the status of the work, and what might remain. I'll try to find some time to review it to see.

What release would it be ? 7.82.0 ?

Correct, that's the next possible feature release.

mickae1 · 2021-12-14T09:08:39Z

@danielgustafsson thank you,

I've made the change needed, I will wait for your review, thank you !

mickae1 · 2022-01-04T08:31:41Z

@danielgustafsson or @Badger ? Any news ??

bagder · 2022-01-07T15:22:26Z

@mickae1 it still fails at least two tests: 1119 1173

mickae1 · 2022-01-07T16:06:25Z

@mickae1 it still fails at least two tests: 1119 1173

do you have a link? because there is so many fails :(

bagder · 2022-01-08T15:43:23Z

include/curl/curl.h

+/* this is the set of return values expected from the curl_sshhostkeycallback
+   callback */
+enum curl_khcheck {
+  CURLKHCHECK_UNKNOWN,


This UKNOWN value isn't necessary here, is i? It has no documented purpose.

I agree, but it's to prevent to use value 0

bagder · 2022-01-08T15:45:08Z

@mickae1 it still fails at least two tests: 1119 1173

do you have a link? because there is so many fails :(

Did you try to run them locally? They will fail there as well. These two fail in almost every CI build so you can just pick one and look like this

mickae1 · 2022-04-26T08:00:38Z

I've some time to work on this now. @bagder

I've check the error, I've : TESTFAIL: These test cases failed: 1119 1173 1918

test 1119...[Verify that symbols-in-versions and headers are in sync]
I don't understand for the moment this error ...
test 1918...[curl_easy_option_by_name() and curl_easy_option_by_id()]
I don't understand this error :(
test 1173...[Man page syntax checks]
This should be ok now.

And I'm using the code in production without any problem :)

mickae1 · 2022-04-26T08:13:06Z

@bagder
CURLOPT_SSH_HOSTKEYFUNCTION 7.82.0
CURLOPT_SSH_HOSTKEYDATA 7.82.0

What is the correct version now ?

mickae1 · 2022-05-02T14:36:56Z

@bagder CURLOPT_SSH_HOSTKEYFUNCTION 7.82.0 CURLOPT_SSH_HOSTKEYDATA 7.82.0

What is the correct version now ?

@bagder please

danielgustafsson · 2022-05-02T20:40:25Z

What is the correct version now ?

The next feature version will be 7.84.0

MAntoniak · 2022-05-03T17:48:46Z

* test 1119...[Verify that symbols-in-versions and headers are in sync]
  I don't understand for the moment this error ...

You have to add CURLKHCHECK_FINE, CURLKHCHECK_REJECT and CURLKHCHECK_UNKNOWN to symbols-in-versions document (as like you did it with CURLOPT_SSH_HOSTKEYFUNCTION and CURLOPT_SSH_HOSTKEYDATA). Pay attention to the alphabetical order.

* test 1918...[curl_easy_option_by_name() and curl_easy_option_by_id()]
  I don't understand this error :(

Update Curl_easyopts_check() function in easyoptions.c (line 363) - you added extra 2 enumeration values.

Also add CURLOPT_SSH_HOSTKEYDATA to the curlcheck_cb_data_option list in typecheck-gcc.h file. It will fix 1912 test.

lib/vssh/libssh2.c

MAntoniak · 2022-05-05T08:54:20Z

Also run checksrc script locally and resolve all warnings.

mickae1 · 2022-05-05T09:57:42Z

@MAntoniak Thanks.

checksrc

I tried to start checksrc.bat on my windows machine, but I got no message :(

mickae1 · 2022-05-06T05:43:41Z

@MAntoniak @bagder, looks OK to me, no ?

bagder

I think this generally looks good. I only found some small things...

bagder · 2022-05-06T09:32:23Z

docs/libcurl/opts/CURLOPT_SSH_HOSTKEYDATA.3

+SCP and SFTP
+.SH EXAMPLE
+.nf
+int curl_sshhostkeycallback(void *clientp,/* custom pointer passed with CURLOPT_SSH_HOSTKEYDATA */


I think you should avoid curl_ as a prefix for an example function, as we use that for public API functions.

I used the same syntax as this function ;
curl_sshkeycallback in the file curl.h line 867

What should I do ?

Just rename it without the leading curl_ prefix?

bagder · 2022-05-06T09:32:43Z

docs/libcurl/opts/CURLOPT_SSH_HOSTKEYFUNCTION.3

+Pass a pointer to your callback function, which should match the prototype
+shown above. It overrides CURLOPT_SSH_KNOWNHOSTS.
+
+It gets called to act and decide for libcurl how to proceed.


when is it called?

ok => It gets called when the verification of the hostkey is needed.

bagder · 2022-05-06T09:33:32Z

docs/libcurl/opts/CURLOPT_SSH_HOSTKEYFUNCTION.3

+}
+.fi
+.SH AVAILABILITY
+Added in 7.82.0 , work only with libssh2 backend.


Added in 7.84.0, works only with libssh2 backend.

docs/libcurl/opts/CURLOPT_SSH_HOSTKEYFUNCTION.3

lib/setopt.c

lib/urldata.h

bagder · 2022-05-06T09:40:35Z

Oh, and we need a test or two.

mickae1 · 2022-05-06T10:31:46Z

@bagder I would like to add some test, but I could n't find any test for CURLOPT_SSH_KEYFUNCTION to use a as a model....

mickae1 · 2022-05-06T13:15:44Z

I squashed every thing, it's better now :)

mickae1 · 2022-05-10T07:26:41Z

@bagder @MAntoniak please :)

danielgustafsson · 2022-05-10T07:28:53Z

docs/libcurl/opts/CURLOPT_SSH_HOSTKEYDATA.3

+SCP and SFTP
+.SH EXAMPLE
+.nf
+int curl_sshhostkeycallback(void *clientp,/* custom pointer passed with CURLOPT_SSH_HOSTKEYDATA */


Just rename it without the leading curl_ prefix?

docs/libcurl/opts/CURLOPT_SSH_HOSTKEYDATA.3

docs/libcurl/opts/CURLOPT_SSH_HOSTKEYFUNCTION.3

lib/vssh/libssh2.c

CURLOPT_SSH_HOSTKEYCHECK_FUNCTION The callback defined by CURLOPT_SSH_HOSTKEYCHECK_FUNCTION is called to check wether or not the connexion should continue. the host key is passed in argument with a custom handle for the application. It overrides CURLOPT_SSH_KNOWNHOSTS

mickae1 · 2022-05-19T09:15:03Z

@bagder please
@danielgustafsson please
@MAntoniak please

pleaase :)

mickae1 · 2022-05-31T09:02:20Z

@bagder @danielgustafsson @MAntoniak ?

please, I know you are busy , but I would like to have it for the next release :(

bagder · 2022-06-02T07:21:51Z

Thanks. I did some minor edits before this landed.

mickae1 · 2022-06-02T07:31:36Z

thank you very much all of you for your help :)

bagder reviewed Nov 5, 2021

View reviewed changes

mickae1 changed the title ~~CURLOPT_SSH_HOSTKEYCHECK_FUNCTION~~ CURLOPT_SSH_HOSTKEY_FUNCTION Nov 8, 2021

bagder reviewed Jan 8, 2022

View reviewed changes

MAntoniak reviewed May 5, 2022

View reviewed changes

lib/vssh/libssh2.c Show resolved Hide resolved

bagder reviewed May 6, 2022

View reviewed changes

danielgustafsson reviewed May 10, 2022

View reviewed changes

mickae1 requested review from danielgustafsson and bagder May 17, 2022 07:26

bagder approved these changes Jun 2, 2022

View reviewed changes

bagder closed this in 1544513 Jun 2, 2022

CURLOPT_SSH_HOSTKEY_FUNCTION #7959

CURLOPT_SSH_HOSTKEY_FUNCTION #7959

Conversation

mickae1 commented Nov 4, 2021

mickae1 commented Nov 4, 2021

bagder commented Nov 4, 2021

mickae1 commented Nov 4, 2021

mickae1 commented Nov 4, 2021

bagder commented Nov 4, 2021

mickae1 commented Nov 5, 2021

mickae1 commented Nov 5, 2021

bagder commented Nov 5, 2021

mickae1 commented Nov 5, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mickae1 commented Nov 10, 2021

mickae1 commented Dec 14, 2021 • edited

danielgustafsson commented Dec 14, 2021

mickae1 commented Dec 14, 2021

danielgustafsson commented Dec 14, 2021

mickae1 commented Dec 14, 2021

mickae1 commented Jan 4, 2022

bagder commented Jan 7, 2022

mickae1 commented Jan 7, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bagder commented Jan 8, 2022

mickae1 commented Apr 26, 2022 • edited

mickae1 commented Apr 26, 2022 • edited

mickae1 commented May 2, 2022

danielgustafsson commented May 2, 2022

MAntoniak commented May 3, 2022 • edited

MAntoniak commented May 5, 2022

mickae1 commented May 5, 2022 • edited

mickae1 commented May 6, 2022

bagder left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bagder commented May 6, 2022

mickae1 commented May 6, 2022

mickae1 commented May 6, 2022

mickae1 commented May 10, 2022

Choose a reason for hiding this comment

mickae1 commented May 19, 2022 • edited

mickae1 commented May 31, 2022

bagder commented Jun 2, 2022

mickae1 commented Jun 2, 2022 • edited

mickae1 commented Dec 14, 2021 •

edited

mickae1 commented Apr 26, 2022 •

edited

mickae1 commented Apr 26, 2022 •

edited

MAntoniak commented May 3, 2022 •

edited

mickae1 commented May 5, 2022 •

edited

mickae1 commented May 19, 2022 •

edited

mickae1 commented Jun 2, 2022 •

edited