Correction of few bugs on windows/debian client and some code refactoring

install/requirements.txt

@@ -59,7 +59,7 @@ unicode-slugify==0.1.3
 vobject==0.9.2
 waitress==0.8.9
 who-ldap==3.1.0
--e git+git@github.com:mar10/wsgidav.git@b95354f17ec57133c656f470ca3933a3bd54f524#egg=wsgidav
+-e git+git@github.com:Nonolost/wsgidav.git@73f832e6bd94ac21ae608af43a9516ff31abc9a2#egg=wsgidav
 zope.interface==4.1.3
 zope.sqlalchemy==0.7.6
 

tracim/tracim/controllers/root.py

@@ -144,7 +144,7 @@ class RootController(StandardController):
         # - last activity
         # - oldest open stuff
 
-        items = ContentApi(user).get_all(None, ContentType.Any, None)[:4]
+        items = ContentApi(user).get_all_without_exception(ContentType.Any, None)[:4]
         fake_api.favorites = Context(CTX.CONTENT_LIST).toDict(items, 'contents', 'nb')
         return DictLikeClass(fake_api=fake_api)
 

tracim/tracim/lib/content.py

@@ -396,9 +396,13 @@ class ContentApi(object):
         try:
             return resultset.filter(Content.label == content_label).one()
         except:
-            return resultset.filter(Content.file_name == content_label).one()
+            try:
+                return resultset.filter(Content.file_name == content_label).one()
+            except:
+                import re
+                return resultset.filter(Content.label == re.sub(r'\.[^.]+$', '', content_label)).one()
 
-    def get_all(self, parent_id: int, content_type: str, workspace: Workspace=None) -> [Content]:
+    def get_all(self, parent_id: int=None, content_type: str=ContentType.Any, workspace: Workspace=None) -> [Content]:
         assert parent_id is None or isinstance(parent_id, int) # DYN_REMOVE
         assert content_type is not None# DYN_REMOVE
         assert isinstance(content_type, str) # DYN_REMOVE
@@ -412,10 +416,10 @@ class ContentApi(object):
 
         return resultset.all()
 
-    def get_all_without_exception(self, content_type: str) -> [Content]:
+    def get_all_without_exception(self, content_type: str, workspace: Workspace=None) -> [Content]:
         assert content_type is not None# DYN_REMOVE
 
-        resultset = self._base_query(None)
+        resultset = self._base_query(workspace)
 
         if content_type != ContentType.Any:
             resultset = resultset.filter(Content.type==content_type)

tracim/tracim/lib/daemons.py

@@ -230,6 +230,9 @@ from wsgidav.xml_tools import useLxml
 from wsgidav.wsgidav_app import WsgiDAVApp
 from wsgidav._version import __version__
 
+from tracim.lib.webdav.sql_dav_provider import Provider
+from tracim.lib.webdav.sql_domain_controller import SQLDomainController
+
 from inspect import isfunction
 import traceback
 
@@ -252,21 +255,25 @@ class WsgiDavDaemon(Daemon):
 
         # Configuration file overrides defaults
         config_file = os.path.abspath(DEFAULT_CONFIG_FILE)
-        if config_file:
-            fileConf = self._readConfigFile(config_file, temp_verbose)
-            config.update(fileConf)
-        else:
-            if temp_verbose >= 2:
-                print("Running without configuration file.")
+        fileConf = self._readConfigFile(config_file, temp_verbose)
+        config.update(fileConf)
 
         if not useLxml and config["verbose"] >= 1:
             print(
                 "WARNING: Could not import lxml: using xml instead (slower). Consider installing lxml from http://codespeak.net/lxml/.")
 
-        if not config["provider_mapping"]:
-            print("ERROR: No DAV provider defined. Try --help option.", file=sys.stderr)
-            sys.exit(-1)
-
+        config['provider_mapping'] = \
+            {
+                config['root_path']: Provider(
+                    show_archived=config['show_archived'],
+                    show_deleted=config['show_deleted'],
+                    show_history=config['show_history'],
+                    manage_locks=config['manager_locks']
+                )
+            }
+
+        config['domaincontroller'] = SQLDomainController(presetdomain=None, presetserver=None)
+        config['defaultdigest'] = False
         return config
 
     def _readConfigFile(self, config_file, verbose):
