X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=python%2Fcumulus%2Fstore%2Fsftp.py;h=f7818614552a9ae184884159efe56e028724e6ee;hp=de77b6465e52edb874b609361b09c35230ece2f3;hb=64bff41cb3ccdd60e767a5bb9ed8525d2dda1966;hpb=a44f5f73e7b43ff152f8b515a74bb9e0b1b48cc6

diff --git a/python/cumulus/store/sftp.py b/python/cumulus/store/sftp.py
index de77b64..f781861 100644
--- a/python/cumulus/store/sftp.py
+++ b/python/cumulus/store/sftp.py
@@ -1,4 +1,24 @@
-# vim: ai ts=4 sts=4 et sw=4
+# Cumulus: Efficient Filesystem Backup to the Cloud
+# Copyright (C) 2010 The Cumulus Developers
+# See the AUTHORS file for a list of contributors.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+#needed for python 2.5
+from __future__ import with_statement
+
 from paramiko import Transport, SFTPClient, RSAKey, DSSKey
 from paramiko.config import SSHConfig
 import paramiko.util
@@ -8,26 +28,34 @@ import getpass
 import re
 import sys
 
+
 class SSHHostConfig(dict):
     def __init__(self, hostname, user = None, filename = None):
-        dict.__init__()
         #set defaults
         if filename == None:
             filename = os.path.expanduser('~/.ssh/config')
-        self['port'] = 22
-        self['user'] = getpass.getuser()
-        self['hostname'] = hostname
-        self['hostkeyalias'] = hostname
 
         #read config file
         ssh_config = SSHConfig()
         with open(filename) as config_file:
             ssh_config.parse(config_file)
+
         self.update(ssh_config.lookup(hostname))
 
+        self.defaults={'port': 22, 'user': getpass.getuser(), 'hostname': hostname, 'hostkeyalias': hostname}
+
         if user != None:
             self['user'] = user
 
+    def __getitem__(self, key):
+        if key in self:
+            return dict.__getitem__(self,key)
+        elif key == 'hostkeyalias' and 'hostname' in self:
+            return dict.__getitem__(self,'hostname')
+        else:
+            return self.defaults[key]
+
+
 class SFTPStore(Store):
     """implements the sftp:// storage backend
 
@@ -37,40 +65,39 @@ class SFTPStore(Store):
         does not support password authentication or password
         protected authentication keys"""
     def __init__(self, url, **kw):
-        if self.path.find('@') != -1:
-            user, self.path = self.path.split('@')
+        if self.netloc.find('@') != -1:
+            user, self.netloc = self.netloc.split('@')
         else:
             user = None
 
-        if self.path.find(':') != -1:
-            host, self.path = selfpath.split(':')
-        else:
-            host, self.path = self.path.split('/', 1)
-
-        self.config = SSHHostConfig(host, user)
-
+        self.config = SSHHostConfig(self.netloc, user)
 
         host_keys = paramiko.util.load_host_keys(os.path.expanduser('~/.ssh/known_hosts'))
-        self.hostkey = host_keys[config['hostkeyalias']].values()[0]
+        try:
+            self.hostkey = host_keys[self.config['hostkeyalias']].values()[0]
+        except:
+            print str(self.config)
+            raise
+
 
-        if(config.has_key('identityfile')):
-            key_file = os.path.expanduser(host_config['identityfile'])
+        if(self.config.has_key('identityfile')):
+            key_file = os.path.expanduser(self.config['identityfile'])
             #not really nice but i don't see a cleaner way atm...
             try:
-                self.auth_key = RSAKey (filename = key_file)
+                self.auth_key = RSAKey (key_file)
             except SSHException, e:
                 if e.message == 'Unable to parse file':
-                    self.auth_key = DSAKey (filename = key_file)
+                    self.auth_key = DSAKey (key_file)
                 else:
                     raise
         else:
             filename = os.path.expanduser('~/.ssh/id_rsa')
             if os.path.exists(filename):
-                self.auth_key = RSAKey(filename = filename)
+                self.auth_key = RSAKey(filename)
             else:
                 filename = os.path.expanduser('~/.ssh/id_dsa')
                 if (os.path.exists(filename)):
-                    self.auth_key = DSSKey (filename = filename)
+                    self.auth_key = DSSKey (filename)
 
         self.__connect()
 
@@ -87,10 +114,10 @@ class SFTPStore(Store):
         return filter(type_patterns[type].match, self.client.listdir(self.path))
 
     def get(self, type, name):
-        return self.client.open(filename = self.__build_fn(name), mode = 'rb')
+        return self.client.open(self.__build_fn(name), mode = 'rb')
 
     def put(self, type, name, fp):
-        remote_file = self.client.open(filename = self.__build_fn(name), mode = 'wb')
+        remote_file = self.client.open(self.__build_fn(name), mode = 'wb')
         buf = fp.read(4096)
         while (len(buf) > 0):
             remote_file.write(buf)
@@ -98,11 +125,14 @@ class SFTPStore(Store):
         remote_file.close()
 
     def delete(self, type, name):
-        self.client.remove(filename = self.__build_fn(name))
+        self.client.remove(self.__build_fn(name))
 
     def stat(self, type, name):
-        stat = self.client.stat(filename = self.__build_fn(name))
-        return {'size': stat.st_size}
+        try:
+            stat = self.client.stat(self.__build_fn(name))
+            return {'size': stat.st_size}
+        except IOError:
+            raise NotFoundError
 
     def close(self):
         """connection has to be explicitly closed, otherwise