Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NavWindow: fix file permissions bug #71

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

NavWindow: fix file permissions bug #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 36 additions & 12 deletions navigator/components/NavWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,9 @@ export class NavWindow {
}

async mkdir() {
let current_user;
var user_promise = cockpit.user();
user_promise.then(user => current_user = user.name);
let response = await this.modal_prompt.prompt("Creating Directory",
{
new_name: {
Expand All @@ -518,15 +521,24 @@ export class NavWindow {
return;
}
var promise = new Promise((resolve, reject) => {
var proc = cockpit.spawn(
["mkdir", this.pwd().path_str() + "/" + new_dir_name],
{superuser: "try", err: "out"}
var admin_access_proc = cockpit.spawn(
["runuser", "-u", current_user, "mkdir", this.pwd().path_str() + "/" + new_dir_name],
{superuser: "require", err: "out"}
);
proc.done((data) => {
admin_access_proc.done((data) => {
resolve();
});
proc.fail((e, data) => {
reject(data);
admin_access_proc.fail((e, data) => {
var limited_access_proc = cockpit.spawn(
["mkdir", this.pwd().path_str() + "/" + new_dir_name],
{superuser: "try", err: "out"}
);
limited_access_proc.done((data) => {
resolve();
});
limited_access_proc.fail((e, data) => {
reject(data);
})
});
});
try {
Expand All @@ -538,6 +550,9 @@ export class NavWindow {
}

async touch() {
let current_user;
var user_promise = cockpit.user();
user_promise.then(user => current_user = user.name);
let response = await this.modal_prompt.prompt("Creating File",
{
new_name: {
Expand All @@ -558,15 +573,24 @@ export class NavWindow {
return;
}
var promise = new Promise((resolve, reject) => {
var proc = cockpit.spawn(
["/usr/share/cockpit/navigator/scripts/touch.py3", this.pwd().path_str() + "/" + new_file_name],
{superuser: "try", err: "out"}
var admin_access_proc = cockpit.spawn(
["runuser", "-u", current_user, "/usr/share/cockpit/navigator/scripts/touch.py3", this.pwd().path_str() + "/" + new_file_name],
{superuser: "require", err: "out"}
);
proc.done((data) => {
admin_access_proc.done((data) => {
resolve();
});
proc.fail((e, data) => {
reject(data);
admin_access_proc.fail((e, data) => {
var limited_access_proc = cockpit.spawn(
["/usr/share/cockpit/navigator/scripts/touch.py3", this.pwd().path_str() + "/" + new_file_name],
{superuser: "try", err: "out"}
);
limited_access_proc.done((data) => {
resolve();
});
limited_access_proc.fail((e, data) => {
reject(data);
})
});
});
try {
Expand Down