Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added first_note.mp4
Binary file not shown.
8 changes: 8 additions & 0 deletions src/backend/src/routers/hosting/puter-site.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ class PuterSiteMiddleware extends AdvancedBase {
res.status(502).send('subdomain is pointing to non-directory');
}

// Verify subdomain owner permission
const subdomain_actor = Actor.adapt(subdomain_owner);
const svc_acl = services.get('acl');
if ( ! await svc_acl.check(subdomain_actor, node, 'read') ) {
res.status(502).send('subdomain owner does not have access to directory');
return;
}

subdomain_root_path = await node.get('path');
}

Expand Down
2 changes: 0 additions & 2 deletions src/gui/src/UI/UITaskbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ async function UITaskbar(options){
appendTo: "body",
revert: "invalid",
connectToSortable: ".taskbar",
//containment: "document",
zIndex: parseInt($(popover).css('z-index')) + 1,
scroll: false,
distance: 5,
Expand Down Expand Up @@ -292,7 +291,6 @@ window.make_taskbar_sortable = function(){
});
let el = ($(item).detach())
$(el).insertAfter(ui.item);
// $(ui.item).insertBefore(`<h1>Hello!</h1>`);
$(el).show();
$(ui.item).removeItems();
window.update_taskbar();
Expand Down
1 change: 0 additions & 1 deletion src/gui/src/initgui.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import UIWindowChangeUsername from './UI/UIWindowChangeUsername.js';
import update_last_touch_coordinates from './helpers/update_last_touch_coordinates.js';
import update_title_based_on_uploads from './helpers/update_title_based_on_uploads.js';
import PuterDialog from './UI/PuterDialog.js';
import determine_active_container_parent from './helpers/determine_active_container_parent.js';
import { ThemeService } from './services/ThemeService.js';
import { BroadcastService } from './services/BroadcastService.js';
import { ProcessService } from './services/ProcessService.js';
Expand Down