@@ -336,7 +343,6 @@ class WsgiDavDaemon(Daemon):
 
     def stop(self):
         self._server.stop()
-        print("WsgiDav : je m'arrête")
 
     def append_thread_callback(self, callback: collections.Callable) -> None:
         """

tracim/tracim/lib/webdav/__init__.py

@@ -2,7 +2,7 @@ from wsgidav.compat import to_bytes
 
 from tracim.lib.content import ContentApi
 from tracim.model import new_revision
-from tracim.model.data import ActionDescription, ContentType, Content
+from tracim.model.data import ActionDescription, ContentType, Content, Workspace
 from wsgidav import util
 
 import transaction
@@ -14,52 +14,77 @@ class HistoryType(object):
     All = 'all'
 
 
-class FileStream(object):
-    def __init__(self, file_name: str, content: Content, content_api: ContentApi, new_file: bool):
+class FakeFileStream(object):
+    """Fake a FileStream object that is needed by wsgidav to create or update existing files
+    with new content"""
+
+    def __init__(self, content_api: ContentApi, workspace: Workspace,
+                 file_name: str='', content: Content=None, parent: Content=None):
+        """
+
+        :param file_name: the filename if the file is new
+        :param content_api:
+        :param workspace: content's workspace, necessary if the file is new as we've got no other way to get it
+        :param content: either the content to be updated or None if it's a new file
+        """
         self._buffer = []
         self._file_name = file_name if file_name != '' else self._content.file_name
         self._content = content
         self._api = content_api
-        self._is_new_file = new_file
+        self._workspace = workspace
+        self._parent = parent
 
-    def beginWrite(self, contentType) -> 'FileStream':
+    def beginWrite(self, contentType) -> 'FakeFileStream':
+        """Called by request_server to user as a file stream to write bits by bits content into a filestream"""
         return self
 
     def endWrite(self, withErrors: bool):
+        """Called by request_server when finished writing everythin, wdc"""
         pass
 
     def write(self, s: str):
+        """Called by request_server when writing content to files, we stock it in our file"""
         self._buffer.append(s)
 
     def close(self):
+        """Called by request_server when everything has been written and we either update the file or
+        create a new file"""
         item_content = b''
 
         for part in self._buffer:
             item_content += part
 
-        if self._is_new_file:
-            file = self._api.create(
-                content_type=ContentType.File,
-                workspace=self._content.workspace,
-                parent=self._content
-                )
+        if self._content is None:
+            self.create_file(item_content)
+        else:
+            self.update_file(item_content)
+
+    def create_file(self, item_content):
+        file = self._api.create(
+            content_type=ContentType.File,
+            workspace=self._workspace,
+            parent=self._parent
+            )
+
+        self._api.update_file_data(
+            file,
+            self._file_name,
+            util.guessMimeType(self._file_name),
+            item_content
+        )
 
+        self._api.save(file, ActionDescription.CREATION)
+
+        transaction.commit()
+
+    def update_file(self, item_content: bytes):
+        with new_revision(self._content):
             self._api.update_file_data(
-                file,
+                self._content,
                 self._file_name,
-                util.guessMimeType(self._file_name),
+                util.guessMimeType(self._content.file_name),
                 item_content
-                )
+            )
+            self._api.save(self._content, ActionDescription.EDITION)
 
-            self._api.save(file, ActionDescription.CREATION)
-
-        else:
-            with new_revision(self._content):
-                self._api.update_file_data(
-                    self._content,
-                    self._file_name,
-                    util.guessMimeType(self._content.file_name),
-                    item_content)
-                self._api.save(self._content, ActionDescription.EDITION)
-
-        transaction.commit()
+        transaction.commit()

tracim/tracim/lib/webdav/sql_dav_provider.py

@@ -30,19 +30,21 @@ def wsgi_encode(s):
     return s.encode().decode('latin1')
 
 
+
+
 # ============================================================
 # PostgreSQLProvider
 # ============================================================
 class Provider(DAVProvider):
-    def __init__(self, manage_lock=True):
+    def __init__(self, show_history=True, show_deleted=True, show_archived=True, manage_locks=True):
         super(Provider, self).__init__()
 
-        if manage_lock:
+        if manage_locks:
             self.lockManager = LockManager(LockStorage())
 
-        self._show_archive = True
-        self._show_delete = True
-        self._show_history = True
+        self._show_archive = show_archived
+        self._show_delete = show_deleted
+        self._show_history = show_history
 
     def show_history(self):
         return self._show_history
@@ -61,8 +63,15 @@ class Provider(DAVProvider):
     def getResourceInst(self, path, environ):
         #if not self.exists(path, environ):
         #    return None
+        if not self.exists(path, environ):
+            return None
+
+        uapi = UserApi(None)
+        environ['user'] = uapi.get_one_by_email(environ['http_authenticator.username'])
 
         norm_path = normpath(path)
+        norm_path = self.transform_to_display(norm_path)
+
         root_path = environ['http_authenticator.realm']
         parent_path = dirname(norm_path)
 
@@ -101,6 +110,7 @@ class Provider(DAVProvider):
                 path=norm_path,
                 environ=environ,
                 content=content,
+                workspace=self.get_workspace_from_path(norm_path, workspace_api)
             )
 
         # is delete
@@ -110,7 +120,8 @@ class Provider(DAVProvider):
             return sql_resources.DeletedFolder(
                 path=norm_path,
                 environ=environ,
-                content=content
+                content=content,
+                workspace=self.get_workspace_from_path(norm_path, workspace_api)
             )
 
         # is history
@@ -128,7 +139,8 @@ class Provider(DAVProvider):
                 path=norm_path,
                 environ=environ,
                 content=content,
-                type=type
+                type=type,
+                workspace=self.get_workspace_from_path(norm_path, workspace_api)
             )
 
         # is history
@@ -154,16 +166,21 @@ class Provider(DAVProvider):
                 return sql_resources.HistoryOtherFile(path, environ, content, content_revision)
 
         # other
+        if content is None:
+            return None
         if content.type == ContentType.Folder:
-            return sql_resources.Folder(path, environ, content)
+            return sql_resources.Folder(path, environ, content, content.workspace)
         elif content.type == ContentType.File:
-            return sql_resources.File(path, environ, content, False)
+            return sql_resources.File(path, environ, content)
         elif content.type in [ContentType.Page, ContentType.Thread]:
             return sql_resources.OtherFile(path, environ, content)
         else:
             return None
 
     def exists(self, path, environ):
+        uapi = UserApi(None)
+        environ['user'] = uapi.get_one_by_email(environ['http_authenticator.username'])
+
         norm_path = normpath(path)
         parent_path = dirname(norm_path)
         root_path = environ['http_authenticator.realm']
@@ -176,16 +193,12 @@ class Provider(DAVProvider):
         )
 
         if path == root_path:
-            return sql_resources.Root(path, environ)
+            return True
         elif parent_path == root_path:
-            return sql_resources.Workspace(
-                path=norm_path,
-                environ=environ,
-                workspace=self.get_workspace_from_path(
+            return self.get_workspace_from_path(
                     norm_path,
                     workspace_api
-                )
-            ) is not None
+                ) is not None
 
         is_archived = re.search(r'/\.archived/(\.history/)?(?!\.history)[^/]*(/\.)?(history|deleted|archived)?$', norm_path) is not None
 
@@ -193,6 +206,10 @@ class Provider(DAVProvider):
 
         revision_id = re.search(r'/\.history/[^/]+/(\d+)-([^/].+)$', norm_path)
 
+        blbl = self.reduce_path(norm_path)
+        if dirname(blbl) == '/':
+            return self.get_workspace_from_path(norm_path, workspace_api) is not None
+
         if revision_id:
             revision_id = revision_id.group(1)
             content = content_api.get_one_revision(revision_id)
@@ -217,18 +234,18 @@ class Provider(DAVProvider):
 
         workspace = self.get_workspace_from_path(path, workspace_api)
 
-        if basename(dirname(path)) == workspace.label:
-            try:
-                return content_api.get_one_by_label_and_parent(basename(path), workspace=workspace)
-            except:
+        try:
+            if basename(dirname(path)) == workspace.label:
+                return content_api.get_one_by_label_and_parent(
+                    self.transform_to_bdd(basename(path)),
+                    workspace=workspace
+                )
+            else:
+                parent = self.get_parent_from_path(path, content_api, workspace_api)
+                if parent is not None:
+                    return content_api.get_one_by_label_and_parent(self.transform_to_bdd(basename(path)), content_parent=parent)
                 return None
-        else:
-            parent = self.get_parent_from_path(path, content_api, workspace_api)
-            if parent is not None:
-                try:
-                    return content_api.get_one_by_label_and_parent(basename(path), content_parent=parent)
-                except:
-                    return None
+        except:
             return None
 
     def get_content_from_revision(self, revision: ContentRevisionRO, api:ContentApi):
@@ -238,320 +255,53 @@ class Provider(DAVProvider):
             return None
 
     def get_parent_from_path(self, path, api: ContentApi, workspace_api: WorkspaceApi):
+
         return self.get_content_from_path(dirname(path), api, workspace_api)
 
     def get_workspace_from_path(self, path: str, api: WorkspaceApi):
         assert path.startswith('/')
 
-        print(path)
         try:
-            return api.get_one_by_label(path.split('/')[1])
+            return api.get_one_by_label(self.transform_to_bdd(path.split('/')[1]))
         except:
             return None
 
-    #########################################################
-    # Everything that transform path
-    '''
-    def from_id_to_name(self, path):
-        path_ret = ''
-
-        for item_id in path.split('/'):
-            if item_id == '':
-                pass
-            elif path_ret == '':
-                path_ret += '/' + self.get_workspace({'workspace_id': item_id}).label
-            else:
-                path_ret += '/' + self.get_item({'id': item_id}).item_name
-
-        return path_ret
-
-    def from_name_to_id(self, path):
-        if path == '/':
-            return '/'
-        path_ret = ""
-        last_id = None
-        workspace_id = None
-
-        for item_name in path.split("/"):
-            if item_name == '':
-                pass
-            elif path_ret == '':
-                workspace = self.get_workspace({'label': item_name})
-                if workspace is None:
-                    return None
-
-                workspace_id = workspace.workspace_id
-                path_ret += '/' + str(workspace_id)
-            else:
-                item = self.get_item(
-                    {
-                        'parent_id': last_id,
-                        'item_name': item_name,
-                        'workspace_id': workspace_id,
-                        'child_revision_id': None
-                    }
-                )
-
-                if item is None:
-                    return None
-
-                last_id = item.id
-                path_ret += '/' + str(last_id)
-
-        return path_ret
-
-    #########################################################
-    # Everything that check things (lol) ...
-    def has_right(self, username, workspace_id, expected=0):
-        ret = self.session.query(UserRoleInWorkspace.role).filter(
-            UserRoleInWorkspace.workspace_id == workspace_id,
-            User.user_id == UserRoleInWorkspace.user_id,
-            User.display_name == username
-        ).one_or_none()
-
-        return ret is not None and role[ret.role] >= expected
-
-    def exist_revision(self, item_name, item_id):
-        return self.get_item({'id': item_id, 'item_name': item_name}) is not None
-
-    @staticmethod
-    def is_history(path):
-        return normpath(path).endswith('.history')
-
-    #########################################################
-    # Everything that goes with "delete"
-    def delete_item(self, element):
-        self.session.delete(element)
-        self.session.commit()
-
-    #########################################################
-    # Everything that goes with "add"
-    def add_item(self, item_name, item_type, workspace_id, parent_id=None, parent_revision_id=None,
-                 child_revision_id=None, item_content=None, created=None, updated=None):
-
-        item = ItemRevision(
-            item_name=to_unicode(item_name),
-            item_type=to_unicode(item_type),
-            item_content=item_content,
-            workspace_id=workspace_id,
-            parent_id=parent_id,
-            created=created,
-            updated=updated,
-            parent_revision_id=parent_revision_id,
-            child_revision_id=child_revision_id
-        )
-
-        self.session.add(item)
-        self.session.commit()
-
-        return item
-
-    def add_workspace(self, environ, label):
-        workspace = Workspace(label=label)
-
-        self.session.add(workspace)
-
-        user = self.get_user_with_name(environ['http_authenticator.username'])
-
-        user_workspace = UserRoleInWorkspace(
-            role='WORKSPACE_MANAGER',
-            workspace_id=workspace.workspace_id,
-            user_id=user.user_id
-        )
-
-        self.session.add(user_workspace)
-        self.session.commit()
-
-        return workspace
-
-    #########################################################
-    # Everything that goes with "set"
-    def set_workspace_label(self, workspace, label):
-        workspace.label = label
-        self.session.commit()
-
-    #########################################################
-    # Everything that goes with "get"
-    def get_all_revisions_from_item(self, item, only_id=False):
-        ret = []
-        current_item = item
-        while current_item is not None:
-            if only_id:
-                ret.insert(0,current_item.id)
-            else:
-                ret.insert(0,current_item)
-
-            current_item = self.get_item(
-                {
-                    'child_revision_id': current_item.id
-                }
-            )
-
-        return ret
-
-    def get_item(self, keys_dict):
-        query = self.session.query(ItemRevision)
-
-        for key, value in keys_dict.items():
-            query = query.filter(getattr(ItemRevision, key) == value)
-        return query.first()
-
-    def get_item_children(self, item_id):
-        items_result = self.session.query(ItemRevision.id).filter(
-            ItemRevision.parent_id == item_id,
-            ItemRevision.child_revision_id.is_(None)
-        )
-
-        ret_id = []
-        for item in items_result:
-            ret_id.append(item.id)
-
-        return ret_id
-
-    def get_workspace_id_from_path(self, path):
-        return int(self.get_id_from_path('/' + path.split('/')[1]))
-
-    def get_workspace_children_id(self, workspace):
-        items_result = self.session.query(ItemRevision.id).filter(
-            ItemRevision.parent_id.is_(None),
-            ItemRevision.workspace_id == workspace.workspace_id
-        )
-
-        ret = []
-        for item in items_result:
-            ret.append(item.id)
-
-        return ret
-
-    # on workspaces
-    def get_workspace(self, keys_dict):
-        query = self.session.query(Workspace)
-
-        for key, value in keys_dict.items():
-            query = query.filter(getattr(Workspace, key) == value)
-        return query.one_or_none()
-
-    def get_all_workspaces(self, only_name=False):
-        retlist = []
-        for workspace in self.session.query(Workspace).all():
-            if only_name:
-                retlist.append(workspace.label)
-            else:
-                retlist.append(workspace)
-
-        return retlist
-
-    # on users
-    def get_user_with_name(self, username):
-        return self.session.query(User).filter(
-            User.display_name == username
-        ).one_or_none()
-
-    # on path
-    def get_id_from_path(self, path):
-        path_id = self.from_name_to_id(path)
-
-        if path_id == '/':
-            return None
-        else:
-            return int(basename(path_id))
-
-    def get_parent_id_from_path(self, path):
-        return self.get_id_from_path(dirname(path))
-
-    #########################################################
-    # Everything that goes with "move"
-    def move_item(self, item, destpath):
-        path = normpath(destpath)
-
-        if dirname(dirname(path)) == '/':
-            new_parent = None
-        else:
-            new_parent = self.get_parent_id_from_path(path)
-
-        item.parent_id = new_parent
-        item.workspace_id = self.get_workspace_id_from_path(path)
-        item.item_name = basename(path)
-        self.session.commit()
-
-    def move_all_revisions(self, item, destpath):
-        path = normpath(destpath)
-        new_parent = self.get_parent_id_from_path(path)
-        new_workspace = self.get_workspace_id_from_path(destpath)
-
-        items = self.get_all_revisions_from_item(item)
-
-        for current_item in items:
-            current_item.parent_id = new_parent
-            current_item.workspace_id = new_workspace
-
-        new_name = basename(normpath(destpath))
-
-        new_item = self.add_item(
-            item_name=new_name,
-            item_type=item.item_type,
-            workspace_id=item.workspace_id,
-            parent_id=item.parent_id,
-            parent_revision_id=item.id,
-            child_revision_id=None,
-            item_content=item.item_content,
-            created=item.created,
-            updated=datetime.now()
-        )
-
-        item.child_revision_id = new_item.id
-
-        self.session.commit()
-
-    #########################################################
-    # Everything that goes with "copy"
-    def copy_item(self, item, destpath):
-        path = normpath(destpath)
-
-        new_parent = self.get_parent_id_from_path(path)
-        new_workspace = self.get_workspace_id_from_path(path)
-        items = self.get_all_revisions_from_item(item)
-
-        first = True
-        last_item = None
-
-        for current_item in items:
-            new_item = self.add_item(
-                item_name=current_item.item_name,
-                item_type=current_item.item_type,
-                workspace_id=new_workspace,
-                parent_id=new_parent,
-                parent_revision_id=None,
-                child_revision_id=None,
-                item_content=current_item.item_content,
-                created=current_item.created,
-                updated=current_item.updated
-            )
-
-            if not first:
-                last_item.child_revision_id = new_item.id
-                new_item.parent_revision_id = last_item.id
-
-            first = False
-            last_item = new_item
-
-        new_name = basename(destpath)
-        
-        new_item = self.add_item(
-            item_name=new_name,
-            item_type=item.item_type,
-            workspace_id=new_workspace,
-            parent_id=new_parent,
-            parent_revision_id=last_item.id,
-            child_revision_id=None,
-            item_content=item.item_content,
-            created=datetime.now(),
-            updated=datetime.now()
-        )
-
-        last_item.child_revision_id = new_item.id
+    def transform_to_display(self, string):
+        _TO_DISPLAY = {
+            # '/':'⁄',
+            '\\': '⧹',
+            ':': '∶',
+            '*': '∗',
+            '?': 'ʔ',
+            '"': 'ʺ',
+            '<': '❮',
+            '>': '❯',
+            '|': '∣'
+        }
+
+        for key, value in _TO_DISPLAY.items():
+            string = string.replace(key, value)
+
+        return string
+
+    def transform_to_bdd(self, string):
+        _TO_BDD = {
+            # '⁄': '/',
+            '⧹': '\\',
+            '∶': ':',
+            '∗': '*',
+            'ʔ': '?',
+            'ʺ': '"',
+            '❮': '<',
+            '❯': '>',
+            '∣': '|'
+        }
+
+        for key, value in _TO_BDD.items():
+            string = string.replace(key, value)
+
+        return string
 
-        self.session.commit()'''
 
 """
 
