1
=== removed file 'duplicity/backends/ftpbackend.py'
2
--- duplicity/backends/ftpbackend.py	2014-04-26 12:54:37 +0000
3
+++ duplicity/backends/ftpbackend.py	1970-01-01 00:00:00 +0000
4
@@ -1,114 +0,0 @@
5
1
# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
6
2
#
7
3
# Copyright 2002 Ben Escoto <ben@emerose.org>
8
4
# Copyright 2007 Kenneth Loafman <kenneth@loafman.com>
9
5
#
10
6
# This file is part of duplicity.
11
7
#
12
8
# Duplicity is free software; you can redistribute it and/or modify it
13
9
# under the terms of the GNU General Public License as published by the
14
10
# Free Software Foundation; either version 2 of the License, or (at your
15
11
# option) any later version.
16
12
#
17
13
# Duplicity is distributed in the hope that it will be useful, but
18
14
# WITHOUT ANY WARRANTY; without even the implied warranty of
19
15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
20
16
# General Public License for more details.
21
17
#
22
18
# You should have received a copy of the GNU General Public License
23
19
# along with duplicity; if not, write to the Free Software Foundation,
24
20
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
25
21
26
22
import os.path
27
23
import urllib
28
24
29
25
import duplicity.backend
30
26
from duplicity import globals
31
27
from duplicity import log
32
28
from duplicity import tempdir
33
29
34
30
class FTPBackend(duplicity.backend.Backend):
35
31
    """Connect to remote store using File Transfer Protocol"""
36
32
    def __init__(self, parsed_url):
37
33
        duplicity.backend.Backend.__init__(self, parsed_url)
38
34
39
35
        # we expect an error return, so go low-level and ignore it
40
36
        try:
41
37
            p = os.popen("ncftpls -v")
42
38
            fout = p.read()
43
39
            ret = p.close()
44
40
        except Exception:
45
41
            pass
46
42
        # the expected error is 8 in the high-byte and some output
47
43
        if ret != 0x0800 or not fout:
48
44
            log.FatalError("NcFTP not found:  Please install NcFTP version 3.1.9 or later",
49
45
                           log.ErrorCode.ftp_ncftp_missing)
50
46
51
47
        # version is the second word of the first line
52
48
        version = fout.split('\n')[0].split()[1]
53
49
        if version < "3.1.9":
54
50
            log.FatalError("NcFTP too old:  Duplicity requires NcFTP version 3.1.9,"
55
51
                           "3.2.1 or later.  Version 3.2.0 will not work properly.",
56
52
                           log.ErrorCode.ftp_ncftp_too_old)
57
53
        elif version == "3.2.0":
58
54
            log.Warn("NcFTP (ncftpput) version 3.2.0 may fail with duplicity.\n"
59
55
                     "see: http://www.ncftpd.com/ncftp/doc/changelog.html\n"
60
56
                     "If you have trouble, please upgrade to 3.2.1 or later",
61
57
                     log.WarningCode.ftp_ncftp_v320)
62
58
        log.Notice("NcFTP version is %s" % version)
63
59
64
60
        self.parsed_url = parsed_url
65
61
66
62
        self.url_string = duplicity.backend.strip_auth_from_url(self.parsed_url)
67
63
68
64
        # This squelches the "file not found" result from ncftpls when
69
65
        # the ftp backend looks for a collection that does not exist.
70
66
        # version 3.2.2 has error code 5, 1280 is some legacy value
71
67
        self.popen_breaks[ 'ncftpls' ] = [ 5, 1280 ]
72
68
73
69
        # Use an explicit directory name.
74
70
        if self.url_string[-1] != '/':
75
71
            self.url_string += '/'
76
72
77
73
        self.password = self.get_password()
78
74
79
75
        if globals.ftp_connection == 'regular':
80
76
            self.conn_opt = '-E'
81
77
        else:
82
78
            self.conn_opt = '-F'
83
79
84
80
        self.tempfile, self.tempname = tempdir.default().mkstemp()
85
81
        os.write(self.tempfile, "host %s\n" % self.parsed_url.hostname)
86
82
        os.write(self.tempfile, "user %s\n" % self.parsed_url.username)
87
83
        os.write(self.tempfile, "pass %s\n" % self.password)
88
84
        os.close(self.tempfile)
89
85
        self.flags = "-f %s %s -t %s -o useCLNT=0,useHELP_SITE=0 " % \
