Skip to content

Commit 9009ad1

Browse files
AdrienCastexAdrienCastex
committed
Implemented DAV:lockdiscovery in PROPFIND
1 parent bb9b575 commit 9009ad1

File tree

2 files changed

+118
-4
lines changed

2 files changed

+118
-4
lines changed

‎lib/server/commands/Propfind.js

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,35 @@
22
Object.defineProperty(exports, "__esModule", { value: true });
33
var WebDAVRequest_1 = require("../WebDAVRequest");
44
var IResource_1 = require("../../resource/IResource");
5+
var FSPath_1 = require("../../manager/FSPath");
56
var XML_1 = require("../../helper/XML");
67
var http = require("http");
8+
function lockDiscovery(arg, path, resource, callback) {
9+
arg.requireErPrivilege('canListLocks', resource, function (e, can) {
10+
if (e || !can) {
11+
callback(e, {});
12+
return;
13+
}
14+
resource.getLocks(function (e, locks) {
15+
if (resource.parent) {
16+
var parentPath = path.getParent();
17+
lockDiscovery(arg, parentPath, resource.parent, function (e, l) {
18+
if (e)
19+
callback(e, null);
20+
else {
21+
l[path.toString()] = locks;
22+
callback(null, l);
23+
}
24+
});
25+
}
26+
else
27+
callback(null, (_a = {},
28+
_a[path.toString()] = locks,
29+
_a));
30+
var _a;
31+
});
32+
});
33+
}
734
function default_1(arg, callback) {
835
arg.getResource(function (e, resource) {
936
if (e || !resource) {
@@ -80,9 +107,33 @@ function default_1(arg, callback) {
80107
nbOut(e);
81108
}); });
82109
arg.getResourcePath(resource, function (e, path) {
83-
if (!e)
110+
if (!e) {
84111
response.ele('D:href').add(arg.fullUri(path).replace(' ', '%20'));
85-
nbOut(e);
112+
var lockdiscovery_1 = prop.ele('D:lockdiscovery');
113+
lockDiscovery(arg, new FSPath_1.FSPath(path), resource, function (e, l) {
114+
if (e) {
115+
nbOut(e);
116+
return;
117+
}
118+
for (var path_1 in l) {
119+
for (var _i = 0, _a = l[path_1]; _i < _a.length; _i++) {
120+
var _lock = _a[_i];
121+
var lock = _lock;
122+
var activelock = lockdiscovery_1.ele('D:activelock');
123+
activelock.ele('D:lockscope').ele('D:' + lock.lockKind.scope.value.toLowerCase());
124+
activelock.ele('D:locktype').ele('D:' + lock.lockKind.type.value.toLowerCase());
125+
activelock.ele('D:depth').add('Infinity');
126+
activelock.ele('D:owner').add(lock.owner);
127+
activelock.ele('D:timeout').add('Second-' + (lock.expirationDate - Date.now()));
128+
activelock.ele('D:locktoken').ele('D:href').add(lock.uuid);
129+
activelock.ele('D:lockroot').ele('D:href').add(arg.fullUri(path_1).replace(' ', '%20'));
130+
}
131+
}
132+
nbOut(null);
133+
});
134+
}
135+
else
136+
nbOut(e);
86137
});
87138
resource.webName(function (e, name) { return process.nextTick(function () {
88139
if (!e)

‎src/server/commands/Propfind.ts

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,42 @@
11
import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
2-
import { IResource, ETag } from '../../resource/IResource'
2+
import { IResource, ETag, ReturnCallback } from '../../resource/IResource'
33
import { BasicPrivilege } from '../../user/privilege/IPrivilegeManager'
4+
import { FSPath } from '../../manager/FSPath'
5+
import { Lock } from '../../resource/lock/Lock'
46
import { XML } from '../../helper/XML'
57
import * as http from 'http'
68

9+
function lockDiscovery(arg : MethodCallArgs, path : FSPath, resource : IResource, callback : ReturnCallback<any>)
10+
{
11+
arg.requireErPrivilege('canListLocks', resource, (e, can) => {
12+
if(e || !can)
13+
{
14+
callback(e, {});
15+
return;
16+
}
17+
18+
resource.getLocks((e, locks) => {
19+
if(resource.parent)
20+
{
21+
const parentPath = path.getParent();
22+
lockDiscovery(arg, parentPath, resource.parent, (e, l) => {
23+
if(e)
24+
callback(e, null);
25+
else
26+
{
27+
l[path.toString()] = locks;
28+
callback(null, l);
29+
}
30+
});
31+
}
32+
else
33+
callback(null, {
34+
[path.toString()]: locks
35+
});
36+
});
37+
})
38+
}
39+
740
export default function(arg : MethodCallArgs, callback)
841
{
942
arg.getResource((e, resource) => {
@@ -108,8 +141,38 @@ export default function(arg : MethodCallArgs, callback)
108141

109142
arg.getResourcePath(resource, (e, path) => {
110143
if(!e)
144+
{
111145
response.ele('D:href').add(arg.fullUri(path).replace(' ', '%20'));
112-
nbOut(e);
146+
const lockdiscovery = prop.ele('D:lockdiscovery');
147+
lockDiscovery(arg, new FSPath(path), resource, (e, l) => {
148+
if(e)
149+
{
150+
nbOut(e);
151+
return;
152+
}
153+
154+
for(const path in l)
155+
{
156+
for(const _lock of l[path])
157+
{
158+
const lock : Lock = _lock;
159+
const activelock = lockdiscovery.ele('D:activelock');
160+
161+
activelock.ele('D:lockscope').ele('D:' + lock.lockKind.scope.value.toLowerCase())
162+
activelock.ele('D:locktype').ele('D:' + lock.lockKind.type.value.toLowerCase())
163+
activelock.ele('D:depth').add('Infinity')
164+
activelock.ele('D:owner').add(lock.owner)
165+
activelock.ele('D:timeout').add('Second-' + (lock.expirationDate - Date.now()))
166+
activelock.ele('D:locktoken').ele('D:href').add(lock.uuid)
167+
activelock.ele('D:lockroot').ele('D:href').add(arg.fullUri(path).replace(' ', '%20'))
168+
}
169+
}
170+
171+
nbOut(null);
172+
})
173+
}
174+
else
175+
nbOut(e);
113176
})
114177

115178
resource.webName((e, name) => process.nextTick(() => {

0 commit comments

Comments
 (0)