@@ -597,8 +347,12 @@ class Provider(DAVProvider):
      'ext_servers': ['cherrypy-bundled', 'wsgidav']
  },
  'http_authenticator.realm': '/',
- 'HTTP_AUTHORIZATION': 'Digest username="admin@admin.admin", realm="/", nonce="=", uri="/nouveau/", algorithm=MD5, response="9c78c484263409b3385ead95ea7bf65b", '
-                       'cnonce="MHgyMzNkZjkwOjQ4OTU6MTQ2OTc3OTI1NQ==", nc=00000471, qop=auth',
+ 'HTTP_AUTHORIZATION': 'Digest username="admin@admin.admin",
+ realm="/", nonce="=",
+ uri="/nouveau/",
+ algorithm=MD5,
+ response="9c78c484263409b3385ead95ea7bf65b", '
+ 'cnonce="MHgyMzNkZjkwOjQ4OTU6MTQ2OTc3OTI1NQ==", nc=00000471, qop=auth',
  'HTTP_ACCEPT_ENCODING': 'gzip, deflate',
  'HTTP_USER_AGENT': 'gvfs/1.22.2', 'wsgidav.debug_break': False,
  'HTTP_CONNECTION': 'Keep-Alive', 'SERVER_PORT': '3030', 'CONTENT_LENGTH': '235', 'HTTP_HOST': '127.0.0.1:3030', 'REQUEST_METHOD': 'PROPFIND', 'HTTP_APPLY_TO_REDIRECT_REF': 'T', 'SERVER_NAME': 'WsgiDAV/3.0.0pre1 CherryPy/3.2.4 Python/3.4.2', 'wsgi.errors': <_io.TextIOWrapper name='<stderr>' mode='w' encoding='UTF-8'>, 'wsgi.url_scheme': 'http', 'user': <User: email='admin@admin.admin', display='Global manager'>, 'HTTP_ACCEPT_LANGUAGE': 'en-us, en;q=0.9', 'ACTUAL_SERVER_PROTOCOL': 'HTTP/1.1', 'REMOTE_PORT': '48375', 'CONTENT_TYPE': 'application/xml', 'SCRIPT_NAME': '', 'wsgi.input': <wsgidav.server.cherrypy.wsgiserver.wsgiserver3.KnownLengthRFile object at 0x7fbc8410ce48>, 'wsgidav.username': 'admin@admin.admin', 'http_authenticator.username': 'admin@admin.admin', 'wsgidav.provider': Provider, 'PATH_INFO': '/nouveau/', 'HTTP_DEPTH': '1', 'SERVER_SOFTWARE': 'WsgiDAV/3.0.0pre1 CherryPy/3.2.4 Python/3.4.2 Server'}

