GNU bug report logs - #26191
Allow custom FTP logins.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 26191 in the body.
You can then email your comments to 26191 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Roel Janssen <roel <at> gnu.org>
To: guix-patches <at> gnu.org
Subject: Allow custom FTP logins.
Date: Mon, 20 Mar 2017 13:10:08 +0100

[0001-ftp-client-Allow-custom-username-and-password-for-FT.patch (text/x-patch, attachment)]

[0002-download-Handle-username-and-password-properties-for.patch (text/x-patch, attachment)]

[Message part 3 (text/plain, inline)]

Dear guix,

These two patches enable the handling of usernames and passwords in a
FTP uri.

Kind regards,
Roel Janssen

Message #8 received at 26191 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Roel Janssen <roel <at> gnu.org>
Cc: 26191 <at> debbugs.gnu.org
Subject: Re: bug#26191: Allow custom FTP logins.
Date: Mon, 20 Mar 2017 15:10:14 -0400

[Message part 1 (text/plain, inline)]

Roel Janssen <roel <at> gnu.org> writes:

>>From e7263ce1d1a242f187c9801b14ea47043f59be8e Mon Sep 17 00:00:00 2001
> From: Roel Janssen <roel <at> gnu.org>
> Date: Mon, 20 Mar 2017 12:59:59 +0100
> Subject: [PATCH 2/2] download: Handle username and password properties for FTP
>  uris.
>
> guix/build/download.scm (ftp-fetch): Process username and password from a URI.
> ---
>  guix/build/download.scm | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/guix/build/download.scm b/guix/build/download.scm
> index 36c815c16..f48da7500 100644
> --- a/guix/build/download.scm
> +++ b/guix/build/download.scm
> @@ -241,7 +241,14 @@ and 'guix publish', something like
>  (define* (ftp-fetch uri file #:key timeout)
>    "Fetch data from URI and write it to FILE.  Return FILE on success.  Bail
>  out if the connection could not be established in less than TIMEOUT seconds."
> -  (let* ((conn (ftp-open (uri-host uri) #:timeout timeout))
> +  (let* ((userinfo (string-split (uri-userinfo uri) #\:))
> +         (username (if (and (> (length userinfo) 0)
> +                            (not (string= (car userinfo) "")))
> +                       (car userinfo) #f))
> +         (password (if (> (length userinfo) 1) (cadr userinfo) #f))
> +         (conn (ftp-open (uri-host uri) #:timeout timeout
> +                                        #:username username
> +                                        #:password password))
>           (size (false-if-exception (ftp-size conn (uri-path uri))))
>           (in   (ftp-retr conn (basename (uri-path uri))
>                           (dirname (uri-path uri)))))

Hi Roel,

The code looks good and seems to work fine, but seeing that this is my
first time reviewing a patch to the "inner workings" of Guix, I'll defer
to the opinion of someone more experienced.

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 26191 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Roel Janssen <roel <at> gnu.org>
Cc: 26191 <at> debbugs.gnu.org
Subject: Re: bug#26191: Allow custom FTP logins.
Date: Mon, 20 Mar 2017 20:44:48 +0100

Hi Roel,

On Mon, 20 Mar 2017 13:10:08 +0100
Roel Janssen <roel <at> gnu.org> wrote:
> +  (let* ((userinfo (string-split (uri-userinfo uri) #\:))

> +         (username (if (and (> (length userinfo) 0)
> +                            (not (string= (car userinfo) "")))
> +                       (car userinfo) #f))
> +         (password (if (> (length userinfo) 1) (cadr userinfo) #f))

It would make it more readable if you used (match ...).

Message #14 received at 26191 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Roel Janssen <roel <at> gnu.org>
Cc: 26191 <at> debbugs.gnu.org
Subject: Re: bug#26191: Allow custom FTP logins.
Date: Mon, 20 Mar 2017 21:30:52 +0100

Roel Janssen <roel <at> gnu.org> skribis:

> From 8536ba69ec3a04930e8a78c8f2b824df3e8c0454 Mon Sep 17 00:00:00 2001
> From: Roel Janssen <roel <at> gnu.org>
> Date: Mon, 20 Mar 2017 12:57:25 +0100
> Subject: [PATCH 1/2] ftp-client: Allow custom username and password for FTP
>  servers.
>
> * guix/ftp-client.scm (ftp-open): Add username and password arguments.

OK!

> From e7263ce1d1a242f187c9801b14ea47043f59be8e Mon Sep 17 00:00:00 2001
> From: Roel Janssen <roel <at> gnu.org>
> Date: Mon, 20 Mar 2017 12:59:59 +0100
> Subject: [PATCH 2/2] download: Handle username and password properties for FTP
>  uris.
>
> guix/build/download.scm (ftp-fetch): Process username and password from a URI.

[...]

> +  (let* ((userinfo (string-split (uri-userinfo uri) #\:))
> +         (username (if (and (> (length userinfo) 0)
> +                            (not (string= (car userinfo) "")))
> +                       (car userinfo) #f))
> +         (password (if (> (length userinfo) 1) (cadr userinfo) #f))
> +         (conn (ftp-open (uri-host uri) #:timeout timeout
> +                                        #:username username
> +                                        #:password password))

Of course I have to agree with Danny here regarding ‘match’.  ;-)

  (let ((user (match userinfo
                (() #f)
                (("") #f)
                (((? string? user)) user)))
        (pass (match userinfo
                 …)))
    …)

OK with a change along these lines.

Thank you!

Ludo’.

Message #17 received at 26191 <at> debbugs.gnu.org (full text, mbox):

From: Roel Janssen <roel <at> gnu.org>
To: Ludovic Courtès <ludo <at> gnu.org>, Danny Milosavljevic
 <dannym <at> scratchpost.org>
Cc: 26191 <at> debbugs.gnu.org
Subject: Re: bug#26191: Allow custom FTP logins.
Date: Tue, 21 Mar 2017 09:51:57 +0100

[0001-download-Handle-username-and-password-properties-for.patch (text/x-patch, attachment)]

[Message part 2 (text/plain, inline)]

Hello Danny and Ludo’,

Thanks for your quick responses and feedback!


Ludovic Courtès writes:

> Roel Janssen <roel <at> gnu.org> skribis:
>
>> From 8536ba69ec3a04930e8a78c8f2b824df3e8c0454 Mon Sep 17 00:00:00 2001
>> From: Roel Janssen <roel <at> gnu.org>
>> Date: Mon, 20 Mar 2017 12:57:25 +0100
>> Subject: [PATCH 1/2] ftp-client: Allow custom username and password for FTP
>>  servers.
>>
>> * guix/ftp-client.scm (ftp-open): Add username and password arguments.
>
> OK!
>
>> From e7263ce1d1a242f187c9801b14ea47043f59be8e Mon Sep 17 00:00:00 2001
>> From: Roel Janssen <roel <at> gnu.org>
>> Date: Mon, 20 Mar 2017 12:59:59 +0100
>> Subject: [PATCH 2/2] download: Handle username and password properties for FTP
>>  uris.
>>
>> guix/build/download.scm (ftp-fetch): Process username and password from a URI.
>
> [...]
>
>> +  (let* ((userinfo (string-split (uri-userinfo uri) #\:))
>> +         (username (if (and (> (length userinfo) 0)
>> +                            (not (string= (car userinfo) "")))
>> +                       (car userinfo) #f))
>> +         (password (if (> (length userinfo) 1) (cadr userinfo) #f))
>> +         (conn (ftp-open (uri-host uri) #:timeout timeout
>> +                                        #:username username
>> +                                        #:password password))
>
> Of course I have to agree with Danny here regarding ‘match’.  ;-)
>
>   (let ((user (match userinfo
>                 (() #f)
>                 (("") #f)
>                 (((? string? user)) user)))
>         (pass (match userinfo
>                  …)))
>     …)
>
> OK with a change along these lines.

I am unsure about this patch (see attached).  Is this what you had in mind?
I would probably have to add a copyright line as well, right?

Thank you!

Kind regards,
Roel Janssen

Message #20 received at 26191 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Roel Janssen <roel <at> gnu.org>
Cc: 26191 <at> debbugs.gnu.org, Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: Re: bug#26191: Allow custom FTP logins.
Date: Tue, 21 Mar 2017 11:49:48 +0100

Hi Roel,

Roel Janssen <roel <at> gnu.org> skribis:

> Ludovic Courtès writes:
>
>> Roel Janssen <roel <at> gnu.org> skribis:
>>
>>> From 8536ba69ec3a04930e8a78c8f2b824df3e8c0454 Mon Sep 17 00:00:00 2001
>>> From: Roel Janssen <roel <at> gnu.org>
>>> Date: Mon, 20 Mar 2017 12:57:25 +0100
>>> Subject: [PATCH 1/2] ftp-client: Allow custom username and password for FTP
>>>  servers.
>>>
>>> * guix/ftp-client.scm (ftp-open): Add username and password arguments.
>>
>> OK!
>>
>>> From e7263ce1d1a242f187c9801b14ea47043f59be8e Mon Sep 17 00:00:00 2001
>>> From: Roel Janssen <roel <at> gnu.org>
>>> Date: Mon, 20 Mar 2017 12:59:59 +0100
>>> Subject: [PATCH 2/2] download: Handle username and password properties for FTP
>>>  uris.
>>>
>>> guix/build/download.scm (ftp-fetch): Process username and password from a URI.
>>
>> [...]
>>
>>> +  (let* ((userinfo (string-split (uri-userinfo uri) #\:))
>>> +         (username (if (and (> (length userinfo) 0)
>>> +                            (not (string= (car userinfo) "")))
>>> +                       (car userinfo) #f))
>>> +         (password (if (> (length userinfo) 1) (cadr userinfo) #f))
>>> +         (conn (ftp-open (uri-host uri) #:timeout timeout
>>> +                                        #:username username
>>> +                                        #:password password))
>>
>> Of course I have to agree with Danny here regarding ‘match’.  ;-)
>>
>>   (let ((user (match userinfo
>>                 (() #f)
>>                 (("") #f)
>>                 (((? string? user)) user)))
>>         (pass (match userinfo
>>                  …)))
>>     …)
>>
>> OK with a change along these lines.
>
> I am unsure about this patch (see attached).  Is this what you had in mind?
> I would probably have to add a copyright line as well, right?

Yes, LGTM!

Thanks,
Ludo’.

Message #25 received at 26191-done <at> debbugs.gnu.org (full text, mbox):

From: Roel Janssen <roel <at> gnu.org>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 26191-done <at> debbugs.gnu.org, Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: Re: bug#26191: Allow custom FTP logins.
Date: Tue, 21 Mar 2017 12:18:40 +0100

Ludovic Courtès writes:

> Hi Roel,
>
> Roel Janssen <roel <at> gnu.org> skribis:
>
>> Ludovic Courtès writes:
>>
>>> Roel Janssen <roel <at> gnu.org> skribis:
>>>
>>>> From 8536ba69ec3a04930e8a78c8f2b824df3e8c0454 Mon Sep 17 00:00:00 2001
>>>> From: Roel Janssen <roel <at> gnu.org>
>>>> Date: Mon, 20 Mar 2017 12:57:25 +0100
>>>> Subject: [PATCH 1/2] ftp-client: Allow custom username and password for FTP
>>>>  servers.
>>>>
>>>> * guix/ftp-client.scm (ftp-open): Add username and password arguments.
>>>
>>> OK!
>>>
>>>> From e7263ce1d1a242f187c9801b14ea47043f59be8e Mon Sep 17 00:00:00 2001
>>>> From: Roel Janssen <roel <at> gnu.org>
>>>> Date: Mon, 20 Mar 2017 12:59:59 +0100
>>>> Subject: [PATCH 2/2] download: Handle username and password properties for FTP
>>>>  uris.
>>>>
>>>> guix/build/download.scm (ftp-fetch): Process username and password from a URI.
>>>
>>> [...]
>>>
>>>> +  (let* ((userinfo (string-split (uri-userinfo uri) #\:))
>>>> +         (username (if (and (> (length userinfo) 0)
>>>> +                            (not (string= (car userinfo) "")))
>>>> +                       (car userinfo) #f))
>>>> +         (password (if (> (length userinfo) 1) (cadr userinfo) #f))
>>>> +         (conn (ftp-open (uri-host uri) #:timeout timeout
>>>> +                                        #:username username
>>>> +                                        #:password password))
>>>
>>> Of course I have to agree with Danny here regarding ‘match’.  ;-)
>>>
>>>   (let ((user (match userinfo
>>>                 (() #f)
>>>                 (("") #f)
>>>                 (((? string? user)) user)))
>>>         (pass (match userinfo
>>>                  …)))
>>>     …)
>>>
>>> OK with a change along these lines.
>>
>> I am unsure about this patch (see attached).  Is this what you had in mind?
>> I would probably have to add a copyright line as well, right?
>
> Yes, LGTM!

Ok, thanks!  I pushed the two patches.

Kind regards,
Roel Janssen

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.