Skip to content

Commit 1023738

Browse files
test
1 parent 81ad324 commit 1023738

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

first_note.mp4

4.44 MB
Binary file not shown.

src/backend/src/routers/hosting/puter-site.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,14 @@ class PuterSiteMiddleware extends AdvancedBase {
147147
res.status(502).send('subdomain is pointing to non-directory');
148148
}
149149

150+
// Verify subdomain owner permission
151+
const subdomain_actor = Actor.adapt(subdomain_owner);
152+
const svc_acl = services.get('acl');
153+
if ( ! await svc_acl.check(subdomain_actor, node, 'read') ) {
154+
res.status(502).send('subdomain owner does not have access to directory');
155+
return;
156+
}
157+
150158
subdomain_root_path = await node.get('path');
151159
}
152160

src/gui/src/UI/UITaskbar.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ async function UITaskbar(options){
148148
appendTo: "body",
149149
revert: "invalid",
150150
connectToSortable: ".taskbar",
151-
//containment: "document",
152151
zIndex: parseInt($(popover).css('z-index')) + 1,
153152
scroll: false,
154153
distance: 5,
@@ -292,7 +291,6 @@ window.make_taskbar_sortable = function(){
292291
});
293292
let el = ($(item).detach())
294293
$(el).insertAfter(ui.item);
295-
// $(ui.item).insertBefore(`<h1>Hello!</h1>`);
296294
$(el).show();
297295
$(ui.item).removeItems();
298296
window.update_taskbar();

src/gui/src/initgui.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import UIWindowChangeUsername from './UI/UIWindowChangeUsername.js';
3434
import update_last_touch_coordinates from './helpers/update_last_touch_coordinates.js';
3535
import update_title_based_on_uploads from './helpers/update_title_based_on_uploads.js';
3636
import PuterDialog from './UI/PuterDialog.js';
37-
import determine_active_container_parent from './helpers/determine_active_container_parent.js';
3837
import { ThemeService } from './services/ThemeService.js';
3938
import { BroadcastService } from './services/BroadcastService.js';
4039
import { ProcessService } from './services/ProcessService.js';

0 commit comments

Comments
 (0)