tracim/tracim/lib/webdav/sql_domain_controller.py

@@ -21,7 +21,7 @@ class SQLDomainController(object):
         travailler dans la bdd pour vérifier si utilisateur existe
         """
         try:
-            environ['user'] = self._api.get_one_by_email(username)
+            self._api.get_one_by_email(username)
             return True
         except:
             return False
@@ -30,7 +30,6 @@ class SQLDomainController(object):
         """Retourne le mdp pour l'utilisateur pour ce real"""
         try:
             user = self._api.get_one_by_email(username)
-            return 'test'
             return user.password
         except:
             return None

tracim/wsgidav.conf.sample

@@ -1,33 +1,12 @@
 ################################################################################
 # Sample WsgiDAV configuration file
-# 
+#
 # 1. Rename this file to `wsgidav.conf`
 # 2. Adjust settings as appropriate
-# 3. Run `wsgidav` fro, the same directory.
-#
-# See
-#     doc/annotated_wsgidav.conf
-# for a complete, annotated configuration example.
+# 3. Run tracim as you always do :)
 #
 ################################################################################
 
-# HELPERS - Do not modify this section
-
-provider_mapping = {}
-user_mapping = {}
-
-def addShare(shareName, davProvider):
-    provider_mapping[shareName] = davProvider
-
-    
-def addUser(realmName, user, password, description, roles=[]):
-    realmName = "/" + realmName.strip(r"\/")
-    userDict = user_mapping.setdefault(realmName, {}).setdefault(user, {})
-    userDict["password"] = password
-    userDict["description"] = description
-    userDict["roles"] = roles
-
-        
 ################################################################################
 # SERVER OPTIONS
 #===============================================================================
