1.0.67-alpha

Author: ITHitBuild

FileSystem/DavContext.js

@@ -42,6 +42,7 @@ class DavContext extends DavContextBase_1.DavContextBase {
         }
         return source.replace(/^\s+|\s+$/g, '');
     }
+    //$<DavContextBase.GetHierarchyItem
     /**
      * Creates {@link IHierarchyItem}  instance by path.
      * @param path Item relative path including query string.
@@ -65,6 +66,7 @@ class DavContext extends DavContextBase_1.DavContextBase {
         return null;
         //  no hierarchy item that corresponds to path parameter was found in the repository
     }
+    //$>
     /**
      * Returns the physical file path that corresponds to the specified virtual path on the Web server.
      * @param relativePath Path relative to WebDAV root folder.

FileSystem/DavFile.js

@@ -65,9 +65,11 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
      * @returns  File instance or null if physical file is not found in file system.
      */
     static async getFile(context, path) {
-        const filePath = context.mapPath(path) + path_1.sep + path;
-        const existFile = await util_1.promisify(fs_1.exists)(filePath);
-        if (!existFile) {
+        const filePath = EncodeUtil_1.EncodeUtil.decodeUrlPart(context.mapPath(path) + path_1.sep + path);
+        try {
+            await util_1.promisify(fs_1.access)(filePath, constants_1.F_OK);
+        }
+        catch (err) {
             return null;
         }
         const file = await util_1.promisify(fs_1.stat)(filePath);
@@ -199,7 +201,7 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
         }
         //  Copy the file togather with all extended attributes (custom props and locks).
         try {
-            await util_1.promisify(fs_1.copyFile)(this.directory, newFilePath, constants_1.COPYFILE_EXCL);
+            await util_1.promisify(fs_1.copyFile)(this.directory, newFilePath);
         }
         catch (err) {
             /*if(err.errno && err.errno === EACCES) {
@@ -220,7 +222,28 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
      * @param destName New name of this file.
      * @param multistatus Information about items that failed to move.
      */
-    moveTo(destFolder, destName, multistatus) {
+    async moveTo(destFolder, destName, multistatus) {
+        await this.requireHasToken();
+        const targetFolder = destFolder;
+        if (targetFolder == null || !await util_1.promisify(fs_1.exists)(targetFolder.directory)) {
+            throw new DavException_1.DavException("Target directory doesn't exist", undefined, DavStatus_1.DavStatus.CONFLICT);
+        }
+        const newDirPath = path_1.join(targetFolder.directory, destName);
+        const targetPath = (targetFolder.path + EncodeUtil_1.EncodeUtil.encodeUrlPart(destName));
+        // If an item with the same name exists in target directory - remove it.
+        try {
+            const item = await this.context.getHierarchyItem(targetPath);
+            if (item != null) {
+                await item.delete(multistatus);
+            }
+        }
+        catch (err) {
+            // Report exception to client and continue with other items by returning from recursion.
+            multistatus.addInnerException(targetPath, undefined, err);
+            return;
+        }
+        // Move the file.
+        await util_1.promisify(fs_1.rename)(this.directory, newDirPath);
     }
     //$>
     //$<IHierarchyItem.Delete

FileSystem/DavFile.ts

@@ -1,4 +1,4 @@
-import { createWriteStream, exists, ftruncate, open, stat, Stats, createReadStream, copyFile, unlink } from "fs";
+import { createWriteStream, exists, ftruncate, open, stat, Stats, createReadStream, copyFile, unlink, rename, access } from "fs";
 import { IncomingMessage, ServerResponse } from "http";
 import { IFile } from "ithit.webdav.server/Class1/IFile";
 import { DavException } from "ithit.webdav.server/DavException";
@@ -13,7 +13,7 @@ import { DavContext } from "./DavContext";
 import { DavHierarchyItem } from "./DavHierarchyItem";
 import { FileSystemInfoExtension } from "./ExtendedAttributes/FileSystemInfoExtension";
 import { DavFolder } from "./DavFolder";
-import { COPYFILE_EXCL } from "constants";
+import { F_OK } from "constants";
 
 /**
  * Represents file in WebDAV repository.
@@ -101,9 +101,10 @@ export class DavFile extends DavHierarchyItem implements IFile {
      * @returns  File instance or null if physical file is not found in file system.
      */
     public static async getFile(context: DavContext, path: string): Promise<DavFile | null> {
-        const filePath: string = context.mapPath(path) + sep + path;
-        const existFile = await promisify(exists)(filePath);
-        if (!existFile) {
+        const filePath = EncodeUtil.decodeUrlPart(context.mapPath(path) + sep + path);
+        try {
+            await promisify(access)(filePath, F_OK);
+        } catch(err) {
             return null;
         }
 
@@ -257,7 +258,7 @@ export class DavFile extends DavHierarchyItem implements IFile {
 
         //  Copy the file togather with all extended attributes (custom props and locks).
         try {
-            await promisify(copyFile)(this.directory, newFilePath, COPYFILE_EXCL);            
+            await promisify(copyFile)(this.directory, newFilePath);            
         } catch (err) {
             /*if(err.errno && err.errno === EACCES) {
                 const ex = new NeedPrivilegesException("Not enough privileges");
@@ -279,7 +280,32 @@ export class DavFile extends DavHierarchyItem implements IFile {
      * @param destName New name of this file.
      * @param multistatus Information about items that failed to move.
      */
-    public moveTo(destFolder: IItemCollection, destName: string, multistatus: MultistatusException): void {
+    public async moveTo(destFolder: IItemCollection, destName: string, multistatus: MultistatusException): Promise<void> {
+        await this.requireHasToken();
+        const targetFolder = destFolder as DavFolder;
+         if (targetFolder == null || !await promisify(exists)(targetFolder.directory)) {
+            throw new DavException("Target directory doesn't exist", undefined, DavStatus.CONFLICT);
+        }
+
+        const newDirPath = join(targetFolder.directory, destName);
+        const targetPath = (targetFolder.path + EncodeUtil.encodeUrlPart(destName));
+
+        // If an item with the same name exists in target directory - remove it.
+        try {
+            const item = await this.context.getHierarchyItem(targetPath);
+            if (item != null) {
+                await item.delete(multistatus);
+            }
+            
+        } catch (err) {
+            // Report exception to client and continue with other items by returning from recursion.
+            multistatus.addInnerException(targetPath, undefined, err);
+
+            return;
+        }
+
+        // Move the file.
+        await promisify(rename)(this.directory, newDirPath);
     }
 	//$>
 

FileSystem/DavFolder.js

@@ -8,6 +8,7 @@ const DavHierarchyItem_1 = require("./DavHierarchyItem");
 const DavException_1 = require("ithit.webdav.server/DavException");
 const DavStatus_1 = require("ithit.webdav.server/DavStatus");
 const EncodeUtil_1 = require("ithit.webdav.server/EncodeUtil");
+const constants_1 = require("constants");
 /**
  * Folder in WebDAV repository.
  */
@@ -19,9 +20,11 @@ class DavFolder extends DavHierarchyItem_1.DavHierarchyItem {
      * @returns  Folder instance or null if physical folder not found in file system.
      */
     static async getFolder(context, path) {
-        const folderPath = context.mapPath(path) + path_1.sep + path;
-        const existFolder = await util_1.promisify(fs_1.exists)(folderPath);
-        if (!existFolder) {
+        const folderPath = EncodeUtil_1.EncodeUtil.decodeUrlPart(context.mapPath(path) + path_1.sep + path);
+        try {
+            await util_1.promisify(fs_1.access)(folderPath, constants_1.F_OK);
+        }
+        catch (err) {
             return null;
         }
         const folder = await util_1.promisify(fs_1.stat)(folderPath);
@@ -150,7 +153,47 @@ class DavFolder extends DavHierarchyItem_1.DavHierarchyItem {
      * @param destName New name of this folder.
      * @param multistatus Information about child items that failed to move.
      */
-    moveTo(destFolder, destName, multistatus) {
+    async moveTo(destFolder, destName, multistatus) {
+        await this.requireHasToken();
+        const targetFolder = destFolder;
+        if (targetFolder == null) {
+            throw new DavException_1.DavException("Target folder doesn't exist", undefined, DavStatus_1.DavStatus.CONFLICT);
+        }
+        if (this.isRecursive(targetFolder)) {
+            throw new DavException_1.DavException("Cannot move folder to its subtree.", undefined, DavStatus_1.DavStatus.FORBIDDEN);
+        }
+        const targetPath = (targetFolder.path + EncodeUtil_1.EncodeUtil.encodeUrlPart(destName));
+        try {
+            // Remove item with the same name at destination if it exists.
+            const item = await this.context.getHierarchyItem(targetPath);
+            if (item !== null) {
+                await item.delete(multistatus);
+            }
+            await targetFolder.createFolder(destName);
+        }
+        catch (err) {
+            // Continue the operation but report error with destination path to client.
+            multistatus.addInnerException(targetPath, undefined, err);
+            return;
+        }
+        // Move child items.
+        let movedSuccessfully = true;
+        const createdFolder = await this.context.getHierarchyItem(targetPath);
+        const children = await this.getChildren([new PropertyName_1.PropertyName()]);
+        for (let i = 0; i < children.length; i++) {
+            const item = children[i];
+            try {
+                await item.moveTo(createdFolder, item.name, multistatus);
+            }
+            catch (err) {
+                // If a child item failed to copy we continue but report error to client.
+                multistatus.addInnerException(item.path, undefined, err);
+                movedSuccessfully = false;
+            }
+        }
+        if (movedSuccessfully) {
+            await this.delete(multistatus);
+        }
     }
     /**
      * Called whan this folder is being deleted.
@@ -186,6 +229,7 @@ class DavFolder extends DavHierarchyItem_1.DavHierarchyItem {
      * @returns  List of @see IHierarchyItemAsync  satisfying search request.
      */
     search(searchString, options, propNames) {
+        // Not implemented currently.
     }
     //$>
     /**

FileSystem/DavFolder.ts

@@ -1,4 +1,4 @@
-import { exists, readdir, stat, Stats, mkdir, rmdir, open, close } from "fs";
+import { exists, readdir, stat, Stats, mkdir, rmdir, open, close, access } from "fs";
 import { IFolder } from "ithit.webdav.server/Class1/IFolder";
 import { IHierarchyItem } from "ithit.webdav.server/IHierarchyItem";
 import { IItemCollection } from "ithit.webdav.server/IItemCollection";
@@ -11,6 +11,7 @@ import { DavHierarchyItem } from "./DavHierarchyItem";
 import { DavException } from "ithit.webdav.server/DavException";
 import { DavStatus } from "ithit.webdav.server/DavStatus";
 import { EncodeUtil } from "ithit.webdav.server/EncodeUtil";
+import { F_OK } from "constants";
 
 /**
  * Folder in WebDAV repository.
@@ -23,9 +24,10 @@ export class DavFolder extends DavHierarchyItem implements IFolder {
      * @returns  Folder instance or null if physical folder not found in file system.
      */
     public static async getFolder(context: DavContext, path: string): Promise<DavFolder | null> {
-        const folderPath: string = context.mapPath(path) + sep + path;
-        const existFolder = await promisify(exists)(folderPath);
-        if (!existFolder) {
+        const folderPath: string = EncodeUtil.decodeUrlPart(context.mapPath(path) + sep + path);
+        try {
+            await promisify(access)(folderPath, F_OK);
+        } catch(err) {
             return null;
         }
 
@@ -170,7 +172,51 @@ export class DavFolder extends DavHierarchyItem implements IFolder {
      * @param destName New name of this folder.
      * @param multistatus Information about child items that failed to move.
      */
-    public moveTo(destFolder: IItemCollection, destName: string, multistatus: MultistatusException): void {
+    public async moveTo(destFolder: IItemCollection, destName: string, multistatus: MultistatusException): Promise<void> {
+        await this.requireHasToken();
+        const targetFolder = destFolder as DavFolder;
+        if (targetFolder == null) {
+            throw new DavException("Target folder doesn't exist", undefined, DavStatus.CONFLICT);
+        }
+
+        if (this.isRecursive(targetFolder)) {
+            throw new DavException("Cannot move folder to its subtree.", undefined, DavStatus.FORBIDDEN);
+        }
+
+        const targetPath = (targetFolder.path + EncodeUtil.encodeUrlPart(destName));
+        try {
+            // Remove item with the same name at destination if it exists.
+            const item = await this.context.getHierarchyItem(targetPath);
+            if (item !== null) {
+                await item.delete(multistatus);
+            }
+
+            await targetFolder.createFolder(destName);
+        } catch (err) {
+            // Continue the operation but report error with destination path to client.
+            multistatus.addInnerException(targetPath, undefined, err);
+            return;
+        }
+
+        // Move child items.
+        let movedSuccessfully = true;
+        const createdFolder = await this.context.getHierarchyItem(targetPath);
+        const children = await this.getChildren([new PropertyName()]);
+        for(let i = 0; i < children.length; i++) {
+            const item = children[i];
+
+            try {
+                await item.moveTo(createdFolder as IItemCollection, item.name, multistatus);
+            } catch (err) {
+                // If a child item failed to copy we continue but report error to client.
+                multistatus.addInnerException(item.path, undefined, err);
+                movedSuccessfully = false;
+            }
+        }
+
+        if (movedSuccessfully) {
+            await this.delete(multistatus);
+        }
     }
 
     /**
@@ -208,6 +254,7 @@ export class DavFolder extends DavHierarchyItem implements IFolder {
      * @returns  List of @see IHierarchyItemAsync  satisfying search request.
      */
     public search(searchString: string, options: any, propNames: PropertyName[]): void {
+        // Not implemented currently.
     }
 	//$>