diff mbox

guix: Support authentication when fetching from SVN.

Message ID 20160630134323.25587-1-ricardo.wurmus@mdc-berlin.de
State New
Headers show

Commit Message

Ricardo Wurmus June 30, 2016, 1:43 p.m. UTC
* guix/svn-download.scm (<svn-reference>): Add fields for optional
credentials.
(svn-fetch): Pass credentials to build-side "svn-fetch".
* guix/build/svn.scm (svn-fetch): Pass optional credentials to svn
command.
---
 guix/build/svn.scm    | 21 ++++++++++++++-------
 guix/svn-download.scm |  8 ++++++--
 2 files changed, 20 insertions(+), 9 deletions(-)

Comments

Ludovic Courtès June 30, 2016, 9:09 p.m. UTC | #1
Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:

> * guix/svn-download.scm (<svn-reference>): Add fields for optional
> credentials.
> (svn-fetch): Pass credentials to build-side "svn-fetch".
> * guix/build/svn.scm (svn-fetch): Pass optional credentials to svn
> command.

[...]

> --- a/guix/svn-download.scm
> +++ b/guix/svn-download.scm
> @@ -42,7 +42,9 @@
>    svn-reference make-svn-reference
>    svn-reference?
>    (url      svn-reference-url)                    ; string
> -  (revision svn-reference-revision))              ; number
> +  (revision svn-reference-revision)               ; number
> +  (username svn-reference-username (default #f))

I think I’m old-school, but I would prefer ‘user-name’.

Otherwise LGTM, thank you!

Ludo’.
Alex Kost July 1, 2016, 9:09 a.m. UTC | #2
Ludovic Courtès (2016-07-01 00:09 +0300) wrote:

> Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:
>
>> * guix/svn-download.scm (<svn-reference>): Add fields for optional
>> credentials.
>> (svn-fetch): Pass credentials to build-side "svn-fetch".
>> * guix/build/svn.scm (svn-fetch): Pass optional credentials to svn
>> command.
>
> [...]
>
>> --- a/guix/svn-download.scm
>> +++ b/guix/svn-download.scm
>> @@ -42,7 +42,9 @@
>>    svn-reference make-svn-reference
>>    svn-reference?
>>    (url      svn-reference-url)                    ; string
>> -  (revision svn-reference-revision))              ; number
>> +  (revision svn-reference-revision)               ; number
>> +  (username svn-reference-username (default #f))
>
> I think I’m old-school, but I would prefer ‘user-name’.

I also prefer "user-name".
Ricardo Wurmus July 6, 2016, 10:37 a.m. UTC | #3
Alex Kost <alezost@gmail.com> writes:

> Ludovic Courtès (2016-07-01 00:09 +0300) wrote:
>>> --- a/guix/svn-download.scm
>>> +++ b/guix/svn-download.scm
>>> @@ -42,7 +42,9 @@
>>>    svn-reference make-svn-reference
>>>    svn-reference?
>>>    (url      svn-reference-url)                    ; string
>>> -  (revision svn-reference-revision))              ; number
>>> +  (revision svn-reference-revision)               ; number
>>> +  (username svn-reference-username (default #f))
>>
>> I think I’m old-school, but I would prefer ‘user-name’.
>
> I also prefer "user-name".

I changed it to “user-name” and pushed.

Thanks!

~~ Ricardo
diff mbox

Patch

diff --git a/guix/build/svn.scm b/guix/build/svn.scm
index 74fe084..0506e4e 100644
--- a/guix/build/svn.scm
+++ b/guix/build/svn.scm
@@ -29,15 +29,22 @@ 
 ;;; Code:
 
 (define* (svn-fetch url revision directory
-                    #:key (svn-command "svn"))
+                    #:key (svn-command "svn")
+                    (username #f)
+                    (password #f))
   "Fetch REVISION from URL into DIRECTORY.  REVISION must be an integer, and a
 valid Subversion revision.  Return #t on success, #f otherwise."
-  (and (zero? (system* svn-command "checkout" "--non-interactive"
-                       ;; Trust the server certificate.  This is OK as we
-                       ;; verify the checksum later.  This can be removed when
-                       ;; ca-certificates package is added.
-                       "--trust-server-cert" "-r" (number->string revision)
-                       url directory))
+  (and (zero? (apply system* svn-command
+                     "checkout" "--non-interactive"
+                     ;; Trust the server certificate.  This is OK as we
+                     ;; verify the checksum later.  This can be removed when
+                     ;; ca-certificates package is added.
+                     "--trust-server-cert" "-r" (number->string revision)
+                     `(,@(if (and username password)
+                             (list (string-append "--username=" username)
+                                   (string-append "--password=" password))
+                             '())
+                       ,url ,directory)))
        (with-directory-excursion directory
          (begin
            ;; The contents of '.svn' vary as a function of the current status
diff --git a/guix/svn-download.scm b/guix/svn-download.scm
index d6853ca..b15e3e0 100644
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@ -42,7 +42,9 @@ 
   svn-reference make-svn-reference
   svn-reference?
   (url      svn-reference-url)                    ; string
-  (revision svn-reference-revision))              ; number
+  (revision svn-reference-revision)               ; number
+  (username svn-reference-username (default #f))
+  (password svn-reference-password (default #f)))
 
 (define (subversion-package)
   "Return the default Subversion package."
@@ -62,7 +64,9 @@  HASH-ALGO (a symbol).  Use NAME as the file name, or a generic name if #f."
         (svn-fetch '#$(svn-reference-url ref)
                    '#$(svn-reference-revision ref)
                    #$output
-                   #:svn-command (string-append #+svn "/bin/svn"))))
+                   #:svn-command (string-append #+svn "/bin/svn")
+                   #:username #$(svn-reference-username ref)
+                   #:password #$(svn-reference-password ref))))
 
   (mlet %store-monad ((guile (package->derivation guile system)))
     (gexp->derivation (or name "svn-checkout") build