github_mirrors/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2025-02-02 23:28:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: support readdir for directory symlinks

Browse Source
This commit is contained in:
KernelDeimos 2024-10-08 18:31:39 -04:00
parent c2a9506b48
commit 7f1b870d30
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backend/src/filesystem/hl_operations/hl_readdir.js
View File

@ -18,7 +18,7 @@
*/ */
const APIError = require("../../api/APIError"); const APIError = require("../../api/APIError");
const { chkperm } = require("../../helpers"); const { chkperm } = require("../../helpers");
const { TYPE_DIRECTORY } = require("../FSNodeContext"); const { TYPE_DIRECTORY, TYPE_SYMLINK } = require("../FSNodeContext");
const { LLListUsers } = require("../ll_operations/ll_listusers"); const { LLListUsers } = require("../ll_operations/ll_listusers");
const { LLReadDir } = require("../ll_operations/ll_readdir"); const { LLReadDir } = require("../ll_operations/ll_readdir");
const { LLReadShares } = require("../ll_operations/ll_readshares"); const { LLReadShares } = require("../ll_operations/ll_readshares");
@ -26,12 +26,23 @@ const { HLFilesystemOperation } = require("./definitions");
class HLReadDir extends HLFilesystemOperation { class HLReadDir extends HLFilesystemOperation {
async _run () { async _run () {
const { subject, user, no_thumbs, no_assocs, actor } = this.values; const { subject: subject_let, user, no_thumbs, no_assocs, actor } = this.values;
let subject = subject_let;
if ( ! await subject.exists() ) { if ( ! await subject.exists() ) {
throw APIError.create('subject_does_not_exist'); throw APIError.create('subject_does_not_exist');
} }
if ( await subject.get('type') === TYPE_SYMLINK ) {
const { context } = this;
const svc_acl = context.get('services').get('acl');
if ( ! await svc_acl.check(actor, subject, 'read') ) {
throw await svc_acl.get_safe_acl_error(actor, subject, 'read');
}
const target = await subject.getTarget();
subject = target;
}
if ( await subject.get('type') !== TYPE_DIRECTORY ) { if ( await subject.get('type') !== TYPE_DIRECTORY ) {
const { context } = this; const { context } = this;
const svc_acl = context.get('services').get('acl'); const svc_acl = context.get('services').get('acl');

16
src/backend/src/filesystem/ll_operations/ll_readdir.js
View File

@ -17,6 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
const APIError = require("../../api/APIError"); const APIError = require("../../api/APIError");
const { TYPE_SYMLINK } = require("../FSNodeContext");
const { RootNodeSelector } = require("../node/selectors"); const { RootNodeSelector } = require("../node/selectors");
const { NodeUIDSelector, NodeChildSelector } = require("../node/selectors"); const { NodeUIDSelector, NodeChildSelector } = require("../node/selectors");
const { LLFilesystemOperation } = require("./definitions"); const { LLFilesystemOperation } = require("./definitions");
@ -24,7 +25,8 @@ const { LLFilesystemOperation } = require("./definitions");
class LLReadDir extends LLFilesystemOperation { class LLReadDir extends LLFilesystemOperation {
async _run () { async _run () {
const { context } = this; const { context } = this;
const { subject, user, actor, no_acl } = this.values; const { subject: subject_let, user, actor, no_acl } = this.values;
let subject = subject_let;
if ( ! await subject.exists() ) { if ( ! await subject.exists() ) {
throw APIError.create('subject_does_not_exist'); throw APIError.create('subject_does_not_exist');
@ -37,6 +39,18 @@ class LLReadDir extends LLFilesystemOperation {
} }
} }
// TODO: DRY ACL check here
const subject_type = await subject.get('type');
if ( subject_type === TYPE_SYMLINK ) {
const target = await subject.getTarget();
if ( ! no_acl ) {
if ( ! await svc_acl.check(actor, target, 'list') ) {
throw await svc_acl.get_safe_acl_error(actor, target, 'list');
}
}
subject = target;
}
const subject_uuid = await subject.get('uid'); const subject_uuid = await subject.get('uid');
const svc = context.get('services'); const svc = context.get('services');