Centralized the 'source' header check in the 'MethodCallArgs' class

OpenMarshal · Jun 10, 2017 · 163914f · 163914f
1 parent 2d9627e
commit 163914f
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 10 deletions.
diff --git a/lib/server/MethodCallArgs.js b/lib/server/MethodCallArgs.js
@@ -16,6 +16,7 @@ var MethodCallArgs = (function () {
         this.exit = exit;
         this.callback = callback;
         this.contentLength = parseInt(this.findHeader('Content-length', '0'), 10);
+        this.isSource = this.findHeader('source', 'F').toUpperCase() === 'T' || this.findHeader('translate', 'F').toUpperCase() === 'T';
         this.depth = parseInt(this.findHeader('Depth', '0'), 10);
         this.host = this.findHeader('Host');
         this.uri = url.parse(request.url).pathname;

diff --git a/lib/server/commands/Get.js b/lib/server/commands/Get.js
@@ -53,7 +53,7 @@ function default_1(arg, callback) {
                 return;
             }
             arg.checkIfHeader(r, function () {
-                var targetSource = arg.findHeader('source', 'F').toUpperCase() === 'T';
+                var targetSource = arg.isSource;
                 arg.requirePrivilege(targetSource ? ['canRead', 'canSource'] : ['canRead'], r, function () {
                     r.read(targetSource, function (e, rstream) { return process.nextTick(function () {
                         if (e) {

diff --git a/lib/server/commands/Head.js b/lib/server/commands/Head.js
@@ -9,7 +9,7 @@ function default_1(arg, callback) {
                 callback();
                 return;
             }
-            var targetSource = arg.findHeader('source', 'F').toUpperCase() === 'T';
+            var targetSource = arg.isSource;
             arg.checkIfHeader(r, function () {
                 arg.requirePrivilege(targetSource ? ['canRead', 'canSource'] : ['canRead'], r, function () {
                     r.type(function (e, type) {

diff --git a/lib/server/commands/Propfind.js b/lib/server/commands/Propfind.js
@@ -92,7 +92,7 @@ function default_1(arg, callback) {
         }
         var lockDiscoveryCache = {};
         arg.checkIfHeader(resource, function () {
-            var targetSource = arg.findHeader('source', 'F').toUpperCase() === 'T';
+            var targetSource = arg.isSource;
             var multistatus = XML_1.XML.createElement('D:multistatus', {
                 'xmlns:D': 'DAV:'
             });

diff --git a/lib/server/commands/Put.js b/lib/server/commands/Put.js
@@ -39,7 +39,7 @@ function createResource(arg, callback, validCallback) {
     });
 }
 function unchunkedMethod(arg, callback) {
-    var targetSource = arg.findHeader('source', 'F').toUpperCase() === 'T';
+    var targetSource = arg.isSource;
     arg.getResource(function (e, r) {
         if (e && e !== Errors_1.Errors.ResourceNotFound) {
             arg.setCode(WebDAVRequest_1.HTTPCodes.InternalServerError);
@@ -121,7 +121,7 @@ function unchunkedMethod(arg, callback) {
 }
 exports.default = unchunkedMethod;
 unchunkedMethod.chunked = function (arg, callback) {
-    var targetSource = arg.findHeader('source', 'F').toUpperCase() === 'T';
+    var targetSource = arg.isSource;
     arg.getResource(function (e, r) {
         if (e && e !== Errors_1.Errors.ResourceNotFound) {
             arg.setCode(WebDAVRequest_1.HTTPCodes.InternalServerError);

diff --git a/src/server/commands/Get.ts b/src/server/commands/Get.ts
@@ -53,7 +53,7 @@ export default function(arg : MethodCallArgs, callback)
             }
 
             arg.checkIfHeader(r, () => {
-                const targetSource = arg.findHeader('source', 'F').toUpperCase() === 'T';
+                const targetSource = arg.isSource;
 
                 arg.requirePrivilege(targetSource ? [ 'canRead', 'canSource' ] : [ 'canRead' ], r, () => {
                     r.read(targetSource, (e, rstream) => process.nextTick(() => {

diff --git a/src/server/commands/Head.ts b/src/server/commands/Head.ts
@@ -12,7 +12,7 @@ export default function(arg : MethodCallArgs, callback)
                 return;
             }
 
-            const targetSource = arg.findHeader('source', 'F').toUpperCase() === 'T';
+            const targetSource = arg.isSource;
 
             arg.checkIfHeader(r, () => {
                 arg.requirePrivilege(targetSource ? [ 'canRead', 'canSource' ] : [ 'canRead' ], r, () => {

diff --git a/src/server/commands/Propfind.ts b/src/server/commands/Propfind.ts
@@ -126,7 +126,7 @@ export default function(arg : MethodCallArgs, callback)
         const lockDiscoveryCache = {};
 
         arg.checkIfHeader(resource, () => {
-            const targetSource = arg.findHeader('source', 'F').toUpperCase() === 'T';
+            const targetSource = arg.isSource;
 
             const multistatus = XML.createElement('D:multistatus', {
                 'xmlns:D': 'DAV:'

diff --git a/src/server/commands/Put.ts b/src/server/commands/Put.ts
@@ -48,7 +48,7 @@ function createResource(arg : MethodCallArgs, callback, validCallback : (resourc
 
 export default function unchunkedMethod(arg : MethodCallArgs, callback)
 {
-    const targetSource = arg.findHeader('source', 'F').toUpperCase() === 'T';
+    const targetSource = arg.isSource;
 
     arg.getResource((e, r) => {
         if(e && e !== Errors.ResourceNotFound)
@@ -148,7 +148,7 @@ export default function unchunkedMethod(arg : MethodCallArgs, callback)
 
 (unchunkedMethod as WebDAVRequest).chunked = function(arg : MethodCallArgs, callback)
 {
-    const targetSource = arg.findHeader('source', 'F').toUpperCase() === 'T';
+    const targetSource = arg.isSource;
 
     arg.getResource((e, r) => {
         if(e && e !== Errors.ResourceNotFound)