@@ -36,149 +15,19 @@ def addUser(realmName, user, password, description, roles=[]):
 # host  = "192.168.0.1"
 host  = "0.0.0.0"
 
-port = 8080
-
-#===============================================================================
-# Enable SSL support
-# (The certificate should match the servers hostname, so the bogus certs will not
-# work in all scenarios.)
-
-# ssl_certificate = "wsgidav/server/sample_bogo_server.crt"
-# ssl_private_key = "wsgidav/server/sample_bogo_server.key"
-# ssl_certificate_chain = None
-
-
-# Add the MS-Author-Via Response Header to OPTIONS command to allow editing
-# with Microsoft Office (default: True)
-add_header_MS_Author_Via = True	
-
-#================================================================================
-# Misc. setings
-#
-
-# Block size in bytes
-#block_size = 8192
-
-#===============================================================================
-# Middlewares
-# 
-# Use this section to modify the default middleware stack
-
-#from wsgidav.dir_browser import WsgiDavDirBrowser
-#from debug_filter import WsgiDavDebugFilter
-#from http_authenticator import HTTPAuthenticator
-#from error_printer import ErrorPrinter
-#middleware_stack = [ WsgiDavDirBrowser, HTTPAuthenticator, ErrorPrinter, WsgiDavDebugFilter ]
-
-#===============================================================================
-# Debugging
-
-# verbose = 3
-
-# Enable specific module loggers
-# E.g. ["lock_manager", "property_manager", "http_authenticator", ...]
-# enable_loggers = ["http_authenticator", ]
-
-# Enable max. logging for certain http methods
-# E.g. ["COPY", "DELETE", "GET", "HEAD", "LOCK", "MOVE", "OPTIONS", "PROPFIND", "PROPPATCH", "PUT", "UNLOCK"]
-debug_methods = []
-
-# Enable max. logging during  litmus suite tests that contain certain strings
-# E.g. ["lock_excl", "notowner_modify", "fail_cond_put_unlocked", ...]
-debug_litmus = []
-
-
-################################################################################
-# WsgiDavDirBrowser
-
-dir_browser = {
-    "enable": True,          # Render HTML listing for GET requests on collections
-    "response_trailer": "",  # Raw HTML code, appended as footer
-    "davmount": True,        # Send <dm:mount> response if request URL contains '?davmount'
-    "ms_mount": True,        # Add an 'open as webfolder' link (requires Windows)
-    "ms_sharepoint_plugin": True, # Invoke MS Offce documents for editing using WebDAV
-    "ms_sharepoint_urls": False,  # Prepend 'ms-word:ofe|u|' to URL for MS Offce documents
-}
-
+port = 3030
 
