bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 2/2] bootstrap, gnulib-tool: use https instead of insecure rsync


From: Benno Schulenberg
Subject: [PATCH 2/2] bootstrap, gnulib-tool: use https instead of insecure rsync
Date: Sun, 7 Oct 2018 18:20:44 +0200

The rsync command does not do any authentication and thus allows
man-in-the-middle attacks.  Better use wget over https, although
this is slower.

* build-aux/bootstrap (download_po_files, po_download_command_format):
Don't try using rsync; always use wget over https to fetch PO files.
* gnulib-tool (func_import): Likewise.
* pygnulib/GLImport.py (GLImport.execute): Likewise.
---
 build-aux/bootstrap  | 12 +-----------
 gnulib-tool          | 10 +---------
 pygnulib/GLImport.py | 13 +++----------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 4a37ed0d0..cde39f4e7 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -164,15 +164,8 @@ bootstrap_epilogue() { :; }
 
 # The command to download all .po files for a specified domain into
 # a specified directory.  Fill in the first %s is the domain name, and
-# the second with the destination directory.  Use rsync's -L and -r
-# options because the latest/%s directory and the .po files within are
-# all symlinks.
+# the second with the destination directory.
 po_download_command_format=\
-"rsync --include '*.po' --exclude '*' -Lrtvz \
- 'translationproject.org::tp/latest/%s/' '%s'"
-
-# Fallback for downloading .po files (if rsync fails).
-po_download_command_format2=\
 "wget --mirror --level=1 -nd -q -A.po -P '%s' \
  https://translationproject.org/latest/%s/";
 
@@ -742,9 +735,6 @@ download_po_files() {
   domain=$2
   echo "$me: getting translations into $subdir for $domain..."
   cmd=$(printf "$po_download_command_format" "$domain" "$subdir")
-  eval "$cmd" && return
-  # Fallback to HTTPS.
-  cmd=$(printf "$po_download_command_format2" "$subdir" "$domain")
   eval "$cmd"
 }
 
diff --git a/gnulib-tool b/gnulib-tool
index a0a52ce80..90e17aa19 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -5431,18 +5431,10 @@ s,//*$,/,'
     fi
     # Fetch PO files.
     TP_URL="https://translationproject.org/latest/";
-    TP_RSYNC_URI="translationproject.org::tp/latest/"
     if $doit; then
       echo "Fetching gnulib PO files from $TP_URL"
       (cd "$destdir"/$pobase \
-       && { # Prefer rsync over wget if it is available, since it consumes
-            # less network bandwidth, due to compression.
-            if type rsync 2>/dev/null | grep / > /dev/null; then
-              rsync --delete --include "*.po" --exclude "*" -Lrtz 
"${TP_RSYNC_URI}gnulib/" . && return
-            fi
-
-            wget --no-verbose --mirror -l1 -nd -A.po -P . "${TP_URL}gnulib/"
-          }
+       && wget --no-verbose --mirror -l1 -nd -A.po -P . "${TP_URL}gnulib/"
       )
     else
       echo "Fetch gnulib PO files from $TP_URL"
diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index 3b4729ee7..19ade5e8d 100644
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -1200,19 +1200,12 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
 
             # Fetch PO files.
             TP_URL = 'https://translationproject.org/latest/'
-            TP_RSYNC_URI = 'translationproject.org::tp/latest/'
             if not self.config['dryrun']:
                 print('Fetching gnulib PO files from %s' % TP_URL)
                 os.chdir(joinpath(destdir, pobase))
-                cmd = 'type rsync 2>/dev/null | grep / > /dev/null'
-                result = sp.call(cmd, shell=True)
-                if result == 0:  # use rsync
-                    args = ['rsync', '--include', '*.po', '--exclude', '*', 
'-Lrtz', '%sgnulib/' % TP_RSYNC_URI, '.']
-                    result = sp.call(args, shell=True)
-                if result != 0:  # use wget
-                    args = ['wget', '--no-verbose', '--mirror', '--level=1', 
'-nd', '-A.po', '-P', '.',
-                            '%sgnulib/' % TP_URL]
-                    sp.call(args, shell=True)
+                args = ['wget', '--no-verbose', '--mirror', '--level=1', 
'-nd', '-A.po', '-P', '.',
+                        '%sgnulib/' % TP_URL]
+                sp.call(args, shell=True)
             else:  # if self.config['dryrun']
                 print('Fetch gnulib PO files from %s' % TP_URL)
 
-- 
2.17.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]