90
86
            (self.tempname, self.conn_opt, globals.timeout)
91
87
        if parsed_url.port != None and parsed_url.port != 21:
92
88
            self.flags += " -P '%s'" % (parsed_url.port)
93
89
94
90
    def _put(self, source_path, remote_filename):
95
91
        remote_path = os.path.join(urllib.unquote(self.parsed_url.path.lstrip('/')), remote_filename).rstrip()
96
92
        commandline = "ncftpput %s -m -V -C '%s' '%s'" % \
97
93
            (self.flags, source_path.name, remote_path)
98
94
        self.subprocess_popen(commandline)
99
95
100
96
    def _get(self, remote_filename, local_path):
101
97
        remote_path = os.path.join(urllib.unquote(self.parsed_url.path), remote_filename).rstrip()
102
98
        commandline = "ncftpget %s -V -C '%s' '%s' '%s'" % \
103
99
            (self.flags, self.parsed_url.hostname, remote_path.lstrip('/'), local_path.name)
104
100
        self.subprocess_popen(commandline)
105
101
106
102
    def _list(self):
107
103
        # Do a long listing to avoid connection reset
108
104
        commandline = "ncftpls %s -l '%s'" % (self.flags, self.url_string)
109
105
        _, l, _ = self.subprocess_popen(commandline)
110
106
        # Look for our files as the last element of a long list line
111
107
        return [x.split()[-1] for x in l.split('\n') if x and not x.startswith("total ")]
112
108
113
109
    def _delete(self, filename):
114
110
        commandline = "ncftpls %s -l -X 'DELE %s' '%s'" % \
115
111
            (self.flags, filename, self.url_string)
116
112
        self.subprocess_popen(commandline)
117
113
118
114
duplicity.backend.register_backend("ftp", FTPBackend)
119
115
0
120
=== renamed file 'duplicity/backends/ftpsbackend.py' => 'duplicity/backends/ftpbackend.py'
121
--- duplicity/backends/ftpsbackend.py	2014-04-28 02:49:39 +0000
122
+++ duplicity/backends/ftpbackend.py	2014-10-13 13:20:56 +0000
123
@@ -3,6 +3,7 @@
124
3
# Copyright 2002 Ben Escoto <ben@emerose.org>
3
# Copyright 2002 Ben Escoto <ben@emerose.org>
125
4
# Copyright 2007 Kenneth Loafman <kenneth@loafman.com>
4
# Copyright 2007 Kenneth Loafman <kenneth@loafman.com>
126
5
# Copyright 2010 Marcel Pennewiss <opensource@pennewiss.de>
5
# Copyright 2010 Marcel Pennewiss <opensource@pennewiss.de>
127
6
# Copyright 2014 Moritz Maisel <moritz@maisel.name>
128
6
#
7
#
129
7
# This file is part of duplicity.
8
# This file is part of duplicity.
130
8
#
9
#
131
@@ -30,7 +31,7 @@
132
30
from duplicity import log
31
from duplicity import log
133
31
from duplicity import tempdir
32
from duplicity import tempdir
134
32
33
136
33
class FTPSBackend(duplicity.backend.Backend):
34
class FTPBackend(duplicity.backend.Backend):
137
34
    """Connect to remote store using File Transfer Protocol"""
35
    """Connect to remote store using File Transfer Protocol"""
138
35
    def __init__(self, parsed_url):
36
    def __init__(self, parsed_url):
139
36
        duplicity.backend.Backend.__init__(self, parsed_url)
37
        duplicity.backend.Backend.__init__(self, parsed_url)
140
@@ -109,4 +110,5 @@
141
109
        commandline = "lftp -c 'source %s;cd \'%s\';rm \'%s\''" % (self.tempname, remote_dir, filename)
110
        commandline = "lftp -c 'source %s;cd \'%s\';rm \'%s\''" % (self.tempname, remote_dir, filename)
142
110
        self.subprocess_popen(commandline)
111
        self.subprocess_popen(commandline)
143
111
112
145
112
duplicity.backend.register_backend("ftps", FTPSBackend)
113
duplicity.backend.register_backend("ftp", FTPBackend)
146
114
duplicity.backend.register_backend("ftps", FTPBackend)
Reviewer	Review Type	Date Requested	Status
duplicity-team		2014-10-13	Pending
Review via email: mp+238157@code.launchpad.net