-################################################################################
-# DAV Provider
-
-#===============================================================================
-# Property Manager
-
-# Example: Use PERSISTENT shelve based property manager
-#from wsgidav.property_manager import ShelvePropertyManager
-#propsmanager = ShelvePropertyManager("wsgidav-props.shelve")
+show_history = True
+show_deleted = True
+show_archived = True
 
-### Use in-memory property manager (NOT persistent)
-propsmanager = True
-
-
-### Optional additional live property modification
-# Enable to allow clients to use e.g. the touch or cp / rsync commands with the
-# preserve-timestamp flags in a mounted DAV share (may be RFC4918 incompliant)
-#mutable_live_props = ["{DAV:}getlastmodified"]
+manager_locks = True
 
+root_path = ''
 
 #===============================================================================
 # Lock Manager
 #
 # Example: Use PERSISTENT shelve based lock manager
 #from wsgidav.lock_storage import LockStorageShelve
-#locksmanager = LockStorageShelve("wsgidav-locks.shelve")
-
-
-#===============================================================================
-# SHARES
-
-addShare("", r"~/davshare")
-
-
-################################################################################
-# AUTHENTICATION
-#===============================================================================
-# HTTP Authentication Options
-
-acceptbasic = True    # Allow basic authentication, True or False
-acceptdigest = True   # Allow digest authentication, True or False
-defaultdigest = True  # True (default digest) or False (default basic)
-
-
-#domaincontroller =   # Uncomment this line to specify your own domain controller
-                      # Default: wsgidav.domain_controller, which uses the USERS 
-                      #          section below
-
-
-# Example: use a domain controller that allows users to authenticate against 
-#          a Windows NT domain or a local computer.
-#          Note: NTDomainController requires basic authentication:
-#                Set acceptbasic=True, acceptdigest=False, defaultdigest=False 
-
-# from wsgidav.addons.nt_domain_controller import NTDomainController
-# domaincontroller = NTDomainController(presetdomain=None, presetserver=None)
-# acceptbasic = True
-# acceptdigest = False
-# defaultdigest = False
-
-
-#===============================================================================
-# USERS
-#
-# This section is ONLY used by the DEFAULT Domain Controller.
-#
-# Users are defined per realm: 
-#     addUser(<realm>, <user>, <password>, <description>)  
-#
-# Note that the default Domain Controller uses the share name as realm name.   
-# 
-# If no users are specified for a realm, no authentication is required.
-# Thus granting read-write access to anonymous! 
-#
-# Note: If you wish to use Windows WebDAV support (such as Windows XP's My 
-# Network Places), you need to include the domain of the user as part of the 
-# username (note the DOUBLE slash), such as:
-# addUser("v_root", "domain\\user", "password", "description")
-
-addUser("", "tester", "secret", "")
-#addUser("", "tester2", "secret2", "")
+#locksmanager = LockStorageShelve("wsgidav-locks.shelve")