浏览代码

fix server-side IndexError for 4-arg open() of old clients, fixes #3192

borg 1.1(.0) server didn't support the 4 argument open() calls made
by < 1.0.7 clients.

(cherry picked from commit dbcc870489a8fe3cc3517a438e21331feef63538)
Thomas Waldmann 7 年之前
父节点
当前提交
2aa676f85c
共有 1 个文件被更改,包括 9 次插入1 次删除
  1. 9 1
      src/borg/remote.py

+ 9 - 1
src/borg/remote.py

@@ -180,7 +180,15 @@ class RepositoryServer:  # pragma: no cover
 
     def positional_to_named(self, method, argv):
         """Translate from positional protocol to named protocol."""
-        return {name: argv[pos] for pos, name in enumerate(compatMap[method])}
+        try:
+            return {name: argv[pos] for pos, name in enumerate(compatMap[method])}
+        except IndexError:
+            if method == 'open' and len(argv) == 4:
+                # borg clients < 1.0.7 use open() with 4 args
+                mapping = compatMap[method][:4]
+            else:
+                raise
+            return {name: argv[pos] for pos, name in enumerate(mapping)}
 
     def filter_args(self, f, kwargs):
         """Remove unknown named parameters from call, because client did (implicitly) say it's ok."""